diff --git a/build/NuSpecs/UmbracoCms.Web.nuspec b/build/NuSpecs/UmbracoCms.Web.nuspec
index b6cbbbdb81..658d2f0672 100644
--- a/build/NuSpecs/UmbracoCms.Web.nuspec
+++ b/build/NuSpecs/UmbracoCms.Web.nuspec
@@ -52,17 +52,17 @@
         <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.dll" target="lib\net472\Umbraco.Web.dll" />
         <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.UI.dll" target="lib\net472\Umbraco.Web.UI.dll" />
         <file src="$BuildTmp$\WebApp\bin\Umbraco.Examine.dll" target="lib\net472\Umbraco.Examine.dll" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.ModelsBuilder.dll" target="lib\net472\Umbraco.ModelsBuilder.dll" />
+        <file src="$BuildTmp$\WebApp\bin\Umbraco.ModelsBuilder.Embedded.dll" target="lib\net472\Umbraco.ModelsBuilder.Embedded.dll" />
 
         <!-- docs -->
         <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.xml" target="lib\net472\Umbraco.Web.xml" />
         <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.UI.xml" target="lib\net472\Umbraco.Web.UI.xml" />
         <file src="$BuildTmp$\WebApp\bin\Umbraco.Examine.xml" target="lib\net472\Umbraco.Examine.xml" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.ModelsBuilder.xml" target="lib\net472\Umbraco.ModelsBuilder.xml" />
+        <file src="$BuildTmp$\WebApp\bin\Umbraco.ModelsBuilder.Embedded.xml" target="lib\net472\Umbraco.ModelsBuilder.Embedded.xml" />
 
         <!-- symbols -->
         <file src="$BuildTmp$\bin\Umbraco.Web.pdb" target="lib\net472\Umbraco.Web.pdb" />
         <file src="$BuildTmp$\bin\Umbraco.Examine.pdb" target="lib\net472\Umbraco.Examine.pdb" />
-        <file src="$BuildTmp$\bin\Umbraco.ModelsBuilder.pdb" target="lib\net472\Umbraco.ModelsBuilder.pdb" />
+        <file src="$BuildTmp$\bin\Umbraco.ModelsBuilder.Embedded.pdb" target="lib\net472\Umbraco.ModelsBuilder.Embedded.pdb" />
     </files>
 </package>
diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec
index a6b06d9964..d0bd4a2688 100644
--- a/build/NuSpecs/UmbracoCms.nuspec
+++ b/build/NuSpecs/UmbracoCms.nuspec
@@ -42,6 +42,7 @@
         <file src="$BuildTmp$\WebApp\Global.asax" target="Content\Global.asax" />
         <file src="$BuildTmp$\WebApp\config\BackOfficeTours\**" target="Content\Config\BackOfficeTours" />
         <file src="$BuildTmp$\WebApp\Media\Web.config" target="Content\Media\Web.config" />
+        <file src="$BuildTmp$\WebApp\App_Plugins\UmbModelsBuilder\**" target="Content\App_Plugins\UmbModelsBuilder" />
 
         <!-- these files are copied by install.ps1 -->
         <file src="$BuildTmp$\WebApp\Web.config" target="UmbracoFiles\Web.config" />
diff --git a/src/Umbraco.Core/Properties/AssemblyInfo.cs b/src/Umbraco.Core/Properties/AssemblyInfo.cs
index 139af8725d..87e0732d47 100644
--- a/src/Umbraco.Core/Properties/AssemblyInfo.cs
+++ b/src/Umbraco.Core/Properties/AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
 [assembly: InternalsVisibleTo("Umbraco.Web")]
 [assembly: InternalsVisibleTo("Umbraco.Web.UI")]
 [assembly: InternalsVisibleTo("Umbraco.Examine")]
-[assembly: InternalsVisibleTo("Umbraco.ModelsBuilder")]
+[assembly: InternalsVisibleTo("Umbraco.ModelsBuilder.Embedded")]
 
 [assembly: InternalsVisibleTo("Umbraco.Tests")]
 [assembly: InternalsVisibleTo("Umbraco.Tests.Benchmarks")]
diff --git a/src/Umbraco.ModelsBuilder/ApiVersion.cs b/src/Umbraco.ModelsBuilder.Embedded/ApiVersion.cs
similarity index 96%
rename from src/Umbraco.ModelsBuilder/ApiVersion.cs
rename to src/Umbraco.ModelsBuilder.Embedded/ApiVersion.cs
index 67d0ec5c4c..22347edd60 100644
--- a/src/Umbraco.ModelsBuilder/ApiVersion.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/ApiVersion.cs
@@ -2,7 +2,7 @@
 using System.Reflection;
 using Semver;
 
