diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 787d7c0b74..3ca249efd5 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -634,9 +634,6 @@
       <DependentUpon>Dashboard.config</DependentUpon>
       <SubType>Designer</SubType>
     </None>
-    <Content Include="MacroScripts\Web.config">
-      <SubType>Designer</SubType>
-    </Content>
     <Content Include="Umbraco\Install\Views\Index.cshtml" />
     <None Include="packages.config">
       <SubType>Designer</SubType>
diff --git a/src/Umbraco.Web/Mvc/Strings.Designer.cs b/src/Umbraco.Web/Mvc/Strings.Designer.cs
index fb978890d0..02a44fbbd7 100644
--- a/src/Umbraco.Web/Mvc/Strings.Designer.cs
+++ b/src/Umbraco.Web/Mvc/Strings.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34003
+//     Runtime Version:4.0.30319.34014
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
diff --git a/src/Umbraco.Web/umbraco.presentation/EnsureSystemPathsApplicationStartupHandler.cs b/src/Umbraco.Web/umbraco.presentation/EnsureSystemPathsApplicationStartupHandler.cs
index f5949ff1c3..dc354be71d 100644
--- a/src/Umbraco.Web/umbraco.presentation/EnsureSystemPathsApplicationStartupHandler.cs
+++ b/src/Umbraco.Web/umbraco.presentation/EnsureSystemPathsApplicationStartupHandler.cs
@@ -19,8 +19,7 @@ namespace umbraco.presentation
             EnsurePathExists("~/App_Code");
             EnsurePathExists("~/App_Data");
             EnsurePathExists(SystemDirectories.AppPlugins);
-            EnsurePathExists(SystemDirectories.Css);
-            EnsurePathExists(SystemDirectories.MacroScripts);
+            EnsurePathExists(SystemDirectories.Css);            
             EnsurePathExists(SystemDirectories.Masterpages);
             EnsurePathExists(SystemDirectories.Media);
             EnsurePathExists(SystemDirectories.Scripts);
