diff --git a/app/Umbraco/Archetype.Tests/Serialization/Base/ArchetypeJsonConverterTestBase.cs b/app/Umbraco/Archetype.Tests/Serialization/Base/ArchetypeJsonConverterTestBase.cs
index 0616e86..d8b0d08 100644
--- a/app/Umbraco/Archetype.Tests/Serialization/Base/ArchetypeJsonConverterTestBase.cs
+++ b/app/Umbraco/Archetype.Tests/Serialization/Base/ArchetypeJsonConverterTestBase.cs
@@ -1,16 +1,16 @@
-using Archetype.Umbraco.PropertyConverters;
-using at = Archetype.Umbraco.Models;
+using Archetype.PropertyConverters;
+using at = Archetype.Models;
 using Newtonsoft.Json;
 
 namespace Archetype.Tests.Serialization.Base
 {
     public abstract class ArchetypeJsonConverterTestBase
     {
-        public at.Archetype ConvertModelToArchetype<T>(T model)
+        public at.ArchetypeModel ConvertModelToArchetype<T>(T model)
         {
             var converter = new ArchetypeValueConverter();
             var json = JsonConvert.SerializeObject(model);
-            var archetype = (Umbraco.Models.Archetype)converter.ConvertDataToSource(null, json, false);
+            var archetype = (at.ArchetypeModel)converter.ConvertDataToSource(null, json, false);
             return archetype;
         }
 
diff --git a/app/Umbraco/Archetype.Tests/Serialization/Base/RegressionTestBase.cs b/app/Umbraco/Archetype.Tests/Serialization/Base/RegressionTestBase.cs
index 733081c..d06383d 100644
--- a/app/Umbraco/Archetype.Tests/Serialization/Base/RegressionTestBase.cs
+++ b/app/Umbraco/Archetype.Tests/Serialization/Base/RegressionTestBase.cs
@@ -3,9 +3,8 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using Archetype.Umbraco.Extensions;
-using Archetype.Umbraco.PropertyEditors;
-using Archetype.Umbraco.Serialization;
+using Archetype.PropertyEditors;
+using Archetype.Serialization;
 using Moq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -13,6 +12,7 @@ using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Editors;
+using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
@@ -111,7 +111,7 @@ namespace Archetype.Tests.Serialization.Base
             {
                 prop.DataTypeGuid = propGuid.ToString();
                 if (prop.Value.ToString().Contains("fieldsets"))
-                    prop.PropertyEditorAlias = Umbraco.Constants.PropertyEditorAlias;
+                    prop.PropertyEditorAlias = Constants.PropertyEditorAlias;
             }
 
             var archetypeJson = JsonConvert.SerializeObject(archetype);
@@ -193,9 +193,13 @@ namespace Archetype.Tests.Serialization.Base
                 Mock.Of<IEntityService>(),
                 Mock.Of<IRelationService>(),
                 Mock.Of<IMemberGroupService>(),
+                Mock.Of<IMemberTypeService>(),
+                Mock.Of<IMemberService>(),
+                Mock.Of<IUserService>(),
                 Mock.Of<ISectionService>(),
                 Mock.Of<IApplicationTreeService>(),
-                Mock.Of<ITagService>()
+                Mock.Of<ITagService>(),
+                Mock.Of<INotificationService>()
                 );
 
             ApplicationContext.EnsureContext(
diff --git a/app/Umbraco/Archetype.Tests/Serialization/Delinter/ArchetypeJsonDelinterTest.cs b/app/Umbraco/Archetype.Tests/Serialization/Delinter/ArchetypeJsonDelinterTest.cs
index 4f4a5dd..7c92ba2 100644
--- a/app/Umbraco/Archetype.Tests/Serialization/Delinter/ArchetypeJsonDelinterTest.cs
+++ b/app/Umbraco/Archetype.Tests/Serialization/Delinter/ArchetypeJsonDelinterTest.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Archetype.PropertyEditors;
+using Archetype.Serialization;
 using Archetype.Tests.Serialization.Base;
-using Archetype.Umbraco.PropertyEditors;
-using Archetype.Umbraco.Serialization;
 using Moq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -129,7 +129,7 @@ namespace Archetype.Tests.Serialization.Delinter
             {
                 prop.DataTypeGuid = propGuid.ToString();
                 if (prop.Value.ToString().Contains("fieldsets"))
-                    prop.PropertyEditorAlias = Umbraco.Constants.PropertyEditorAlias;
+                    prop.PropertyEditorAlias = Constants.PropertyEditorAlias;
             }
 
             var archetypeJson = JsonConvert.SerializeObject(archetype);
diff --git a/app/Umbraco/Archetype.Tests/Serialization/Regression/JsonTestModels.cs b/app/Umbraco/Archetype.Tests/Serialization/Regression/JsonTestModels.cs
index ce2763e..8ff3be5 100644
--- a/app/Umbraco/Archetype.Tests/Serialization/Regression/JsonTestModels.cs
+++ b/app/Umbraco/Archetype.Tests/Serialization/Regression/JsonTestModels.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using Archetype.Umbraco.Serialization;
+using Archetype.Serialization;
 using Newtonsoft.Json;
 
 namespace Archetype.Tests.Serialization.Regression
diff --git a/app/Umbraco/Archetype.Tests/Serialization/UseCases/Complex/JsonTestModels.cs b/app/Umbraco/Archetype.Tests/Serialization/UseCases/Complex/JsonTestModels.cs
index c8aeda8..14f999a 100644
--- a/app/Umbraco/Archetype.Tests/Serialization/UseCases/Complex/JsonTestModels.cs
+++ b/app/Umbraco/Archetype.Tests/Serialization/UseCases/Complex/JsonTestModels.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Archetype.Umbraco.Serialization;
+using Archetype.Serialization;
 using Newtonsoft.Json;
 
 namespace Archetype.Tests.Serialization.UseCases.Complex
diff --git a/app/Umbraco/Archetype.Tests/Serialization/UseCases/Enumerable/ArchetypeJsonConverterTest.cs b/app/Umbraco/Archetype.Tests/Serialization/UseCases/Enumerable/ArchetypeJsonConverterTest.cs
index 21f325e..51b4ae5 100644
--- a/app/Umbraco/Archetype.Tests/Serialization/UseCases/Enumerable/ArchetypeJsonConverterTest.cs
+++ b/app/Umbraco/Archetype.Tests/Serialization/UseCases/Enumerable/ArchetypeJsonConverterTest.cs
@@ -1,8 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Archetype.Models;
+using Archetype.PropertyConverters;
 using Archetype.Tests.Serialization.Base;
-using Archetype.Umbraco.PropertyConverters;
 using Newtonsoft.Json;
 using NUnit.Framework;
 
@@ -43,7 +44,7 @@ namespace Archetype.Tests.Serialization.UseCases.Enumerable
         {
             var converter = new ArchetypeValueConverter();
             var json = JsonConvert.SerializeObject(_feedbacks);
-            var archetype = (Umbraco.Models.Archetype)converter.ConvertDataToSource(null, json, false);
+            var archetype = (ArchetypeModel)converter.ConvertDataToSource(null, json, false);
 
             Assert.NotNull(archetype);
         }
@@ -93,7 +94,7 @@ namespace Archetype.Tests.Serialization.UseCases.Enumerable
         {
             var converter = new ArchetypeValueConverter();
             var json = JsonConvert.SerializeObject(_captions);
-            var archetype = (Umbraco.Models.Archetype)converter.ConvertDataToSource(null, json, false);
+            var archetype = (ArchetypeModel)converter.ConvertDataToSource(null, json, false);
 
             Assert.NotNull(archetype);
         }
diff --git a/app/Umbraco/Archetype.Tests/Serialization/UseCases/Enumerable/JsonTestModels.cs b/app/Umbraco/Archetype.Tests/Serialization/UseCases/Enumerable/JsonTestModels.cs
index 127687f..7e7fdf4 100644
--- a/app/Umbraco/Archetype.Tests/Serialization/UseCases/Enumerable/JsonTestModels.cs
+++ b/app/Umbraco/Archetype.Tests/Serialization/UseCases/Enumerable/JsonTestModels.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using Archetype.Umbraco.Serialization;
+using Archetype.Serialization;
 using Newtonsoft.Json;
 
 namespace Archetype.Tests.Serialization.UseCases.Enumerable
diff --git a/app/Umbraco/Archetype.Tests/Serialization/UseCases/JsonTestModels.cs b/app/Umbraco/Archetype.Tests/Serialization/UseCases/JsonTestModels.cs
index 1b244dd..ddc2357 100644
--- a/app/Umbraco/Archetype.Tests/Serialization/UseCases/JsonTestModels.cs
+++ b/app/Umbraco/Archetype.Tests/Serialization/UseCases/JsonTestModels.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using Archetype.Umbraco.Serialization;
+using Archetype.Serialization;
 using Newtonsoft.Json;
 
 namespace Archetype.Tests.Serialization.UseCases
diff --git a/app/Umbraco/Umbraco.Archetype/Extensions/Extensions.cs b/app/Umbraco/Umbraco.Archetype/Extensions/Extensions.cs
index dbd02a2..703a012 100644
--- a/app/Umbraco/Umbraco.Archetype/Extensions/Extensions.cs
+++ b/app/Umbraco/Umbraco.Archetype/Extensions/Extensions.cs
@@ -2,7 +2,6 @@ using System;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Collections.Generic;
-using Archetype.Umbraco.Serialization;
 using Umbraco.Core;
 using Archetype.Models;
 
diff --git a/app/Umbraco/Umbraco.Archetype/Models/ArchetypeModel.cs b/app/Umbraco/Umbraco.Archetype/Models/ArchetypeModel.cs
index ef4ff45..f1f701c 100644
--- a/app/Umbraco/Umbraco.Archetype/Models/ArchetypeModel.cs
+++ b/app/Umbraco/Umbraco.Archetype/Models/ArchetypeModel.cs
@@ -2,7 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using Archetype.Umbraco.Serialization;
+using Archetype.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
diff --git a/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs b/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs
index 310b6a1..ffb6be5 100644
--- a/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs
+++ b/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs
@@ -1,16 +1,16 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Dynamic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Dynamic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
 using System.Text;
-using Archetype.Umbraco.Models;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-namespace Archetype.Umbraco.Serialization
+using Archetype.Models;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace Archetype.Serialization
 {
     public class ArchetypeJsonConverter : JsonConverter
     {
@@ -512,9 +512,9 @@ namespace Archetype.Umbraco.Serialization
 
         private object GetTypedValue(JToken jToken, Type type)
         {
-            var property = JsonConvert.DeserializeObject<Property>(jToken.ToString());
+            var property = JsonConvert.DeserializeObject<ArchetypePropertyModel>(jToken.ToString());
 
-            var method = typeof(Property).GetMethod("GetValue");
+            var method = typeof(ArchetypePropertyModel).GetMethod("GetValue");
             var getValue = method.MakeGenericMethod(type);
 
             return getValue.Invoke(property, null);
diff --git a/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonDelinter.cs b/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonDelinter.cs
index 26607c6..ef7b758 100644
--- a/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonDelinter.cs
+++ b/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonDelinter.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
 
-namespace Archetype.Umbraco.Serialization
+namespace Archetype.Serialization
 {
     public enum DelinterStep
     {
diff --git a/app/Umbraco/Umbraco.Archetype/Serialization/AsArchetypeAttribute.cs b/app/Umbraco/Umbraco.Archetype/Serialization/AsArchetypeAttribute.cs
index 800bb36..a3d9088 100644
--- a/app/Umbraco/Umbraco.Archetype/Serialization/AsArchetypeAttribute.cs
+++ b/app/Umbraco/Umbraco.Archetype/Serialization/AsArchetypeAttribute.cs
@@ -1,6 +1,6 @@
-using System;
-
-namespace Archetype.Umbraco.Serialization
+using System;
+
+namespace Archetype.Serialization
 {
     public class AsArchetypeAttribute : Attribute
     {
diff --git a/app/Umbraco/Umbraco.Archetype/Serialization/AsFieldsetAttribute.cs b/app/Umbraco/Umbraco.Archetype/Serialization/AsFieldsetAttribute.cs
index bcee649..eca3689 100644
--- a/app/Umbraco/Umbraco.Archetype/Serialization/AsFieldsetAttribute.cs
+++ b/app/Umbraco/Umbraco.Archetype/Serialization/AsFieldsetAttribute.cs
@@ -1,6 +1,6 @@
-using System;
-
-namespace Archetype.Umbraco.Serialization
+using System;
+
+namespace Archetype.Serialization
 {
     public class AsFieldsetAttribute : Attribute
     {
diff --git a/app/Umbraco/Umbraco.Archetype/Serialization/SerializationExtensions.cs b/app/Umbraco/Umbraco.Archetype/Serialization/SerializationExtensions.cs
index 8d72842..e0ace69 100644
--- a/app/Umbraco/Umbraco.Archetype/Serialization/SerializationExtensions.cs
+++ b/app/Umbraco/Umbraco.Archetype/Serialization/SerializationExtensions.cs
@@ -2,12 +2,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using Archetype.Umbraco.Extensions;
-using Newtonsoft.Json;
-using Umbraco.Core.Models;
-using Umbraco.Web;
-
-namespace Archetype.Umbraco.Serialization
+using Archetype.Extensions;
+using Newtonsoft.Json;
+using Umbraco.Core.Models;
+using Umbraco.Web;
+
+namespace Archetype.Serialization
 {
     public static class SerializationExtensions
     {