-namespace Umbraco.ModelsBuilder
+namespace Umbraco.ModelsBuilder.Embedded
 {
     /// <summary>
     /// Manages API version handshake between client and server.
diff --git a/src/Umbraco.ModelsBuilder/BackOffice/ContentTypeModelValidator.cs b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidator.cs
similarity index 96%
rename from src/Umbraco.ModelsBuilder/BackOffice/ContentTypeModelValidator.cs
rename to src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidator.cs
index 1971c62c9f..f351721e56 100644
--- a/src/Umbraco.ModelsBuilder/BackOffice/ContentTypeModelValidator.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidator.cs
@@ -2,13 +2,11 @@
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using Umbraco.Core;
-using Umbraco.Core.Composing;
 using Umbraco.Core.Models.PublishedContent;
-using Umbraco.ModelsBuilder.Configuration;
 using Umbraco.Web.Editors;
 using Umbraco.Web.Models.ContentEditing;
 
-namespace Umbraco.ModelsBuilder.BackOffice
+namespace Umbraco.ModelsBuilder.Embedded.BackOffice
 {
     /// <summary>
     /// Used to validate the aliases for the content type when MB is enabled to ensure that
diff --git a/src/Umbraco.ModelsBuilder/BackOffice/DashboardReport.cs b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/DashboardReport.cs
similarity index 94%
rename from src/Umbraco.ModelsBuilder/BackOffice/DashboardReport.cs
rename to src/Umbraco.ModelsBuilder.Embedded/BackOffice/DashboardReport.cs
index 64fb217fce..e4c45aaf3e 100644
--- a/src/Umbraco.ModelsBuilder/BackOffice/DashboardReport.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/DashboardReport.cs
@@ -1,8 +1,7 @@
 using System.Text;
-using Umbraco.Core.Composing;
-using Umbraco.ModelsBuilder.Configuration;
+using Umbraco.ModelsBuilder.Embedded.Configuration;
 
-namespace Umbraco.ModelsBuilder.BackOffice
+namespace Umbraco.ModelsBuilder.Embedded.BackOffice
 {
     internal class DashboardReport
     {
diff --git a/src/Umbraco.ModelsBuilder/BackOffice/ModelsBuilderBackOfficeController.cs b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ModelsBuilderBackOfficeController.cs
similarity index 96%
rename from src/Umbraco.ModelsBuilder/BackOffice/ModelsBuilderBackOfficeController.cs
rename to src/Umbraco.ModelsBuilder.Embedded/BackOffice/ModelsBuilderBackOfficeController.cs
index e4efca70bd..0842c3586a 100644
--- a/src/Umbraco.ModelsBuilder/BackOffice/ModelsBuilderBackOfficeController.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ModelsBuilderBackOfficeController.cs
@@ -1,18 +1,15 @@
 using System;
-using System.IO;
-using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Runtime.Serialization;
-using System.Text;
 using System.Web.Hosting;
 using Umbraco.Core.Exceptions;
-using Umbraco.ModelsBuilder.Building;
-using Umbraco.ModelsBuilder.Configuration;
+using Umbraco.ModelsBuilder.Embedded.Building;
+using Umbraco.ModelsBuilder.Embedded.Configuration;
 using Umbraco.Web.Editors;
 using Umbraco.Web.WebApi.Filters;
 
-namespace Umbraco.ModelsBuilder.BackOffice
+namespace Umbraco.ModelsBuilder.Embedded.BackOffice
 {
     /// <summary>
     /// API controller for use in the Umbraco back office with Angular resources
diff --git a/src/Umbraco.ModelsBuilder/Building/Builder.cs b/src/Umbraco.ModelsBuilder.Embedded/Building/Builder.cs
similarity index 97%
rename from src/Umbraco.ModelsBuilder/Building/Builder.cs
rename to src/Umbraco.ModelsBuilder.Embedded/Building/Builder.cs
index bba19c3b9f..82b1b0adec 100644
--- a/src/Umbraco.ModelsBuilder/Building/Builder.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Building/Builder.cs
@@ -1,15 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Umbraco.Core.Composing;
-using Umbraco.Core.Configuration;
-using Umbraco.ModelsBuilder.Configuration;
+using Umbraco.ModelsBuilder.Embedded.Configuration;
 
-namespace Umbraco.ModelsBuilder.Building
+namespace Umbraco.ModelsBuilder.Embedded.Building
 {
     // NOTE
     // The idea was to have different types of builder, because I wanted to experiment with
diff --git a/src/Umbraco.ModelsBuilder/Building/ModelsGenerator.cs b/src/Umbraco.ModelsBuilder.Embedded/Building/ModelsGenerator.cs
similarity index 93%
rename from src/Umbraco.ModelsBuilder/Building/ModelsGenerator.cs
rename to src/Umbraco.ModelsBuilder.Embedded/Building/ModelsGenerator.cs
index 6f6872e8ff..8a3bc5a5b5 100644
--- a/src/Umbraco.ModelsBuilder/Building/ModelsGenerator.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Building/ModelsGenerator.cs
@@ -1,10 +1,8 @@
-using System;
-using System.IO;
+using System.IO;
 using System.Text;
-using System.Web;
-using Umbraco.ModelsBuilder.Configuration;
+using Umbraco.ModelsBuilder.Embedded.Configuration;
 
-namespace Umbraco.ModelsBuilder.Building
+namespace Umbraco.ModelsBuilder.Embedded.Building
 {
     public class ModelsGenerator
     {
diff --git a/src/Umbraco.ModelsBuilder/Building/PropertyModel.cs b/src/Umbraco.ModelsBuilder.Embedded/Building/PropertyModel.cs
similarity index 97%
rename from src/Umbraco.ModelsBuilder/Building/PropertyModel.cs
rename to src/Umbraco.ModelsBuilder.Embedded/Building/PropertyModel.cs
index 5f2545ec2a..af5445b175 100644
--- a/src/Umbraco.ModelsBuilder/Building/PropertyModel.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Building/PropertyModel.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Umbraco.ModelsBuilder.Building
+namespace Umbraco.ModelsBuilder.Embedded.Building
 {
     /// <summary>
     /// Represents a model property.
diff --git a/src/Umbraco.ModelsBuilder/Building/TextBuilder.cs b/src/Umbraco.ModelsBuilder.Embedded/Building/TextBuilder.cs
similarity index 99%
rename from src/Umbraco.ModelsBuilder/Building/TextBuilder.cs
rename to src/Umbraco.ModelsBuilder.Embedded/Building/TextBuilder.cs
index 56349f16a8..d1190a0374 100644
--- a/src/Umbraco.ModelsBuilder/Building/TextBuilder.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Building/TextBuilder.cs
@@ -3,11 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
-using Umbraco.Core.Composing;
-using Umbraco.Core.Configuration;
-using Umbraco.ModelsBuilder.Configuration;
+using Umbraco.ModelsBuilder.Embedded.Configuration;
 
-namespace Umbraco.ModelsBuilder.Building
+namespace Umbraco.ModelsBuilder.Embedded.Building
 {
     /// <summary>
     /// Implements a builder that works by writing text.
diff --git a/src/Umbraco.ModelsBuilder/Building/TextHeaderWriter.cs b/src/Umbraco.ModelsBuilder.Embedded/Building/TextHeaderWriter.cs
similarity index 95%
rename from src/Umbraco.ModelsBuilder/Building/TextHeaderWriter.cs
rename to src/Umbraco.ModelsBuilder.Embedded/Building/TextHeaderWriter.cs
index 7244a2966d..a93df97806 100644
--- a/src/Umbraco.ModelsBuilder/Building/TextHeaderWriter.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Building/TextHeaderWriter.cs
@@ -1,6 +1,6 @@
 using System.Text;
 
-namespace Umbraco.ModelsBuilder.Building
+namespace Umbraco.ModelsBuilder.Embedded.Building
 {
     internal static class TextHeaderWriter
     {
diff --git a/src/Umbraco.ModelsBuilder/Building/TypeModel.cs b/src/Umbraco.ModelsBuilder.Embedded/Building/TypeModel.cs
similarity index 99%
rename from src/Umbraco.ModelsBuilder/Building/TypeModel.cs
rename to src/Umbraco.ModelsBuilder.Embedded/Building/TypeModel.cs
index 06b5e7848a..95356cf3ff 100644
--- a/src/Umbraco.ModelsBuilder/Building/TypeModel.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Building/TypeModel.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Core.Models.PublishedContent;
 
-namespace Umbraco.ModelsBuilder.Building
+namespace Umbraco.ModelsBuilder.Embedded.Building
 {
     /// <summary>
     /// Represents a model.
diff --git a/src/Umbraco.ModelsBuilder/Building/TypeModelHasher.cs b/src/Umbraco.ModelsBuilder.Embedded/Building/TypeModelHasher.cs
similarity index 96%
rename from src/Umbraco.ModelsBuilder/Building/TypeModelHasher.cs
rename to src/Umbraco.ModelsBuilder.Embedded/Building/TypeModelHasher.cs
index 2099c09415..ff2893d097 100644
--- a/src/Umbraco.ModelsBuilder/Building/TypeModelHasher.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Building/TypeModelHasher.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Umbraco.ModelsBuilder.Building
+namespace Umbraco.ModelsBuilder.Embedded.Building
 {
     internal class TypeModelHasher
     {
diff --git a/src/Umbraco.ModelsBuilder/Compose/ModelsBuilderComponent.cs b/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComponent.cs
similarity index 98%
rename from src/Umbraco.ModelsBuilder/Compose/ModelsBuilderComponent.cs
rename to src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComponent.cs
index a68315606e..401a5a8931 100644
--- a/src/Umbraco.ModelsBuilder/Compose/ModelsBuilderComponent.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComponent.cs
@@ -8,13 +8,13 @@ using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;
-using Umbraco.ModelsBuilder.BackOffice;
-using Umbraco.ModelsBuilder.Configuration;
+using Umbraco.ModelsBuilder.Embedded.BackOffice;
+using Umbraco.ModelsBuilder.Embedded.Configuration;
 using Umbraco.Web;
 using Umbraco.Web.JavaScript;
 using Umbraco.Web.Mvc;
 
-namespace Umbraco.ModelsBuilder.Compose
+namespace Umbraco.ModelsBuilder.Embedded.Compose
 {
     public class ModelsBuilderComponent : IComponent
     {
diff --git a/src/Umbraco.ModelsBuilder/Compose/ModelsBuilderComposer.cs b/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
similarity index 94%
rename from src/Umbraco.ModelsBuilder/Compose/ModelsBuilderComposer.cs
rename to src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
index fdc4253490..8b3f8db534 100644
--- a/src/Umbraco.ModelsBuilder/Compose/ModelsBuilderComposer.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
@@ -2,11 +2,11 @@
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Models.PublishedContent;
-using Umbraco.ModelsBuilder.Building;
-using Umbraco.ModelsBuilder.Configuration;
+using Umbraco.ModelsBuilder.Embedded.Building;
+using Umbraco.ModelsBuilder.Embedded.Configuration;
 using Umbraco.Web.PublishedCache.NuCache;
 
-namespace Umbraco.ModelsBuilder.Compose
+namespace Umbraco.ModelsBuilder.Embedded.Compose
 {
     [ComposeBefore(typeof(NuCacheComposer))]
     [RuntimeLevel(MinLevel = RuntimeLevel.Run)]
@@ -16,6 +16,8 @@ namespace Umbraco.ModelsBuilder.Compose
         {
             base.Compose(composition);
 
+          
+
             composition.Register<UmbracoServices>(Lifetime.Singleton);
             composition.Configs.Add<IModelsBuilderConfig>(() => new ModelsBuilderConfig());
             composition.RegisterUnique<ModelsGenerator>();
diff --git a/src/Umbraco.ModelsBuilder/Compose/ModelsBuilderInitializer.cs b/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderInitializer.cs
similarity index 91%
rename from src/Umbraco.ModelsBuilder/Compose/ModelsBuilderInitializer.cs
rename to src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderInitializer.cs
index 6eb8bbb328..a86669b135 100644
--- a/src/Umbraco.ModelsBuilder/Compose/ModelsBuilderInitializer.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderInitializer.cs
@@ -1,10 +1,10 @@
 using System.Web;
 using System.Web.Compilation;
-using Umbraco.ModelsBuilder.Compose;
+using Umbraco.ModelsBuilder.Embedded.Compose;
 
 [assembly: PreApplicationStartMethod(typeof(ModelsBuilderInitializer), "Initialize")]
 
-namespace Umbraco.ModelsBuilder.Compose
+namespace Umbraco.ModelsBuilder.Embedded.Compose
 {
     public static class ModelsBuilderInitializer
     {
diff --git a/src/Umbraco.ModelsBuilder/ConfigsExtensions.cs b/src/Umbraco.ModelsBuilder.Embedded/ConfigsExtensions.cs
similarity index 87%
rename from src/Umbraco.ModelsBuilder/ConfigsExtensions.cs
rename to src/Umbraco.ModelsBuilder.Embedded/ConfigsExtensions.cs
index 09314bc3f3..e2b91a8974 100644
--- a/src/Umbraco.ModelsBuilder/ConfigsExtensions.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/ConfigsExtensions.cs
@@ -1,7 +1,7 @@
 using Umbraco.Core.Configuration;
-using Umbraco.ModelsBuilder.Configuration;
+using Umbraco.ModelsBuilder.Embedded.Configuration;
 
-namespace Umbraco.ModelsBuilder
+namespace Umbraco.ModelsBuilder.Embedded
 {
     /// <summary>
     /// Provides extension methods for the <see cref="UmbracoConfig"/> class.
diff --git a/src/Umbraco.ModelsBuilder/Configuration/IModelsBuilderConfig.cs b/src/Umbraco.ModelsBuilder.Embedded/Configuration/IModelsBuilderConfig.cs
similarity index 86%
rename from src/Umbraco.ModelsBuilder/Configuration/IModelsBuilderConfig.cs
rename to src/Umbraco.ModelsBuilder.Embedded/Configuration/IModelsBuilderConfig.cs
index 3bca389f2f..d8a81f0458 100644
--- a/src/Umbraco.ModelsBuilder/Configuration/IModelsBuilderConfig.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Configuration/IModelsBuilderConfig.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.ModelsBuilder.Configuration
+namespace Umbraco.ModelsBuilder.Embedded.Configuration
 {
     public interface IModelsBuilderConfig
     {
diff --git a/src/Umbraco.ModelsBuilder/Configuration/ModelsBuilderConfig.cs b/src/Umbraco.ModelsBuilder.Embedded/Configuration/ModelsBuilderConfig.cs
similarity index 99%
rename from src/Umbraco.ModelsBuilder/Configuration/ModelsBuilderConfig.cs
rename to src/Umbraco.ModelsBuilder.Embedded/Configuration/ModelsBuilderConfig.cs
index 48a4423054..881c4f97b8 100644
--- a/src/Umbraco.ModelsBuilder/Configuration/ModelsBuilderConfig.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Configuration/ModelsBuilderConfig.cs
@@ -2,11 +2,10 @@
 using System.Configuration;
 using System.IO;
 using System.Web.Configuration;
-using System.Web.Hosting;
 using Umbraco.Core;
 using Umbraco.Core.IO;
 
-namespace Umbraco.ModelsBuilder.Configuration
+namespace Umbraco.ModelsBuilder.Embedded.Configuration
 {
     /// <summary>
     /// Represents the models builder configuration.
diff --git a/src/Umbraco.ModelsBuilder/Configuration/ModelsMode.cs b/src/Umbraco.ModelsBuilder.Embedded/Configuration/ModelsMode.cs
similarity index 95%
rename from src/Umbraco.ModelsBuilder/Configuration/ModelsMode.cs
rename to src/Umbraco.ModelsBuilder.Embedded/Configuration/ModelsMode.cs
index 1f1d65f4f1..145508991a 100644
--- a/src/Umbraco.ModelsBuilder/Configuration/ModelsMode.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Configuration/ModelsMode.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.ModelsBuilder.Configuration
+namespace Umbraco.ModelsBuilder.Embedded.Configuration
 {
     /// <summary>
     /// Defines the models generation modes.
diff --git a/src/Umbraco.ModelsBuilder/Configuration/ModelsModeExtensions.cs b/src/Umbraco.ModelsBuilder.Embedded/Configuration/ModelsModeExtensions.cs
similarity index 95%
rename from src/Umbraco.ModelsBuilder/Configuration/ModelsModeExtensions.cs
rename to src/Umbraco.ModelsBuilder.Embedded/Configuration/ModelsModeExtensions.cs
index f40d7973b8..be638729ea 100644
--- a/src/Umbraco.ModelsBuilder/Configuration/ModelsModeExtensions.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Configuration/ModelsModeExtensions.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.ModelsBuilder.Configuration
+namespace Umbraco.ModelsBuilder.Embedded.Configuration
 {
     /// <summary>
     /// Provides extensions for the <see cref="ModelsMode"/> enumeration.
diff --git a/src/Umbraco.ModelsBuilder/HashCombiner.cs b/src/Umbraco.ModelsBuilder.Embedded/HashCombiner.cs
similarity index 95%
rename from src/Umbraco.ModelsBuilder/HashCombiner.cs
rename to src/Umbraco.ModelsBuilder.Embedded/HashCombiner.cs
index 51e02e93c1..1c1fca6f73 100644
--- a/src/Umbraco.ModelsBuilder/HashCombiner.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/HashCombiner.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Globalization;
 
-namespace Umbraco.ModelsBuilder
+namespace Umbraco.ModelsBuilder.Embedded
 {
     // because, of course, it's internal in Umbraco
     // see also System.Web.Util.HashCodeCombiner
diff --git a/src/Umbraco.ModelsBuilder/ImplementPropertyTypeAttribute.cs b/src/Umbraco.ModelsBuilder.Embedded/ImplementPropertyTypeAttribute.cs
similarity index 92%
rename from src/Umbraco.ModelsBuilder/ImplementPropertyTypeAttribute.cs
rename to src/Umbraco.ModelsBuilder.Embedded/ImplementPropertyTypeAttribute.cs
index a3dba740c1..0359c49654 100644
--- a/src/Umbraco.ModelsBuilder/ImplementPropertyTypeAttribute.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/ImplementPropertyTypeAttribute.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Umbraco.ModelsBuilder
+namespace Umbraco.ModelsBuilder.Embedded
 {
     /// <summary>
     /// Indicates that a property implements a given property alias.
diff --git a/src/Umbraco.ModelsBuilder/LiveModelsProvider.cs b/src/Umbraco.ModelsBuilder.Embedded/LiveModelsProvider.cs
similarity index 95%
rename from src/Umbraco.ModelsBuilder/LiveModelsProvider.cs
rename to src/Umbraco.ModelsBuilder.Embedded/LiveModelsProvider.cs
index 0dfe503fce..333181f27c 100644
--- a/src/Umbraco.ModelsBuilder/LiveModelsProvider.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/LiveModelsProvider.cs
@@ -1,15 +1,12 @@
 using System;
 using System.Threading;
-using System.Web;
 using System.Web.Hosting;
-using Umbraco.Core.Exceptions;
-using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
-using Umbraco.ModelsBuilder.Building;
-using Umbraco.ModelsBuilder.Configuration;
+using Umbraco.ModelsBuilder.Embedded.Building;
+using Umbraco.ModelsBuilder.Embedded.Configuration;
 using Umbraco.Web.Cache;
 
-namespace Umbraco.ModelsBuilder
+namespace Umbraco.ModelsBuilder.Embedded
 {
     // supports LiveAppData - but not PureLive
     public sealed class LiveModelsProvider
diff --git a/src/Umbraco.ModelsBuilder/LiveModelsProviderModule.cs b/src/Umbraco.ModelsBuilder.Embedded/LiveModelsProviderModule.cs
similarity index 95%
rename from src/Umbraco.ModelsBuilder/LiveModelsProviderModule.cs
rename to src/Umbraco.ModelsBuilder.Embedded/LiveModelsProviderModule.cs
index 9d50c4ab42..37b39124c3 100644
--- a/src/Umbraco.ModelsBuilder/LiveModelsProviderModule.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/LiveModelsProviderModule.cs
@@ -2,12 +2,12 @@
 using System.Web;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
-using Umbraco.ModelsBuilder;
+using Umbraco.ModelsBuilder.Embedded;
 
 // will install only if configuration says it needs to be installed
 [assembly: PreApplicationStartMethod(typeof(LiveModelsProviderModule), "Install")]
 
-namespace Umbraco.ModelsBuilder
+namespace Umbraco.ModelsBuilder.Embedded
 {
     // have to do this because it's the only way to subscribe to EndRequest,
     // module is installed by assembly attribute at the top of this file
diff --git a/src/Umbraco.ModelsBuilder/ModelsBuilderAssemblyAttribute.cs b/src/Umbraco.ModelsBuilder.Embedded/ModelsBuilderAssemblyAttribute.cs
similarity index 95%
rename from src/Umbraco.ModelsBuilder/ModelsBuilderAssemblyAttribute.cs
rename to src/Umbraco.ModelsBuilder.Embedded/ModelsBuilderAssemblyAttribute.cs
index ed956852f8..7570c0b5b2 100644
--- a/src/Umbraco.ModelsBuilder/ModelsBuilderAssemblyAttribute.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/ModelsBuilderAssemblyAttribute.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Umbraco.ModelsBuilder
+namespace Umbraco.ModelsBuilder.Embedded
 {
     /// <summary>
     /// Indicates that an Assembly is a Models Builder assembly.
diff --git a/src/Umbraco.ModelsBuilder/ModelsGenerationError.cs b/src/Umbraco.ModelsBuilder.Embedded/ModelsGenerationError.cs
similarity index 93%
rename from src/Umbraco.ModelsBuilder/ModelsGenerationError.cs
rename to src/Umbraco.ModelsBuilder.Embedded/ModelsGenerationError.cs
index 8264fecc87..a692f633a5 100644
--- a/src/Umbraco.ModelsBuilder/ModelsGenerationError.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/ModelsGenerationError.cs
@@ -1,10 +1,9 @@
 using System;
 using System.IO;
 using System.Text;
-using Umbraco.Core.Composing;
-using Umbraco.ModelsBuilder.Configuration;
+using Umbraco.ModelsBuilder.Embedded.Configuration;
 
-namespace Umbraco.ModelsBuilder
+namespace Umbraco.ModelsBuilder.Embedded
 {
     public sealed class ModelsGenerationError
     {
diff --git a/src/Umbraco.ModelsBuilder/OutOfDateModelsStatus.cs b/src/Umbraco.ModelsBuilder.Embedded/OutOfDateModelsStatus.cs
similarity index 94%
rename from src/Umbraco.ModelsBuilder/OutOfDateModelsStatus.cs
rename to src/Umbraco.ModelsBuilder.Embedded/OutOfDateModelsStatus.cs
index 3b43ed771e..5425c31c77 100644
--- a/src/Umbraco.ModelsBuilder/OutOfDateModelsStatus.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/OutOfDateModelsStatus.cs
@@ -1,9 +1,8 @@
 using System.IO;
-using Umbraco.Core.Composing;
-using Umbraco.ModelsBuilder.Configuration;
+using Umbraco.ModelsBuilder.Embedded.Configuration;
 using Umbraco.Web.Cache;
 
-namespace Umbraco.ModelsBuilder
+namespace Umbraco.ModelsBuilder.Embedded
 {
     public sealed class OutOfDateModelsStatus
     {
diff --git a/src/Umbraco.ModelsBuilder/Properties/AssemblyInfo.cs b/src/Umbraco.ModelsBuilder.Embedded/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Umbraco.ModelsBuilder/Properties/AssemblyInfo.cs
rename to src/Umbraco.ModelsBuilder.Embedded/Properties/AssemblyInfo.cs
diff --git a/src/Umbraco.ModelsBuilder/PublishedElementExtensions.cs b/src/Umbraco.ModelsBuilder.Embedded/PublishedElementExtensions.cs
similarity index 98%
rename from src/Umbraco.ModelsBuilder/PublishedElementExtensions.cs
rename to src/Umbraco.ModelsBuilder.Embedded/PublishedElementExtensions.cs
index 1211c4fdad..29429ba74f 100644
--- a/src/Umbraco.ModelsBuilder/PublishedElementExtensions.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/PublishedElementExtensions.cs
@@ -3,6 +3,7 @@ using System.Linq.Expressions;
 using System.Reflection;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.ModelsBuilder;
+using Umbraco.ModelsBuilder.Embedded;
 
 // same namespace as original Umbraco.Web PublishedElementExtensions
 // ReSharper disable once CheckNamespace
diff --git a/src/Umbraco.ModelsBuilder/PublishedModelUtility.cs b/src/Umbraco.ModelsBuilder.Embedded/PublishedModelUtility.cs
similarity index 98%
rename from src/Umbraco.ModelsBuilder/PublishedModelUtility.cs
rename to src/Umbraco.ModelsBuilder.Embedded/PublishedModelUtility.cs
index 44af532a0b..8a6ed83ce9 100644
--- a/src/Umbraco.ModelsBuilder/PublishedModelUtility.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/PublishedModelUtility.cs
@@ -1,11 +1,10 @@
 using System;
-using System.ComponentModel;
 using System.Linq;
 using System.Linq.Expressions;
-using Umbraco.Web.Composing;
 using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Web.Composing;
 
-namespace Umbraco.ModelsBuilder
+namespace Umbraco.ModelsBuilder.Embedded
 {
     /// <summary>
     /// This is called from within the generated model classes
diff --git a/src/Umbraco.ModelsBuilder/PureLiveModelFactory.cs b/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs
similarity index 99%
rename from src/Umbraco.ModelsBuilder/PureLiveModelFactory.cs
rename to src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs
index eb82b4323f..8e8a19c729 100644
--- a/src/Umbraco.ModelsBuilder/PureLiveModelFactory.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs
@@ -13,15 +13,13 @@ using System.Web.Compilation;
 using System.Web.Hosting;
 using System.Web.WebPages.Razor;
 using Umbraco.Core;
-using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.PublishedContent;
-using Umbraco.Web.Cache;
-using Umbraco.ModelsBuilder.Building;
-using Umbraco.ModelsBuilder.Configuration;
+using Umbraco.ModelsBuilder.Embedded.Building;
+using Umbraco.ModelsBuilder.Embedded.Configuration;
 using File = System.IO.File;
 
-namespace Umbraco.ModelsBuilder
+namespace Umbraco.ModelsBuilder.Embedded
 {
     internal class PureLiveModelFactory : ILivePublishedModelFactory, IRegisteredObject
     {
diff --git a/src/Umbraco.ModelsBuilder/ReferencedAssemblies.cs b/src/Umbraco.ModelsBuilder.Embedded/ReferencedAssemblies.cs
similarity index 99%
rename from src/Umbraco.ModelsBuilder/ReferencedAssemblies.cs
rename to src/Umbraco.ModelsBuilder.Embedded/ReferencedAssemblies.cs
index e0a20eb9d6..4ccc1afc93 100644
--- a/src/Umbraco.ModelsBuilder/ReferencedAssemblies.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/ReferencedAssemblies.cs
@@ -6,7 +6,7 @@ using System.Web.Compilation;
 using System.Web.Hosting;
 using Umbraco.Core;
 
-namespace Umbraco.ModelsBuilder
+namespace Umbraco.ModelsBuilder.Embedded
 {
     internal static class ReferencedAssemblies
     {
diff --git a/src/Umbraco.ModelsBuilder/TypeExtensions.cs b/src/Umbraco.ModelsBuilder.Embedded/TypeExtensions.cs
similarity index 96%
rename from src/Umbraco.ModelsBuilder/TypeExtensions.cs
rename to src/Umbraco.ModelsBuilder.Embedded/TypeExtensions.cs
index d3b3ff6b4e..1f270a80a6 100644
--- a/src/Umbraco.ModelsBuilder/TypeExtensions.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/TypeExtensions.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Umbraco.ModelsBuilder
+namespace Umbraco.ModelsBuilder.Embedded
 {
     internal static class TypeExtensions
     {
diff --git a/src/Umbraco.ModelsBuilder/Umbraco.ModelsBuilder.csproj b/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj
similarity index 95%
rename from src/Umbraco.ModelsBuilder/Umbraco.ModelsBuilder.csproj
rename to src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj
index 46ec0c7d2c..a9a925d9cf 100644
--- a/src/Umbraco.ModelsBuilder/Umbraco.ModelsBuilder.csproj
+++ b/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj
@@ -7,8 +7,8 @@
     <ProjectGuid>{52AC0BA8-A60E-4E36-897B-E8B97A54ED1C}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Umbraco.ModelsBuilder</RootNamespace>
-    <AssemblyName>Umbraco.ModelsBuilder</AssemblyName>
+    <RootNamespace>Umbraco.ModelsBuilder.Embedded</RootNamespace>
+    <AssemblyName>Umbraco.ModelsBuilder.Embedded</AssemblyName>
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
@@ -30,7 +30,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\Umbraco.ModelsBuilder.xml</DocumentationFile>
+    <DocumentationFile>bin\Release\Umbraco.ModelsBuilder.Embedded.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
diff --git a/src/Umbraco.ModelsBuilder/UmbracoServices.cs b/src/Umbraco.ModelsBuilder.Embedded/UmbracoServices.cs
similarity index 98%
rename from src/Umbraco.ModelsBuilder/UmbracoServices.cs
rename to src/Umbraco.ModelsBuilder.Embedded/UmbracoServices.cs
index 725e5b18c4..cd9f4802f2 100644
--- a/src/Umbraco.ModelsBuilder/UmbracoServices.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/UmbracoServices.cs
@@ -2,16 +2,14 @@
 using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Core;
-using Umbraco.Core.Composing;
 using Umbraco.Core.Exceptions;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Services;
 using Umbraco.Core.Strings;
-using Umbraco.ModelsBuilder.Building;
-using Umbraco.ModelsBuilder.Configuration;
+using Umbraco.ModelsBuilder.Embedded.Building;
 
-namespace Umbraco.ModelsBuilder
+namespace Umbraco.ModelsBuilder.Embedded
 {
     public sealed class UmbracoServices
     {
diff --git a/src/Umbraco.Tests/ModelsBuilder/BuilderTests.cs b/src/Umbraco.Tests/ModelsBuilder/BuilderTests.cs
index 99012643aa..fd381178cc 100644
--- a/src/Umbraco.Tests/ModelsBuilder/BuilderTests.cs
+++ b/src/Umbraco.Tests/ModelsBuilder/BuilderTests.cs
@@ -2,15 +2,14 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Microsoft.CodeAnalysis;
 using Moq;
 using NUnit.Framework;
-using Umbraco.Core.Composing;
 using Umbraco.Core.Models.PublishedContent;
-using Umbraco.ModelsBuilder.Building;
-using Umbraco.ModelsBuilder.Configuration;
+using Umbraco.ModelsBuilder.Embedded;
+using Umbraco.ModelsBuilder.Embedded.Building;
+using Umbraco.ModelsBuilder.Embedded.Configuration;
 
-namespace Umbraco.ModelsBuilder.Tests
+namespace Umbraco.Tests.ModelsBuilder
 {
     [TestFixture]
     public class BuilderTests
@@ -246,7 +245,7 @@ namespace Umbraco.Web.PublishedModels
             {
                 Alias = "prop2",
                 ClrName = "Prop2",
-                ModelClrType = typeof(System.Text.StringBuilder),
+                ModelClrType = typeof(global::System.Text.StringBuilder),
             });
             type1.Properties.Add(new PropertyModel
             {
@@ -342,7 +341,7 @@ namespace Umbraco.Web.PublishedModels
             builder.Using.Add("Umbraco.ModelsBuilder.Tests");
             builder.ModelsNamespaceForTests = "SomeRandomNamespace";
             var sb = new StringBuilder();
-            builder.WriteClrType(sb, typeof(System.Text.ASCIIEncoding));
+            builder.WriteClrType(sb, typeof(global::System.Text.ASCIIEncoding));
 
             // note - these assertions differ from the original tests in MB because in the embedded version, the result of Builder.IsAmbiguousSymbol is always true
             // which means global:: syntax will be applied to most things
@@ -358,7 +357,7 @@ namespace Umbraco.Web.PublishedModels
             builder.Using.Add("Umbraco.ModelsBuilder.Tests");
             builder.ModelsNamespaceForTests = "SomeBorkedNamespace";
             var sb = new StringBuilder();
-            builder.WriteClrType(sb, typeof(System.Text.ASCIIEncoding));
+            builder.WriteClrType(sb, typeof(global::System.Text.ASCIIEncoding));
 
             // note - these assertions differ from the original tests in MB because in the embedded version, the result of Builder.IsAmbiguousSymbol is always true
             // which means global:: syntax will be applied to most things
@@ -417,7 +416,7 @@ namespace Umbraco.Web.PublishedModels
         public class Class1 { }
     }
 
-    // make it public to be ambiguous (see above)
+// make it public to be ambiguous (see above)
     public class ASCIIEncoding
     {
         // can we handle nested types?
@@ -425,9 +424,6 @@ namespace Umbraco.Web.PublishedModels
     }
 
     class BuilderTestsClass1 {}
-}
 
-namespace SomeBorkedNamespace
-{
     public class System { }
 }
diff --git a/src/Umbraco.Tests/ModelsBuilder/ConfigTests.cs b/src/Umbraco.Tests/ModelsBuilder/ConfigTests.cs
index 58215707f7..5e122ad0fa 100644
--- a/src/Umbraco.Tests/ModelsBuilder/ConfigTests.cs
+++ b/src/Umbraco.Tests/ModelsBuilder/ConfigTests.cs
@@ -1,8 +1,8 @@
 using System.Configuration;
 using NUnit.Framework;
-using Umbraco.ModelsBuilder.Configuration;
+using Umbraco.ModelsBuilder.Embedded.Configuration;
 
-namespace Umbraco.ModelsBuilder.Tests
+namespace Umbraco.Tests.ModelsBuilder
 {
     [TestFixture]
     public class ModelsBuilderConfigTests
diff --git a/src/Umbraco.Tests/ModelsBuilder/StringExtensions.cs b/src/Umbraco.Tests/ModelsBuilder/StringExtensions.cs
index 13a256aa14..361d104911 100644
--- a/src/Umbraco.Tests/ModelsBuilder/StringExtensions.cs
+++ b/src/Umbraco.Tests/ModelsBuilder/StringExtensions.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Umbraco.ModelsBuilder.Tests
+namespace Umbraco.Tests.ModelsBuilder
 {
     public static class StringExtensions
     {
diff --git a/src/Umbraco.Tests/ModelsBuilder/UmbracoApplicationTests.cs b/src/Umbraco.Tests/ModelsBuilder/UmbracoApplicationTests.cs
index d6d44474c3..4d2ae0e6c6 100644
--- a/src/Umbraco.Tests/ModelsBuilder/UmbracoApplicationTests.cs
+++ b/src/Umbraco.Tests/ModelsBuilder/UmbracoApplicationTests.cs
@@ -1,12 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
-using Umbraco.ModelsBuilder.Building;
+using Umbraco.ModelsBuilder.Embedded;
+using Umbraco.ModelsBuilder.Embedded.Building;
 
-namespace Umbraco.ModelsBuilder.Tests
+namespace Umbraco.Tests.ModelsBuilder
 {
     [TestFixture]
     public class UmbracoApplicationTests
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index ebf081160b..83fff814a4 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -553,9 +553,9 @@
       <Project>{31785BC3-256C-4613-B2F5-A1B0BDDED8C1}</Project>
       <Name>Umbraco.Core</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Umbraco.ModelsBuilder\Umbraco.ModelsBuilder.csproj">
+    <ProjectReference Include="..\Umbraco.ModelsBuilder.Embedded\Umbraco.ModelsBuilder.Embedded.csproj">
       <Project>{52ac0ba8-a60e-4e36-897b-e8b97a54ed1c}</Project>
-      <Name>Umbraco.ModelsBuilder</Name>
+      <Name>Umbraco.ModelsBuilder.Embedded</Name>
     </ProjectReference>
     <ProjectReference Include="..\Umbraco.Web\Umbraco.Web.csproj">
       <Project>{651E1350-91B6-44B7-BD60-7207006D7003}</Project>
diff --git a/src/Umbraco.Web.UI/App_Plugins/ModelsBuilder/modelsbuilder.controller.js b/src/Umbraco.Web.UI/App_Plugins/UmbModelsBuilder/modelsbuilder.controller.js
similarity index 100%
rename from src/Umbraco.Web.UI/App_Plugins/ModelsBuilder/modelsbuilder.controller.js
rename to src/Umbraco.Web.UI/App_Plugins/UmbModelsBuilder/modelsbuilder.controller.js
diff --git a/src/Umbraco.Web.UI/App_Plugins/ModelsBuilder/modelsbuilder.html b/src/Umbraco.Web.UI/App_Plugins/UmbModelsBuilder/modelsbuilder.html
similarity index 100%
rename from src/Umbraco.Web.UI/App_Plugins/ModelsBuilder/modelsbuilder.html
rename to src/Umbraco.Web.UI/App_Plugins/UmbModelsBuilder/modelsbuilder.html
diff --git a/src/Umbraco.Web.UI/App_Plugins/ModelsBuilder/modelsbuilder.resource.js b/src/Umbraco.Web.UI/App_Plugins/UmbModelsBuilder/modelsbuilder.resource.js
similarity index 100%
rename from src/Umbraco.Web.UI/App_Plugins/ModelsBuilder/modelsbuilder.resource.js
rename to src/Umbraco.Web.UI/App_Plugins/UmbModelsBuilder/modelsbuilder.resource.js
diff --git a/src/Umbraco.Web.UI/App_Plugins/ModelsBuilder/package.manifest b/src/Umbraco.Web.UI/App_Plugins/UmbModelsBuilder/package.manifest
similarity index 100%
rename from src/Umbraco.Web.UI/App_Plugins/ModelsBuilder/package.manifest
rename to src/Umbraco.Web.UI/App_Plugins/UmbModelsBuilder/package.manifest
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 1db4fabbe1..99c1c994d9 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -12,7 +12,7 @@
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
     <UseIISExpress>true</UseIISExpress>
-    <IISExpressSSLPort>44319</IISExpressSSLPort>
+    <IISExpressSSLPort>44331</IISExpressSSLPort>
     <IISExpressAnonymousAuthentication>enabled</IISExpressAnonymousAuthentication>
     <IISExpressWindowsAuthentication>disabled</IISExpressWindowsAuthentication>
     <IISExpressUseClassicPipelineMode>false</IISExpressUseClassicPipelineMode>
@@ -118,10 +118,6 @@
       <Name>Umbraco.Examine</Name>
       <Project>{07FBC26B-2927-4A22-8D96-D644C667FECC}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\Umbraco.ModelsBuilder\Umbraco.ModelsBuilder.csproj">
-      <Project>{52ac0ba8-a60e-4e36-897b-e8b97a54ed1c}</Project>
-      <Name>Umbraco.ModelsBuilder</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Umbraco.Web\Umbraco.Web.csproj">
       <Project>{651e1350-91b6-44b7-bd60-7207006d7003}</Project>
       <Name>Umbraco.Web</Name>
@@ -144,9 +140,9 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
       <DependentUpon>Settings.settings</DependentUpon>
     </Compile>
-    <Content Include="App_Plugins\ModelsBuilder\modelsbuilder.controller.js" />
-    <Content Include="App_Plugins\ModelsBuilder\modelsbuilder.html" />
-    <Content Include="App_Plugins\ModelsBuilder\modelsbuilder.resource.js" />
+    <Content Include="App_Plugins\UmbModelsBuilder\modelsbuilder.controller.js" />
+    <Content Include="App_Plugins\UmbModelsBuilder\modelsbuilder.html" />
+    <Content Include="App_Plugins\UmbModelsBuilder\modelsbuilder.resource.js" />
     <Content Include="Config\grid.editors.config.js" />
     <Content Include="Config\Lang\cs-CZ.user.xml" />
     <Content Include="Config\Lang\da-DK.user.xml" />
@@ -172,7 +168,7 @@
     <Content Include="Umbraco\Config\Lang\zh_tw.xml" />
     <Content Include="Config\Splashes\noNodes.aspx" />
     <Content Include="Umbraco\Install\Views\Web.config" />
-    <Content Include="App_Plugins\ModelsBuilder\package.manifest" />
+    <Content Include="App_Plugins\UmbModelsBuilder\package.manifest" />
     <None Include="Config\ClientDependency.Release.config">
       <DependentUpon>ClientDependency.config</DependentUpon>
       <SubType>Designer</SubType>
diff --git a/src/umbraco.sln b/src/umbraco.sln
index 1d5aa9a60e..ba9df633bb 100644
--- a/src/umbraco.sln
+++ b/src/umbraco.sln
@@ -1,6 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
-VisualStudioVersion = 16.0.29009.5
 VisualStudioVersion = 16.0.29209.152
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Web.UI", "Umbraco.Web.UI\Umbraco.Web.UI.csproj", "{4C4C194C-B5E4-4991-8F87-4373E24CC19F}"
@@ -103,7 +102,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IssueTemplates", "IssueTemp
 		..\.github\ISSUE_TEMPLATE\5_Security_issue.md = ..\.github\ISSUE_TEMPLATE\5_Security_issue.md
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.ModelsBuilder", "Umbraco.ModelsBuilder\Umbraco.ModelsBuilder.csproj", "{52AC0BA8-A60E-4E36-897B-E8B97A54ED1C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.ModelsBuilder.Embedded", "Umbraco.ModelsBuilder.Embedded\Umbraco.ModelsBuilder.Embedded.csproj", "{52AC0BA8-A60E-4E36-897B-E8B97A54ED1C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution