diff --git a/LinqToUmbraco/dep/Reference Assemblies/Umbraco/Microsoft.ApplicationBlocks.Data.dll b/LinqToUmbraco/dep/Reference Assemblies/Umbraco/Microsoft.ApplicationBlocks.Data.dll
deleted file mode 100644
index c431985632..0000000000
Binary files a/LinqToUmbraco/dep/Reference Assemblies/Umbraco/Microsoft.ApplicationBlocks.Data.dll and /dev/null differ
diff --git a/LinqToUmbraco/dep/Reference Assemblies/Umbraco/businesslogic.dll b/LinqToUmbraco/dep/Reference Assemblies/Umbraco/businesslogic.dll
deleted file mode 100644
index c1baffb93c..0000000000
Binary files a/LinqToUmbraco/dep/Reference Assemblies/Umbraco/businesslogic.dll and /dev/null differ
diff --git a/LinqToUmbraco/dep/Reference Assemblies/Umbraco/cms.dll b/LinqToUmbraco/dep/Reference Assemblies/Umbraco/cms.dll
deleted file mode 100644
index 176594d02f..0000000000
Binary files a/LinqToUmbraco/dep/Reference Assemblies/Umbraco/cms.dll and /dev/null differ
diff --git a/LinqToUmbraco/dep/Reference Assemblies/Umbraco/interfaces.dll b/LinqToUmbraco/dep/Reference Assemblies/Umbraco/interfaces.dll
deleted file mode 100644
index 5c1cad16f4..0000000000
Binary files a/LinqToUmbraco/dep/Reference Assemblies/Umbraco/interfaces.dll and /dev/null differ
diff --git a/LinqToUmbraco/dep/Reference Assemblies/Umbraco/umbraco.DataLayer.dll b/LinqToUmbraco/dep/Reference Assemblies/Umbraco/umbraco.DataLayer.dll
deleted file mode 100644
index 8dd88a3325..0000000000
Binary files a/LinqToUmbraco/dep/Reference Assemblies/Umbraco/umbraco.DataLayer.dll and /dev/null differ
diff --git a/LinqToUmbraco/dep/Reference Assemblies/Umbraco/umbraco.dll b/LinqToUmbraco/dep/Reference Assemblies/Umbraco/umbraco.dll
deleted file mode 100644
index 6eb88e89cb..0000000000
Binary files a/LinqToUmbraco/dep/Reference Assemblies/Umbraco/umbraco.dll and /dev/null differ
diff --git a/LinqToUmbraco/dep/Reference Assemblies/Umbraco/umbraco.editorControls.dll b/LinqToUmbraco/dep/Reference Assemblies/Umbraco/umbraco.editorControls.dll
deleted file mode 100644
index bea852fc0f..0000000000
Binary files a/LinqToUmbraco/dep/Reference Assemblies/Umbraco/umbraco.editorControls.dll and /dev/null differ
diff --git a/LinqToUmbraco/src/umbraco.Linq/Core.Mockable.Tests/Core.Mockable.Tests.csproj b/LinqToUmbraco/src/umbraco.Linq/Core.Mockable.Tests/Core.Mockable.Tests.csproj
index 9e06840049..351b3025bf 100644
--- a/LinqToUmbraco/src/umbraco.Linq/Core.Mockable.Tests/Core.Mockable.Tests.csproj
+++ b/LinqToUmbraco/src/umbraco.Linq/Core.Mockable.Tests/Core.Mockable.Tests.csproj
@@ -67,9 +67,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Core\Core.csproj">
+    <ProjectReference Include="..\Core\umbraco.Linq.Core.csproj">
       <Project>{31CAEC36-0C3D-4D69-B092-84866811EA07}</Project>
