diff --git a/src/Umbraco.Web/PropertyEditors/CheckBoxListPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/CheckBoxListPropertyEditor.cs
similarity index 98%
rename from src/Umbraco.Web/PropertyEditors/CheckBoxListPropertyEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/CheckBoxListPropertyEditor.cs
index 5791b3d05a..67f3dd61cd 100644
--- a/src/Umbraco.Web/PropertyEditors/CheckBoxListPropertyEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/CheckBoxListPropertyEditor.cs
@@ -1,5 +1,4 @@
 using Umbraco.Core;
-using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;
diff --git a/src/Umbraco.Web/PropertyEditors/ColorPickerConfigurationEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/ColorPickerConfigurationEditor.cs
similarity index 100%
rename from src/Umbraco.Web/PropertyEditors/ColorPickerConfigurationEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/ColorPickerConfigurationEditor.cs
diff --git a/src/Umbraco.Web/PropertyEditors/ColorPickerPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/ColorPickerPropertyEditor.cs
similarity index 97%
rename from src/Umbraco.Web/PropertyEditors/ColorPickerPropertyEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/ColorPickerPropertyEditor.cs
index 0b7da0054f..0f6996ddd4 100644
--- a/src/Umbraco.Web/PropertyEditors/ColorPickerPropertyEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/ColorPickerPropertyEditor.cs
@@ -1,5 +1,4 @@
 using Umbraco.Core;
-using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;
diff --git a/src/Umbraco.Web/PropertyEditors/ContentPickerConfiguration.cs b/src/Umbraco.Infrastructure/PropertyEditors/ContentPickerConfiguration.cs
similarity index 100%
rename from src/Umbraco.Web/PropertyEditors/ContentPickerConfiguration.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/ContentPickerConfiguration.cs
diff --git a/src/Umbraco.Web/PropertyEditors/ContentPickerConfigurationEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/ContentPickerConfigurationEditor.cs
similarity index 100%
rename from src/Umbraco.Web/PropertyEditors/ContentPickerConfigurationEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/ContentPickerConfigurationEditor.cs
diff --git a/src/Umbraco.Web/PropertyEditors/ContentPickerPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/ContentPickerPropertyEditor.cs
similarity index 98%
rename from src/Umbraco.Web/PropertyEditors/ContentPickerPropertyEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/ContentPickerPropertyEditor.cs
index 77c74b288c..4c996fd4fc 100644
--- a/src/Umbraco.Web/PropertyEditors/ContentPickerPropertyEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/ContentPickerPropertyEditor.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using Umbraco.Core;
-using Umbraco.Web.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.Editors;
diff --git a/src/Umbraco.Web/PropertyEditors/DateTimeConfigurationEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/DateTimeConfigurationEditor.cs
similarity index 100%
rename from src/Umbraco.Web/PropertyEditors/DateTimeConfigurationEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/DateTimeConfigurationEditor.cs
diff --git a/src/Umbraco.Web/PropertyEditors/DateTimePropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/DateTimePropertyEditor.cs
similarity index 98%
rename from src/Umbraco.Web/PropertyEditors/DateTimePropertyEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/DateTimePropertyEditor.cs
index 6656efcabc..d2a08c3a2b 100644
--- a/src/Umbraco.Web/PropertyEditors/DateTimePropertyEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/DateTimePropertyEditor.cs
@@ -1,5 +1,4 @@
 using Umbraco.Core;
