diff --git a/source2/Build/Cosmos.Build.Builder/App.xaml b/source/Cosmos.Build.Builder/App.xaml
similarity index 100%
rename from source2/Build/Cosmos.Build.Builder/App.xaml
rename to source/Cosmos.Build.Builder/App.xaml
diff --git a/source2/Build/Cosmos.Build.Builder/App.xaml.cs b/source/Cosmos.Build.Builder/App.xaml.cs
similarity index 100%
rename from source2/Build/Cosmos.Build.Builder/App.xaml.cs
rename to source/Cosmos.Build.Builder/App.xaml.cs
diff --git a/source2/Build/Cosmos.Build.Builder/Cosmos.Build.Builder.csproj b/source/Cosmos.Build.Builder/Cosmos.Build.Builder.csproj
similarity index 95%
rename from source2/Build/Cosmos.Build.Builder/Cosmos.Build.Builder.csproj
rename to source/Cosmos.Build.Builder/Cosmos.Build.Builder.csproj
index 089303c12..55f8bd7c1 100644
--- a/source2/Build/Cosmos.Build.Builder/Cosmos.Build.Builder.csproj
+++ b/source/Cosmos.Build.Builder/Cosmos.Build.Builder.csproj
@@ -14,10 +14,14 @@
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
-    <SccProjectName>SAK</SccProjectName>
-    <SccLocalPath>SAK</SccLocalPath>
-    <SccAuxPath>SAK</SccAuxPath>
-    <SccProvider>SAK</SccProvider>
+    <SccProjectName>
+    </SccProjectName>
+    <SccLocalPath>
+    </SccLocalPath>
+    <SccAuxPath>
+    </SccAuxPath>
+    <SccProvider>
+    </SccProvider>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>Cosmos.ico</ApplicationIcon>
diff --git a/source2/Build/Cosmos.Build.Builder/Cosmos.Build.Builder.csproj.vspscc b/source/Cosmos.Build.Builder/Cosmos.Build.Builder.csproj.vspscc
similarity index 100%
rename from source2/Build/Cosmos.Build.Builder/Cosmos.Build.Builder.csproj.vspscc
rename to source/Cosmos.Build.Builder/Cosmos.Build.Builder.csproj.vspscc
diff --git a/source2/Build/Cosmos.Build.Builder/Cosmos.ico b/source/Cosmos.Build.Builder/Cosmos.ico
similarity index 100%
rename from source2/Build/Cosmos.Build.Builder/Cosmos.ico
rename to source/Cosmos.Build.Builder/Cosmos.ico
diff --git a/source2/Build/Cosmos.Build.Builder/CosmosTask.cs b/source/Cosmos.Build.Builder/CosmosTask.cs
similarity index 100%
rename from source2/Build/Cosmos.Build.Builder/CosmosTask.cs
rename to source/Cosmos.Build.Builder/CosmosTask.cs
diff --git a/source2/Build/Cosmos.Build.Builder/MainWindow.xaml b/source/Cosmos.Build.Builder/MainWindow.xaml
similarity index 100%
rename from source2/Build/Cosmos.Build.Builder/MainWindow.xaml
rename to source/Cosmos.Build.Builder/MainWindow.xaml
diff --git a/source2/Build/Cosmos.Build.Builder/MainWindow.xaml.cs b/source/Cosmos.Build.Builder/MainWindow.xaml.cs
similarity index 100%
rename from source2/Build/Cosmos.Build.Builder/MainWindow.xaml.cs
rename to source/Cosmos.Build.Builder/MainWindow.xaml.cs
diff --git a/source2/Build/Cosmos.Build.Builder/Properties/AssemblyInfo.cs b/source/Cosmos.Build.Builder/Properties/AssemblyInfo.cs
similarity index 100%
rename from source2/Build/Cosmos.Build.Builder/Properties/AssemblyInfo.cs
rename to source/Cosmos.Build.Builder/Properties/AssemblyInfo.cs
diff --git a/source2/Build/Cosmos.Build.Builder/Properties/Resources.Designer.cs b/source/Cosmos.Build.Builder/Properties/Resources.Designer.cs
similarity index 100%
rename from source2/Build/Cosmos.Build.Builder/Properties/Resources.Designer.cs
rename to source/Cosmos.Build.Builder/Properties/Resources.Designer.cs
diff --git a/source2/Build/Cosmos.Build.Builder/Properties/Resources.resx b/source/Cosmos.Build.Builder/Properties/Resources.resx
similarity index 100%
rename from source2/Build/Cosmos.Build.Builder/Properties/Resources.resx
rename to source/Cosmos.Build.Builder/Properties/Resources.resx
diff --git a/source2/Build/Cosmos.Build.Builder/Properties/Settings.Designer.cs b/source/Cosmos.Build.Builder/Properties/Settings.Designer.cs
similarity index 100%
rename from source2/Build/Cosmos.Build.Builder/Properties/Settings.Designer.cs
rename to source/Cosmos.Build.Builder/Properties/Settings.Designer.cs
diff --git a/source2/Build/Cosmos.Build.Builder/Properties/Settings.settings b/source/Cosmos.Build.Builder/Properties/Settings.settings
similarity index 100%
rename from source2/Build/Cosmos.Build.Builder/Properties/Settings.settings
rename to source/Cosmos.Build.Builder/Properties/Settings.settings
diff --git a/source2/Build/Cosmos.Build.Builder/app.config b/source/Cosmos.Build.Builder/app.config
similarity index 100%
rename from source2/Build/Cosmos.Build.Builder/app.config
rename to source/Cosmos.Build.Builder/app.config
diff --git a/source2/Build/Cosmos.Build.Installer/Cosmos.Build.Installer.csproj b/source/Cosmos.Build.Installer/Cosmos.Build.Installer.csproj
similarity index 91%
rename from source2/Build/Cosmos.Build.Installer/Cosmos.Build.Installer.csproj
rename to source/Cosmos.Build.Installer/Cosmos.Build.Installer.csproj
index cd1af6fdf..8288e0af1 100644
--- a/source2/Build/Cosmos.Build.Installer/Cosmos.Build.Installer.csproj
+++ b/source/Cosmos.Build.Installer/Cosmos.Build.Installer.csproj
@@ -12,10 +12,14 @@
     <AssemblyName>Cosmos.Build.Installer</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <SccProjectName>SAK</SccProjectName>
