diff --git a/Test/UnitTest/Caching/EntrySearchCacheFixture.cs b/test/UnitTest/Caching/EntrySearchCacheFixture.cs
similarity index 100%
rename from Test/UnitTest/Caching/EntrySearchCacheFixture.cs
rename to test/UnitTest/Caching/EntrySearchCacheFixture.cs
diff --git a/Test/UnitTest/Caching/ProfanityFilterCacheFixture.cs b/test/UnitTest/Caching/ProfanityFilterCacheFixture.cs
similarity index 100%
rename from Test/UnitTest/Caching/ProfanityFilterCacheFixture.cs
rename to test/UnitTest/Caching/ProfanityFilterCacheFixture.cs
diff --git a/Test/UnitTest/Comparers/ItemIdentityComparer.cs b/test/UnitTest/Comparers/ItemIdentityComparer.cs
similarity index 100%
rename from Test/UnitTest/Comparers/ItemIdentityComparer.cs
rename to test/UnitTest/Comparers/ItemIdentityComparer.cs
diff --git a/Test/UnitTest/Components/EntryNavigationCoreFixture.cs b/test/UnitTest/Components/EntryNavigationCoreFixture.cs
similarity index 100%
rename from Test/UnitTest/Components/EntryNavigationCoreFixture.cs
rename to test/UnitTest/Components/EntryNavigationCoreFixture.cs
diff --git a/Test/UnitTest/Components/TestableEntryNavigationCore.cs b/test/UnitTest/Components/TestableEntryNavigationCore.cs
similarity index 100%
rename from Test/UnitTest/Components/TestableEntryNavigationCore.cs
rename to test/UnitTest/Components/TestableEntryNavigationCore.cs
diff --git a/Test/UnitTest/Configuration/BlogSettingsResolverFixture.cs b/test/UnitTest/Configuration/BlogSettingsResolverFixture.cs
similarity index 100%
rename from Test/UnitTest/Configuration/BlogSettingsResolverFixture.cs
rename to test/UnitTest/Configuration/BlogSettingsResolverFixture.cs
diff --git a/Test/UnitTest/Data/FeedResolverFixture.cs b/test/UnitTest/Data/FeedResolverFixture.cs
similarity index 100%
rename from Test/UnitTest/Data/FeedResolverFixture.cs
rename to test/UnitTest/Data/FeedResolverFixture.cs
diff --git a/Test/UnitTest/Data/Items/BlogHomeItemFixture.cs b/test/UnitTest/Data/Items/BlogHomeItemFixture.cs
similarity index 100%
rename from Test/UnitTest/Data/Items/BlogHomeItemFixture.cs
rename to test/UnitTest/Data/Items/BlogHomeItemFixture.cs
diff --git a/Test/UnitTest/Data/Items/CommentItemFixture.cs b/test/UnitTest/Data/Items/CommentItemFixture.cs
similarity index 100%
rename from Test/UnitTest/Data/Items/CommentItemFixture.cs
rename to test/UnitTest/Data/Items/CommentItemFixture.cs
diff --git a/Test/UnitTest/Data/Items/EntryItemFixture.cs b/test/UnitTest/Data/Items/EntryItemFixture.cs
similarity index 100%
rename from Test/UnitTest/Data/Items/EntryItemFixture.cs
rename to test/UnitTest/Data/Items/EntryItemFixture.cs
diff --git a/Test/UnitTest/Data/Items/ScribanMailActionItemFixture.cs b/test/UnitTest/Data/Items/ScribanMailActionItemFixture.cs
similarity index 100%
rename from Test/UnitTest/Data/Items/ScribanMailActionItemFixture.cs
rename to test/UnitTest/Data/Items/ScribanMailActionItemFixture.cs
diff --git a/Test/UnitTest/ExperienceEditor/NewCategoryFixture.cs b/test/UnitTest/ExperienceEditor/NewCategoryFixture.cs
similarity index 100%
rename from Test/UnitTest/ExperienceEditor/NewCategoryFixture.cs
rename to test/UnitTest/ExperienceEditor/NewCategoryFixture.cs
diff --git a/Test/UnitTest/ExperienceEditor/NewEntryFixture.cs b/test/UnitTest/ExperienceEditor/NewEntryFixture.cs
similarity index 100%
rename from Test/UnitTest/ExperienceEditor/NewEntryFixture.cs
rename to test/UnitTest/ExperienceEditor/NewEntryFixture.cs
diff --git a/Test/UnitTest/Extensions/BaseTemplateManagerExtensionsFixture.cs b/test/UnitTest/Extensions/BaseTemplateManagerExtensionsFixture.cs
similarity index 100%
rename from Test/UnitTest/Extensions/BaseTemplateManagerExtensionsFixture.cs
rename to test/UnitTest/Extensions/BaseTemplateManagerExtensionsFixture.cs
diff --git a/Test/UnitTest/FieldFactory.cs b/test/UnitTest/FieldFactory.cs
similarity index 100%
rename from Test/UnitTest/FieldFactory.cs
rename to test/UnitTest/FieldFactory.cs
diff --git a/Test/UnitTest/ItemFactory.cs b/test/UnitTest/ItemFactory.cs
similarity index 100%
rename from Test/UnitTest/ItemFactory.cs
rename to test/UnitTest/ItemFactory.cs
diff --git a/Test/UnitTest/Model/ThemeIncludeFixture.cs b/test/UnitTest/Model/ThemeIncludeFixture.cs
similarity index 100%
rename from Test/UnitTest/Model/ThemeIncludeFixture.cs
rename to test/UnitTest/Model/ThemeIncludeFixture.cs
diff --git a/Test/UnitTest/Model/ThemeScriptIncludeFixture.cs b/test/UnitTest/Model/ThemeScriptIncludeFixture.cs
similarity index 100%
rename from Test/UnitTest/Model/ThemeScriptIncludeFixture.cs
rename to test/UnitTest/Model/ThemeScriptIncludeFixture.cs
diff --git a/Test/UnitTest/Pipelines/CreateComment/AkismetSpamCheckFixture.cs b/test/UnitTest/Pipelines/CreateComment/AkismetSpamCheckFixture.cs
similarity index 100%
rename from Test/UnitTest/Pipelines/CreateComment/AkismetSpamCheckFixture.cs
rename to test/UnitTest/Pipelines/CreateComment/AkismetSpamCheckFixture.cs
diff --git a/Test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddActionItemFixture.cs b/test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddActionItemFixture.cs
similarity index 100%
rename from Test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddActionItemFixture.cs
rename to test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddActionItemFixture.cs
diff --git a/Test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddBlogFixture.cs b/test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddBlogFixture.cs
similarity index 100%
rename from Test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddBlogFixture.cs
rename to test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddBlogFixture.cs
diff --git a/Test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddCommentFixture.cs b/test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddCommentFixture.cs
similarity index 100%
rename from Test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddCommentFixture.cs
rename to test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddCommentFixture.cs
diff --git a/Test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddCurrentTimestampFixture.cs b/test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddCurrentTimestampFixture.cs
similarity index 100%
rename from Test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddCurrentTimestampFixture.cs
rename to test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddCurrentTimestampFixture.cs
diff --git a/Test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddDataItemFixture.cs b/test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddDataItemFixture.cs
similarity index 100%
rename from Test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddDataItemFixture.cs
rename to test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddDataItemFixture.cs
diff --git a/Test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddEntryModelsFixture.cs b/test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddEntryModelsFixture.cs
similarity index 100%
rename from Test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddEntryModelsFixture.cs
rename to test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddEntryModelsFixture.cs
diff --git a/Test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddNextWorkflowStateFixture.cs b/test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddNextWorkflowStateFixture.cs
similarity index 100%
rename from Test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddNextWorkflowStateFixture.cs
rename to test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddNextWorkflowStateFixture.cs
diff --git a/Test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddSiteFixture.cs b/test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddSiteFixture.cs
similarity index 100%
rename from Test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddSiteFixture.cs
rename to test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddSiteFixture.cs
diff --git a/Test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddUserFixture.cs b/test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddUserFixture.cs
similarity index 100%
rename from Test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddUserFixture.cs
rename to test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddUserFixture.cs
diff --git a/Test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddWorkflowHistoryFixture.cs b/test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddWorkflowHistoryFixture.cs
similarity index 100%
rename from Test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddWorkflowHistoryFixture.cs
rename to test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddWorkflowHistoryFixture.cs
diff --git a/Test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddWorkflowPipelineArgsFixture.cs b/test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddWorkflowPipelineArgsFixture.cs
similarity index 100%
rename from Test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddWorkflowPipelineArgsFixture.cs
rename to test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddWorkflowPipelineArgsFixture.cs
diff --git a/Test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddWorkflowStateFixture.cs b/test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddWorkflowStateFixture.cs
similarity index 100%
rename from Test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddWorkflowStateFixture.cs
rename to test/UnitTest/Pipelines/PopulateScribanMailActionModel/AddWorkflowStateFixture.cs
diff --git a/Test/UnitTest/Pipelines/PopulateScribanMailActionModel/PopulateScribanMailActionModelArgsFixture.cs b/test/UnitTest/Pipelines/PopulateScribanMailActionModel/PopulateScribanMailActionModelArgsFixture.cs
similarity index 100%
rename from Test/UnitTest/Pipelines/PopulateScribanMailActionModel/PopulateScribanMailActionModelArgsFixture.cs
rename to test/UnitTest/Pipelines/PopulateScribanMailActionModel/PopulateScribanMailActionModelArgsFixture.cs
diff --git a/Test/UnitTest/Pipelines/PopulateScribanMailActionModel/ResolveItemsFixture.cs b/test/UnitTest/Pipelines/PopulateScribanMailActionModel/ResolveItemsFixture.cs
similarity index 100%
rename from Test/UnitTest/Pipelines/PopulateScribanMailActionModel/ResolveItemsFixture.cs
rename to test/UnitTest/Pipelines/PopulateScribanMailActionModel/ResolveItemsFixture.cs
diff --git a/Test/UnitTest/Pipelines/PopulateScribanMailActionModel/TestAddEntryModels.cs b/test/UnitTest/Pipelines/PopulateScribanMailActionModel/TestAddEntryModels.cs
similarity index 100%
rename from Test/UnitTest/Pipelines/PopulateScribanMailActionModel/TestAddEntryModels.cs
rename to test/UnitTest/Pipelines/PopulateScribanMailActionModel/TestAddEntryModels.cs
diff --git a/Test/UnitTest/Pipelines/ProfanityFilter/GetProfanityListFromFileFixture.cs b/test/UnitTest/Pipelines/ProfanityFilter/GetProfanityListFromFileFixture.cs
similarity index 100%
rename from Test/UnitTest/Pipelines/ProfanityFilter/GetProfanityListFromFileFixture.cs
rename to test/UnitTest/Pipelines/ProfanityFilter/GetProfanityListFromFileFixture.cs
diff --git a/Test/UnitTest/Pipelines/ProfanityFilter/GetProfanityListFromItemFixture.cs b/test/UnitTest/Pipelines/ProfanityFilter/GetProfanityListFromItemFixture.cs
similarity index 100%
rename from Test/UnitTest/Pipelines/ProfanityFilter/GetProfanityListFromItemFixture.cs
rename to test/UnitTest/Pipelines/ProfanityFilter/GetProfanityListFromItemFixture.cs
diff --git a/Test/UnitTest/Pipelines/ValidateComment/CommentProvidedFixture.cs b/test/UnitTest/Pipelines/ValidateComment/CommentProvidedFixture.cs
similarity index 100%
rename from Test/UnitTest/Pipelines/ValidateComment/CommentProvidedFixture.cs
rename to test/UnitTest/Pipelines/ValidateComment/CommentProvidedFixture.cs
diff --git a/Test/UnitTest/Pipelines/ValidateComment/ContactNotRobotFixture.cs b/test/UnitTest/Pipelines/ValidateComment/ContactNotRobotFixture.cs
similarity index 100%
rename from Test/UnitTest/Pipelines/ValidateComment/ContactNotRobotFixture.cs
rename to test/UnitTest/Pipelines/ValidateComment/ContactNotRobotFixture.cs
diff --git a/Test/UnitTest/Pipelines/ValidateComment/EmailProvidedFixture.cs b/test/UnitTest/Pipelines/ValidateComment/EmailProvidedFixture.cs
similarity index 100%
rename from Test/UnitTest/Pipelines/ValidateComment/EmailProvidedFixture.cs
rename to test/UnitTest/Pipelines/ValidateComment/EmailProvidedFixture.cs
diff --git a/Test/UnitTest/Pipelines/ValidateComment/NameProvidedFixture.cs b/test/UnitTest/Pipelines/ValidateComment/NameProvidedFixture.cs
similarity index 100%
rename from Test/UnitTest/Pipelines/ValidateComment/NameProvidedFixture.cs
rename to test/UnitTest/Pipelines/ValidateComment/NameProvidedFixture.cs
diff --git a/Test/UnitTest/Pipelines/ValidateComment/ValidateCommentArgsFixture.cs b/test/UnitTest/Pipelines/ValidateComment/ValidateCommentArgsFixture.cs
similarity index 100%
rename from Test/UnitTest/Pipelines/ValidateComment/ValidateCommentArgsFixture.cs
rename to test/UnitTest/Pipelines/ValidateComment/ValidateCommentArgsFixture.cs
diff --git a/Test/UnitTest/Search/ComputedFields/ClosestEntryFixture.cs b/test/UnitTest/Search/ComputedFields/ClosestEntryFixture.cs
similarity index 100%
rename from Test/UnitTest/Search/ComputedFields/ClosestEntryFixture.cs
rename to test/UnitTest/Search/ComputedFields/ClosestEntryFixture.cs
diff --git a/Test/UnitTest/Search/EntryCriteriaFixture.cs b/test/UnitTest/Search/EntryCriteriaFixture.cs
similarity index 100%
rename from Test/UnitTest/Search/EntryCriteriaFixture.cs
rename to test/UnitTest/Search/EntryCriteriaFixture.cs
diff --git a/Test/UnitTest/TemplateFactory.cs b/test/UnitTest/TemplateFactory.cs
similarity index 100%
rename from Test/UnitTest/TemplateFactory.cs
rename to test/UnitTest/TemplateFactory.cs
diff --git a/Test/UnitTest/Text/ContextTokenReplacerFixture.cs b/test/UnitTest/Text/ContextTokenReplacerFixture.cs
similarity index 100%
rename from Test/UnitTest/Text/ContextTokenReplacerFixture.cs
rename to test/UnitTest/Text/ContextTokenReplacerFixture.cs
diff --git a/Test/UnitTest/Text/SettingsTokenReplacerFixture.cs b/test/UnitTest/Text/SettingsTokenReplacerFixture.cs
similarity index 100%
rename from Test/UnitTest/Text/SettingsTokenReplacerFixture.cs
rename to test/UnitTest/Text/SettingsTokenReplacerFixture.cs
diff --git a/Test/UnitTest/Themes/ThemeFileResolverFixture.cs b/test/UnitTest/Themes/ThemeFileResolverFixture.cs
similarity index 100%
rename from Test/UnitTest/Themes/ThemeFileResolverFixture.cs
rename to test/UnitTest/Themes/ThemeFileResolverFixture.cs
diff --git a/Test/UnitTest/Themes/ThemeFilesFixture.cs b/test/UnitTest/Themes/ThemeFilesFixture.cs
similarity index 100%
rename from Test/UnitTest/Themes/ThemeFilesFixture.cs
rename to test/UnitTest/Themes/ThemeFilesFixture.cs
diff --git a/Test/UnitTest/Workflow/ScribanMailActionFixture.cs b/test/UnitTest/Workflow/ScribanMailActionFixture.cs
similarity index 100%
rename from Test/UnitTest/Workflow/ScribanMailActionFixture.cs
rename to test/UnitTest/Workflow/ScribanMailActionFixture.cs
diff --git a/Test/UnitTest/WorkflowPipelineArgsFactory.cs b/test/UnitTest/WorkflowPipelineArgsFactory.cs
similarity index 100%
rename from Test/UnitTest/WorkflowPipelineArgsFactory.cs
rename to test/UnitTest/WorkflowPipelineArgsFactory.cs
diff --git a/Test/UnitTest/empty.txt b/test/UnitTest/empty.txt
similarity index 100%
rename from Test/UnitTest/empty.txt
rename to test/UnitTest/empty.txt
diff --git a/Test/UnitTest/words.txt b/test/UnitTest/words.txt
similarity index 100%
rename from Test/UnitTest/words.txt
rename to test/UnitTest/words.txt