-using Umbraco.Web.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;
diff --git a/src/Umbraco.Web/PropertyEditors/DateTimeValidator.cs b/src/Umbraco.Infrastructure/PropertyEditors/DateTimeValidator.cs
similarity index 98%
rename from src/Umbraco.Web/PropertyEditors/DateTimeValidator.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/DateTimeValidator.cs
index 1000922b36..a94edb99bd 100644
--- a/src/Umbraco.Web/PropertyEditors/DateTimeValidator.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/DateTimeValidator.cs
@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using Umbraco.Core.Models;
-using Umbraco.Core.PropertyEditors;
 using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PropertyEditors
 {
diff --git a/src/Umbraco.Web/PropertyEditors/DateValueEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/DateValueEditor.cs
similarity index 97%
rename from src/Umbraco.Web/PropertyEditors/DateValueEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/DateValueEditor.cs
index 3fdb95c757..8973dd812b 100644
--- a/src/Umbraco.Web/PropertyEditors/DateValueEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/DateValueEditor.cs
@@ -1,6 +1,5 @@
 using System;
 using Umbraco.Core;
-using Umbraco.Web.Composing;
 using Umbraco.Core.Models;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
diff --git a/src/Umbraco.Web/PropertyEditors/DecimalConfigurationEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/DecimalConfigurationEditor.cs
similarity index 99%
rename from src/Umbraco.Web/PropertyEditors/DecimalConfigurationEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/DecimalConfigurationEditor.cs
index 22b1123b7c..952e3557dd 100644
--- a/src/Umbraco.Web/PropertyEditors/DecimalConfigurationEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/DecimalConfigurationEditor.cs
@@ -35,4 +35,4 @@ namespace Umbraco.Web.PropertyEditors
             });
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web/PropertyEditors/DecimalPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/DecimalPropertyEditor.cs
similarity index 98%
rename from src/Umbraco.Web/PropertyEditors/DecimalPropertyEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/DecimalPropertyEditor.cs
index e2f4a69f2c..e5ca56878f 100644
--- a/src/Umbraco.Web/PropertyEditors/DecimalPropertyEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/DecimalPropertyEditor.cs
@@ -1,5 +1,4 @@
 using Umbraco.Core;
-using Umbraco.Web.Composing;
 using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.PropertyEditors.Validators;
diff --git a/src/Umbraco.Web/PropertyEditors/DropDownFlexibleConfigurationEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/DropDownFlexibleConfigurationEditor.cs
similarity index 100%
rename from src/Umbraco.Web/PropertyEditors/DropDownFlexibleConfigurationEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/DropDownFlexibleConfigurationEditor.cs
diff --git a/src/Umbraco.Web/PropertyEditors/DropDownFlexiblePropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/DropDownFlexiblePropertyEditor.cs
similarity index 98%
rename from src/Umbraco.Web/PropertyEditors/DropDownFlexiblePropertyEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/DropDownFlexiblePropertyEditor.cs
index 897ca63afc..73ce726257 100644
--- a/src/Umbraco.Web/PropertyEditors/DropDownFlexiblePropertyEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/DropDownFlexiblePropertyEditor.cs
@@ -1,5 +1,4 @@
 using Umbraco.Core;
-using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;
diff --git a/src/Umbraco.Web/PropertyEditors/EmailAddressConfiguration.cs b/src/Umbraco.Infrastructure/PropertyEditors/EmailAddressConfiguration.cs
similarity index 100%
rename from src/Umbraco.Web/PropertyEditors/EmailAddressConfiguration.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/EmailAddressConfiguration.cs
diff --git a/src/Umbraco.Web/PropertyEditors/EmailAddressConfigurationEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/EmailAddressConfigurationEditor.cs
similarity index 100%
rename from src/Umbraco.Web/PropertyEditors/EmailAddressConfigurationEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/EmailAddressConfigurationEditor.cs
diff --git a/src/Umbraco.Web/PropertyEditors/EmailAddressPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/EmailAddressPropertyEditor.cs
similarity index 98%
rename from src/Umbraco.Web/PropertyEditors/EmailAddressPropertyEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/EmailAddressPropertyEditor.cs
index 675febf9c5..c5bcaf0f86 100644
--- a/src/Umbraco.Web/PropertyEditors/EmailAddressPropertyEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/EmailAddressPropertyEditor.cs
@@ -1,5 +1,4 @@
 using Umbraco.Core;
-using Umbraco.Web.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;
diff --git a/src/Umbraco.Web/PropertyEditors/GridConfiguration.cs b/src/Umbraco.Infrastructure/PropertyEditors/GridConfiguration.cs
similarity index 100%
rename from src/Umbraco.Web/PropertyEditors/GridConfiguration.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/GridConfiguration.cs
diff --git a/src/Umbraco.Web/PropertyEditors/ImageCropperConfigurationEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/ImageCropperConfigurationEditor.cs
similarity index 100%
rename from src/Umbraco.Web/PropertyEditors/ImageCropperConfigurationEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/ImageCropperConfigurationEditor.cs
diff --git a/src/Umbraco.Web/PropertyEditors/IntegerConfigurationEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/IntegerConfigurationEditor.cs
similarity index 100%
rename from src/Umbraco.Web/PropertyEditors/IntegerConfigurationEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/IntegerConfigurationEditor.cs
diff --git a/src/Umbraco.Web/PropertyEditors/IntegerPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/IntegerPropertyEditor.cs
similarity index 97%
rename from src/Umbraco.Web/PropertyEditors/IntegerPropertyEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/IntegerPropertyEditor.cs
index 4e54200d5e..49e49e005a 100644
--- a/src/Umbraco.Web/PropertyEditors/IntegerPropertyEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/IntegerPropertyEditor.cs
@@ -1,5 +1,4 @@
 using Umbraco.Core;
