From 26b997da5fc18100638f98549c50e495ae4f39ab Mon Sep 17 00:00:00 2001
From: mterwoord_cp <7cd3fd84a0151ea055c2f79e4d2eef9576fe9afesxUZAwxD>
Date: Sun, 22 Aug 2010 06:39:58 +0000
Subject: [PATCH]

---
 Build/VSIP/install.bat                        | 13 ++-
 Setup2/BuildUserKit.bat                       | 12 ++-
 Setup2/Code.inc                               | 18 -----
 Setup2/Cosmos.iss                             |  4 +-
 source/Cosmos.sln                             |  8 +-
 .../Kudzu/Breakpoints/Breakpoints.Cosmos      | 16 ++--
 .../Breakpoints/BreakpointsKernel.csproj      |  7 +-
 .../Cosmos.VS.Package.csproj                  | 36 ---------
 .../Templates/CosmosProject.Cosmos            | 42 ----------
 .../Templates/GenerateCosmosProjectWizard.cs  | 79 -------------------
 .../Templates/GenerateGuidsWizard.cs          | 44 -----------
 .../Projects/Cosmos/CosmosProject.Cosmos      |  4 +-
 .../CosmosKernel (C#)/CSharpProject.csproj    |  8 +-
 .../Projects/CosmosKernel (C#)/Kernel.cs      | 20 ++---
 .../CosmosProject (C#)/CSharpProject.csproj   |  8 +-
 .../Projects/CosmosProject (C#)/Kernel.cs     | 20 ++---
 .../Templates/UseGuidsWizard.cs               | 41 ----------
 .../Cosmos.VS.Wizards/CosmosProject.Cosmos    |  4 +
 18 files changed, 66 insertions(+), 318 deletions(-)
 delete mode 100644 source2/VSIP/Cosmos.VS.Package/Templates/CosmosProject.Cosmos
 delete mode 100644 source2/VSIP/Cosmos.VS.Package/Templates/GenerateCosmosProjectWizard.cs
 delete mode 100644 source2/VSIP/Cosmos.VS.Package/Templates/GenerateGuidsWizard.cs
 delete mode 100644 source2/VSIP/Cosmos.VS.Package/Templates/UseGuidsWizard.cs

diff --git a/Build/VSIP/install.bat b/Build/VSIP/install.bat
index 48c1eba42..0baa6b08e 100644
--- a/Build/VSIP/install.bat
+++ b/Build/VSIP/install.bat
@@ -41,9 +41,16 @@ REM xcopy /Y ..\..\source2\Compiler\Cosmos.Compiler.DebugStub\bin\debug\Cosmos.C
 REM xcopy /Y ..\..\source2\Compiler\Cosmos.Compiler.XSharp\bin\debug\Cosmos.Compiler.XSharp.* .
 
 REM Copy templates
-xcopy /Y "..\..\source2\VSIP\Cosmos.VS.Package\obj\x86\Debug\CosmosProject (C#).zip" .
-xcopy /Y "..\..\source2\VSIP\Cosmos.VS.Package\obj\x86\Debug\CosmosKernel (C#).zip" .
-xcopy /Y "..\..\source2\VSIP\Cosmos.VS.Package\obj\Debug\Cosmos.zip" .
+IF EXIST "..\..\source2\VSIP\Cosmos.VS.Package\obj\x86\Debug\CosmosProject (C#).zip" (
+	xcopy /Y "..\..\source2\VSIP\Cosmos.VS.Package\obj\x86\Debug\CosmosProject (C#).zip" .
+	xcopy /Y "..\..\source2\VSIP\Cosmos.VS.Package\obj\x86\Debug\CosmosKernel (C#).zip" .
+	xcopy /Y "..\..\source2\VSIP\Cosmos.VS.Package\obj\x86\Debug\Cosmos.zip" .
+) ELSE (
+	xcopy /Y "..\..\source2\VSIP\Cosmos.VS.Package\obj\Debug\CosmosProject (C#).zip" .
+	xcopy /Y "..\..\source2\VSIP\Cosmos.VS.Package\obj\Debug\CosmosKernel (C#).zip" .
+	xcopy /Y "..\..\source2\VSIP\Cosmos.VS.Package\obj\Debug\Cosmos.zip" .
+)
+
 
 echo .
 echo .
diff --git a/Setup2/BuildUserKit.bat b/Setup2/BuildUserKit.bat
index 3ffba4e01..e09b6ffa9 100644
--- a/Setup2/BuildUserKit.bat
+++ b/Setup2/BuildUserKit.bat
@@ -48,9 +48,15 @@ REM xcopy /Y ..\..\source2\Compiler\Cosmos.Compiler.DebugStub\bin\debug\Cosmos.C
 REM xcopy /Y ..\..\source2\Compiler\Cosmos.Compiler.XSharp\bin\debug\Cosmos.Compiler.XSharp.* .
 
 REM Copy templates
-xcopy /Y "..\..\source2\VSIP\Cosmos.VS.Package\obj\x86\Debug\CosmosProject (C#).zip" .
-xcopy /Y "..\..\source2\VSIP\Cosmos.VS.Package\obj\x86\Debug\CosmosKernel (C#).zip" .
-xcopy /Y "..\..\source2\VSIP\Cosmos.VS.Package\obj\Debug\Cosmos.zip" .
+IF EXIST "..\..\source2\VSIP\Cosmos.VS.Package\obj\x86\Debug\CosmosProject (C#).zip" (
+	xcopy /Y "..\..\source2\VSIP\Cosmos.VS.Package\obj\x86\Debug\CosmosProject (C#).zip" .
+	xcopy /Y "..\..\source2\VSIP\Cosmos.VS.Package\obj\x86\Debug\CosmosKernel (C#).zip" .
+	xcopy /Y "..\..\source2\VSIP\Cosmos.VS.Package\obj\x86\Debug\Cosmos.zip" .
+) ELSE (
+	xcopy /Y "..\..\source2\VSIP\Cosmos.VS.Package\obj\Debug\CosmosProject (C#).zip" .
+	xcopy /Y "..\..\source2\VSIP\Cosmos.VS.Package\obj\Debug\CosmosKernel (C#).zip" .
+	xcopy /Y "..\..\source2\VSIP\Cosmos.VS.Package\obj\Debug\Cosmos.zip" .
+)
 
 echo . 
 echo .
diff --git a/Setup2/Code.inc b/Setup2/Code.inc
index 0e2a16ae0..4e77c14e2 100644
--- a/Setup2/Code.inc
+++ b/Setup2/Code.inc
@@ -256,24 +256,6 @@ begin
 	Result := __VBExpress2008ProjectTEmplatePath;
 end;
 
-function PrepareToInstall(var NeedsRestart: Boolean): String;
-var
-	FullPath: string;
-	ReturnCode: Integer;
-begin
-	ExtractTemporaryFile('InstallCleaner.exe');
-	FullPath := ExpandConstant('{tmp}\InstallCleaner.exe');
-	if not Exec(FullPath, '', '', SW_SHOW, ewWaitUntilTerminated, ReturnCode) then
-		Result := Format('Error running cleanup utility (Exec returned false, ReturnCode contains %d)', [ReturnCode])
-	else 
-	begin
-		if ReturnCode <> 0 then
-			Result := Format('Error running cleanup utility (ReturnCode %d)', [ReturnCode])
-		else
-			Result := '';
-	end;
-end;
-
 function InitializeSetup: Boolean;
 begin
   if not VSNET2008 then begin
diff --git a/Setup2/Cosmos.iss b/Setup2/Cosmos.iss
index 669443bd6..135216624 100644
--- a/Setup2/Cosmos.iss
+++ b/Setup2/Cosmos.iss
@@ -135,13 +135,13 @@ Name: {code:VSNET2008_PATH|}\ProjectTemplates\Cosmos; Flags: uninsalwaysuninstal
 Name: {app}; Flags: uninsalwaysuninstall
 
 [InstallDelete]
+Type: files; Name: "{code:VSNET2008_PATH|}\PrivateAssemblies\Cosmos.*";
 Type: filesandordirs; Name: "{code:VSNET2008_PATH|}\ProjectTemplates\Cosmos";
 Type: filesandordirs; Name: "{code:GetCSHarpExpress2008ProjectTemplatePath|}\*Cosmos*.*"; Check: IsCSharpExpress2008Installed('dummy') and (not csharp2008_Installed('dummy'))
 
 
 
 [Files]
-Source: .\Build\VSIP\InstallCleaner.exe; DestDir: {app}; Flags: dontcopy
 ; Tools
 Source: .\Build\Tools\*.exe; DestDir: {app}\Build\Tools; Flags: ignoreversion uninsremovereadonly
 Source: .\Build\Tools\NAsm\*.exe; DestDir: {app}\Build\Tools\NAsm; Flags: ignoreversion uninsremovereadonly
@@ -165,7 +165,7 @@ Source: .\Build\VSIP\corapi.*; DestDir: {app}\Build\VSIP\; Flags: ignoreversion
 Source: .\Build\VSIP\raw.*; DestDir: {app}\Build\VSIP\; Flags: ignoreversion uninsremovereadonly
 
 ; wizards
-Source: .\source2\VSIP\Cosmos.VS.Wizards\bin\Debug\Cosmos.VS.Wizards.*; DestDir: {code:VSNET2008_PATH|}\PrivateAssemblies; Flags: ignoreversion uninsremovereadonly
+Source: .\Build\VSIP\Cosmos.VS.Wizards.*; DestDir: {code:VSNET2008_PATH|}\PrivateAssemblies; Flags: ignoreversion uninsremovereadonly
 
 Source: .\Build\ISO\isolinux.*; DestDir: {app}\Build\ISO
 Source: .\Build\ISO\mboot.c32; DestDir: {app}\Build\ISO
diff --git a/source/Cosmos.sln b/source/Cosmos.sln
index 1bf8652e7..d675d1619 100644
--- a/source/Cosmos.sln
+++ b/source/Cosmos.sln
@@ -114,6 +114,7 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Docs", "..\Docs", "{67E7DEF
 		Release.AspNetCompiler.ForceOverwrite = "true"
 		Release.AspNetCompiler.FixedNames = "false"
 		Release.AspNetCompiler.Debug = "False"
+		VWDPort = "24703"
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Compiler.Debug", "..\source2\IL2PCU\Cosmos.IL2CPU.Debug\Cosmos.Compiler.Debug.csproj", "{9998B4EA-385E-4DA2-8905-2BBEB5B2C6E2}"
@@ -366,37 +367,31 @@ Global
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{CE50FE98-9AC4-4B4D-ADC7-31F6DCD28755}.Bootstrap|x86.ActiveCfg = Debug|x86
-		{CE50FE98-9AC4-4B4D-ADC7-31F6DCD28755}.Bootstrap|x86.Build.0 = Debug|x86
 		{CE50FE98-9AC4-4B4D-ADC7-31F6DCD28755}.Debug|x86.ActiveCfg = Debug|x86
 		{CE50FE98-9AC4-4B4D-ADC7-31F6DCD28755}.Debug|x86.Build.0 = Debug|x86
 		{CE50FE98-9AC4-4B4D-ADC7-31F6DCD28755}.Release|x86.ActiveCfg = Release|x86
 		{CE50FE98-9AC4-4B4D-ADC7-31F6DCD28755}.Release|x86.Build.0 = Release|x86
 		{B168BEDD-C6A6-4E7C-B9A5-0144286E9E42}.Bootstrap|x86.ActiveCfg = Debug|x86
-		{B168BEDD-C6A6-4E7C-B9A5-0144286E9E42}.Bootstrap|x86.Build.0 = Debug|x86
 		{B168BEDD-C6A6-4E7C-B9A5-0144286E9E42}.Debug|x86.ActiveCfg = Debug|x86
 		{B168BEDD-C6A6-4E7C-B9A5-0144286E9E42}.Debug|x86.Build.0 = Debug|x86
 		{B168BEDD-C6A6-4E7C-B9A5-0144286E9E42}.Release|x86.ActiveCfg = Release|x86
 		{B168BEDD-C6A6-4E7C-B9A5-0144286E9E42}.Release|x86.Build.0 = Release|x86
 		{A1F83D9F-2D44-4264-A08B-416797123018}.Bootstrap|x86.ActiveCfg = Debug|x86
-		{A1F83D9F-2D44-4264-A08B-416797123018}.Bootstrap|x86.Build.0 = Debug|x86
 		{A1F83D9F-2D44-4264-A08B-416797123018}.Debug|x86.ActiveCfg = Debug|x86
 		{A1F83D9F-2D44-4264-A08B-416797123018}.Debug|x86.Build.0 = Debug|x86
 		{A1F83D9F-2D44-4264-A08B-416797123018}.Release|x86.ActiveCfg = Release|x86
 		{A1F83D9F-2D44-4264-A08B-416797123018}.Release|x86.Build.0 = Release|x86
 		{5C293BB9-FB42-495E-AAD9-D15888631CA4}.Bootstrap|x86.ActiveCfg = Debug|x86
-		{5C293BB9-FB42-495E-AAD9-D15888631CA4}.Bootstrap|x86.Build.0 = Debug|x86
 		{5C293BB9-FB42-495E-AAD9-D15888631CA4}.Debug|x86.ActiveCfg = Debug|x86
 		{5C293BB9-FB42-495E-AAD9-D15888631CA4}.Debug|x86.Build.0 = Debug|x86
 		{5C293BB9-FB42-495E-AAD9-D15888631CA4}.Release|x86.ActiveCfg = Release|x86
 		{5C293BB9-FB42-495E-AAD9-D15888631CA4}.Release|x86.Build.0 = Release|x86
 		{819DB8FC-5DA1-461F-83C9-2F5C88088C94}.Bootstrap|x86.ActiveCfg = Debug|x86
-		{819DB8FC-5DA1-461F-83C9-2F5C88088C94}.Bootstrap|x86.Build.0 = Debug|x86
 		{819DB8FC-5DA1-461F-83C9-2F5C88088C94}.Debug|x86.ActiveCfg = Debug|x86
 		{819DB8FC-5DA1-461F-83C9-2F5C88088C94}.Debug|x86.Build.0 = Debug|x86
 		{819DB8FC-5DA1-461F-83C9-2F5C88088C94}.Release|x86.ActiveCfg = Release|x86
 		{819DB8FC-5DA1-461F-83C9-2F5C88088C94}.Release|x86.Build.0 = Release|x86
 		{6110AD07-EB07-4A99-BB73-7A69AF5732F1}.Bootstrap|x86.ActiveCfg = Debug|x86
-		{6110AD07-EB07-4A99-BB73-7A69AF5732F1}.Bootstrap|x86.Build.0 = Debug|x86
 		{6110AD07-EB07-4A99-BB73-7A69AF5732F1}.Debug|x86.ActiveCfg = Debug|x86
 		{6110AD07-EB07-4A99-BB73-7A69AF5732F1}.Debug|x86.Build.0 = Debug|x86
 		{6110AD07-EB07-4A99-BB73-7A69AF5732F1}.Release|x86.ActiveCfg = Release|x86
@@ -444,7 +439,6 @@ Global
 		{63F7BFB9-419E-4965-B580-304B9C9FA7D8}.Release|x86.ActiveCfg = Release|x86
 		{63F7BFB9-419E-4965-B580-304B9C9FA7D8}.Release|x86.Build.0 = Release|x86
 		{B2F76E27-EAE1-4ECF-8A33-77B2CFBB9367}.Bootstrap|x86.ActiveCfg = Debug|x86
-		{B2F76E27-EAE1-4ECF-8A33-77B2CFBB9367}.Bootstrap|x86.Build.0 = Debug|x86
 		{B2F76E27-EAE1-4ECF-8A33-77B2CFBB9367}.Debug|x86.ActiveCfg = Debug|x86
 		{B2F76E27-EAE1-4ECF-8A33-77B2CFBB9367}.Debug|x86.Build.0 = Debug|x86
 		{B2F76E27-EAE1-4ECF-8A33-77B2CFBB9367}.Release|x86.ActiveCfg = Release|x86
diff --git a/source2/Users/Kudzu/Breakpoints/Breakpoints.Cosmos b/source2/Users/Kudzu/Breakpoints/Breakpoints.Cosmos
index 205ffa12b..3de6e7b28 100644
--- a/source2/Users/Kudzu/Breakpoints/Breakpoints.Cosmos
+++ b/source2/Users/Kudzu/Breakpoints/Breakpoints.Cosmos
@@ -49,16 +49,6 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Kernel\Debug\Cosmos.Debug.Kernel.Plugs\Cosmos.Debug.Kernel.Plugs.csproj">
-      <Name>Cosmos.Debug.Kernel.Plugs</Name>
-      <Project>{b97a2956-c363-47f2-a6aa-b4fccff4d315}</Project>
-      <Private>True</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Kernel\System\Hardware\Core\Cosmos.Core.Plugs\Cosmos.Core.Plugs.csproj">
-      <Name>Cosmos.Core.Plugs</Name>
-      <Project>{d9a87aad-fcc9-4517-b31d-e904dad00784}</Project>
-      <Private>True</Private>
-    </ProjectReference>
     <ProjectReference Include="..\Breakpoints\BreakpointsKernel.csproj">
       <Name>BreakpointsKernel</Name>
       <Project>{91cbd640-c07d-4556-b4cb-6f8cd88c67c9}</Project>
@@ -66,6 +56,12 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="Cosmos.Core.Plugs, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983">
+      <Name>Cosmos.Core.Plugs</Name>
+      <AssemblyName>Cosmos.Core.Plugs.dll</AssemblyName>
+      <HintPath>..\..\..\..\..\..\..\..\Users\matthijs\AppData\Roaming\Cosmos User Kit\Kernel\Cosmos.Core.Plugs.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Cosmos.System.Plugs.System, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983">
       <Name>Cosmos.System.Plugs.System</Name>
       <AssemblyName>Cosmos.System.Plugs.System.dll</AssemblyName>
diff --git a/source2/Users/Kudzu/Breakpoints/BreakpointsKernel.csproj b/source2/Users/Kudzu/Breakpoints/BreakpointsKernel.csproj
index 93f485aab..a9145826b 100644
--- a/source2/Users/Kudzu/Breakpoints/BreakpointsKernel.csproj
+++ b/source2/Users/Kudzu/Breakpoints/BreakpointsKernel.csproj
@@ -39,6 +39,7 @@
   <ItemGroup>
     <Reference Include="Cosmos.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983, processorArchitecture=MSIL" />
     <Reference Include="Cosmos.Hardware, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983, processorArchitecture=MSIL" />
+    <Reference Include="Cosmos.System, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983, processorArchitecture=MSIL" />
     <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
@@ -46,12 +47,6 @@
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\Kernel\System\Cosmos.System\Cosmos.System.csproj">
-      <Project>{DA50B9B2-0E95-4F0D-A3C8-79FC549301B5}</Project>
-      <Name>Cosmos.System</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\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/source2/VSIP/Cosmos.VS.Package/Cosmos.VS.Package.csproj b/source2/VSIP/Cosmos.VS.Package/Cosmos.VS.Package.csproj
index 185cec4fb..8aea504bb 100644
--- a/source2/VSIP/Cosmos.VS.Package/Cosmos.VS.Package.csproj
+++ b/source2/VSIP/Cosmos.VS.Package/Cosmos.VS.Package.csproj
@@ -130,9 +130,6 @@
     <Compile Include="SubPropertyPageBase.Designer.cs">
       <DependentUpon>SubPropertyPageBase.cs</DependentUpon>
     </Compile>
-    <Compile Include="Templates\GenerateCosmosProjectWizard.cs" />
-    <Compile Include="Templates\GenerateGuidsWizard.cs" />
-    <Compile Include="Templates\UseGuidsWizard.cs" />
     <Compile Include="TitleDivision.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -242,7 +239,6 @@
     <ZipItem Include="Templates\Projects\Cosmos\Cosmos.vstemplate">
       <RootPath>Templates\Projects\Cosmos</RootPath>
     </ZipItem>
-    <EmbeddedResource Include="Templates\CosmosProject.Cosmos" />
     <None Include="Templates\Projects\CosmosProject %28C#%29\Proj\CosmosProj.vstemplate">
       <RootPath>Templates\Projects\CosmosProject %28C#%29</RootPath>
     </None>
@@ -282,30 +278,6 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\source\Cosmos.Kernel.FileSystems\Cosmos.Sys.FileSystem.csproj">
-      <Project>{5C293BB9-FB42-495E-AAD9-D15888631CA4}</Project>
-      <Name>Cosmos.Sys.FileSystem</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\source\Cosmos\Cosmos.Hardware\Cosmos.Hardware2.csproj">
-      <Project>{CE50FE98-9AC4-4B4D-ADC7-31F6DCD28755}</Project>
-      <Name>Cosmos.Hardware2</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\source\Cosmos\Cosmos.Kernel.Plugs\Cosmos.Kernel.Plugs.csproj">
-      <Project>{B168BEDD-C6A6-4E7C-B9A5-0144286E9E42}</Project>
-      <Name>Cosmos.Kernel.Plugs</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\source\Cosmos\Cosmos.Kernel\Cosmos.Kernel.csproj">
-      <Project>{A1F83D9F-2D44-4264-A08B-416797123018}</Project>
-      <Name>Cosmos.Kernel</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\source\Cosmos\Cosmos.Sys.Plugs\Cosmos.Sys.Plugs.csproj">
-      <Project>{6110AD07-EB07-4A99-BB73-7A69AF5732F1}</Project>
-      <Name>Cosmos.Sys.Plugs</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\source\Cosmos\Cosmos.System\Cosmos.Sys.csproj">
-      <Project>{819DB8FC-5DA1-461F-83C9-2F5C88088C94}</Project>
-      <Name>Cosmos.Sys</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\Build\Cosmos.Build.Common\Cosmos.Build.Common.csproj">
       <Project>{0462E82B-8C29-41A9-8265-9C89038ADB29}</Project>
       <Name>Cosmos.Build.Common</Name>
@@ -322,14 +294,6 @@
       <Project>{6D2688FE-6FD8-44A8-B96A-6037457F72A7}</Project>
       <Name>Cosmos.Debug.VSDebugEngine</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\IL2PCU\Cosmos.IL2CPU.X86\Cosmos.IL2CPU.X86.csproj">
-      <Project>{63F7BFB9-419E-4965-B580-304B9C9FA7D8}</Project>
-      <Name>Cosmos.IL2CPU.X86</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\IL2PCU\Cosmos.IL2CPU\Cosmos.IL2CPU.csproj">
-      <Project>{239E33A7-F0C3-4801-85CA-4D8F89A31DC0}</Project>
-      <Name>Cosmos.IL2CPU</Name>
-    </ProjectReference>
   </ItemGroup>
   <PropertyGroup>
     <!--
diff --git a/source2/VSIP/Cosmos.VS.Package/Templates/CosmosProject.Cosmos b/source2/VSIP/Cosmos.VS.Package/Templates/CosmosProject.Cosmos
deleted file mode 100644
index 5c7fcde7d..000000000
--- a/source2/VSIP/Cosmos.VS.Package/Templates/CosmosProject.Cosmos
+++ /dev/null
@@ -1,42 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <PropertyGroup>
-        <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-        <SchemaVersion>2.0</SchemaVersion>
-        <ProjectGuid>$CosmosProjGuid$</ProjectGuid>
-        <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
-        <Name>$CosmosProjectName$</Name>
-        <BinFormat>elf</BinFormat>
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-        <DebugSymbols>true</DebugSymbols>
-        <OutputPath>bin\Debug\</OutputPath>
-        <Framework>MicrosoftNET</Framework>
-        <UseInternalAssembler>False</UseInternalAssembler>
-        <EnableGDB>False</EnableGDB>
-        <DebugMode>Source</DebugMode>
-        <TraceMode>User</TraceMode>
-        <BuildTarget>VMWare</BuildTarget>
-        <VMWareFlavor>Player</VMWareFlavor>
-        <StartCosmosGDB>false</StartCosmosGDB>
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-        <DebugSymbols>true</DebugSymbols>
-        <OutputPath>bin\Release\</OutputPath>
-        <Framework>MicrosoftNET</Framework>
-        <UseInternalAssembler>False</UseInternalAssembler>
-        <EnableGDB>False</EnableGDB>
-        <DebugMode>Source</DebugMode>
-        <TraceMode>User</TraceMode>
-        <BuildTarget>VMWare</BuildTarget>
-        <VMWareFlavor>Player</VMWareFlavor>
-        <StartCosmosGDB>false</StartCosmosGDB>
-    </PropertyGroup>
-    <ItemGroup>
-        <ProjectReference Include=".\$KernelName$.csproj">
-            <Name>$KernelName$</Name>
-            <Project>$KernelGuid$</Project>
-        </ProjectReference>
-    </ItemGroup>
-
-    <Import Project="$(MSBuildExtensionsPath)\Cosmos\Cosmos.targets" />
-</Project>
\ No newline at end of file
diff --git a/source2/VSIP/Cosmos.VS.Package/Templates/GenerateCosmosProjectWizard.cs b/source2/VSIP/Cosmos.VS.Package/Templates/GenerateCosmosProjectWizard.cs
deleted file mode 100644
index e4404cce3..000000000
--- a/source2/VSIP/Cosmos.VS.Package/Templates/GenerateCosmosProjectWizard.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Microsoft.VisualStudio.TemplateWizard;
-using System.Windows.Forms;
-using System.IO;
-
-namespace Cosmos.VS.Package.Templates
-{
-    public class GenerateCosmosProjectWizard: IWizard
-    {
-        public void BeforeOpeningFile(EnvDTE.ProjectItem projectItem)
-        {
-        }
-
-        private static string GetTemplateString()
-        {
-            var xAsm = typeof(GenerateCosmosProjectWizard).Assembly;
-            using (var xStream = xAsm.GetManifestResourceStream(typeof(GenerateCosmosProjectWizard), "CosmosProject.Cosmos"))
-            {
-                if (xStream == null)
-                {
-                    MessageBox.Show("Could not find template manifest stream!");
-                    return null;
-                }
-                using (var xReader = new StreamReader(xStream))
-                {
-                    return xReader.ReadToEnd();
-                }
-            }
-        }
-
-        public void ProjectFinishedGenerating(EnvDTE.Project project)
-        {
-            //project.DTE.Solution
-            var xInputString = GetTemplateString();
-            if (xInputString == null)
-            {
-                return;
-            }
-
-            xInputString = xInputString.Replace("$KernelGuid$", mGuidKernel.ToString("b"));
-            xInputString = xInputString.Replace("$CosmosProjGuid$", mGuidCosmosProj.ToString("b"));
-            xInputString = xInputString.Replace("$KernelName$", project.Name);
-            xInputString = xInputString.Replace("$CosmosProjectName$", project.Name + "Boot");
-            var xFilename = Path.GetDirectoryName(project.FullName);
-            xFilename = Path.Combine(xFilename, project.Name + "Boot");
-            xFilename += ".Cosmos";
-            File.WriteAllText(xFilename, xInputString);
-            project.DTE.Solution.AddFromFile(xFilename, false);
-        }
-
-        public void ProjectItemFinishedGenerating(EnvDTE.ProjectItem projectItem)
-        {
-        }
-
-        public void RunFinished()
-        {
-        }
-
-        private Guid mGuidKernel;
-        private Guid mGuidCosmosProj;
-
-        public void RunStarted(object automationObject, Dictionary<string, string> replacementsDictionary, WizardRunKind runKind, object[] customParams)
-        {
-            mGuidKernel = Guid.NewGuid();
-            mGuidCosmosProj = Guid.NewGuid();
-            replacementsDictionary.Add("$KernelGuid$", mGuidKernel.ToString("B"));
-            replacementsDictionary.Add("$CosmosProjGuid$", mGuidCosmosProj.ToString("B"));
-
-        }
-
-        public bool ShouldAddProjectItem(string filePath)
-        {
-            return true;
-        }
-    }
-}
diff --git a/source2/VSIP/Cosmos.VS.Package/Templates/GenerateGuidsWizard.cs b/source2/VSIP/Cosmos.VS.Package/Templates/GenerateGuidsWizard.cs
deleted file mode 100644
index 13a38bc3a..000000000
--- a/source2/VSIP/Cosmos.VS.Package/Templates/GenerateGuidsWizard.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Microsoft.VisualStudio.TemplateWizard;
-
-namespace Cosmos.VS.Package.Templates.Wizards
-{
-    public class GenerateGuidsWizard: IWizard
-    {
-        public static Guid? Guid1 = null;
-        public static Guid? Guid2 = null;
-
-        public void BeforeOpeningFile(EnvDTE.ProjectItem projectItem)
-        {
-        }
-
-        public void ProjectFinishedGenerating(EnvDTE.Project project)
-        {
-        }
-
-        public void ProjectItemFinishedGenerating(EnvDTE.ProjectItem projectItem)
-        {
-        }
-
-        public void RunFinished()
-        {
-        }
-
-        public void RunStarted(object automationObject, Dictionary<string, string> replacementsDictionary, WizardRunKind runKind, object[] customParams)
-        {
-            Guid1 = Guid.NewGuid();
-            Guid2 = Guid.NewGuid();
-            replacementsDictionary.Add("$GeneratedGuid1$", GenerateGuidsWizard.Guid1.Value.ToString("B"));
-            replacementsDictionary.Add("$GeneratedGuid2$", GenerateGuidsWizard.Guid2.Value.ToString("B"));
-
-        }
-
-        public bool ShouldAddProjectItem(string filePath)
-        {
-            return true;
-        }
-    }
-}
diff --git a/source2/VSIP/Cosmos.VS.Package/Templates/Projects/Cosmos/CosmosProject.Cosmos b/source2/VSIP/Cosmos.VS.Package/Templates/Projects/Cosmos/CosmosProject.Cosmos
index f6c88aaba..a46fbc2b0 100644
--- a/source2/VSIP/Cosmos.VS.Package/Templates/Projects/Cosmos/CosmosProject.Cosmos
+++ b/source2/VSIP/Cosmos.VS.Package/Templates/Projects/Cosmos/CosmosProject.Cosmos
@@ -25,13 +25,15 @@
         <Framework>MicrosoftNET</Framework>
         <UseInternalAssembler>False</UseInternalAssembler>
         <EnableGDB>False</EnableGDB>
-        <DebugMode>Source</DebugMode>
+        <DebugMode>None</DebugMode>
         <TraceMode>User</TraceMode>
         <BuildTarget>VMWare</BuildTarget>
         <VMWareFlavor>Player</VMWareFlavor>
         <StartCosmosGDB>false</StartCosmosGDB>
     </PropertyGroup>
     <ItemGroup>
+        <Reference Include="Cosmos.Core.Plugs, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983"/>
+        <Reference Include="Cosmos.System.Plugs.System, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983"/>
     </ItemGroup>
 
     <Import Project="$(MSBuildExtensionsPath)\Cosmos\Cosmos.targets" />
diff --git a/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosKernel (C#)/CSharpProject.csproj b/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosKernel (C#)/CSharpProject.csproj
index d2671f664..407f26915 100644
--- a/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosKernel (C#)/CSharpProject.csproj	
+++ b/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosKernel (C#)/CSharpProject.csproj	
@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
 		<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-		<ProductVersion>8.0.30703</ProductVersion>
+		<ProductVersion>9.0.30729</ProductVersion>
 		<SchemaVersion>2.0</SchemaVersion>
 		<ProjectGuid>$guid1$</ProjectGuid>
 		<OutputType>Library</OutputType>
@@ -34,9 +34,9 @@
 		<Reference Include="System.Data"/>
 		<Reference Include="System.Xml"/>
 
-        <Reference Include="Cosmos.Hardware, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983, processorArchitecture=x86" />
-        <Reference Include="Cosmos.Kernel, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983, processorArchitecture=x86" />
-        <Reference Include="Cosmos.Sys, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983, processorArchitecture=x86" />
+        <Reference Include="Cosmos.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983, processorArchitecture=MSIL" />
+        <Reference Include="Cosmos.Hardware, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983, processorArchitecture=MSIL" />
+        <Reference Include="Cosmos.System, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983, processorArchitecture=MSIL" />
     </ItemGroup>
 	<ItemGroup>
 		<Compile Include="Kernel.cs" />
diff --git a/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosKernel (C#)/Kernel.cs b/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosKernel (C#)/Kernel.cs
index 7e678a4ea..bd1772240 100644
--- a/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosKernel (C#)/Kernel.cs	
+++ b/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosKernel (C#)/Kernel.cs	
@@ -1,21 +1,23 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using Sys = Cosmos.System;
 
 namespace $safeprojectname$
 {
-    public class Kernel
+    public class Kernel: Sys.Kernel
     {
-	    public static void Boot()
+        protected override void BeforeRun()
         {
-            // Boot the Cosmos kernel:
-            Cosmos.Sys.Boot xBoot = new Cosmos.Sys.Boot();
-            xBoot.Execute();
-            
-            Console.WriteLine("Cosmos booted successfully. Type a line of text to get it echoed back:");
-            string xResult = Console.ReadLine();
+            Console.WriteLine("Cosmos booted successfully. Type a line of text to get it echoed back.");
+        }
+        
+        protected override void Run()
+        {
+            Console.Write("Input: ");
+            var input = Console.ReadLine();
             Console.Write("Text typed: ");
-            Console.WriteLine(xResult);
+            Console.WriteLine(input);
         }
     }
 }
diff --git a/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject (C#)/CSharpProject.csproj b/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject (C#)/CSharpProject.csproj
index 9dc5fbd9d..611cb87b2 100644
--- a/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject (C#)/CSharpProject.csproj	
+++ b/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject (C#)/CSharpProject.csproj	
@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
 		<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-		<ProductVersion>8.0.30703</ProductVersion>
+		<ProductVersion>9.0.30729</ProductVersion>
 		<SchemaVersion>2.0</SchemaVersion>
 		<ProjectGuid>$KernelGuid$</ProjectGuid>
 		<OutputType>Library</OutputType>
@@ -34,9 +34,9 @@
 		<Reference Include="System.Data"/>
 		<Reference Include="System.Xml"/>
 
-        <Reference Include="Cosmos.Hardware2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983, processorArchitecture=x86" />
-        <Reference Include="Cosmos.Kernel, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983, processorArchitecture=x86" />
-        <Reference Include="Cosmos.Sys, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983, processorArchitecture=x86" />
+        <Reference Include="Cosmos.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983, processorArchitecture=MSIL" />
+        <Reference Include="Cosmos.Hardware, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983, processorArchitecture=MSIL" />
+        <Reference Include="Cosmos.System, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983, processorArchitecture=MSIL" />
     </ItemGroup>
 	<ItemGroup>
 		<Compile Include="Kernel.cs" />
diff --git a/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject (C#)/Kernel.cs b/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject (C#)/Kernel.cs
index 7e678a4ea..bd1772240 100644
--- a/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject (C#)/Kernel.cs	
+++ b/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject (C#)/Kernel.cs	
@@ -1,21 +1,23 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using Sys = Cosmos.System;
 
 namespace $safeprojectname$
 {
-    public class Kernel
+    public class Kernel: Sys.Kernel
     {
-	    public static void Boot()
+        protected override void BeforeRun()
         {
-            // Boot the Cosmos kernel:
-            Cosmos.Sys.Boot xBoot = new Cosmos.Sys.Boot();
-            xBoot.Execute();
-            
-            Console.WriteLine("Cosmos booted successfully. Type a line of text to get it echoed back:");
-            string xResult = Console.ReadLine();
+            Console.WriteLine("Cosmos booted successfully. Type a line of text to get it echoed back.");
+        }
+        
+        protected override void Run()
+        {
+            Console.Write("Input: ");
+            var input = Console.ReadLine();
             Console.Write("Text typed: ");
-            Console.WriteLine(xResult);
+            Console.WriteLine(input);
         }
     }
 }
diff --git a/source2/VSIP/Cosmos.VS.Package/Templates/UseGuidsWizard.cs b/source2/VSIP/Cosmos.VS.Package/Templates/UseGuidsWizard.cs
deleted file mode 100644
index 5ae955ecb..000000000
--- a/source2/VSIP/Cosmos.VS.Package/Templates/UseGuidsWizard.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Microsoft.VisualStudio.TemplateWizard;
-
-namespace Cosmos.VS.Package.Templates.Wizards
-{
-    public class UseGuidsWizard: IWizard
-    {
-        public void BeforeOpeningFile(EnvDTE.ProjectItem projectItem)
-        {
-        }
-
-        public void ProjectFinishedGenerating(EnvDTE.Project project)
-        {
-        }
-
-        public void ProjectItemFinishedGenerating(EnvDTE.ProjectItem projectItem)
-        {
-
-        }
-
-        public void RunFinished()
-        {
-        }
-
-        public void RunStarted(object automationObject, Dictionary<string, string> replacementsDictionary, WizardRunKind runKind, object[] customParams)
-        {
-            replacementsDictionary.Add("$GeneratedGuid1$", GenerateGuidsWizard.Guid1.Value.ToString("B"));
-            replacementsDictionary.Add("$GeneratedGuid2$", GenerateGuidsWizard.Guid2.Value.ToString("B"));
-            GenerateGuidsWizard.Guid1 = null;
-            GenerateGuidsWizard.Guid2 = null;
-        }
-
-        public bool ShouldAddProjectItem(string filePath)
-        {
-            return true;
-        }
-    }
-}
\ No newline at end of file
diff --git a/source2/VSIP/Cosmos.VS.Wizards/CosmosProject.Cosmos b/source2/VSIP/Cosmos.VS.Wizards/CosmosProject.Cosmos
index 07e4f0fc7..05d5a02a7 100644
--- a/source2/VSIP/Cosmos.VS.Wizards/CosmosProject.Cosmos
+++ b/source2/VSIP/Cosmos.VS.Wizards/CosmosProject.Cosmos
@@ -37,6 +37,10 @@
             <Project>$KernelGuid$</Project>
         </ProjectReference>
     </ItemGroup>
+    <ItemGroup>
+        <Reference Include="Cosmos.Core.Plugs, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983"/>
+        <Reference Include="Cosmos.System.Plugs.System, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983"/>
+    </ItemGroup>
 
     <Import Project="$(MSBuildExtensionsPath)\Cosmos\Cosmos.targets" />
 </Project>
\ No newline at end of file