diff --git a/src/Umbraco.Core/Models/ITemplate.cs b/src/Umbraco.Core/Models/ITemplate.cs
index 6548a49626..1a3ce30087 100644
--- a/src/Umbraco.Core/Models/ITemplate.cs
+++ b/src/Umbraco.Core/Models/ITemplate.cs
@@ -20,7 +20,7 @@ namespace Umbraco.Core.Models
         /// <summary>
         /// Returns true if the template is used as a layout for other templates (i.e. it has 'children')
         /// </summary>
-        bool IsMasterTemplate { get; }
+        bool IsMasterTemplate { get; set; }
 
         /// <summary>
         /// returns the master template alias
diff --git a/src/Umbraco.Infrastructure/Models/Macro.cs b/src/Umbraco.Core/Models/Macro.cs
similarity index 100%
rename from src/Umbraco.Infrastructure/Models/Macro.cs
rename to src/Umbraco.Core/Models/Macro.cs
diff --git a/src/Umbraco.Infrastructure/Models/MediaExtensions.cs b/src/Umbraco.Core/Models/MediaExtensions.cs
similarity index 100%
rename from src/Umbraco.Infrastructure/Models/MediaExtensions.cs
rename to src/Umbraco.Core/Models/MediaExtensions.cs
diff --git a/src/Umbraco.Infrastructure/Models/ObjectTypes.cs b/src/Umbraco.Core/Models/ObjectTypes.cs
similarity index 100%
rename from src/Umbraco.Infrastructure/Models/ObjectTypes.cs
rename to src/Umbraco.Core/Models/ObjectTypes.cs
diff --git a/src/Umbraco.Infrastructure/Models/Template.cs b/src/Umbraco.Core/Models/Template.cs
similarity index 90%
rename from src/Umbraco.Infrastructure/Models/Template.cs
rename to src/Umbraco.Core/Models/Template.cs
index e1dead8f92..e9cfb71efd 100644
--- a/src/Umbraco.Infrastructure/Models/Template.cs
+++ b/src/Umbraco.Core/Models/Template.cs
@@ -18,10 +18,10 @@ namespace Umbraco.Core.Models
         private Lazy<int> _masterTemplateId;
 
         public Template(IShortStringHelper shortStringHelper, string name, string alias)
-            : this(shortStringHelper, name, alias, (Func<File, string>) null)
+            : this(shortStringHelper, name, alias, null)
         { }
 
-        internal Template(IShortStringHelper shortStringHelper, string name, string alias, Func<File, string> getFileContent)
+        public Template(IShortStringHelper shortStringHelper, string name, string alias, Func<File, string> getFileContent)
             : base(string.Empty, getFileContent)
         {
             _shortStringHelper = shortStringHelper;
@@ -60,7 +60,7 @@ namespace Umbraco.Core.Models
         /// <summary>
         /// Returns true if the template is used as a layout for other templates (i.e. it has 'children')
         /// </summary>
-        public bool IsMasterTemplate { get; internal set; }
+        public bool IsMasterTemplate { get; set; }
 
         public void SetMasterTemplate(ITemplate masterTemplate)
         {
diff --git a/src/Umbraco.Infrastructure/Models/TemplateOnDisk.cs b/src/Umbraco.Core/Models/TemplateOnDisk.cs
similarity index 100%
rename from src/Umbraco.Infrastructure/Models/TemplateOnDisk.cs
rename to src/Umbraco.Core/Models/TemplateOnDisk.cs