-using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.PropertyEditors.Validators;
diff --git a/src/Umbraco.Web/PropertyEditors/ListViewConfiguration.cs b/src/Umbraco.Infrastructure/PropertyEditors/ListViewConfiguration.cs
similarity index 100%
rename from src/Umbraco.Web/PropertyEditors/ListViewConfiguration.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/ListViewConfiguration.cs
diff --git a/src/Umbraco.Web/PropertyEditors/ListViewConfigurationEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/ListViewConfigurationEditor.cs
similarity index 100%
rename from src/Umbraco.Web/PropertyEditors/ListViewConfigurationEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/ListViewConfigurationEditor.cs
diff --git a/src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/ListViewPropertyEditor.cs
similarity index 98%
rename from src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/ListViewPropertyEditor.cs
index 9dbd51be66..f46743f0cc 100644
--- a/src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/ListViewPropertyEditor.cs
@@ -1,5 +1,4 @@
 using Umbraco.Core;
-using Umbraco.Web.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;
diff --git a/src/Umbraco.Web/PropertyEditors/MarkdownConfiguration.cs b/src/Umbraco.Infrastructure/PropertyEditors/MarkdownConfiguration.cs
similarity index 100%
rename from src/Umbraco.Web/PropertyEditors/MarkdownConfiguration.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/MarkdownConfiguration.cs
diff --git a/src/Umbraco.Web/PropertyEditors/MarkdownConfigurationEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/MarkdownConfigurationEditor.cs
similarity index 100%
rename from src/Umbraco.Web/PropertyEditors/MarkdownConfigurationEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/MarkdownConfigurationEditor.cs
diff --git a/src/Umbraco.Web/PropertyEditors/MarkdownPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/MarkdownPropertyEditor.cs
similarity index 97%
rename from src/Umbraco.Web/PropertyEditors/MarkdownPropertyEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/MarkdownPropertyEditor.cs
index b875670023..167b05df53 100644
--- a/src/Umbraco.Web/PropertyEditors/MarkdownPropertyEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/MarkdownPropertyEditor.cs
@@ -1,5 +1,4 @@
 using Umbraco.Core;
-using Umbraco.Web.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;
diff --git a/src/Umbraco.Web/PropertyEditors/PropertyEditorsComponent.cs b/src/Umbraco.Infrastructure/PropertyEditors/PropertyEditorsComponent.cs
similarity index 97%
rename from src/Umbraco.Web/PropertyEditors/PropertyEditorsComponent.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/PropertyEditorsComponent.cs
index df603d9e88..de071d1a1e 100644
--- a/src/Umbraco.Web/PropertyEditors/PropertyEditorsComponent.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/PropertyEditorsComponent.cs
@@ -6,7 +6,7 @@ using Umbraco.Core.Services.Implement;
 
 namespace Umbraco.Web.PropertyEditors
 {
-    internal sealed class PropertyEditorsComponent : IComponent
+    public sealed class PropertyEditorsComponent : IComponent
     {
         private readonly PropertyEditorCollection _propertyEditors;
 
diff --git a/src/Umbraco.Web/PropertyEditors/TagConfigurationEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/TagConfigurationEditor.cs
similarity index 97%
rename from src/Umbraco.Web/PropertyEditors/TagConfigurationEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/TagConfigurationEditor.cs
index aed32f10a1..3877611a68 100644
--- a/src/Umbraco.Web/PropertyEditors/TagConfigurationEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/TagConfigurationEditor.cs
@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
 using Umbraco.Core.IO;
 using Umbraco.Core.Models;
 using Umbraco.Core.PropertyEditors;
diff --git a/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/TagsPropertyEditor.cs
similarity index 99%
rename from src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/TagsPropertyEditor.cs
index a80723e340..7fccd3a15f 100644
--- a/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/TagsPropertyEditor.cs
@@ -4,7 +4,6 @@ using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using Newtonsoft.Json.Linq;
 using Umbraco.Core;
-using Umbraco.Web.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.Editors;
diff --git a/src/Umbraco.Web/PropertyEditors/TextAreaConfiguration.cs b/src/Umbraco.Infrastructure/PropertyEditors/TextAreaConfiguration.cs
similarity index 100%
rename from src/Umbraco.Web/PropertyEditors/TextAreaConfiguration.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/TextAreaConfiguration.cs
diff --git a/src/Umbraco.Web/PropertyEditors/TextAreaConfigurationEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/TextAreaConfigurationEditor.cs
similarity index 100%
rename from src/Umbraco.Web/PropertyEditors/TextAreaConfigurationEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/TextAreaConfigurationEditor.cs
diff --git a/src/Umbraco.Web/PropertyEditors/TextAreaPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/TextAreaPropertyEditor.cs
similarity index 98%
rename from src/Umbraco.Web/PropertyEditors/TextAreaPropertyEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/TextAreaPropertyEditor.cs
index c91788b99b..dd3c1fd350 100644
--- a/src/Umbraco.Web/PropertyEditors/TextAreaPropertyEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/TextAreaPropertyEditor.cs
@@ -1,5 +1,4 @@
 using Umbraco.Core;
-using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;
diff --git a/src/Umbraco.Web/PropertyEditors/TextOnlyValueEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/TextOnlyValueEditor.cs
similarity index 98%
rename from src/Umbraco.Web/PropertyEditors/TextOnlyValueEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/TextOnlyValueEditor.cs
index e9389779fd..e53c673986 100644
--- a/src/Umbraco.Web/PropertyEditors/TextOnlyValueEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/TextOnlyValueEditor.cs
@@ -1,5 +1,4 @@
 using System;
-using Umbraco.Core.Composing;
 using Umbraco.Core.Models;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
diff --git a/src/Umbraco.Web/PropertyEditors/TextboxConfiguration.cs b/src/Umbraco.Infrastructure/PropertyEditors/TextboxConfiguration.cs
similarity index 100%
rename from src/Umbraco.Web/PropertyEditors/TextboxConfiguration.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/TextboxConfiguration.cs
diff --git a/src/Umbraco.Web/PropertyEditors/TextboxConfigurationEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/TextboxConfigurationEditor.cs
similarity index 100%
rename from src/Umbraco.Web/PropertyEditors/TextboxConfigurationEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/TextboxConfigurationEditor.cs
diff --git a/src/Umbraco.Web/PropertyEditors/TextboxPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/TextboxPropertyEditor.cs
similarity index 98%
rename from src/Umbraco.Web/PropertyEditors/TextboxPropertyEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/TextboxPropertyEditor.cs
index 79d42f19d4..b89f5e228a 100644
--- a/src/Umbraco.Web/PropertyEditors/TextboxPropertyEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/TextboxPropertyEditor.cs
@@ -1,5 +1,4 @@
 using Umbraco.Core;
-using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;
diff --git a/src/Umbraco.Web/PropertyEditors/TrueFalseConfiguration.cs b/src/Umbraco.Infrastructure/PropertyEditors/TrueFalseConfiguration.cs
similarity index 100%
rename from src/Umbraco.Web/PropertyEditors/TrueFalseConfiguration.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/TrueFalseConfiguration.cs
diff --git a/src/Umbraco.Web/PropertyEditors/TrueFalseConfigurationEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/TrueFalseConfigurationEditor.cs
similarity index 100%
rename from src/Umbraco.Web/PropertyEditors/TrueFalseConfigurationEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/TrueFalseConfigurationEditor.cs
diff --git a/src/Umbraco.Web/PropertyEditors/TrueFalsePropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/TrueFalsePropertyEditor.cs
similarity index 97%
rename from src/Umbraco.Web/PropertyEditors/TrueFalsePropertyEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/TrueFalsePropertyEditor.cs
index 3c98b61292..3d82dc2809 100644
--- a/src/Umbraco.Web/PropertyEditors/TrueFalsePropertyEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/TrueFalsePropertyEditor.cs
@@ -1,5 +1,4 @@
 using Umbraco.Core;
-using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;
diff --git a/src/Umbraco.Web/PropertyEditors/UserPickerConfiguration.cs b/src/Umbraco.Infrastructure/PropertyEditors/UserPickerConfiguration.cs
similarity index 99%
rename from src/Umbraco.Web/PropertyEditors/UserPickerConfiguration.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/UserPickerConfiguration.cs
index f7bd0ceb7d..4d497867a1 100644
--- a/src/Umbraco.Web/PropertyEditors/UserPickerConfiguration.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/UserPickerConfiguration.cs
@@ -10,4 +10,4 @@ namespace Umbraco.Web.PropertyEditors
             {"entityType", "User"}
         };
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web/PropertyEditors/UserPickerPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/UserPickerPropertyEditor.cs
similarity index 97%
rename from src/Umbraco.Web/PropertyEditors/UserPickerPropertyEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/UserPickerPropertyEditor.cs
index 30568de0ea..429527f3eb 100644
--- a/src/Umbraco.Web/PropertyEditors/UserPickerPropertyEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/UserPickerPropertyEditor.cs
@@ -1,5 +1,4 @@
 using Umbraco.Core;
-using Umbraco.Web.Composing;
 using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
diff --git a/src/Umbraco.Web/PropertyEditors/ValueListConfigurationEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/ValueListConfigurationEditor.cs
similarity index 100%
rename from src/Umbraco.Web/PropertyEditors/ValueListConfigurationEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/ValueListConfigurationEditor.cs
index 6facc69f40..7802767ad6 100644
--- a/src/Umbraco.Web/PropertyEditors/ValueListConfigurationEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/ValueListConfigurationEditor.cs
@@ -2,8 +2,8 @@
 using System.Linq;
 using Newtonsoft.Json.Linq;
 using Umbraco.Core.IO;
-using Umbraco.Core.Services;
 using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Services;
 
 namespace Umbraco.Web.PropertyEditors
 {
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 0ce7127a5b..e764a0fa6c 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -446,23 +446,6 @@
     <Compile Include="Mvc\FilteredControllerFactoryCollection.cs" />
     <Compile Include="Mvc\FilteredControllerFactoryCollectionBuilder.cs" />
     <Compile Include="Mvc\SurfaceControllerTypeCollection.cs" />
-    <Compile Include="PropertyEditors\ContentPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\ContentPickerConfiguration.cs" />
-    <Compile Include="PropertyEditors\ContentPickerConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\DateValueEditor.cs" />
-    <Compile Include="PropertyEditors\DecimalConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\DropDownFlexiblePropertyEditor.cs" />
-    <Compile Include="PropertyEditors\DropDownFlexibleConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\EmailAddressConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\EmailAddressConfiguration.cs" />
-    <Compile Include="PropertyEditors\GridConfiguration.cs" />
-    <Compile Include="PropertyEditors\GridConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\ImageCropperConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\IntegerConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\ListViewConfiguration.cs" />
-    <Compile Include="PropertyEditors\ListViewConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\MarkdownConfiguration.cs" />
-    <Compile Include="PropertyEditors\MarkdownConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\MediaPickerPropertyEditor.cs" />
     <Compile Include="PropertyEditors\MediaPickerConfiguration.cs" />
     <Compile Include="PropertyEditors\MediaPickerConfigurationEditor.cs" />
@@ -479,18 +462,8 @@
     <Compile Include="PropertyEditors\NestedContentController.cs" />
     <Compile Include="PropertyEditors\NestedContentPropertyEditor.cs" />
     <Compile Include="PropertyEditors\ParameterEditors\MultipleContentPickerParameterEditor.cs" />
-    <Compile Include="PropertyEditors\PropertyEditorsComponent.cs" />
     <Compile Include="PropertyEditors\RichTextConfiguration.cs" />
     <Compile Include="PropertyEditors\SliderConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\TagConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\TextAreaConfiguration.cs" />
-    <Compile Include="PropertyEditors\TextAreaConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\TextboxConfiguration.cs" />
-    <Compile Include="PropertyEditors\TextboxConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\TextOnlyValueEditor.cs" />
-    <Compile Include="PropertyEditors\TrueFalseConfiguration.cs" />
-    <Compile Include="PropertyEditors\TrueFalseConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\UserPickerConfiguration.cs" />
     <Compile Include="PropertyEditors\ValueConverters\FlexibleDropdownPropertyValueConverter.cs" />
     <Compile Include="PropertyEditors\ValueConverters\NestedContentManyValueConverter.cs" />
     <Compile Include="PropertyEditors\ValueConverters\NestedContentValueConverterBase.cs" />
@@ -498,7 +471,6 @@
     <Compile Include="PropertyEditors\ValueConverters\MediaPickerValueConverter.cs" />
     <Compile Include="PropertyEditors\ValueConverters\MemberPickerValueConverter.cs" />
     <Compile Include="PropertyEditors\ValueConverters\MultiNodeTreePickerValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueListUniqueValueValidator.cs" />
     <Compile Include="PublishedCache\IPublishedSnapshot.cs" />
     <Compile Include="PublishedCache\IDefaultCultureAccessor.cs" />
     <Compile Include="PublishedCache\NuCache\DataSource\BTree.ContentDataSerializer.cs" />
@@ -630,8 +602,6 @@
     <Compile Include="Mvc\UmbracoRequireHttpsAttribute.cs" />
     <Compile Include="Mvc\ValidateMvcAngularAntiForgeryTokenAttribute.cs" />
     <Compile Include="OwinMiddlewareConfiguredEventArgs.cs" />
-    <Compile Include="PropertyEditors\DateTimeConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\DecimalPropertyEditor.cs" />
     <Compile Include="Routing\RedirectTrackingComponent.cs" />
     <Compile Include="Editors\RedirectUrlManagementController.cs" />
     <Compile Include="Models\ContentEditing\RedirectUrlSearchResults.cs" />
@@ -789,12 +759,6 @@
     <Compile Include="Models\Mapping\TagMapDefinition.cs" />
     <Compile Include="Models\UpgradeCheckResponse.cs" />
     <Compile Include="Models\PasswordChangedModel.cs" />
-    <Compile Include="PropertyEditors\ColorPickerConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\EmailAddressPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\ImageCropperPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\ImageCropperPropertyValueEditor.cs" />
-    <Compile Include="PropertyEditors\ListViewPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MarkdownPropertyEditor.cs" />
     <Compile Include="PropertyEditors\MemberGroupPickerPropertyEditor.cs" />
     <Compile Include="PropertyEditors\ParameterEditors\ContentTypeParameterEditor.cs" />
     <Compile Include="PropertyEditors\ParameterEditors\MultipleContentTypeParameterEditor.cs" />
@@ -814,21 +778,11 @@
     <Compile Include="Models\ContentEditing\PropertyEditorBasic.cs" />
     <Compile Include="Models\Mapping\DataTypeMapDefinition.cs" />
     <Compile Include="Models\Mapping\EntityMapDefinition.cs" />
-    <Compile Include="PropertyEditors\CheckBoxListPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\ColorPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\DateTimePropertyEditor.cs" />
-    <Compile Include="PropertyEditors\DateTimeValidator.cs" />
-    <Compile Include="PropertyEditors\IntegerPropertyEditor.cs" />
     <Compile Include="PropertyEditors\MultipleTextStringPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MultipleValueEditor.cs" />
     <Compile Include="PropertyEditors\RadioButtonsPropertyEditor.cs" />
     <Compile Include="PropertyEditors\RichTextPreValueController.cs" />
     <Compile Include="PropertyEditors\RichTextConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\SliderPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\TagsPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\UploadFileTypeValidator.cs" />
-    <Compile Include="PropertyEditors\UserPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\ValueListConfigurationEditor.cs" />
     <Compile Include="PublishedContentQuery.cs" />
     <Compile Include="ImageCropperTemplateExtensions.cs" />
     <Compile Include="Mvc\UmbracoVirtualNodeRouteHandler.cs" />
@@ -926,12 +880,7 @@
     <Compile Include="Models\Mapping\SectionMapDefinition.cs" />
     <Compile Include="Models\Mapping\TabsAndPropertiesMapper.cs" />
     <Compile Include="Models\Mapping\UserMapDefinition.cs" />
-    <Compile Include="PropertyEditors\FileUploadPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\FileUploadPropertyValueEditor.cs" />
     <Compile Include="PropertyEditors\RichTextPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\TextAreaPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\TextboxPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\TrueFalsePropertyEditor.cs" />
     <Compile Include="Trees\MediaTreeController.cs" />
     <Compile Include="Models\Trees\ActionMenuItem.cs" />
     <Compile Include="Trees\ActionUrlMethod.cs" />