diff --git a/app/Umbraco/Archetype.Tests/Models/FieldsetTests.cs b/app/Umbraco/Archetype.Tests/Models/FieldsetTests.cs
index 3b1c401..e1bbc0d 100644
--- a/app/Umbraco/Archetype.Tests/Models/FieldsetTests.cs
+++ b/app/Umbraco/Archetype.Tests/Models/FieldsetTests.cs
@@ -4,7 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Archetype.Umbraco.PropertyConverters;
+using Archetype.PropertyConverters;
 using NUnit.Framework;
 
 namespace Archetype.Tests.Models
@@ -26,7 +26,7 @@ namespace Archetype.Tests.Models
         public void Can_Get_Fieldset_Property_By_Alias()
         {
             var converter = new ArchetypeValueConverter();
-            var result = (Archetype.Umbraco.Models.Archetype)converter.ConvertDataToSource(null, _sampleJson, false);
+            var result = (Archetype.Models.ArchetypeModel)converter.ConvertDataToSource(null, _sampleJson, false);
 
             var fieldset = result.Fieldsets.First();
             var propertyValue = fieldset.GetValue("boxHeadline");
@@ -38,7 +38,7 @@ namespace Archetype.Tests.Models
         public void Can_Convert_Property_Value_Types()
         {
             var converter = new ArchetypeValueConverter();
-            var result = (Archetype.Umbraco.Models.Archetype)converter.ConvertDataToSource(null, _sampleJson, false);
+            var result = (Archetype.Models.ArchetypeModel)converter.ConvertDataToSource(null, _sampleJson, false);
 
             var fieldset = result.Fieldsets.First();
 
@@ -51,7 +51,7 @@ namespace Archetype.Tests.Models
         public void Returns_String_When_No_Type_Specified()
         {
             var converter = new ArchetypeValueConverter();
-            var result = (Archetype.Umbraco.Models.Archetype)converter.ConvertDataToSource(null, _sampleJson, false);
+            var result = (Archetype.Models.ArchetypeModel)converter.ConvertDataToSource(null, _sampleJson, false);
 
             var fieldset = result.Fieldsets.First();
 
diff --git a/app/Umbraco/Archetype.Tests/PropertyValueConverter/PropertyValueConverterTests.cs b/app/Umbraco/Archetype.Tests/PropertyValueConverter/PropertyValueConverterTests.cs
index 6329a4d..63f595c 100644
--- a/app/Umbraco/Archetype.Tests/PropertyValueConverter/PropertyValueConverterTests.cs
+++ b/app/Umbraco/Archetype.Tests/PropertyValueConverter/PropertyValueConverterTests.cs
@@ -4,7 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Archetype.Umbraco.PropertyConverters;
+using Archetype.PropertyConverters;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Core.Models.PublishedContent;
@@ -31,9 +31,9 @@ namespace Archetype.Tests.PropertyValueConverter
             var converter = new ArchetypeValueConverter();
             var result = converter.ConvertDataToSource(null, data, false);
 
-            Assert.AreEqual(result.GetType(), typeof (Archetype.Umbraco.Models.Archetype));
+            Assert.AreEqual(result.GetType(), typeof (Archetype.Models.ArchetypeModel));
 
-            var fieldsets = (Archetype.Umbraco.Models.Archetype) result;
+            var fieldsets = (Archetype.Models.ArchetypeModel) result;
             Assert.IsTrue(fieldsets.Count() == 0);
         }
 
@@ -44,9 +44,9 @@ namespace Archetype.Tests.PropertyValueConverter
             var converter = new ArchetypeValueConverter();
             var result = converter.ConvertDataToSource(null, data, false);
             
-            Assert.AreEqual(result.GetType(), typeof (Archetype.Umbraco.Models.Archetype));
+            Assert.AreEqual(result.GetType(), typeof (Archetype.Models.ArchetypeModel));
 
-            var fieldsets = (Archetype.Umbraco.Models.Archetype) result;
+            var fieldsets = (Archetype.Models.ArchetypeModel) result;
             Assert.IsTrue(fieldsets.Count() == 0);
         }
 
@@ -54,7 +54,7 @@ namespace Archetype.Tests.PropertyValueConverter
         public void Can_Serialize_From_Json_Model()
         {
             var converter = new ArchetypeValueConverter();
-            var result = (Archetype.Umbraco.Models.Archetype)converter.ConvertDataToSource(null, _sampleJson, false);
+            var result = (Archetype.Models.ArchetypeModel)converter.ConvertDataToSource(null, _sampleJson, false);
 
             Assert.That(result != null);
             Assert.That(result.Fieldsets.Count() == 2);
diff --git a/app/Umbraco/Umbraco.Archetype/Api/ArchetypeDataTypeController.cs b/app/Umbraco/Umbraco.Archetype/Api/ArchetypeDataTypeController.cs
index 3a03b2f..a544c3a 100644
--- a/app/Umbraco/Umbraco.Archetype/Api/ArchetypeDataTypeController.cs
+++ b/app/Umbraco/Umbraco.Archetype/Api/ArchetypeDataTypeController.cs
@@ -9,7 +9,7 @@ using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.Editors;
 
-namespace Archetype.Umbraco.Api
+namespace Archetype.Api
 {
     [PluginController("ArchetypeApi")]
     public class ArchetypeDataTypeController : UmbracoAuthorizedJsonController
diff --git a/app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj b/app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj
index f379ec2..2b38170 100644
--- a/app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj
+++ b/app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj
@@ -7,7 +7,7 @@
     <ProjectGuid>{7D185D41-4228-4978-ACB8-83F9A48AD94F}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Archetype.Umbraco</RootNamespace>
+    <RootNamespace>Archetype</RootNamespace>
     <AssemblyName>Archetype</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
diff --git a/app/Umbraco/Umbraco.Archetype/Constants.cs b/app/Umbraco/Umbraco.Archetype/Constants.cs
index 83d036b..f8e6b50 100644
--- a/app/Umbraco/Umbraco.Archetype/Constants.cs
+++ b/app/Umbraco/Umbraco.Archetype/Constants.cs
@@ -1,4 +1,4 @@
-namespace Archetype.Umbraco
+namespace Archetype
 {
     public static class Constants
     {
diff --git a/app/Umbraco/Umbraco.Archetype/Events/ExpireCache.cs b/app/Umbraco/Umbraco.Archetype/Events/ExpireCache.cs
index 3db68df..792165b 100644
--- a/app/Umbraco/Umbraco.Archetype/Events/ExpireCache.cs
+++ b/app/Umbraco/Umbraco.Archetype/Events/ExpireCache.cs
@@ -8,7 +8,7 @@ using Umbraco.Core.Models;
 using Umbraco.Core.Services;
 using Umbraco.Web;
 
-namespace Archetype.Umbraco.Events
+namespace Archetype.Events
 {
     public class ExpireCache : ApplicationEventHandler
     {
diff --git a/app/Umbraco/Umbraco.Archetype/Extensions/ArchetypeHelper.cs b/app/Umbraco/Umbraco.Archetype/Extensions/ArchetypeHelper.cs
index 6517af7..1db4ea6 100644
--- a/app/Umbraco/Umbraco.Archetype/Extensions/ArchetypeHelper.cs
+++ b/app/Umbraco/Umbraco.Archetype/Extensions/ArchetypeHelper.cs
@@ -1,11 +1,11 @@
 using System;
 using System.Linq;
-using Archetype.Umbraco.Models;
+using Archetype.Models;
 using Newtonsoft.Json;
 using Umbraco.Core;
 using Umbraco.Core.Models;
 
-namespace Archetype.Umbraco.Extensions
+namespace Archetype.Extensions
 {
     public class ArchetypeHelper
     {
@@ -22,11 +22,11 @@ namespace Archetype.Umbraco.Extensions
             _app = ApplicationContext.Current;
         }
 
-        internal Models.Archetype DeserializeJsonToArchetype(string sourceJson, PreValueCollection dataTypePreValues)
+        internal Models.ArchetypeModel DeserializeJsonToArchetype(string sourceJson, PreValueCollection dataTypePreValues)
         {
             try
             {
-                var archetype = JsonConvert.DeserializeObject<Models.Archetype>(sourceJson, _jsonSettings);
+                var archetype = JsonConvert.DeserializeObject<Models.ArchetypeModel>(sourceJson, _jsonSettings);
 
                 try
                 {
@@ -42,15 +42,15 @@ namespace Archetype.Umbraco.Extensions
             }
             catch
             {
-                return new Models.Archetype();
+                return new Models.ArchetypeModel();
             }         
         }
 
-        internal Models.Archetype DeserializeJsonToArchetype(string sourceJson, int dataTypeId)
+        internal Models.ArchetypeModel DeserializeJsonToArchetype(string sourceJson, int dataTypeId)
         {
             try
             {
-                var archetype = JsonConvert.DeserializeObject<Models.Archetype>(sourceJson, _jsonSettings);
+                var archetype = JsonConvert.DeserializeObject<Models.ArchetypeModel>(sourceJson, _jsonSettings);
 
                 try
                 {
@@ -66,7 +66,7 @@ namespace Archetype.Umbraco.Extensions
             }
             catch
             {
-                return new Models.Archetype();
+                return new Models.ArchetypeModel();
             }
         }
 
@@ -110,7 +110,7 @@ namespace Archetype.Umbraco.Extensions
         /// </summary>
         /// <param name="archetype">The Archetype to add the additional metadata to</param>
         /// <param name="preValue">The configuration of the Archetype</param>
-        private void RetrieveAdditionalProperties(ref Models.Archetype archetype, ArchetypePreValue preValue)
+        private void RetrieveAdditionalProperties(ref Models.ArchetypeModel archetype, ArchetypePreValue preValue)
         {
             foreach (var fieldset in preValue.Fieldsets)
             {
diff --git a/app/Umbraco/Umbraco.Archetype/Extensions/Extensions.cs b/app/Umbraco/Umbraco.Archetype/Extensions/Extensions.cs
index c9f3953..943d74c 100644
--- a/app/Umbraco/Umbraco.Archetype/Extensions/Extensions.cs
+++ b/app/Umbraco/Umbraco.Archetype/Extensions/Extensions.cs
@@ -5,9 +5,9 @@ using System.Text.RegularExpressions;
 using System.Collections.Generic;
 using Umbraco.Core;
 using Umbraco.Web;
-using Archetype.Umbraco.Models;
+using Archetype.Models;
 
-namespace Archetype.Umbraco.Extensions
+namespace Archetype.Extensions
 {
     public static class Extensions
     {
@@ -19,7 +19,7 @@ namespace Archetype.Umbraco.Extensions
                    || input.StartsWith("[") && input.EndsWith("]");
         }
 
-        public static bool IsArchetype(this Property prop)
+        public static bool IsArchetype(this ArchetypeProperty prop)
         {
             return prop.PropertyEditorAlias.InvariantEquals(Constants.PropertyEditorAlias);
         }
diff --git a/app/Umbraco/Umbraco.Archetype/Models/Archetype.cs b/app/Umbraco/Umbraco.Archetype/Models/Archetype.cs
index 91763ff..1587050 100644
--- a/app/Umbraco/Umbraco.Archetype/Models/Archetype.cs
+++ b/app/Umbraco/Umbraco.Archetype/Models/Archetype.cs
@@ -5,20 +5,20 @@ using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace Archetype.Umbraco.Models
+namespace Archetype.Models
 {
     [JsonObject]
-    public class Archetype : IEnumerable<Fieldset>
+    public class ArchetypeModel : IEnumerable<ArchetypeFieldsetModel>
     {
         [JsonProperty("fieldsets")]
-        internal IEnumerable<Fieldset> Fieldsets { get; set; }
+        internal IEnumerable<ArchetypeFieldsetModel> Fieldsets { get; set; }
 
-        public Archetype()
+        public ArchetypeModel()
         {
-            Fieldsets = new List<Fieldset>();
+            Fieldsets = new List<ArchetypeFieldsetModel>();
         }
 
-        public IEnumerator<Fieldset> GetEnumerator()
+        public IEnumerator<ArchetypeFieldsetModel> GetEnumerator()
         {
             return this.Fieldsets.GetEnumerator();
         }
diff --git a/app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValue.cs b/app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValue.cs
index 653af0e..7d0e0dc 100644
--- a/app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValue.cs
+++ b/app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValue.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Newtonsoft.Json;
 
-namespace Archetype.Umbraco.Models
+namespace Archetype.Models
 {
     public class ArchetypePreValue
     {
diff --git a/app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValueFieldset.cs b/app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValueFieldset.cs
index 251203a..b65683b 100644
--- a/app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValueFieldset.cs
+++ b/app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValueFieldset.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Newtonsoft.Json;
 
-namespace Archetype.Umbraco.Models
+namespace Archetype.Models
 {
     public class ArchetypePreValueFieldset
     {
diff --git a/app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValueProperty.cs b/app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValueProperty.cs
index e2cc12b..e287187 100644
--- a/app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValueProperty.cs
+++ b/app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValueProperty.cs
@@ -1,7 +1,7 @@
 using System;
 using Newtonsoft.Json;
 
-namespace Archetype.Umbraco.Models
+namespace Archetype.Models
 {
     public class ArchetypePreValueProperty
     {
diff --git a/app/Umbraco/Umbraco.Archetype/Models/Fieldset.cs b/app/Umbraco/Umbraco.Archetype/Models/Fieldset.cs
index 23dec2d..2357946 100644
--- a/app/Umbraco/Umbraco.Archetype/Models/Fieldset.cs
+++ b/app/Umbraco/Umbraco.Archetype/Models/Fieldset.cs
@@ -3,19 +3,19 @@ using System.Linq;
 using Newtonsoft.Json;
 using Umbraco.Core;
 
-namespace Archetype.Umbraco.Models
+namespace Archetype.Models
 {
-    public class Fieldset
+    public class ArchetypeFieldsetModel
     {
         [JsonProperty("alias")]
         public string Alias { get; set; }
 
         [JsonProperty("properties")]
-        public IEnumerable<Property> Properties;
+        public IEnumerable<ArchetypeProperty> Properties;
 
-        public Fieldset()
+        public ArchetypeFieldsetModel()
         {
-            Properties = new List<Property>();
+            Properties = new List<ArchetypeProperty>();
         }
 
         #region Helper Methods
@@ -49,7 +49,7 @@ namespace Archetype.Umbraco.Models
             return !string.IsNullOrEmpty(property.Value.ToString());
         }
 
-        private Property GetProperty(string propertyAlias)
+        private ArchetypeProperty GetProperty(string propertyAlias)
         {
             return Properties.FirstOrDefault(p => p.Alias.InvariantEquals(propertyAlias));
         }
diff --git a/app/Umbraco/Umbraco.Archetype/Models/Property.cs b/app/Umbraco/Umbraco.Archetype/Models/Property.cs
index 902e434..9a28856 100644
--- a/app/Umbraco/Umbraco.Archetype/Models/Property.cs
+++ b/app/Umbraco/Umbraco.Archetype/Models/Property.cs
@@ -7,9 +7,9 @@ using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Web;
 
-namespace Archetype.Umbraco.Models
+namespace Archetype.Models
 {
-    public class Property
+    public class ArchetypeProperty
     {
         [JsonProperty("alias")]
         public string Alias { get; internal set; }
diff --git a/app/Umbraco/Umbraco.Archetype/PropertyConverters/ArchetypeValueConverter.cs b/app/Umbraco/Umbraco.Archetype/PropertyConverters/ArchetypeValueConverter.cs
index 2f096d3..e6991e0 100644
--- a/app/Umbraco/Umbraco.Archetype/PropertyConverters/ArchetypeValueConverter.cs
+++ b/app/Umbraco/Umbraco.Archetype/PropertyConverters/ArchetypeValueConverter.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Archetype.Umbraco.Extensions;
-using Archetype.Umbraco.Models;
+using Archetype.Extensions;
+using Archetype.Models;
 using Newtonsoft.Json;
 using Umbraco.Core;
 using Umbraco.Core.Models;
@@ -10,30 +10,30 @@ using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
 
-namespace Archetype.Umbraco.PropertyConverters
-{
-    [PropertyValueType(typeof(Models.Archetype))]
-    [PropertyValueCache(PropertyCacheValue.All, PropertyCacheLevel.Content)]
-    public class ArchetypeValueConverter : PropertyValueConverterBase
-    {
-
-        public ServiceContext Services
-        {
-            get { return ApplicationContext.Current.Services; }
-        }
-
-        public override bool IsConverter(PublishedPropertyType propertyType)
-        {
-            return propertyType.PropertyEditorAlias.Equals(Constants.PropertyEditorAlias);
-        }
-
+namespace Archetype.PropertyConverters
+{
+    [PropertyValueType(typeof(Models.ArchetypeModel))]
+    [PropertyValueCache(PropertyCacheValue.All, PropertyCacheLevel.Content)]
+    public class ArchetypeValueConverter : PropertyValueConverterBase
+    {
+
+        public ServiceContext Services
+        {
+            get { return ApplicationContext.Current.Services; }
+        }
+
+        public override bool IsConverter(PublishedPropertyType propertyType)
+        {
+            return propertyType.PropertyEditorAlias.Equals(Constants.PropertyEditorAlias);
+        }
+
         public override object ConvertDataToSource(PublishedPropertyType propertyType, object source, bool preview)
         {
-            var defaultValue = new Models.Archetype();
-
-            if (source == null)
-                return defaultValue;
-
+            var defaultValue = new Models.ArchetypeModel();
+
+            if (source == null)
+                return defaultValue;
+
             var sourceString = source.ToString();
 
             if (!sourceString.DetectIsJson())
diff --git a/app/Umbraco/Umbraco.Archetype/PropertyEditors/ArcheTypePropertyEditor.cs b/app/Umbraco/Umbraco.Archetype/PropertyEditors/ArcheTypePropertyEditor.cs
index 3192130..9877119 100644
--- a/app/Umbraco/Umbraco.Archetype/PropertyEditors/ArcheTypePropertyEditor.cs
+++ b/app/Umbraco/Umbraco.Archetype/PropertyEditors/ArcheTypePropertyEditor.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Archetype.Umbraco.Extensions;
+using Archetype.Extensions;
 using ClientDependency.Core;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -13,7 +13,7 @@ using Umbraco.Core.Services;
 using Umbraco.Web.PropertyEditors;
 using Umbraco.Core.Logging;
 
-namespace Archetype.Umbraco.PropertyEditors
+namespace Archetype.PropertyEditors
 {
 	[PropertyEditorAsset(ClientDependencyType.Javascript, "/App_Plugins/Archetype/js/archetype.js")]
 	[PropertyEditor("Imulus.Archetype", "Archetype", "/App_Plugins/Archetype/views/archetype.html",