diff --git a/src/umbraco.MacroEngines/RazorCore/RazorMacroEngine.cs b/src/umbraco.MacroEngines/RazorCore/RazorMacroEngine.cs
index 03c9d9e9b8..e3c7a22bd0 100644
--- a/src/umbraco.MacroEngines/RazorCore/RazorMacroEngine.cs
+++ b/src/umbraco.MacroEngines/RazorCore/RazorMacroEngine.cs
@@ -175,6 +175,19 @@ namespace umbraco.MacroEngines
         }
 
         public string Execute(MacroModel macro, INode currentPage) {
+            
+            //if this is executing, we need to ensure the folder exists and that the correct web.config exists on that folder too
+            var absolutePath = IOHelper.MapPath(SystemDirectories.MacroScripts);
+            if (!Directory.Exists(absolutePath))
+                Directory.CreateDirectory(absolutePath);
+            if (!File.Exists(Path.Combine(absolutePath, "web.config")))
+            {
+                using (var writer = File.CreateText(Path.Combine(absolutePath, "web.config")))
+                {
+                    writer.Write(Strings.WebConfig);
+                }
+            }
+            
             try
             {
                 Success = true;
diff --git a/src/umbraco.MacroEngines/Resources/Strings.Designer.cs b/src/umbraco.MacroEngines/Resources/Strings.Designer.cs
index 553c0b9460..236db870a0 100644
--- a/src/umbraco.MacroEngines/Resources/Strings.Designer.cs
+++ b/src/umbraco.MacroEngines/Resources/Strings.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34003
+//     Runtime Version:4.0.30319.34014
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
diff --git a/src/umbraco.MacroEngines/Resources/Strings.resx b/src/umbraco.MacroEngines/Resources/Strings.resx
index e3244825c1..698928939b 100644
--- a/src/umbraco.MacroEngines/Resources/Strings.resx
+++ b/src/umbraco.MacroEngines/Resources/Strings.resx
@@ -119,6 +119,6 @@
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="WebConfig" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\..\umbraco.web.ui\macroscripts\web.config;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+    <value>web.config;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/MacroScripts/Web.config b/src/umbraco.MacroEngines/Resources/Web.config
similarity index 97%
rename from src/Umbraco.Web.UI/MacroScripts/Web.config
rename to src/umbraco.MacroEngines/Resources/Web.config
index 1ef2936cd8..163957b32e 100644
--- a/src/Umbraco.Web.UI/MacroScripts/Web.config
+++ b/src/umbraco.MacroEngines/Resources/Web.config
@@ -1,57 +1,57 @@
-<?xml version="1.0"?>
-<configuration>
-
-  <configSections>
-    <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-      <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
-      <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
-    </sectionGroup>
-  </configSections>
-
-  <system.web.webPages.razor>
-    <host factoryType="umbraco.MacroEngines.RazorUmbracoFactory, umbraco.MacroEngines"/>
-    <pages pageBaseType="umbraco.MacroEngines.DynamicNodeContext">
-      <namespaces>
-        <add namespace="Microsoft.Web.Helpers" />
-        <add namespace="umbraco" />
-        <add namespace="Examine" />
-      </namespaces>
-    </pages>
-  </system.web.webPages.razor>
-
-  <appSettings>
-    <add key="webpages:Enabled" value="false" />
-  </appSettings>
-
-  <system.web>
-    <httpHandlers>
-      <add path="*" verb="*" type="System.Web.HttpNotFoundHandler"/>
-    </httpHandlers>
-
-    <!--
-        Enabling request validation in view pages would cause validation to occur
-        after the input has already been processed by the controller. By default
-        MVC performs request validation before a controller processes the input.
-        To change this behavior apply the ValidateInputAttribute to a
-        controller or action.
-    -->
-    <pages
-        validateRequest="false"
-        pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
-        pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
-        userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-      <controls>
-        <add assembly="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" tagPrefix="mvc" />
-      </controls>
-    </pages>
-  </system.web>
-
-  <system.webServer>
-    <validation validateIntegratedModeConfiguration="false" />
-
-    <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler" />
-    </handlers>
-  </system.webServer>
-</configuration>
+<?xml version="1.0"?>
+<configuration>
+
+  <configSections>
+    <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+      <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
+      <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
+    </sectionGroup>
+  </configSections>
+
+  <system.web.webPages.razor>
+    <host factoryType="umbraco.MacroEngines.RazorUmbracoFactory, umbraco.MacroEngines"/>
+    <pages pageBaseType="umbraco.MacroEngines.DynamicNodeContext">
+      <namespaces>
+        <add namespace="Microsoft.Web.Helpers" />
+        <add namespace="umbraco" />
+        <add namespace="Examine" />
+      </namespaces>
+    </pages>
+  </system.web.webPages.razor>
+
+  <appSettings>
+    <add key="webpages:Enabled" value="false" />
+  </appSettings>
+
+  <system.web>
+    <httpHandlers>
+      <add path="*" verb="*" type="System.Web.HttpNotFoundHandler"/>
+    </httpHandlers>
+
+    <!--
+        Enabling request validation in view pages would cause validation to occur
+        after the input has already been processed by the controller. By default
+        MVC performs request validation before a controller processes the input.
+        To change this behavior apply the ValidateInputAttribute to a
+        controller or action.
+    -->
+    <pages
+        validateRequest="false"
+        pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
+        pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
+        userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+      <controls>
+        <add assembly="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" tagPrefix="mvc" />
+      </controls>
+    </pages>
+  </system.web>
+
+  <system.webServer>
+    <validation validateIntegratedModeConfiguration="false" />
+
+    <handlers>
+      <remove name="BlockViewHandler"/>
+      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler" />
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj b/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
index d840056e4f..6651f0c2ee 100644
--- a/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
+++ b/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
@@ -215,11 +215,11 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\Umbraco.Web.UI\MacroScripts\Web.config">
-      <Link>Resources\Web.config</Link>
-    </None>
     <None Include="app.config" />
     <None Include="packages.config" />
+    <Content Include="Resources\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources\Strings.resx">