-    <SccLocalPath>SAK</SccLocalPath>
-    <SccAuxPath>SAK</SccAuxPath>
-    <SccProvider>SAK</SccProvider>
+    <SccProjectName>
+    </SccProjectName>
+    <SccLocalPath>
+    </SccLocalPath>
+    <SccAuxPath>
+    </SccAuxPath>
+    <SccProvider>
+    </SccProvider>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/source2/Build/Cosmos.Build.Installer/Cosmos.Build.Installer.csproj.vspscc b/source/Cosmos.Build.Installer/Cosmos.Build.Installer.csproj.vspscc
similarity index 100%
rename from source2/Build/Cosmos.Build.Installer/Cosmos.Build.Installer.csproj.vspscc
rename to source/Cosmos.Build.Installer/Cosmos.Build.Installer.csproj.vspscc
diff --git a/source2/Build/Cosmos.Build.Installer/Global.cs b/source/Cosmos.Build.Installer/Global.cs
similarity index 100%
rename from source2/Build/Cosmos.Build.Installer/Global.cs
rename to source/Cosmos.Build.Installer/Global.cs
diff --git a/source2/Build/Cosmos.Build.Installer/Log.cs b/source/Cosmos.Build.Installer/Log.cs
similarity index 100%
rename from source2/Build/Cosmos.Build.Installer/Log.cs
rename to source/Cosmos.Build.Installer/Log.cs
diff --git a/source2/Build/Cosmos.Build.Installer/Paths.cs b/source/Cosmos.Build.Installer/Paths.cs
similarity index 100%
rename from source2/Build/Cosmos.Build.Installer/Paths.cs
rename to source/Cosmos.Build.Installer/Paths.cs
diff --git a/source2/Build/Cosmos.Build.Installer/Properties/AssemblyInfo.cs b/source/Cosmos.Build.Installer/Properties/AssemblyInfo.cs
similarity index 100%
rename from source2/Build/Cosmos.Build.Installer/Properties/AssemblyInfo.cs
rename to source/Cosmos.Build.Installer/Properties/AssemblyInfo.cs
diff --git a/source2/Build/Cosmos.Build.Installer/Task.cs b/source/Cosmos.Build.Installer/Task.cs
similarity index 100%
rename from source2/Build/Cosmos.Build.Installer/Task.cs
rename to source/Cosmos.Build.Installer/Task.cs
diff --git a/source2/Builder.sln b/source2/Builder.sln
index ec529fc0b..5128b0e1e 100644
--- a/source2/Builder.sln
+++ b/source2/Builder.sln
@@ -1,23 +1,13 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
+VisualStudioVersion = 12.0.21005.1
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Build.Builder", "Build\Cosmos.Build.Builder\Cosmos.Build.Builder.csproj", "{74A9329A-2B0B-4C0A-976C-E4FB7228D8B2}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Build.Installer", "Build\Cosmos.Build.Installer\Cosmos.Build.Installer.csproj", "{27D94586-FE88-4203-BE6A-C99013FD5018}"
 EndProject
 Global
-	GlobalSection(TeamFoundationVersionControl) = preSolution
-		SccNumberOfProjects = 3
-		SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
-		SccTeamFoundationServer = https://tfs.codeplex.com/tfs/tfs04
-		SccLocalPath0 = .
-		SccProjectUniqueName1 = Build\\Cosmos.Build.Builder\\Cosmos.Build.Builder.csproj
-		SccProjectName1 = Build/Cosmos.Build.Builder
-		SccLocalPath1 = Build\\Cosmos.Build.Builder
-		SccProjectUniqueName2 = Build\\Cosmos.Build.Installer\\Cosmos.Build.Installer.csproj
-		SccProjectName2 = Build/Cosmos.Build.Installer
-		SccLocalPath2 = Build\\Cosmos.Build.Installer
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|Mixed Platforms = Debug|Mixed Platforms