diff --git a/src/Umbraco.Infrastructure/PropertyEditors/ContentPickerConfiguration.cs b/src/Umbraco.Abstractions/PropertyEditors/ContentPickerConfiguration.cs
similarity index 100%
rename from src/Umbraco.Infrastructure/PropertyEditors/ContentPickerConfiguration.cs
rename to src/Umbraco.Abstractions/PropertyEditors/ContentPickerConfiguration.cs
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/EmailAddressConfiguration.cs b/src/Umbraco.Abstractions/PropertyEditors/EmailAddressConfiguration.cs
similarity index 100%
rename from src/Umbraco.Infrastructure/PropertyEditors/EmailAddressConfiguration.cs
rename to src/Umbraco.Abstractions/PropertyEditors/EmailAddressConfiguration.cs
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/MarkdownConfiguration.cs b/src/Umbraco.Abstractions/PropertyEditors/MarkdownConfiguration.cs
similarity index 99%
rename from src/Umbraco.Infrastructure/PropertyEditors/MarkdownConfiguration.cs
rename to src/Umbraco.Abstractions/PropertyEditors/MarkdownConfiguration.cs
index 4c2374ccd5..f32b3ffb44 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/MarkdownConfiguration.cs
+++ b/src/Umbraco.Abstractions/PropertyEditors/MarkdownConfiguration.cs
@@ -13,4 +13,4 @@ namespace Umbraco.Web.PropertyEditors
         [ConfigurationField("defaultValue", "Default value", "textarea", Description = "If value is blank, the editor will show this")]
         public string DefaultValue { get; set; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web/PropertyEditors/MediaPickerConfiguration.cs b/src/Umbraco.Abstractions/PropertyEditors/MediaPickerConfiguration.cs
similarity index 100%
rename from src/Umbraco.Web/PropertyEditors/MediaPickerConfiguration.cs
rename to src/Umbraco.Abstractions/PropertyEditors/MediaPickerConfiguration.cs
diff --git a/src/Umbraco.Web/PropertyEditors/MultiUrlPickerConfiguration.cs b/src/Umbraco.Abstractions/PropertyEditors/MultiUrlPickerConfiguration.cs
similarity index 100%
rename from src/Umbraco.Web/PropertyEditors/MultiUrlPickerConfiguration.cs
rename to src/Umbraco.Abstractions/PropertyEditors/MultiUrlPickerConfiguration.cs
diff --git a/src/Umbraco.Web/PropertyEditors/MultipleTextStringConfiguration.cs b/src/Umbraco.Abstractions/PropertyEditors/MultipleTextStringConfiguration.cs
similarity index 100%
rename from src/Umbraco.Web/PropertyEditors/MultipleTextStringConfiguration.cs
rename to src/Umbraco.Abstractions/PropertyEditors/MultipleTextStringConfiguration.cs
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/TextAreaConfiguration.cs b/src/Umbraco.Abstractions/PropertyEditors/TextAreaConfiguration.cs
similarity index 100%
rename from src/Umbraco.Infrastructure/PropertyEditors/TextAreaConfiguration.cs
rename to src/Umbraco.Abstractions/PropertyEditors/TextAreaConfiguration.cs
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/TextboxConfiguration.cs b/src/Umbraco.Abstractions/PropertyEditors/TextboxConfiguration.cs
similarity index 100%
rename from src/Umbraco.Infrastructure/PropertyEditors/TextboxConfiguration.cs
rename to src/Umbraco.Abstractions/PropertyEditors/TextboxConfiguration.cs
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/TrueFalseConfiguration.cs b/src/Umbraco.Abstractions/PropertyEditors/TrueFalseConfiguration.cs
similarity index 100%
rename from src/Umbraco.Infrastructure/PropertyEditors/TrueFalseConfiguration.cs
rename to src/Umbraco.Abstractions/PropertyEditors/TrueFalseConfiguration.cs
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/DateTimeValidator.cs b/src/Umbraco.Abstractions/PropertyEditors/Validators/DateTimeValidator.cs
similarity index 96%
rename from src/Umbraco.Infrastructure/PropertyEditors/DateTimeValidator.cs
rename to src/Umbraco.Abstractions/PropertyEditors/Validators/DateTimeValidator.cs
index a94edb99bd..e964eae448 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/DateTimeValidator.cs
+++ b/src/Umbraco.Abstractions/PropertyEditors/Validators/DateTimeValidator.cs
@@ -9,7 +9,7 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// Used to validate if the value is a valid date/time
     /// </summary>
-    internal class DateTimeValidator : IValueValidator
+    public class DateTimeValidator : IValueValidator
     {
         public IEnumerable<ValidationResult> Validate(object value, string valueType, object dataTypeConfiguration)
         {
diff --git a/src/Umbraco.Web/PropertyEditors/MediaPickerConfigurationEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/MediaPickerConfigurationEditor.cs
similarity index 100%
rename from src/Umbraco.Web/PropertyEditors/MediaPickerConfigurationEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/MediaPickerConfigurationEditor.cs
diff --git a/src/Umbraco.Web/PropertyEditors/MediaPickerPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/MediaPickerPropertyEditor.cs
similarity index 95%
rename from src/Umbraco.Web/PropertyEditors/MediaPickerPropertyEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/MediaPickerPropertyEditor.cs
index 04e87bc9fe..d2fcf4e4cc 100644
--- a/src/Umbraco.Web/PropertyEditors/MediaPickerPropertyEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/MediaPickerPropertyEditor.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using Umbraco.Core;
 using Umbraco.Core.IO;
-using Umbraco.Web.Composing;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.Editors;
 using Umbraco.Core.PropertyEditors;
@@ -45,7 +44,7 @@ namespace Umbraco.Web.PropertyEditors
 
         protected override IDataValueEditor CreateValueEditor() => new MediaPickerPropertyValueEditor(DataTypeService, LocalizationService, LocalizedTextService, ShortStringHelper, Attribute);
 
-        internal class MediaPickerPropertyValueEditor : DataValueEditor, IDataValueReference
+        public class MediaPickerPropertyValueEditor : DataValueEditor, IDataValueReference
         {
             public MediaPickerPropertyValueEditor(IDataTypeService dataTypeService, ILocalizationService localizationService, ILocalizedTextService localizedTextService, IShortStringHelper shortStringHelper, DataEditorAttribute attribute)
                 : base(dataTypeService,localizationService, localizedTextService, shortStringHelper,attribute)
@@ -64,6 +63,4 @@ namespace Umbraco.Web.PropertyEditors
             }
         }
     }
-
-
 }