-      <Name>Core</Name>
+      <Name>umbraco.Linq.Core</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
diff --git a/LinqToUmbraco/src/umbraco.Linq/Core.Tests/AncestorTest.cs b/LinqToUmbraco/src/umbraco.Linq/Core.Tests/AncestorTest.cs
index da90cc316b..0b9bb06ae2 100644
--- a/LinqToUmbraco/src/umbraco.Linq/Core.Tests/AncestorTest.cs
+++ b/LinqToUmbraco/src/umbraco.Linq/Core.Tests/AncestorTest.cs
@@ -95,7 +95,7 @@ namespace umbraco.Linq.Core.Tests
             MockHelpers.SetupFakeHttpContext();
             using (var ctx = new MyumbracoDataContext())
             {
-                var photo = ctx.CwsPhotos.First(p => p.Name.Contains("umbraco"));
+                var photo = ctx.CwsPhotos.First(p => p.Name.Contains("Umbraco"));
                 var gallery = photo.AncestorOrDefault<CwsGallery>(g => g.Name.Contains("Codegarden"));
 
                 Assert.IsNotNull(gallery);
@@ -108,7 +108,7 @@ namespace umbraco.Linq.Core.Tests
             MockHelpers.SetupFakeHttpContext();
             using (var ctx = new MyumbracoDataContext())
             {
-                var photo = ctx.CwsPhotos.First(p => p.Name.Contains("umbraco"));
+                var photo = ctx.CwsPhotos.First(p => p.Name.Contains("Umbraco"));
                 var gallery = photo.AncestorOrDefault<CwsGallery>(g => g.Name.Contains("Bookhouses"));
 
                 Assert.IsNull(gallery);
diff --git a/LinqToUmbraco/src/umbraco.Linq/Core.Tests/Core.Tests.csproj b/LinqToUmbraco/src/umbraco.Linq/Core.Tests/Core.Tests.csproj
index 6ca35eb00a..04a1e3fd88 100644
--- a/LinqToUmbraco/src/umbraco.Linq/Core.Tests/Core.Tests.csproj
+++ b/LinqToUmbraco/src/umbraco.Linq/Core.Tests/Core.Tests.csproj
@@ -45,10 +45,6 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="businesslogic, Version=1.0.3317.17186, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\dep\Reference Assemblies\Umbraco\businesslogic.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
     <Reference Include="System" />
     <Reference Include="System.Core">
@@ -74,14 +70,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\dep\Reference Assemblies\Mocking\Typemock.ArrangeActAssert.Dll</HintPath>
     </Reference>
-    <Reference Include="umbraco, Version=1.0.3317.32692, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\dep\Reference Assemblies\Umbraco\umbraco.dll</HintPath>
-    </Reference>
-    <Reference Include="umbraco.DataLayer, Version=0.3.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\dep\Reference Assemblies\Umbraco\umbraco.DataLayer.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\Solution Items\SolutionInfo.cs">
@@ -105,12 +93,6 @@
   <ItemGroup>
     <Content Include="AuthoringTests.txt" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Core\Core.csproj">
-      <Project>{31CAEC36-0C3D-4D69-B092-84866811EA07}</Project>
-      <Name>Core</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <Content Include="..\..\..\dep\Test Helpers\umbraco.config">
       <Link>umbraco.config</Link>
@@ -118,6 +100,24 @@
     </Content>
     <None Include="App.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\umbraco\businesslogic\umbraco.businesslogic.csproj">
+      <Project>{E469A9CE-1BEC-423F-AC44-713CD72457EA}</Project>
+      <Name>umbraco.businesslogic</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\umbraco\datalayer\umbraco.datalayer.csproj">
+      <Project>{C7CB79F0-1C97-4B33-BFA7-00731B579AE2}</Project>
+      <Name>umbraco.datalayer</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\umbraco\presentation\umbraco.presentation.csproj">
+      <Project>{651E1350-91B6-44B7-BD60-7207006D7003}</Project>
+      <Name>umbraco.presentation</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Core\umbraco.Linq.Core.csproj">
+      <Project>{31CAEC36-0C3D-4D69-B092-84866811EA07}</Project>
+      <Name>umbraco.Linq.Core</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/LinqToUmbraco/src/umbraco.Linq/Core/Node/NodeDataProvider.cs b/LinqToUmbraco/src/umbraco.Linq/Core/Node/NodeDataProvider.cs
index 8544835a30..711c1a94ce 100644
--- a/LinqToUmbraco/src/umbraco.Linq/Core/Node/NodeDataProvider.cs
+++ b/LinqToUmbraco/src/umbraco.Linq/Core/Node/NodeDataProvider.cs
@@ -24,7 +24,7 @@ namespace umbraco.Linq.Core.Node
         private Dictionary<UmbracoInfoAttribute, ITree> _trees;
         private bool _enforceSchemaValidation;
         private XDocument _xml;
-        private const string UMBRACO_XSD_PATH = "umbraco.Linq.Core.Node.umbracoConfig.xsd";
+        private const string UMBRACO_XSD_PATH = "umbraco.Linq.Core.Node.UmbracoConfig.xsd";
         private Dictionary<string, Type> _knownTypes;
 
         internal XDocument Xml
diff --git a/LinqToUmbraco/src/umbraco.Linq/DTMetal.Engine.Tests/DTMetal.Engine.Tests.csproj b/LinqToUmbraco/src/umbraco.Linq/DTMetal.Engine.Tests/DTMetal.Engine.Tests.csproj
index eafeff4af2..cbb91add6e 100644
--- a/LinqToUmbraco/src/umbraco.Linq/DTMetal.Engine.Tests/DTMetal.Engine.Tests.csproj
+++ b/LinqToUmbraco/src/umbraco.Linq/DTMetal.Engine.Tests/DTMetal.Engine.Tests.csproj
@@ -84,9 +84,9 @@
     <Content Include="AuthoringTests.txt" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Core\Core.csproj">
+    <ProjectReference Include="..\Core\umbraco.Linq.Core.csproj">
       <Project>{31CAEC36-0C3D-4D69-B092-84866811EA07}</Project>
-      <Name>Core</Name>
+      <Name>umbraco.Linq.Core</Name>
     </ProjectReference>
     <ProjectReference Include="..\DTMetal.CodeBuilder\DTMetal.CodeBuilder.csproj">
       <Project>{461089E7-008E-4737-BA17-E1FCD1CC3D0E}</Project>
diff --git a/LinqToUmbraco/src/umbraco.Linq/DTMetal.Engine/DTMetal.Engine.csproj b/LinqToUmbraco/src/umbraco.Linq/DTMetal.Engine/DTMetal.Engine.csproj
index 49f3047547..208f85a493 100644
--- a/LinqToUmbraco/src/umbraco.Linq/DTMetal.Engine/DTMetal.Engine.csproj
+++ b/LinqToUmbraco/src/umbraco.Linq/DTMetal.Engine/DTMetal.Engine.csproj
@@ -50,7 +50,7 @@
   <ItemGroup>
     <Reference Include="Microsoft.ApplicationBlocks.Data, Version=1.0.1559.20655, Culture=neutral">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\dep\Reference Assemblies\Umbraco\Microsoft.ApplicationBlocks.Data.dll</HintPath>
+      <HintPath>..\..\..\..\foreign dlls\Microsoft.ApplicationBlocks.Data.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
@@ -63,7 +63,7 @@
     <Reference Include="System.Xml" />
     <Reference Include="umbraco.DataLayer, Version=0.3.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\dep\Reference Assemblies\Umbraco\umbraco.DataLayer.dll</HintPath>
+      <HintPath>..\..\..\..\umbraco\datalayer\bin\Debug\umbraco.DataLayer.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/LinqToUmbraco/src/umbraco.Linq/umbraco.Linq.sln b/LinqToUmbraco/src/umbraco.Linq/umbraco.Linq.sln
index e146370ccf..a2779d5408 100644
--- a/LinqToUmbraco/src/umbraco.Linq/umbraco.Linq.sln
+++ b/LinqToUmbraco/src/umbraco.Linq/umbraco.Linq.sln
@@ -10,7 +10,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Umbraco.Linq.vsmdi = Umbraco.Linq.vsmdi
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "Core\Core.csproj", "{31CAEC36-0C3D-4D69-B092-84866811EA07}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.Linq.Core", "Core\umbraco.Linq.Core.csproj", "{31CAEC36-0C3D-4D69-B092-84866811EA07}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Tests", "Core.Tests\Core.Tests.csproj", "{A80528D0-E68C-4A94-9489-C712216665B0}"
 EndProject
@@ -37,36 +37,56 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test Helpers", "Test Helper
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DTMetal.CodeBuilder", "DTMetal.CodeBuilder\DTMetal.CodeBuilder.csproj", "{461089E7-008E-4737-BA17-E1FCD1CC3D0E}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main Umbraco Projects", "Main Umbraco Projects", "{7F2EEC29-D5A4-46AF-BFB7-E33399F5555E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.datalayer", "..\..\..\umbraco\datalayer\umbraco.datalayer.csproj", "{C7CB79F0-1C97-4B33-BFA7-00731B579AE2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.businesslogic", "..\..\..\umbraco\businesslogic\umbraco.businesslogic.csproj", "{E469A9CE-1BEC-423F-AC44-713CD72457EA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.presentation", "..\..\..\umbraco\presentation\umbraco.presentation.csproj", "{651E1350-91B6-44B7-BD60-7207006D7003}"
+EndProject
 Global
 	GlobalSection(TeamFoundationVersionControl) = preSolution
-		SccNumberOfProjects = 9
+		SccNumberOfProjects = 12
 		SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
 		SccTeamFoundationServer = https://tfs01.codeplex.com/
 		SccLocalPath0 = .
 		SccProjectUniqueName1 = DTMetal\\DTMetal.csproj
 		SccProjectName1 = DTMetal
 		SccLocalPath1 = DTMetal
-		SccProjectUniqueName2 = Core\\Core.csproj
-		SccProjectName2 = Core
-		SccLocalPath2 = Core
-		SccProjectUniqueName3 = Core.Tests\\Core.Tests.csproj
-		SccProjectName3 = Core.Tests
-		SccLocalPath3 = Core.Tests
-		SccProjectUniqueName4 = Core.Mockable.Tests\\Core.Mockable.Tests.csproj
-		SccProjectName4 = Core.Mockable.Tests
-		SccLocalPath4 = Core.Mockable.Tests
-		SccProjectUniqueName5 = DTMetal.Engine\\DTMetal.Engine.csproj
-		SccProjectName5 = DTMetal.Engine
-		SccLocalPath5 = DTMetal.Engine
-		SccProjectUniqueName6 = DTMetal.Engine.Tests\\DTMetal.Engine.Tests.csproj
-		SccProjectName6 = DTMetal.Engine.Tests
-		SccLocalPath6 = DTMetal.Engine.Tests
-		SccProjectUniqueName7 = DTMetal\u0020Installer\\DTMetal\u0020Installer.vdproj
-		SccProjectName7 = DTMetal\u0020Installer
-		SccLocalPath7 = DTMetal\u0020Installer
-		SccProjectUniqueName8 = DTMetal.CodeBuilder\\DTMetal.CodeBuilder.csproj
-		SccProjectName8 = DTMetal.CodeBuilder
-		SccLocalPath8 = DTMetal.CodeBuilder
+		SccProjectUniqueName2 = Core.Tests\\Core.Tests.csproj
+		SccProjectName2 = Core.Tests
+		SccLocalPath2 = Core.Tests
+		SccProjectUniqueName3 = Core.Mockable.Tests\\Core.Mockable.Tests.csproj
+		SccProjectName3 = Core.Mockable.Tests
+		SccLocalPath3 = Core.Mockable.Tests
+		SccProjectUniqueName4 = DTMetal.Engine\\DTMetal.Engine.csproj
+		SccProjectName4 = DTMetal.Engine
+		SccLocalPath4 = DTMetal.Engine
+		SccProjectUniqueName5 = DTMetal.Engine.Tests\\DTMetal.Engine.Tests.csproj
+		SccProjectName5 = DTMetal.Engine.Tests
+		SccLocalPath5 = DTMetal.Engine.Tests
+		SccProjectUniqueName6 = DTMetal\u0020Installer\\DTMetal\u0020Installer.vdproj
+		SccProjectName6 = DTMetal\u0020Installer
+		SccLocalPath6 = DTMetal\u0020Installer
+		SccProjectUniqueName7 = DTMetal.CodeBuilder\\DTMetal.CodeBuilder.csproj
+		SccProjectName7 = DTMetal.CodeBuilder
+		SccLocalPath7 = DTMetal.CodeBuilder
+		SccProjectUniqueName8 = Core\\umbraco.Linq.Core.csproj
+		SccProjectName8 = Core
+		SccLocalPath8 = Core
+		SccProjectUniqueName9 = ..\\..\\..\\umbraco\\datalayer\\umbraco.datalayer.csproj
+		SccProjectTopLevelParentUniqueName9 = umbraco.Linq.sln
+		SccProjectName9 = ../../../umbraco/datalayer
+		SccLocalPath9 = ..\\..\\..\\umbraco\\datalayer
+		SccProjectUniqueName10 = ..\\..\\..\\umbraco\\businesslogic\\umbraco.businesslogic.csproj
+		SccProjectTopLevelParentUniqueName10 = umbraco.Linq.sln
+		SccProjectName10 = ../../../umbraco/businesslogic
+		SccLocalPath10 = ..\\..\\..\\umbraco\\businesslogic
+		SccProjectUniqueName11 = ..\\..\\..\\umbraco\\presentation\\umbraco.presentation.csproj
+		SccProjectTopLevelParentUniqueName11 = umbraco.Linq.sln
+		SccProjectName11 = ../../../umbraco/presentation
+		SccLocalPath11 = ..\\..\\..\\umbraco\\presentation
 	EndGlobalSection
 	GlobalSection(TestCaseManagementSettings) = postSolution
 		CategoryFile = Umbraco.Linq.vsmdi
@@ -106,6 +126,18 @@ Global
 		{461089E7-008E-4737-BA17-E1FCD1CC3D0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{461089E7-008E-4737-BA17-E1FCD1CC3D0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{461089E7-008E-4737-BA17-E1FCD1CC3D0E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C7CB79F0-1C97-4B33-BFA7-00731B579AE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C7CB79F0-1C97-4B33-BFA7-00731B579AE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C7CB79F0-1C97-4B33-BFA7-00731B579AE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C7CB79F0-1C97-4B33-BFA7-00731B579AE2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E469A9CE-1BEC-423F-AC44-713CD72457EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E469A9CE-1BEC-423F-AC44-713CD72457EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E469A9CE-1BEC-423F-AC44-713CD72457EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E469A9CE-1BEC-423F-AC44-713CD72457EA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{651E1350-91B6-44B7-BD60-7207006D7003}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{651E1350-91B6-44B7-BD60-7207006D7003}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{651E1350-91B6-44B7-BD60-7207006D7003}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{651E1350-91B6-44B7-BD60-7207006D7003}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -113,5 +145,8 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{EBEACECA-DAE3-48EB-BF0D-9A549D5DEEAB} = {A5EACDEF-4EF4-472D-820A-CC865FF98F19}
 		{76B5D06A-C550-4D5B-86DB-6D25DA88E125} = {A5EACDEF-4EF4-472D-820A-CC865FF98F19}
+		{C7CB79F0-1C97-4B33-BFA7-00731B579AE2} = {7F2EEC29-D5A4-46AF-BFB7-E33399F5555E}
+		{E469A9CE-1BEC-423F-AC44-713CD72457EA} = {7F2EEC29-D5A4-46AF-BFB7-E33399F5555E}
+		{651E1350-91B6-44B7-BD60-7207006D7003} = {7F2EEC29-D5A4-46AF-BFB7-E33399F5555E}
 	EndGlobalSection
 EndGlobal