diff --git a/src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs b/src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs
index 765bd6f761..9d1101ff52 100644
--- a/src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs
+++ b/src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs
@@ -12,6 +12,7 @@ using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Models.ContentEditing;
using Umbraco.Cms.Core.Security;
using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.Infrastructure.Examine;
using Umbraco.Extensions;
using Constants = Umbraco.Cms.Core.Constants;
diff --git a/src/Umbraco.Examine.Lucene/ExamineLuceneComponent.cs b/src/Umbraco.Examine.Lucene/ExamineLuceneComponent.cs
index a33bc3c182..0c8c725051 100644
--- a/src/Umbraco.Examine.Lucene/ExamineLuceneComponent.cs
+++ b/src/Umbraco.Examine.Lucene/ExamineLuceneComponent.cs
@@ -6,6 +6,7 @@ using Examine.LuceneEngine.Directories;
using Microsoft.Extensions.Logging;
using Umbraco.Cms.Core.Composing;
using Umbraco.Cms.Core.Runtime;
+using Umbraco.Cms.Infrastructure.Examine;
using Umbraco.Extensions;
namespace Umbraco.Examine
diff --git a/src/Umbraco.Examine.Lucene/ExamineLuceneComposer.cs b/src/Umbraco.Examine.Lucene/ExamineLuceneComposer.cs
index ddebb458b1..ed5c0aaccc 100644
--- a/src/Umbraco.Examine.Lucene/ExamineLuceneComposer.cs
+++ b/src/Umbraco.Examine.Lucene/ExamineLuceneComposer.cs
@@ -4,6 +4,7 @@
using System.Runtime.InteropServices;
using Umbraco.Cms.Core.Composing;
using Umbraco.Cms.Core.DependencyInjection;
+using Umbraco.Cms.Infrastructure.Examine;
using Umbraco.Extensions;
namespace Umbraco.Examine
diff --git a/src/Umbraco.Examine.Lucene/Extensions/ExamineExtensions.cs b/src/Umbraco.Examine.Lucene/Extensions/ExamineExtensions.cs
index b48638afb8..b4fd017d2b 100644
--- a/src/Umbraco.Examine.Lucene/Extensions/ExamineExtensions.cs
+++ b/src/Umbraco.Examine.Lucene/Extensions/ExamineExtensions.cs
@@ -12,6 +12,7 @@ using Lucene.Net.QueryParsers;
using Lucene.Net.Search;
using Microsoft.Extensions.Logging;
using Umbraco.Cms.Core.Runtime;
+using Umbraco.Cms.Infrastructure.Examine;
using Umbraco.Examine;
using Version = Lucene.Net.Util.Version;
diff --git a/src/Umbraco.Examine.Lucene/LuceneIndexCreator.cs b/src/Umbraco.Examine.Lucene/LuceneIndexCreator.cs
index 0353a3417f..1fdde7629b 100644
--- a/src/Umbraco.Examine.Lucene/LuceneIndexCreator.cs
+++ b/src/Umbraco.Examine.Lucene/LuceneIndexCreator.cs
@@ -7,6 +7,7 @@ using Microsoft.Extensions.Options;
using Umbraco.Cms.Core.Composing;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.Hosting;
+using Umbraco.Cms.Infrastructure.Examine;
namespace Umbraco.Examine
{
diff --git a/src/Umbraco.Examine.Lucene/LuceneIndexDiagnostics.cs b/src/Umbraco.Examine.Lucene/LuceneIndexDiagnostics.cs
index ebc74e694a..380089723c 100644
--- a/src/Umbraco.Examine.Lucene/LuceneIndexDiagnostics.cs
+++ b/src/Umbraco.Examine.Lucene/LuceneIndexDiagnostics.cs
@@ -7,6 +7,7 @@ using Lucene.Net.Store;
using Microsoft.Extensions.Logging;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Hosting;
+using Umbraco.Cms.Infrastructure.Examine;
using Umbraco.Extensions;
namespace Umbraco.Examine
diff --git a/src/Umbraco.Examine.Lucene/LuceneIndexDiagnosticsFactory.cs b/src/Umbraco.Examine.Lucene/LuceneIndexDiagnosticsFactory.cs
index d987e8d6d8..6c45a7ae75 100644
--- a/src/Umbraco.Examine.Lucene/LuceneIndexDiagnosticsFactory.cs
+++ b/src/Umbraco.Examine.Lucene/LuceneIndexDiagnosticsFactory.cs
@@ -5,6 +5,7 @@ using Examine;
using Examine.LuceneEngine.Providers;
using Microsoft.Extensions.Logging;
using Umbraco.Cms.Core.Hosting;
+using Umbraco.Cms.Infrastructure.Examine;
namespace Umbraco.Examine
{
diff --git a/src/Umbraco.Examine.Lucene/UmbracoContentIndex.cs b/src/Umbraco.Examine.Lucene/UmbracoContentIndex.cs
index f03088afbf..aa8e3bd130 100644
--- a/src/Umbraco.Examine.Lucene/UmbracoContentIndex.cs
+++ b/src/Umbraco.Examine.Lucene/UmbracoContentIndex.cs
@@ -12,6 +12,7 @@ using Microsoft.Extensions.Logging;
using Umbraco.Cms.Core.Hosting;
using Umbraco.Cms.Core.Logging;
using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.Infrastructure.Examine;
namespace Umbraco.Examine
{
diff --git a/src/Umbraco.Examine.Lucene/UmbracoExamineIndex.cs b/src/Umbraco.Examine.Lucene/UmbracoExamineIndex.cs
index 95655d5688..dd49002ed2 100644
--- a/src/Umbraco.Examine.Lucene/UmbracoExamineIndex.cs
+++ b/src/Umbraco.Examine.Lucene/UmbracoExamineIndex.cs
@@ -16,6 +16,7 @@ using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Hosting;
using Umbraco.Cms.Core.Logging;
using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.Infrastructure.Examine;
using Directory = Lucene.Net.Store.Directory;
namespace Umbraco.Examine
diff --git a/src/Umbraco.Examine.Lucene/UmbracoExamineIndexDiagnostics.cs b/src/Umbraco.Examine.Lucene/UmbracoExamineIndexDiagnostics.cs
index 124cd11f67..9a530ce99f 100644
--- a/src/Umbraco.Examine.Lucene/UmbracoExamineIndexDiagnostics.cs
+++ b/src/Umbraco.Examine.Lucene/UmbracoExamineIndexDiagnostics.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
using System.Linq;
using Microsoft.Extensions.Logging;
using Umbraco.Cms.Core.Hosting;
+using Umbraco.Cms.Infrastructure.Examine;
namespace Umbraco.Examine
{
diff --git a/src/Umbraco.Examine.Lucene/UmbracoIndexesCreator.cs b/src/Umbraco.Examine.Lucene/UmbracoIndexesCreator.cs
index 000eba7f58..9a36a43957 100644
--- a/src/Umbraco.Examine.Lucene/UmbracoIndexesCreator.cs
+++ b/src/Umbraco.Examine.Lucene/UmbracoIndexesCreator.cs
@@ -12,6 +12,7 @@ using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.Hosting;
using Umbraco.Cms.Core.Logging;
using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.Infrastructure.Examine;
using Constants = Umbraco.Cms.Core.Constants;
namespace Umbraco.Examine
diff --git a/src/Umbraco.Examine.Lucene/UmbracoMemberIndex.cs b/src/Umbraco.Examine.Lucene/UmbracoMemberIndex.cs
index 37a139bbc8..de82c309fa 100644
--- a/src/Umbraco.Examine.Lucene/UmbracoMemberIndex.cs
+++ b/src/Umbraco.Examine.Lucene/UmbracoMemberIndex.cs
@@ -7,6 +7,7 @@ using Microsoft.Extensions.Logging;
using Umbraco.Cms.Core.Hosting;
using Umbraco.Cms.Core.Logging;
using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.Infrastructure.Examine;
using Directory = Lucene.Net.Store.Directory;
namespace Umbraco.Examine
diff --git a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs
index 1f78a7716b..a5aec42ced 100644
--- a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs
+++ b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs
@@ -24,6 +24,7 @@ using Umbraco.Cms.Core.Strings;
using Umbraco.Cms.Core.Templates;
using Umbraco.Cms.Core.Trees;
using Umbraco.Cms.Core.Web;
+using Umbraco.Cms.Infrastructure.Examine;
using Umbraco.Core;
using Umbraco.Core.Logging.Serilog.Enrichers;
using Umbraco.Core.Manifest;
@@ -35,9 +36,7 @@ using Umbraco.Core.Persistence;
using Umbraco.Core.Runtime;
using Umbraco.Core.Scoping;
using Umbraco.Core.Serialization;
-using Umbraco.Examine;
using Umbraco.Extensions;
-using Umbraco.Infrastructure.Examine;
using Umbraco.Infrastructure.HealthChecks;
using Umbraco.Infrastructure.HostedServices;
using Umbraco.Infrastructure.Install;
diff --git a/src/Umbraco.Infrastructure/Examine/BaseValueSetBuilder.cs b/src/Umbraco.Infrastructure/Examine/BaseValueSetBuilder.cs
index d014ab4728..636f50c22d 100644
--- a/src/Umbraco.Infrastructure/Examine/BaseValueSetBuilder.cs
+++ b/src/Umbraco.Infrastructure/Examine/BaseValueSetBuilder.cs
@@ -1,11 +1,10 @@
using System.Collections.Generic;
using Examine;
-using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.PropertyEditors;
using Umbraco.Extensions;
-namespace Umbraco.Examine
+namespace Umbraco.Cms.Infrastructure.Examine
{
///
public abstract class BaseValueSetBuilder : IValueSetBuilder
diff --git a/src/Umbraco.Infrastructure/Examine/ContentIndexPopulator.cs b/src/Umbraco.Infrastructure/Examine/ContentIndexPopulator.cs
index b31f9ca5f7..78180c029b 100644
--- a/src/Umbraco.Infrastructure/Examine/ContentIndexPopulator.cs
+++ b/src/Umbraco.Infrastructure/Examine/ContentIndexPopulator.cs
@@ -6,15 +6,10 @@ using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Persistence.Querying;
using Umbraco.Cms.Core.Services;
-using Umbraco.Core;
-using Umbraco.Core.Models;
-using Umbraco.Core.Services;
using Umbraco.Core.Persistence;
-using Umbraco.Core.Persistence.Querying;
-namespace Umbraco.Examine
+namespace Umbraco.Cms.Infrastructure.Examine
{
-
///
/// Performs the data lookups required to rebuild a content index
///
diff --git a/src/Umbraco.Infrastructure/Examine/ContentValueSetBuilder.cs b/src/Umbraco.Infrastructure/Examine/ContentValueSetBuilder.cs
index 220f8197d2..63b9f0134f 100644
--- a/src/Umbraco.Infrastructure/Examine/ContentValueSetBuilder.cs
+++ b/src/Umbraco.Infrastructure/Examine/ContentValueSetBuilder.cs
@@ -1,7 +1,6 @@
using System.Collections.Generic;
using System.Linq;
using Examine;
-using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Models.Membership;
using Umbraco.Cms.Core.PropertyEditors;
@@ -10,7 +9,7 @@ using Umbraco.Cms.Core.Strings;
using Umbraco.Core.Scoping;
using Umbraco.Extensions;
-namespace Umbraco.Examine
+namespace Umbraco.Cms.Infrastructure.Examine
{
///
/// Builds s for items
diff --git a/src/Umbraco.Infrastructure/Examine/ContentValueSetValidator.cs b/src/Umbraco.Infrastructure/Examine/ContentValueSetValidator.cs
index af40ddc4a0..010ccdf149 100644
--- a/src/Umbraco.Infrastructure/Examine/ContentValueSetValidator.cs
+++ b/src/Umbraco.Infrastructure/Examine/ContentValueSetValidator.cs
@@ -5,7 +5,7 @@ using Umbraco.Cms.Core.Services;
using Umbraco.Extensions;
using Constants = Umbraco.Cms.Core.Constants;
-namespace Umbraco.Examine
+namespace Umbraco.Cms.Infrastructure.Examine
{
///
/// Used to validate a ValueSet for content/media - based on permissions, parent id, etc....
diff --git a/src/Umbraco.Infrastructure/Examine/ExamineExtensions.cs b/src/Umbraco.Infrastructure/Examine/ExamineExtensions.cs
index aed9e2fb6f..b2103f6e7d 100644
--- a/src/Umbraco.Infrastructure/Examine/ExamineExtensions.cs
+++ b/src/Umbraco.Infrastructure/Examine/ExamineExtensions.cs
@@ -3,10 +3,9 @@ using System.Collections.Generic;
using Examine;
using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Cms.Core.PublishedCache;
-using Umbraco.Examine;
-using Umbraco.Web.PublishedCache;
+using Umbraco.Cms.Infrastructure.Examine;
-namespace Umbraco.Web
+namespace Umbraco.Extensions
{
///
/// Extension methods for Examine.
diff --git a/src/Umbraco.Infrastructure/Examine/GenericIndexDiagnostics.cs b/src/Umbraco.Infrastructure/Examine/GenericIndexDiagnostics.cs
index 36c3caa6d5..8c05926483 100644
--- a/src/Umbraco.Infrastructure/Examine/GenericIndexDiagnostics.cs
+++ b/src/Umbraco.Infrastructure/Examine/GenericIndexDiagnostics.cs
@@ -6,7 +6,7 @@ using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Composing;
using Umbraco.Extensions;
-namespace Umbraco.Examine
+namespace Umbraco.Cms.Infrastructure.Examine
{
///
diff --git a/src/Umbraco.Infrastructure/Examine/IBackOfficeExamineSearcher.cs b/src/Umbraco.Infrastructure/Examine/IBackOfficeExamineSearcher.cs
index 885c6c99b7..dc6da46150 100644
--- a/src/Umbraco.Infrastructure/Examine/IBackOfficeExamineSearcher.cs
+++ b/src/Umbraco.Infrastructure/Examine/IBackOfficeExamineSearcher.cs
@@ -1,8 +1,8 @@
-using Examine;
-using System.Collections.Generic;
+using System.Collections.Generic;
+using Examine;
using Umbraco.Cms.Core.Models.ContentEditing;
-namespace Umbraco.Examine
+namespace Umbraco.Cms.Infrastructure.Examine
{
///
/// Used to search the back office for Examine indexed entities (Documents, Media and Members)
diff --git a/src/Umbraco.Infrastructure/Examine/IContentValueSetBuilder.cs b/src/Umbraco.Infrastructure/Examine/IContentValueSetBuilder.cs
index 72870fcf85..af6b613e24 100644
--- a/src/Umbraco.Infrastructure/Examine/IContentValueSetBuilder.cs
+++ b/src/Umbraco.Infrastructure/Examine/IContentValueSetBuilder.cs
@@ -1,8 +1,6 @@
-using Examine;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Core.Models;
+using Umbraco.Cms.Core.Models;
-namespace Umbraco.Examine
+namespace Umbraco.Cms.Infrastructure.Examine
{
///
///
diff --git a/src/Umbraco.Infrastructure/Examine/IContentValueSetValidator.cs b/src/Umbraco.Infrastructure/Examine/IContentValueSetValidator.cs
index fa85a0d32b..e76153f25e 100644
--- a/src/Umbraco.Infrastructure/Examine/IContentValueSetValidator.cs
+++ b/src/Umbraco.Infrastructure/Examine/IContentValueSetValidator.cs
@@ -1,6 +1,6 @@
using Examine;
-namespace Umbraco.Examine
+namespace Umbraco.Cms.Infrastructure.Examine
{
///
/// An extended for content indexes
diff --git a/src/Umbraco.Infrastructure/Examine/IIndexCreator.cs b/src/Umbraco.Infrastructure/Examine/IIndexCreator.cs
index 3b8f683990..aadaa00f46 100644
--- a/src/Umbraco.Infrastructure/Examine/IIndexCreator.cs
+++ b/src/Umbraco.Infrastructure/Examine/IIndexCreator.cs
@@ -1,7 +1,7 @@
using System.Collections.Generic;
using Examine;
-namespace Umbraco.Examine
+namespace Umbraco.Cms.Infrastructure.Examine
{
///
/// Creates 's
diff --git a/src/Umbraco.Infrastructure/Examine/IIndexDiagnostics.cs b/src/Umbraco.Infrastructure/Examine/IIndexDiagnostics.cs
index da03d2546a..a4e1c0ca4f 100644
--- a/src/Umbraco.Infrastructure/Examine/IIndexDiagnostics.cs
+++ b/src/Umbraco.Infrastructure/Examine/IIndexDiagnostics.cs
@@ -1,8 +1,7 @@
using System.Collections.Generic;
using Umbraco.Cms.Core;
-using Umbraco.Core;
-namespace Umbraco.Examine
+namespace Umbraco.Cms.Infrastructure.Examine
{
///
diff --git a/src/Umbraco.Infrastructure/Examine/IIndexDiagnosticsFactory.cs b/src/Umbraco.Infrastructure/Examine/IIndexDiagnosticsFactory.cs
index f7922e64cb..b39ef5c3a8 100644
--- a/src/Umbraco.Infrastructure/Examine/IIndexDiagnosticsFactory.cs
+++ b/src/Umbraco.Infrastructure/Examine/IIndexDiagnosticsFactory.cs
@@ -1,6 +1,6 @@
using Examine;
-namespace Umbraco.Examine
+namespace Umbraco.Cms.Infrastructure.Examine
{
///
diff --git a/src/Umbraco.Infrastructure/Examine/IIndexPopulator.cs b/src/Umbraco.Infrastructure/Examine/IIndexPopulator.cs
index 97a1216fae..2089bd923a 100644
--- a/src/Umbraco.Infrastructure/Examine/IIndexPopulator.cs
+++ b/src/Umbraco.Infrastructure/Examine/IIndexPopulator.cs
@@ -1,6 +1,6 @@
using Examine;
-namespace Umbraco.Examine
+namespace Umbraco.Cms.Infrastructure.Examine
{
public interface IIndexPopulator
{
diff --git a/src/Umbraco.Infrastructure/Examine/IPublishedContentValueSetBuilder.cs b/src/Umbraco.Infrastructure/Examine/IPublishedContentValueSetBuilder.cs
index a4688003b6..8c5348ed46 100644
--- a/src/Umbraco.Infrastructure/Examine/IPublishedContentValueSetBuilder.cs
+++ b/src/Umbraco.Infrastructure/Examine/IPublishedContentValueSetBuilder.cs
@@ -1,8 +1,7 @@
using Examine;
using Umbraco.Cms.Core.Models;
-using Umbraco.Core.Models;
-namespace Umbraco.Examine
+namespace Umbraco.Cms.Infrastructure.Examine
{
///
/// Marker interface for a builder for only published content
diff --git a/src/Umbraco.Infrastructure/Examine/IUmbracoContentIndex.cs b/src/Umbraco.Infrastructure/Examine/IUmbracoContentIndex.cs
index cc85c1eda0..63bbfb047a 100644
--- a/src/Umbraco.Infrastructure/Examine/IUmbracoContentIndex.cs
+++ b/src/Umbraco.Infrastructure/Examine/IUmbracoContentIndex.cs
@@ -1,6 +1,6 @@
using Examine;
-namespace Umbraco.Examine
+namespace Umbraco.Cms.Infrastructure.Examine
{
///
/// Marker interface for indexes of Umbraco content
diff --git a/src/Umbraco.Infrastructure/Examine/IUmbracoIndex.cs b/src/Umbraco.Infrastructure/Examine/IUmbracoIndex.cs
index 9461434fff..8dfdf6d812 100644
--- a/src/Umbraco.Infrastructure/Examine/IUmbracoIndex.cs
+++ b/src/Umbraco.Infrastructure/Examine/IUmbracoIndex.cs
@@ -1,7 +1,7 @@
using System.Collections.Generic;
using Examine;
-namespace Umbraco.Examine
+namespace Umbraco.Cms.Infrastructure.Examine
{
///
/// A Marker interface for defining an Umbraco indexer
diff --git a/src/Umbraco.Infrastructure/Examine/IUmbracoIndexConfig.cs b/src/Umbraco.Infrastructure/Examine/IUmbracoIndexConfig.cs
index 02c6c51d0c..83a3730b97 100644
--- a/src/Umbraco.Infrastructure/Examine/IUmbracoIndexConfig.cs
+++ b/src/Umbraco.Infrastructure/Examine/IUmbracoIndexConfig.cs
@@ -1,6 +1,6 @@
using Examine;
-namespace Umbraco.Examine
+namespace Umbraco.Cms.Infrastructure.Examine
{
public interface IUmbracoIndexConfig
{
diff --git a/src/Umbraco.Infrastructure/Examine/IUmbracoIndexesCreator.cs b/src/Umbraco.Infrastructure/Examine/IUmbracoIndexesCreator.cs
index d64046a940..df61901dba 100644
--- a/src/Umbraco.Infrastructure/Examine/IUmbracoIndexesCreator.cs
+++ b/src/Umbraco.Infrastructure/Examine/IUmbracoIndexesCreator.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Examine
+namespace Umbraco.Cms.Infrastructure.Examine
{
///
///
diff --git a/src/Umbraco.Infrastructure/Examine/IUmbracoMemberIndex.cs b/src/Umbraco.Infrastructure/Examine/IUmbracoMemberIndex.cs
index b1f325b2e9..d09c8518fa 100644
--- a/src/Umbraco.Infrastructure/Examine/IUmbracoMemberIndex.cs
+++ b/src/Umbraco.Infrastructure/Examine/IUmbracoMemberIndex.cs
@@ -1,6 +1,6 @@
using Examine;
-namespace Umbraco.Examine
+namespace Umbraco.Cms.Infrastructure.Examine
{
public interface IUmbracoMemberIndex : IIndex
{
diff --git a/src/Umbraco.Infrastructure/Examine/IUmbracoTreeSearcherFields.cs b/src/Umbraco.Infrastructure/Examine/IUmbracoTreeSearcherFields.cs
index d873d01972..6d0d3f8efb 100644
--- a/src/Umbraco.Infrastructure/Examine/IUmbracoTreeSearcherFields.cs
+++ b/src/Umbraco.Infrastructure/Examine/IUmbracoTreeSearcherFields.cs
@@ -1,6 +1,6 @@
using System.Collections.Generic;
-namespace Umbraco.Examine
+namespace Umbraco.Cms.Infrastructure.Examine
{
///
/// Used to propagate hardcoded internal Field lists
diff --git a/src/Umbraco.Infrastructure/Examine/IValueSetBuilder.cs b/src/Umbraco.Infrastructure/Examine/IValueSetBuilder.cs
index 1c4890f404..0e1d05440d 100644
--- a/src/Umbraco.Infrastructure/Examine/IValueSetBuilder.cs
+++ b/src/Umbraco.Infrastructure/Examine/IValueSetBuilder.cs
@@ -1,8 +1,7 @@
-using Examine;
-using System.Collections.Generic;
-using Umbraco.Core.Models;
+using System.Collections.Generic;
+using Examine;
-namespace Umbraco.Examine
+namespace Umbraco.Cms.Infrastructure.Examine
{
///
/// Creates a collection of to be indexed based on a collection of
diff --git a/src/Umbraco.Infrastructure/Examine/IndexDiagnosticsFactory.cs b/src/Umbraco.Infrastructure/Examine/IndexDiagnosticsFactory.cs
index 9daa1705a9..ca2e732071 100644
--- a/src/Umbraco.Infrastructure/Examine/IndexDiagnosticsFactory.cs
+++ b/src/Umbraco.Infrastructure/Examine/IndexDiagnosticsFactory.cs
@@ -1,6 +1,6 @@
using Examine;
-namespace Umbraco.Examine
+namespace Umbraco.Cms.Infrastructure.Examine
{
///
/// Default implementation of which returns for indexes that don't have an implementation
diff --git a/src/Umbraco.Infrastructure/Examine/IndexPopulator.cs b/src/Umbraco.Infrastructure/Examine/IndexPopulator.cs
index 42182d1af1..2feac0710a 100644
--- a/src/Umbraco.Infrastructure/Examine/IndexPopulator.cs
+++ b/src/Umbraco.Infrastructure/Examine/IndexPopulator.cs
@@ -3,7 +3,7 @@ using System.Linq;
using Examine;
using Umbraco.Cms.Core.Collections;
-namespace Umbraco.Examine
+namespace Umbraco.Cms.Infrastructure.Examine
{
///
/// An that is automatically associated to any index of type
diff --git a/src/Umbraco.Infrastructure/Examine/IndexRebuilder.cs b/src/Umbraco.Infrastructure/Examine/IndexRebuilder.cs
index 2098fedeaa..9e4fe6fed0 100644
--- a/src/Umbraco.Infrastructure/Examine/IndexRebuilder.cs
+++ b/src/Umbraco.Infrastructure/Examine/IndexRebuilder.cs
@@ -1,13 +1,11 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using Microsoft.Extensions.Logging;
-using System.Threading.Tasks;
using Examine;
+using Microsoft.Extensions.Logging;
using Umbraco.Cms.Core.Logging;
-using Umbraco.Core.Logging;
-namespace Umbraco.Examine
+namespace Umbraco.Cms.Infrastructure.Examine
{
///
diff --git a/src/Umbraco.Infrastructure/Examine/IndexRebuildingEventArgs.cs b/src/Umbraco.Infrastructure/Examine/IndexRebuildingEventArgs.cs
index 20141a7194..fbe3dbcbe3 100644
--- a/src/Umbraco.Infrastructure/Examine/IndexRebuildingEventArgs.cs
+++ b/src/Umbraco.Infrastructure/Examine/IndexRebuildingEventArgs.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using Examine;
-namespace Umbraco.Examine
+namespace Umbraco.Cms.Infrastructure.Examine
{
public class IndexRebuildingEventArgs : EventArgs
{
diff --git a/src/Umbraco.Infrastructure/Examine/IndexTypes.cs b/src/Umbraco.Infrastructure/Examine/IndexTypes.cs
index 3fa00e234c..bb6edaa78b 100644
--- a/src/Umbraco.Infrastructure/Examine/IndexTypes.cs
+++ b/src/Umbraco.Infrastructure/Examine/IndexTypes.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Examine
+namespace Umbraco.Cms.Infrastructure.Examine
{
///
/// The index types stored in the Lucene Index
diff --git a/src/Umbraco.Infrastructure/Examine/MediaIndexPopulator.cs b/src/Umbraco.Infrastructure/Examine/MediaIndexPopulator.cs
index 77e3821ff1..429285fa85 100644
--- a/src/Umbraco.Infrastructure/Examine/MediaIndexPopulator.cs
+++ b/src/Umbraco.Infrastructure/Examine/MediaIndexPopulator.cs
@@ -3,10 +3,8 @@ using System.Linq;
using Examine;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Services;
-using Umbraco.Core.Models;
-using Umbraco.Core.Services;
-namespace Umbraco.Examine
+namespace Umbraco.Cms.Infrastructure.Examine
{
///
/// Performs the data lookups required to rebuild a media index
diff --git a/src/Umbraco.Infrastructure/Examine/MediaValueSetBuilder.cs b/src/Umbraco.Infrastructure/Examine/MediaValueSetBuilder.cs
index 3fb1ab7747..4fad6062c1 100644
--- a/src/Umbraco.Infrastructure/Examine/MediaValueSetBuilder.cs
+++ b/src/Umbraco.Infrastructure/Examine/MediaValueSetBuilder.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Linq;
using Examine;
using Microsoft.Extensions.Logging;
-using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.PropertyEditors;
using Umbraco.Cms.Core.Serialization;
@@ -13,7 +12,7 @@ using Umbraco.Core.PropertyEditors.ValueConverters;
using Umbraco.Extensions;
using Constants = Umbraco.Cms.Core.Constants;
-namespace Umbraco.Examine
+namespace Umbraco.Cms.Infrastructure.Examine
{
public class MediaValueSetBuilder : BaseValueSetBuilder
{
diff --git a/src/Umbraco.Infrastructure/Examine/MemberIndexPopulator.cs b/src/Umbraco.Infrastructure/Examine/MemberIndexPopulator.cs
index b97dddabe0..76dee23450 100644
--- a/src/Umbraco.Infrastructure/Examine/MemberIndexPopulator.cs
+++ b/src/Umbraco.Infrastructure/Examine/MemberIndexPopulator.cs
@@ -3,10 +3,8 @@ using System.Linq;
using Examine;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Services;
-using Umbraco.Core.Models;
-using Umbraco.Core.Services;
-namespace Umbraco.Examine
+namespace Umbraco.Cms.Infrastructure.Examine
{
public class MemberIndexPopulator : IndexPopulator
{
diff --git a/src/Umbraco.Infrastructure/Examine/MemberValueSetBuilder.cs b/src/Umbraco.Infrastructure/Examine/MemberValueSetBuilder.cs
index d4c47011ac..9364ac6b94 100644
--- a/src/Umbraco.Infrastructure/Examine/MemberValueSetBuilder.cs
+++ b/src/Umbraco.Infrastructure/Examine/MemberValueSetBuilder.cs
@@ -1,12 +1,11 @@
using System.Collections.Generic;
using System.Linq;
using Examine;
-using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.PropertyEditors;
using Umbraco.Extensions;
-namespace Umbraco.Examine
+namespace Umbraco.Cms.Infrastructure.Examine
{
public class MemberValueSetBuilder : BaseValueSetBuilder
diff --git a/src/Umbraco.Infrastructure/Examine/MemberValueSetValidator.cs b/src/Umbraco.Infrastructure/Examine/MemberValueSetValidator.cs
index 6ce650fc1d..f92a9dc620 100644
--- a/src/Umbraco.Infrastructure/Examine/MemberValueSetValidator.cs
+++ b/src/Umbraco.Infrastructure/Examine/MemberValueSetValidator.cs
@@ -1,8 +1,6 @@
using System.Collections.Generic;
-using System.Linq;
-using Examine;
-namespace Umbraco.Examine
+namespace Umbraco.Cms.Infrastructure.Examine
{
public class MemberValueSetValidator : ValueSetValidator
{
diff --git a/src/Umbraco.Infrastructure/Examine/NoopBackOfficeExamineSearcher.cs b/src/Umbraco.Infrastructure/Examine/NoopBackOfficeExamineSearcher.cs
index a2d6521e24..8b676ab331 100644
--- a/src/Umbraco.Infrastructure/Examine/NoopBackOfficeExamineSearcher.cs
+++ b/src/Umbraco.Infrastructure/Examine/NoopBackOfficeExamineSearcher.cs
@@ -2,9 +2,8 @@ using System.Collections.Generic;
using System.Linq;
using Examine;
using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Examine;
-namespace Umbraco.Infrastructure.Examine
+namespace Umbraco.Cms.Infrastructure.Examine
{
public class NoopBackOfficeExamineSearcher : IBackOfficeExamineSearcher
{
diff --git a/src/Umbraco.Infrastructure/Examine/NoopUmbracoIndexesCreator.cs b/src/Umbraco.Infrastructure/Examine/NoopUmbracoIndexesCreator.cs
index a6133a7e59..e84fb96a74 100644
--- a/src/Umbraco.Infrastructure/Examine/NoopUmbracoIndexesCreator.cs
+++ b/src/Umbraco.Infrastructure/Examine/NoopUmbracoIndexesCreator.cs
@@ -1,9 +1,8 @@
using System.Collections.Generic;
using System.Linq;
using Examine;
-using Umbraco.Examine;
-namespace Umbraco.Infrastructure.Examine
+namespace Umbraco.Cms.Infrastructure.Examine
{
public class NoopUmbracoIndexesCreator : IUmbracoIndexesCreator
{
diff --git a/src/Umbraco.Infrastructure/Examine/PublishedContentIndexPopulator.cs b/src/Umbraco.Infrastructure/Examine/PublishedContentIndexPopulator.cs
index 83089659b4..8781eb37bc 100644
--- a/src/Umbraco.Infrastructure/Examine/PublishedContentIndexPopulator.cs
+++ b/src/Umbraco.Infrastructure/Examine/PublishedContentIndexPopulator.cs
@@ -1,9 +1,7 @@
using Umbraco.Cms.Core.Services;
-using Umbraco.Core.Models;
-using Umbraco.Core.Services;
using Umbraco.Core.Persistence;
-namespace Umbraco.Examine
+namespace Umbraco.Cms.Infrastructure.Examine
{
///
/// Performs the data lookups required to rebuild a content index containing only published content
diff --git a/src/Umbraco.Infrastructure/Examine/UmbracoExamineExtensions.cs b/src/Umbraco.Infrastructure/Examine/UmbracoExamineExtensions.cs
index 8efabacc59..8251e59c94 100644
--- a/src/Umbraco.Infrastructure/Examine/UmbracoExamineExtensions.cs
+++ b/src/Umbraco.Infrastructure/Examine/UmbracoExamineExtensions.cs
@@ -4,7 +4,7 @@ using Examine;
using Examine.Search;
using Umbraco.Extensions;
-namespace Umbraco.Examine
+namespace Umbraco.Cms.Infrastructure.Examine
{
public static class UmbracoExamineExtensions
{
diff --git a/src/Umbraco.Infrastructure/Examine/UmbracoExamineFieldNames.cs b/src/Umbraco.Infrastructure/Examine/UmbracoExamineFieldNames.cs
index 9b6d086ae4..90f1ddf634 100644
--- a/src/Umbraco.Infrastructure/Examine/UmbracoExamineFieldNames.cs
+++ b/src/Umbraco.Infrastructure/Examine/UmbracoExamineFieldNames.cs
@@ -1,6 +1,6 @@
using Examine;
-namespace Umbraco.Examine
+namespace Umbraco.Cms.Infrastructure.Examine
{
public static class UmbracoExamineFieldNames
{
diff --git a/src/Umbraco.Infrastructure/Examine/UmbracoFieldDefinitionCollection.cs b/src/Umbraco.Infrastructure/Examine/UmbracoFieldDefinitionCollection.cs
index 0ea563e9cc..118a427fd7 100644
--- a/src/Umbraco.Infrastructure/Examine/UmbracoFieldDefinitionCollection.cs
+++ b/src/Umbraco.Infrastructure/Examine/UmbracoFieldDefinitionCollection.cs
@@ -1,9 +1,6 @@
-using System.Collections.Generic;
-using System.Text.RegularExpressions;
-using Examine;
-using Umbraco.Core;
+using Examine;
-namespace Umbraco.Examine
+namespace Umbraco.Cms.Infrastructure.Examine
{
///
/// Custom allowing dynamic creation of
diff --git a/src/Umbraco.Infrastructure/Examine/UmbracoIndexConfig.cs b/src/Umbraco.Infrastructure/Examine/UmbracoIndexConfig.cs
index 6f4c4330e9..2c282a1924 100644
--- a/src/Umbraco.Infrastructure/Examine/UmbracoIndexConfig.cs
+++ b/src/Umbraco.Infrastructure/Examine/UmbracoIndexConfig.cs
@@ -1,8 +1,7 @@
using Examine;
using Umbraco.Cms.Core.Services;
-using Umbraco.Core.Services;
-namespace Umbraco.Examine
+namespace Umbraco.Cms.Infrastructure.Examine
{
public class UmbracoIndexConfig : IUmbracoIndexConfig
{
diff --git a/src/Umbraco.Infrastructure/Examine/ValueSetValidator.cs b/src/Umbraco.Infrastructure/Examine/ValueSetValidator.cs
index 688ccec345..54eaac63df 100644
--- a/src/Umbraco.Infrastructure/Examine/ValueSetValidator.cs
+++ b/src/Umbraco.Infrastructure/Examine/ValueSetValidator.cs
@@ -3,7 +3,7 @@ using System.Linq;
using Examine;
using Umbraco.Extensions;
-namespace Umbraco.Examine
+namespace Umbraco.Cms.Infrastructure.Examine
{
///
/// Performing basic validation of a value set
diff --git a/src/Umbraco.Infrastructure/Models/Mapping/EntityMapDefinition.cs b/src/Umbraco.Infrastructure/Models/Mapping/EntityMapDefinition.cs
index 363ee3958c..bf42ae3e7a 100644
--- a/src/Umbraco.Infrastructure/Models/Mapping/EntityMapDefinition.cs
+++ b/src/Umbraco.Infrastructure/Models/Mapping/EntityMapDefinition.cs
@@ -8,7 +8,7 @@ using Umbraco.Cms.Core.Models.ContentEditing;
using Umbraco.Cms.Core.Models.Entities;
using Umbraco.Cms.Core.Models.Mapping;
using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Examine;
+using Umbraco.Cms.Infrastructure.Examine;
using Umbraco.Extensions;
using Constants = Umbraco.Cms.Core.Constants;
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/GridPropertyIndexValueFactory.cs b/src/Umbraco.Infrastructure/PropertyEditors/GridPropertyIndexValueFactory.cs
index 422f61a653..6820b03ea3 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/GridPropertyIndexValueFactory.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/GridPropertyIndexValueFactory.cs
@@ -7,8 +7,8 @@ using Newtonsoft.Json.Linq;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.PropertyEditors;
using Umbraco.Cms.Core.Xml;
+using Umbraco.Cms.Infrastructure.Examine;
using Umbraco.Core.Models;
-using Umbraco.Examine;
using Umbraco.Extensions;
namespace Umbraco.Web.PropertyEditors
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/RichTextPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/RichTextPropertyEditor.cs
index bc63a6d0d2..d829fe7de7 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/RichTextPropertyEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/RichTextPropertyEditor.cs
@@ -11,7 +11,7 @@ using Umbraco.Cms.Core.Serialization;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Strings;
using Umbraco.Cms.Core.Templates;
-using Umbraco.Examine;
+using Umbraco.Cms.Infrastructure.Examine;
using Umbraco.Extensions;
using Umbraco.Web.Macros;
using Constants = Umbraco.Cms.Core.Constants;
diff --git a/src/Umbraco.Infrastructure/PublishedContentQuery.cs b/src/Umbraco.Infrastructure/PublishedContentQuery.cs
index 9cb5864b31..1d6b1a31d9 100644
--- a/src/Umbraco.Infrastructure/PublishedContentQuery.cs
+++ b/src/Umbraco.Infrastructure/PublishedContentQuery.cs
@@ -9,7 +9,7 @@ using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Cms.Core.PublishedCache;
using Umbraco.Cms.Core.Xml;
-using Umbraco.Examine;
+using Umbraco.Cms.Infrastructure.Examine;
using Umbraco.Extensions;
using Constants = Umbraco.Cms.Core.Constants;
diff --git a/src/Umbraco.Infrastructure/Search/BackgroundIndexRebuilder.cs b/src/Umbraco.Infrastructure/Search/BackgroundIndexRebuilder.cs
index eb25c0d0f2..9dc94ea532 100644
--- a/src/Umbraco.Infrastructure/Search/BackgroundIndexRebuilder.cs
+++ b/src/Umbraco.Infrastructure/Search/BackgroundIndexRebuilder.cs
@@ -6,8 +6,8 @@ using System.Threading;
using System.Threading.Tasks;
using Microsoft.Extensions.Logging;
using Umbraco.Cms.Core.Runtime;
+using Umbraco.Cms.Infrastructure.Examine;
using Umbraco.Core;
-using Umbraco.Examine;
using Umbraco.Infrastructure.HostedServices;
namespace Umbraco.Web.Search
diff --git a/src/Umbraco.Infrastructure/Search/ExamineComponent.cs b/src/Umbraco.Infrastructure/Search/ExamineComponent.cs
index 8be81b44d4..697e10c012 100644
--- a/src/Umbraco.Infrastructure/Search/ExamineComponent.cs
+++ b/src/Umbraco.Infrastructure/Search/ExamineComponent.cs
@@ -13,8 +13,8 @@ using Umbraco.Cms.Core.Runtime;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Services.Changes;
using Umbraco.Cms.Core.Sync;
+using Umbraco.Cms.Infrastructure.Examine;
using Umbraco.Core.Scoping;
-using Umbraco.Examine;
using Umbraco.Extensions;
namespace Umbraco.Web.Search
diff --git a/src/Umbraco.Infrastructure/Search/ExamineComposer.cs b/src/Umbraco.Infrastructure/Search/ExamineComposer.cs
index 005490161d..8a76f4ebf7 100644
--- a/src/Umbraco.Infrastructure/Search/ExamineComposer.cs
+++ b/src/Umbraco.Infrastructure/Search/ExamineComposer.cs
@@ -5,8 +5,8 @@ using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.PropertyEditors;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Strings;
+using Umbraco.Cms.Infrastructure.Examine;
using Umbraco.Core.Scoping;
-using Umbraco.Examine;
using Umbraco.Extensions;
namespace Umbraco.Web.Search
diff --git a/src/Umbraco.Infrastructure/Search/UmbracoTreeSearcher.cs b/src/Umbraco.Infrastructure/Search/UmbracoTreeSearcher.cs
index fa2c3e2023..e7d56752fa 100644
--- a/src/Umbraco.Infrastructure/Search/UmbracoTreeSearcher.cs
+++ b/src/Umbraco.Infrastructure/Search/UmbracoTreeSearcher.cs
@@ -10,8 +10,8 @@ using Umbraco.Cms.Core.Models.Mapping;
using Umbraco.Cms.Core.Routing;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Trees;
+using Umbraco.Cms.Infrastructure.Examine;
using Umbraco.Core.Persistence;
-using Umbraco.Examine;
using Umbraco.Extensions;
using Constants = Umbraco.Cms.Core.Constants;
diff --git a/src/Umbraco.Infrastructure/Search/UmbracoTreeSearcherFields.cs b/src/Umbraco.Infrastructure/Search/UmbracoTreeSearcherFields.cs
index a1c9936542..c490d45cfc 100644
--- a/src/Umbraco.Infrastructure/Search/UmbracoTreeSearcherFields.cs
+++ b/src/Umbraco.Infrastructure/Search/UmbracoTreeSearcherFields.cs
@@ -1,6 +1,6 @@
using System.Collections.Generic;
using System.Linq;
-using Umbraco.Examine;
+using Umbraco.Cms.Infrastructure.Examine;
namespace Umbraco.Web.Search
{
diff --git a/src/Umbraco.Infrastructure/Suspendable.cs b/src/Umbraco.Infrastructure/Suspendable.cs
index 8d00d9b3be..414b3505cd 100644
--- a/src/Umbraco.Infrastructure/Suspendable.cs
+++ b/src/Umbraco.Infrastructure/Suspendable.cs
@@ -1,7 +1,7 @@
using Microsoft.Extensions.Logging;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Cache;
-using Umbraco.Examine;
+using Umbraco.Cms.Infrastructure.Examine;
using Umbraco.Web.Search;
namespace Umbraco.Web
diff --git a/src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs b/src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs
index 1c5b05ca2f..64f6c70f64 100644
--- a/src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs
+++ b/src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs
@@ -17,6 +17,7 @@ using Umbraco.Cms.Core.Runtime;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Sync;
using Umbraco.Cms.Core.WebAssets;
+using Umbraco.Cms.Infrastructure.Examine;
using Umbraco.Cms.Infrastructure.PublishedCache;
using Umbraco.Cms.Tests.Common.TestHelpers.Stubs;
using Umbraco.Cms.Tests.Integration.Implementations;
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Examine/UmbracoContentValueSetValidatorTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Examine/UmbracoContentValueSetValidatorTests.cs
index a865624cdd..1cf6b56fcb 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Examine/UmbracoContentValueSetValidatorTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Examine/UmbracoContentValueSetValidatorTests.cs
@@ -10,6 +10,7 @@ using NUnit.Framework;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.Infrastructure.Examine;
using Umbraco.Examine;
namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Examine
diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMediaCache.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMediaCache.cs
index 8536c2ce33..9b4a95e045 100644
--- a/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMediaCache.cs
+++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMediaCache.cs
@@ -17,6 +17,7 @@ using Umbraco.Cms.Core.PublishedCache;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Web;
using Umbraco.Cms.Core.Xml;
+using Umbraco.Cms.Infrastructure.Examine;
using Umbraco.Extensions;
using Umbraco.Examine;
using Umbraco.Web.Composing;
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
index b95103313a..5035c98f6f 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
@@ -15,6 +15,7 @@ using Umbraco.Cms.Core.PropertyEditors;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Strings;
using Umbraco.Cms.Core.Web;
+using Umbraco.Cms.Infrastructure.Examine;
using Umbraco.Cms.Tests.Common;
using Umbraco.Cms.Tests.Common.Testing;
using Umbraco.Examine;
diff --git a/src/Umbraco.Tests/UmbracoExamine/EventsTest.cs b/src/Umbraco.Tests/UmbracoExamine/EventsTest.cs
index 5da57f77f9..dcb306b40e 100644
--- a/src/Umbraco.Tests/UmbracoExamine/EventsTest.cs
+++ b/src/Umbraco.Tests/UmbracoExamine/EventsTest.cs
@@ -1,5 +1,6 @@
using System.Linq;
using NUnit.Framework;
+using Umbraco.Cms.Infrastructure.Examine;
using Umbraco.Cms.Tests.Common.Testing;
using Umbraco.Tests.Testing;
using Umbraco.Examine;
diff --git a/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs b/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs
index b713a5237b..08422bb135 100644
--- a/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs
+++ b/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs
@@ -16,6 +16,7 @@ using Umbraco.Cms.Core.Persistence.Querying;
using Umbraco.Cms.Core.PropertyEditors;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Strings;
+using Umbraco.Cms.Infrastructure.Examine;
using Umbraco.Core.Scoping;
using Umbraco.Examine;
using Umbraco.Tests.TestHelpers;
diff --git a/src/Umbraco.Tests/UmbracoExamine/IndexTest.cs b/src/Umbraco.Tests/UmbracoExamine/IndexTest.cs
index 1a740aef66..3eb9febb0e 100644
--- a/src/Umbraco.Tests/UmbracoExamine/IndexTest.cs
+++ b/src/Umbraco.Tests/UmbracoExamine/IndexTest.cs
@@ -16,6 +16,7 @@ using System;
using Microsoft.Extensions.DependencyInjection;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.PropertyEditors;
+using Umbraco.Cms.Infrastructure.Examine;
using Umbraco.Cms.Tests.Common.Testing;
using Umbraco.Core;
using Umbraco.Tests.TestHelpers;
diff --git a/src/Umbraco.Tests/UmbracoExamine/SearchTests.cs b/src/Umbraco.Tests/UmbracoExamine/SearchTests.cs
index 8d9bc33d13..583f5c4af0 100644
--- a/src/Umbraco.Tests/UmbracoExamine/SearchTests.cs
+++ b/src/Umbraco.Tests/UmbracoExamine/SearchTests.cs
@@ -10,6 +10,7 @@ using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Persistence.Querying;
using Umbraco.Cms.Core.PropertyEditors;
using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.Infrastructure.Examine;
using Umbraco.Cms.Tests.Common.Testing;
using Umbraco.Core;
using Umbraco.Core.Models;
diff --git a/src/Umbraco.Tests/Web/PublishedContentQueryTests.cs b/src/Umbraco.Tests/Web/PublishedContentQueryTests.cs
index 91cd7526d9..aac7511b65 100644
--- a/src/Umbraco.Tests/Web/PublishedContentQueryTests.cs
+++ b/src/Umbraco.Tests/Web/PublishedContentQueryTests.cs
@@ -8,6 +8,7 @@ using Moq;
using NUnit.Framework;
using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Cms.Core.PublishedCache;
+using Umbraco.Cms.Infrastructure.Examine;
using Umbraco.Examine;
using Umbraco.Tests.TestHelpers;
using Umbraco.Web;
diff --git a/src/Umbraco.Web.BackOffice/Controllers/ExamineManagementController.cs b/src/Umbraco.Web.BackOffice/Controllers/ExamineManagementController.cs
index e863293ed4..12300018d1 100644
--- a/src/Umbraco.Web.BackOffice/Controllers/ExamineManagementController.cs
+++ b/src/Umbraco.Web.BackOffice/Controllers/ExamineManagementController.cs
@@ -7,6 +7,7 @@ using Microsoft.Extensions.Logging;
using Umbraco.Cms.Core.Cache;
using Umbraco.Cms.Core.IO;
using Umbraco.Cms.Core.Models.ContentEditing;
+using Umbraco.Cms.Infrastructure.Examine;
using Umbraco.Cms.Web.Common.Attributes;
using Umbraco.Examine;
using Umbraco.Extensions;
diff --git a/src/Umbraco.Web.Website/Extensions/PublishedContentExtensions.cs b/src/Umbraco.Web.Website/Extensions/PublishedContentExtensions.cs
index 20b21308d4..a59ccf196e 100644
--- a/src/Umbraco.Web.Website/Extensions/PublishedContentExtensions.cs
+++ b/src/Umbraco.Web.Website/Extensions/PublishedContentExtensions.cs
@@ -7,6 +7,7 @@ using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Cms.Core.Routing;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Web;
+using Umbraco.Cms.Infrastructure.Examine;
using Umbraco.Examine;
using Umbraco.Web;
using Constants = Umbraco.Cms.Core.Constants;