diff --git a/source/Cosmos.sln b/source/Cosmos.sln
index 69e662d8c..577e9ebc9 100644
--- a/source/Cosmos.sln
+++ b/source/Cosmos.sln
@@ -55,8 +55,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.GdbClient", "Cosmos.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GdpClientTester", "GdpClientTester\GdpClientTester.csproj", "{26E45503-4490-4E38-A8C5-14159B25D6D1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Build.Tasks", "Cosmos.Build.Tasks\Cosmos.Build.Tasks.csproj", "{8BF33FB0-243F-47E3-AE52-2C0E01B73200}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Playgrounds", "Playgrounds", "{EBF602FE-8AFC-408D-A9F1-560C35651090}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Demos", "Demos", "{6F91B8C3-1A78-49D7-B915-F13EDFDAFDB3}"
@@ -87,7 +85,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kudzu-UDP", "Boot\Playgroun
 EndProject
 Global
 	GlobalSection(TeamFoundationVersionControl) = preSolution
-		SccNumberOfProjects = 35
+		SccNumberOfProjects = 34
 		SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
 		SccTeamFoundationServer = https://tfs04.codeplex.com/
 		SccLocalPath0 = .
@@ -187,46 +185,42 @@ Global
 		SccProjectTopLevelParentUniqueName24 = Cosmos.sln
 		SccProjectName24 = JoelBTest
 		SccLocalPath24 = JoelBTest
-		SccProjectUniqueName25 = Cosmos.Build.Tasks\\Cosmos.Build.Tasks.csproj
+		SccProjectUniqueName25 = TestKernel\\TestKernel.csproj
 		SccProjectTopLevelParentUniqueName25 = Cosmos.sln
-		SccProjectName25 = Cosmos.Build.Tasks
-		SccLocalPath25 = Cosmos.Build.Tasks
-		SccProjectUniqueName26 = TestKernel\\TestKernel.csproj
+		SccProjectName25 = TestKernel
+		SccLocalPath25 = TestKernel
+		SccProjectUniqueName26 = SteveKernel\\SteveKernel.csproj
 		SccProjectTopLevelParentUniqueName26 = Cosmos.sln
-		SccProjectName26 = TestKernel
-		SccLocalPath26 = TestKernel
-		SccProjectUniqueName27 = SteveKernel\\SteveKernel.csproj
+		SccProjectName26 = SteveKernel
+		SccLocalPath26 = SteveKernel
+		SccProjectUniqueName27 = FrodeTest\\FrodeTest.csproj
 		SccProjectTopLevelParentUniqueName27 = Cosmos.sln
-		SccProjectName27 = SteveKernel
-		SccLocalPath27 = SteveKernel
-		SccProjectUniqueName28 = FrodeTest\\FrodeTest.csproj
+		SccProjectName27 = FrodeTest
+		SccLocalPath27 = FrodeTest
+		SccProjectUniqueName28 = Tests\\MathTest\\Lost\\Lost.csproj
 		SccProjectTopLevelParentUniqueName28 = Cosmos.sln
-		SccProjectName28 = FrodeTest
-		SccLocalPath28 = FrodeTest
-		SccProjectUniqueName29 = Tests\\MathTest\\Lost\\Lost.csproj
+		SccProjectName28 = Tests/MathTest/Lost
+		SccLocalPath28 = Tests\\MathTest\\Lost
+		SccProjectUniqueName29 = Cosmos.Debug\\Cosmos.Debug.csproj
 		SccProjectTopLevelParentUniqueName29 = Cosmos.sln
-		SccProjectName29 = Tests/MathTest/Lost
-		SccLocalPath29 = Tests\\MathTest\\Lost
-		SccProjectUniqueName30 = Cosmos.Debug\\Cosmos.Debug.csproj
+		SccProjectName29 = Cosmos.Debug
+		SccLocalPath29 = Cosmos.Debug
+		SccProjectUniqueName30 = Boot\\KudzuTest\\Kudzu.csproj
 		SccProjectTopLevelParentUniqueName30 = Cosmos.sln
-		SccProjectName30 = Cosmos.Debug
-		SccLocalPath30 = Cosmos.Debug
-		SccProjectUniqueName31 = Boot\\KudzuTest\\Kudzu.csproj
+		SccProjectName30 = Boot/KudzuTest
+		SccLocalPath30 = Boot\\KudzuTest
+		SccProjectUniqueName31 = MohammedTest\\MohammedTest.csproj
 		SccProjectTopLevelParentUniqueName31 = Cosmos.sln
-		SccProjectName31 = Boot/KudzuTest
-		SccLocalPath31 = Boot\\KudzuTest
-		SccProjectUniqueName32 = MohammedTest\\MohammedTest.csproj
+		SccProjectName31 = MohammedTest
+		SccLocalPath31 = MohammedTest
+		SccProjectUniqueName32 = Cosmos.Kernel.FileSystems\\Cosmos.FileSystem.csproj
 		SccProjectTopLevelParentUniqueName32 = Cosmos.sln
-		SccProjectName32 = MohammedTest
-		SccLocalPath32 = MohammedTest
-		SccProjectUniqueName33 = Cosmos.Kernel.FileSystems\\Cosmos.FileSystem.csproj
+		SccProjectName32 = Cosmos.Kernel.FileSystems
+		SccLocalPath32 = Cosmos.Kernel.FileSystems
+		SccProjectUniqueName33 = Boot\\Playgrounds\\Kudzu\u0020UDP\\Kudzu-UDP.csproj
 		SccProjectTopLevelParentUniqueName33 = Cosmos.sln
-		SccProjectName33 = Cosmos.Kernel.FileSystems
-		SccLocalPath33 = Cosmos.Kernel.FileSystems
-		SccProjectUniqueName34 = Boot\\Playgrounds\\Kudzu\u0020UDP\\Kudzu-UDP.csproj
-		SccProjectTopLevelParentUniqueName34 = Cosmos.sln
-		SccProjectName34 = Boot/Playgrounds/Kudzu\u0020UDP
-		SccLocalPath34 = Boot\\Playgrounds\\Kudzu\u0020UDP
+		SccProjectName33 = Boot/Playgrounds/Kudzu\u0020UDP
+		SccLocalPath33 = Boot\\Playgrounds\\Kudzu\u0020UDP
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -320,9 +314,6 @@ Global
 		{26E45503-4490-4E38-A8C5-14159B25D6D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{26E45503-4490-4E38-A8C5-14159B25D6D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{26E45503-4490-4E38-A8C5-14159B25D6D1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8BF33FB0-243F-47E3-AE52-2C0E01B73200}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8BF33FB0-243F-47E3-AE52-2C0E01B73200}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8BF33FB0-243F-47E3-AE52-2C0E01B73200}.Release|Any CPU.Build.0 = Release|Any CPU
 		{605F8D53-66FA-4BEC-844E-F63209B855C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{605F8D53-66FA-4BEC-844E-F63209B855C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{605F8D53-66FA-4BEC-844E-F63209B855C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -396,7 +387,6 @@ Global
 		{C97DE890-58D2-41A1-86D0-A2E919E6DD80} = {6F91B8C3-1A78-49D7-B915-F13EDFDAFDB3}
 		{E4A9F8F0-D0DC-465A-A64A-FE56504D397E} = {6F91B8C3-1A78-49D7-B915-F13EDFDAFDB3}
 		{1F0EDE86-F6D4-4355-9A97-10E90457770C} = {2DE75CE4-7A3B-4659-84FC-16F5EC0AEDE4}
-		{8BF33FB0-243F-47E3-AE52-2C0E01B73200} = {2DE75CE4-7A3B-4659-84FC-16F5EC0AEDE4}
 		{30057B5B-8BEE-4712-8243-9A42DF8A0C76} = {EBF602FE-8AFC-408D-A9F1-560C35651090}
 		{605F8D53-66FA-4BEC-844E-F63209B855C9} = {EBF602FE-8AFC-408D-A9F1-560C35651090}
 		{B69B89D4-54FC-41DF-B5D7-EE674CF60343} = {EBF602FE-8AFC-408D-A9F1-560C35651090}