diff --git a/src/Umbraco.Web/PropertyEditors/MemberGroupPickerPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/MemberGroupPickerPropertyEditor.cs
similarity index 97%
rename from src/Umbraco.Web/PropertyEditors/MemberGroupPickerPropertyEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/MemberGroupPickerPropertyEditor.cs
index 68dee45252..fd1bd0d102 100644
--- a/src/Umbraco.Web/PropertyEditors/MemberGroupPickerPropertyEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/MemberGroupPickerPropertyEditor.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/MemberPickerConfiguration.cs b/src/Umbraco.Infrastructure/PropertyEditors/MemberPickerConfiguration.cs
similarity index 100%
rename from src/Umbraco.Web/PropertyEditors/MemberPickerConfiguration.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/MemberPickerConfiguration.cs
diff --git a/src/Umbraco.Web/PropertyEditors/MemberPickerPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/MemberPickerPropertyEditor.cs
similarity index 97%
rename from src/Umbraco.Web/PropertyEditors/MemberPickerPropertyEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/MemberPickerPropertyEditor.cs
index e378cd47f0..092e790e51 100644
--- a/src/Umbraco.Web/PropertyEditors/MemberPickerPropertyEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/MemberPickerPropertyEditor.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/MultiNodePickerConfiguration.cs b/src/Umbraco.Infrastructure/PropertyEditors/MultiNodePickerConfiguration.cs
similarity index 95%
rename from src/Umbraco.Web/PropertyEditors/MultiNodePickerConfiguration.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/MultiNodePickerConfiguration.cs
index 81a96b5ad7..0725971e95 100644
--- a/src/Umbraco.Web/PropertyEditors/MultiNodePickerConfiguration.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/MultiNodePickerConfiguration.cs
@@ -1,5 +1,4 @@
-using Newtonsoft.Json.Linq;
-using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PropertyEditors
 {
diff --git a/src/Umbraco.Web/PropertyEditors/MultiNodePickerConfigurationEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/MultiNodePickerConfigurationEditor.cs
similarity index 100%
rename from src/Umbraco.Web/PropertyEditors/MultiNodePickerConfigurationEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/MultiNodePickerConfigurationEditor.cs
diff --git a/src/Umbraco.Web/PropertyEditors/MultiNodePickerConfigurationTreeSource.cs b/src/Umbraco.Infrastructure/PropertyEditors/MultiNodePickerConfigurationTreeSource.cs
similarity index 100%
rename from src/Umbraco.Web/PropertyEditors/MultiNodePickerConfigurationTreeSource.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/MultiNodePickerConfigurationTreeSource.cs
diff --git a/src/Umbraco.Web/PropertyEditors/MultiNodeTreePickerPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/MultiNodeTreePickerPropertyEditor.cs
similarity index 98%
rename from src/Umbraco.Web/PropertyEditors/MultiNodeTreePickerPropertyEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/MultiNodeTreePickerPropertyEditor.cs
index 0e8e495a02..f1ed4e6c44 100644
--- a/src/Umbraco.Web/PropertyEditors/MultiNodeTreePickerPropertyEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/MultiNodeTreePickerPropertyEditor.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/MultiUrlPickerConfigurationEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/MultiUrlPickerConfigurationEditor.cs
similarity index 100%
rename from src/Umbraco.Web/PropertyEditors/MultiUrlPickerConfigurationEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/MultiUrlPickerConfigurationEditor.cs
diff --git a/src/Umbraco.Web/PropertyEditors/MultipleTextStringConfigurationEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/MultipleTextStringConfigurationEditor.cs
similarity index 100%
rename from src/Umbraco.Web/PropertyEditors/MultipleTextStringConfigurationEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/MultipleTextStringConfigurationEditor.cs
diff --git a/src/Umbraco.Web/PropertyEditors/MultipleTextStringPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/MultipleTextStringPropertyEditor.cs
similarity index 99%
rename from src/Umbraco.Web/PropertyEditors/MultipleTextStringPropertyEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/MultipleTextStringPropertyEditor.cs
index 56c9b7a63c..8aba505aed 100644
--- a/src/Umbraco.Web/PropertyEditors/MultipleTextStringPropertyEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/MultipleTextStringPropertyEditor.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.Exceptions;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
diff --git a/src/Umbraco.Web/PropertyEditors/NestedContentConfiguration.cs b/src/Umbraco.Infrastructure/PropertyEditors/NestedContentConfiguration.cs
similarity index 100%
rename from src/Umbraco.Web/PropertyEditors/NestedContentConfiguration.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/NestedContentConfiguration.cs
diff --git a/src/Umbraco.Web/PropertyEditors/NestedContentConfigurationEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/NestedContentConfigurationEditor.cs
similarity index 87%
rename from src/Umbraco.Web/PropertyEditors/NestedContentConfigurationEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/NestedContentConfigurationEditor.cs
index 566c800b3d..7eeee68b07 100644
--- a/src/Umbraco.Web/PropertyEditors/NestedContentConfigurationEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/NestedContentConfigurationEditor.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using Umbraco.Core.IO;
+using Umbraco.Core.IO;
 using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PropertyEditors
diff --git a/src/Umbraco.Web/PropertyEditors/ParameterEditors/ContentTypeParameterEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/ParameterEditors/ContentTypeParameterEditor.cs
similarity index 94%
rename from src/Umbraco.Web/PropertyEditors/ParameterEditors/ContentTypeParameterEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/ParameterEditors/ContentTypeParameterEditor.cs
index 9513b9d0f3..726963b9c5 100644
--- a/src/Umbraco.Web/PropertyEditors/ParameterEditors/ContentTypeParameterEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/ParameterEditors/ContentTypeParameterEditor.cs
@@ -1,5 +1,4 @@
-using Umbraco.Web.Composing;
-using Umbraco.Core.Logging;
+using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
 using Umbraco.Core.Strings;
diff --git a/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleContentPickerParameterEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/ParameterEditors/MultipleContentPickerParameterEditor.cs
similarity index 97%
rename from src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleContentPickerParameterEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/ParameterEditors/MultipleContentPickerParameterEditor.cs
index 9dfdbc6721..a514a47a01 100644
--- a/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleContentPickerParameterEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/ParameterEditors/MultipleContentPickerParameterEditor.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/ParameterEditors/MultipleContentTypeParameterEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/ParameterEditors/MultipleContentTypeParameterEditor.cs
similarity index 93%
rename from src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleContentTypeParameterEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/ParameterEditors/MultipleContentTypeParameterEditor.cs
index bebfea3ad6..7097f951c6 100644
--- a/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleContentTypeParameterEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/ParameterEditors/MultipleContentTypeParameterEditor.cs
@@ -1,5 +1,4 @@
-using Umbraco.Web.Composing;
-using Umbraco.Core.Logging;
+using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
 using Umbraco.Core.Strings;
diff --git a/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleMediaPickerParameterEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/ParameterEditors/MultipleMediaPickerParameterEditor.cs
similarity index 97%
rename from src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleMediaPickerParameterEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/ParameterEditors/MultipleMediaPickerParameterEditor.cs
index 91e33735ea..7b6a965706 100644
--- a/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleMediaPickerParameterEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/ParameterEditors/MultipleMediaPickerParameterEditor.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/ParameterEditors/MultiplePropertyGroupParameterEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/ParameterEditors/MultiplePropertyGroupParameterEditor.cs
similarity index 94%
rename from src/Umbraco.Web/PropertyEditors/ParameterEditors/MultiplePropertyGroupParameterEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/ParameterEditors/MultiplePropertyGroupParameterEditor.cs
index 719d9eb2eb..da98492442 100644
--- a/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultiplePropertyGroupParameterEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/ParameterEditors/MultiplePropertyGroupParameterEditor.cs
@@ -1,5 +1,4 @@
-using Umbraco.Web.Composing;
-using Umbraco.Core.Logging;
+using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
 using Umbraco.Core.Strings;
diff --git a/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultiplePropertyTypeParameterEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/ParameterEditors/MultiplePropertyTypeParameterEditor.cs
similarity index 94%
rename from src/Umbraco.Web/PropertyEditors/ParameterEditors/MultiplePropertyTypeParameterEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/ParameterEditors/MultiplePropertyTypeParameterEditor.cs
index 27eefe491f..46a5652455 100644
--- a/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultiplePropertyTypeParameterEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/ParameterEditors/MultiplePropertyTypeParameterEditor.cs
@@ -1,5 +1,4 @@
-using Umbraco.Web.Composing;
-using Umbraco.Core.Logging;
+using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
 using Umbraco.Core.Strings;
diff --git a/src/Umbraco.Web/PropertyEditors/ParameterEditors/PropertyGroupParameterEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/ParameterEditors/PropertyGroupParameterEditor.cs
similarity index 94%
rename from src/Umbraco.Web/PropertyEditors/ParameterEditors/PropertyGroupParameterEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/ParameterEditors/PropertyGroupParameterEditor.cs
index 3cd120f44d..d331fee6ee 100644
--- a/src/Umbraco.Web/PropertyEditors/ParameterEditors/PropertyGroupParameterEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/ParameterEditors/PropertyGroupParameterEditor.cs
@@ -1,5 +1,4 @@
-using Umbraco.Web.Composing;
-using Umbraco.Core.Logging;
+using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
 using Umbraco.Core.Strings;
diff --git a/src/Umbraco.Web/PropertyEditors/ParameterEditors/PropertyTypeParameterEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/ParameterEditors/PropertyTypeParameterEditor.cs
similarity index 94%
rename from src/Umbraco.Web/PropertyEditors/ParameterEditors/PropertyTypeParameterEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/ParameterEditors/PropertyTypeParameterEditor.cs
index 0526d60f84..affcd4738d 100644
--- a/src/Umbraco.Web/PropertyEditors/ParameterEditors/PropertyTypeParameterEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/ParameterEditors/PropertyTypeParameterEditor.cs
@@ -1,5 +1,4 @@
-using Umbraco.Web.Composing;
-using Umbraco.Core.Logging;
+using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
 using Umbraco.Core.Strings;
diff --git a/src/Umbraco.Web/PropertyEditors/PropertyEditorsComposer.cs b/src/Umbraco.Infrastructure/PropertyEditors/PropertyEditorsComposer.cs
similarity index 100%
rename from src/Umbraco.Web/PropertyEditors/PropertyEditorsComposer.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/PropertyEditorsComposer.cs
diff --git a/src/Umbraco.Web/PropertyEditors/RadioButtonsPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/RadioButtonsPropertyEditor.cs
similarity index 98%
rename from src/Umbraco.Web/PropertyEditors/RadioButtonsPropertyEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/RadioButtonsPropertyEditor.cs
index e25bb758d2..f6b24e5859 100644
--- a/src/Umbraco.Web/PropertyEditors/RadioButtonsPropertyEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/RadioButtonsPropertyEditor.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/RichTextConfiguration.cs b/src/Umbraco.Infrastructure/PropertyEditors/RichTextConfiguration.cs
similarity index 100%
rename from src/Umbraco.Web/PropertyEditors/RichTextConfiguration.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/RichTextConfiguration.cs
diff --git a/src/Umbraco.Web/PropertyEditors/RichTextConfigurationEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/RichTextConfigurationEditor.cs
similarity index 78%
rename from src/Umbraco.Web/PropertyEditors/RichTextConfigurationEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/RichTextConfigurationEditor.cs
index c6d0b95483..752ae97334 100644
--- a/src/Umbraco.Web/PropertyEditors/RichTextConfigurationEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/RichTextConfigurationEditor.cs
@@ -6,7 +6,7 @@ namespace Umbraco.Web.PropertyEditors
     /// <summary>
     /// Represents the configuration editor for the rich text value editor.
     /// </summary>
-    internal class RichTextConfigurationEditor : ConfigurationEditor<RichTextConfiguration>
+    public class RichTextConfigurationEditor : ConfigurationEditor<RichTextConfiguration>
     {
         public RichTextConfigurationEditor(IIOHelper ioHelper) : base(ioHelper)
         {
diff --git a/src/Umbraco.Web/PropertyEditors/SliderConfigurationEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/SliderConfigurationEditor.cs
similarity index 100%
rename from src/Umbraco.Web/PropertyEditors/SliderConfigurationEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/SliderConfigurationEditor.cs
diff --git a/src/Umbraco.Web/PropertyEditors/SliderPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/SliderPropertyEditor.cs
similarity index 97%
rename from src/Umbraco.Web/PropertyEditors/SliderPropertyEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/SliderPropertyEditor.cs
index 6db7b284b8..88bfc3f4e3 100644
--- a/src/Umbraco.Web/PropertyEditors/SliderPropertyEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/SliderPropertyEditor.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/ValueConverters/FlexibleDropdownPropertyValueConverter.cs b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/FlexibleDropdownPropertyValueConverter.cs
similarity index 99%
rename from src/Umbraco.Web/PropertyEditors/ValueConverters/FlexibleDropdownPropertyValueConverter.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/FlexibleDropdownPropertyValueConverter.cs
index 0d6089f0f4..164ce185ae 100644
--- a/src/Umbraco.Web/PropertyEditors/ValueConverters/FlexibleDropdownPropertyValueConverter.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/FlexibleDropdownPropertyValueConverter.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Newtonsoft.Json;
 using Umbraco.Core;
 using Umbraco.Core.Models.PublishedContent;
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 5941e8e986..3a3fae7c69 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -213,7 +213,6 @@
     <Compile Include="Net\AspNetPasswordHasher.cs" />
     <Compile Include="Net\AspNetSessionIdResolver.cs" />
     <Compile Include="Profiling\WebProfilingController.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\MultipleMediaPickerParameterEditor.cs" />
     <Compile Include="PropertyEditors\RichTextEditorPastedImages.cs" />
     <Compile Include="PublishedCache\NuCache\PublishedSnapshotServiceOptions.cs" />
     <Compile Include="PublishedCache\NuCache\Snap\GenObj.cs" />
@@ -260,8 +259,6 @@
     <Compile Include="ViewDataExtensions.cs" />
     <Compile Include="WebApi\Filters\AdminUsersAuthorizeAttribute.cs" />
     <Compile Include="WebApi\Filters\OnlyLocalRequestsAttribute.cs" />
-    <Compile Include="PropertyEditors\MultiUrlPickerConfiguration.cs" />
-    <Compile Include="PropertyEditors\MultiUrlPickerConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\MultiUrlPickerPropertyEditor.cs" />
     <Compile Include="PropertyEditors\MultiUrlPickerValueEditor.cs" />
     <Compile Include="PropertyEditors\ValueConverters\MultiUrlPickerValueConverter.cs" />
@@ -282,7 +279,6 @@
     <Compile Include="Services\ITreeService.cs" />
     <Compile Include="Services\ISectionService.cs" />
     <Compile Include="PropertyEditors\GridPropertyIndexValueFactory.cs" />
-    <Compile Include="PropertyEditors\PropertyEditorsComposer.cs" />
     <Compile Include="PublishedCache\NuCache\NuCacheComposer.cs" />
     <Compile Include="Routing\RedirectTrackingComposer.cs" />
     <Compile Include="Runtime\WebInitialComposer.cs" />
@@ -466,25 +462,8 @@
     <Compile Include="Mvc\FilteredControllerFactoryCollection.cs" />
     <Compile Include="Mvc\FilteredControllerFactoryCollectionBuilder.cs" />
     <Compile Include="Mvc\SurfaceControllerTypeCollection.cs" />
-    <Compile Include="PropertyEditors\MediaPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MediaPickerConfiguration.cs" />
-    <Compile Include="PropertyEditors\MediaPickerConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\MemberPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MemberPickerConfiguration.cs" />
-    <Compile Include="PropertyEditors\MultiNodePickerConfiguration.cs" />
-    <Compile Include="PropertyEditors\MultiNodePickerConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\MultiNodePickerConfigurationTreeSource.cs" />
-    <Compile Include="PropertyEditors\MultiNodeTreePickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\MultipleTextStringConfiguration.cs" />
-    <Compile Include="PropertyEditors\MultipleTextStringConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\NestedContentConfiguration.cs" />
-    <Compile Include="PropertyEditors\NestedContentConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\NestedContentController.cs" />
     <Compile Include="PropertyEditors\NestedContentPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\MultipleContentPickerParameterEditor.cs" />
-    <Compile Include="PropertyEditors\RichTextConfiguration.cs" />
-    <Compile Include="PropertyEditors\SliderConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\FlexibleDropdownPropertyValueConverter.cs" />
     <Compile Include="PropertyEditors\ValueConverters\NestedContentManyValueConverter.cs" />
     <Compile Include="PropertyEditors\ValueConverters\NestedContentValueConverterBase.cs" />
     <Compile Include="PropertyEditors\ValueConverters\NestedContentSingleValueConverter.cs" />
@@ -779,13 +758,6 @@
     <Compile Include="Models\Mapping\TagMapDefinition.cs" />
     <Compile Include="Models\UpgradeCheckResponse.cs" />
     <Compile Include="Models\PasswordChangedModel.cs" />
-    <Compile Include="PropertyEditors\MemberGroupPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\ContentTypeParameterEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\MultipleContentTypeParameterEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\MultiplePropertyGroupParameterEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\MultiplePropertyTypeParameterEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\PropertyGroupParameterEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditors\PropertyTypeParameterEditor.cs" />
     <Compile Include="PropertyEditors\PropertyEditorAssetAttribute.cs" />
     <Compile Include="PropertyEditors\RteEmbedController.cs" />
     <Compile Include="Editors\EntityController.cs" />
@@ -798,11 +770,7 @@
     <Compile Include="Models\ContentEditing\PropertyEditorBasic.cs" />
     <Compile Include="Models\Mapping\DataTypeMapDefinition.cs" />
     <Compile Include="Models\Mapping\EntityMapDefinition.cs" />
-    <Compile Include="PropertyEditors\MultipleTextStringPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\RadioButtonsPropertyEditor.cs" />
     <Compile Include="PropertyEditors\RichTextPreValueController.cs" />
-    <Compile Include="PropertyEditors\RichTextConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\SliderPropertyEditor.cs" />
     <Compile Include="PublishedContentQuery.cs" />
     <Compile Include="ImageCropperTemplateExtensions.cs" />
     <Compile Include="Mvc\UmbracoVirtualNodeRouteHandler.cs" />