diff --git a/Cosmos.sln b/Cosmos.sln
index e173d6958..4895dc97e 100644
--- a/Cosmos.sln
+++ b/Cosmos.sln
@@ -158,6 +158,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.TestRunner.UnitTest"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GraphicTest", "Tests\GraphicTest\GraphicTest.csproj", "{FB23BD72-AEC3-485E-B86C-8E7DB0B3BB9B}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Demos", "Demos", "{B56A6119-1B8F-44E4-9446-291E52F47D4C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Guess", "Guess", "{5FF9BF2A-5162-4F12-82B6-1693AD776636}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GuessKernel", "Demos\Guess\GuessKernel.csproj", "{E35E0DBF-555F-4D38-8F28-ACDFA9DC97BD}"
+EndProject
+Project("{471EC4BB-E47E-4229-A789-D1F5F83B52D4}") = "GuessKernelBoot", "Demos\Guess\GuessKernelBoot.Cosmos", "{77DD08F5-0751-4EFC-B222-78F9F06E1F7C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -615,6 +623,22 @@ Global
 		{FB23BD72-AEC3-485E-B86C-8E7DB0B3BB9B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FB23BD72-AEC3-485E-B86C-8E7DB0B3BB9B}.Release|x86.ActiveCfg = Release|Any CPU
 		{FB23BD72-AEC3-485E-B86C-8E7DB0B3BB9B}.Release|x86.Build.0 = Release|Any CPU
+		{E35E0DBF-555F-4D38-8F28-ACDFA9DC97BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E35E0DBF-555F-4D38-8F28-ACDFA9DC97BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E35E0DBF-555F-4D38-8F28-ACDFA9DC97BD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E35E0DBF-555F-4D38-8F28-ACDFA9DC97BD}.Debug|x86.Build.0 = Debug|Any CPU
+		{E35E0DBF-555F-4D38-8F28-ACDFA9DC97BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E35E0DBF-555F-4D38-8F28-ACDFA9DC97BD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E35E0DBF-555F-4D38-8F28-ACDFA9DC97BD}.Release|x86.ActiveCfg = Release|Any CPU
+		{E35E0DBF-555F-4D38-8F28-ACDFA9DC97BD}.Release|x86.Build.0 = Release|Any CPU
+		{77DD08F5-0751-4EFC-B222-78F9F06E1F7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{77DD08F5-0751-4EFC-B222-78F9F06E1F7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{77DD08F5-0751-4EFC-B222-78F9F06E1F7C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{77DD08F5-0751-4EFC-B222-78F9F06E1F7C}.Debug|x86.Build.0 = Debug|Any CPU
+		{77DD08F5-0751-4EFC-B222-78F9F06E1F7C}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{77DD08F5-0751-4EFC-B222-78F9F06E1F7C}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{77DD08F5-0751-4EFC-B222-78F9F06E1F7C}.Release|x86.ActiveCfg = Debug|Any CPU
+		{77DD08F5-0751-4EFC-B222-78F9F06E1F7C}.Release|x86.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -685,5 +709,8 @@ Global
 		{0B20C26F-CA92-4D88-8211-EC7B0A261337} = {0E67EFE8-5944-4F6C-8B47-C5E06D4C79F5}
 		{6D59FC7A-6F27-4140-BA41-F89126490C4C} = {0E67EFE8-5944-4F6C-8B47-C5E06D4C79F5}
 		{FB23BD72-AEC3-485E-B86C-8E7DB0B3BB9B} = {ECEA7778-E786-4317-90B9-A2D4427CB91C}
+		{5FF9BF2A-5162-4F12-82B6-1693AD776636} = {B56A6119-1B8F-44E4-9446-291E52F47D4C}
+		{E35E0DBF-555F-4D38-8F28-ACDFA9DC97BD} = {5FF9BF2A-5162-4F12-82B6-1693AD776636}
+		{77DD08F5-0751-4EFC-B222-78F9F06E1F7C} = {5FF9BF2A-5162-4F12-82B6-1693AD776636}
 	EndGlobalSection
 EndGlobal
diff --git a/Demos/Guess/Cosmos.bxrc b/Demos/Guess/Cosmos.bxrc
deleted file mode 100644
index e69de29bb..000000000
diff --git a/Demos/Guess/Cosmos.targets b/Demos/Guess/Cosmos.targets
deleted file mode 100644
index 9b6957357..000000000
--- a/Demos/Guess/Cosmos.targets
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
-  <PropertyGroup>
-    <DebugMode Condition="$(DebugMode) == ''">Source</DebugMode>
-    <DebugEnabled Condition="$(DebugEnabled) == ''">True</DebugEnabled>
-    <StackCorruptionDetectionEnabled Condition="$(StackCorruptionDetectionEnabled) == ''">True</StackCorruptionDetectionEnabled>
-    <StackCorruptionDetectionLevel Condition="$(StackCorruptionDetectionLevel) == ''">All</StackCorruptionDetectionLevel>
-    <IgnoreDebugStubAttribute Condition="$(IgnoreDebugStubAttribute) == ''">False</IgnoreDebugStubAttribute>
-    <TraceAssemblies Condition="$(TraceAssemblies) == ''">All</TraceAssemblies>
-    <CosmosDir Condition="$(CosmosDir) == ''">$([MSBuild]::GetRegistryValue("HKEY_LOCAL_MACHINE\Software\Cosmos", "UserKit"))</CosmosDir>
-    <BuildToolsDir Condition="$(BuildToolsDir) == ''">$(CosmosDir)\Build\Tools</BuildToolsDir>
-    <VSIPDir Condition="$(VSIPDir) == ''">$(CosmosDir)\Build\VSIP</VSIPDir>
-    <NasmFile Condition="'$(NasmFile)' == ''">$(BuildToolsDir)\Nasm\nasm.exe</NasmFile>
-    <PlatformTarget Condition="'$(PlatformTarget)' == ''">AnyCPU</PlatformTarget>
-    <BinFormat Condition="$(BinFormat) == ''">bin</BinFormat>
-    <CosmosBuildTaskAssemblyFile Condition="'$(CosmosBuildTaskAssemblyFile)' == ''">$(VSIPDir)\Cosmos.Build.MSBuild.dll</CosmosBuildTaskAssemblyFile>
-  </PropertyGroup>
-
-  <UsingTask TaskName="Cosmos.Build.MSBuild.IL2CPU" AssemblyFile="$(CosmosBuildTaskAssemblyFile)"/>
-  <UsingTask TaskName="Cosmos.Build.MSBuild.NAsm" AssemblyFile="$(CosmosBuildTaskAssemblyFile)"/>
-  <UsingTask TaskName="Cosmos.Build.MSBuild.MakeISO" AssemblyFile="$(CosmosBuildTaskAssemblyFile)"/>
-  <UsingTask TaskName="Cosmos.Build.MSBuild.Ld" AssemblyFile="$(CosmosBuildTaskAssemblyFile)"/>
-  <UsingTask TaskName="Cosmos.Build.MSBuild.ReadNAsmMapToDebugInfo" AssemblyFile="$(CosmosBuildTaskAssemblyFile)"/>
-
-  <Target Name="CosmosDetectDependencies" Outputs="@(CosmosReferences)">
-    <CreateItem Include="$(TargetDir)$(Configuration)\$(TargetFramework)\*.dll">
-      <Output TaskParameter="Include" ItemName="CosmosReferences"/>
-    </CreateItem>
-  </Target>
-
-  <Target Name="CosmosCompile" DependsOnTargets="CosmosDetectDependencies" AfterTargets="Build">
-    <Error Text="File %(Compile.Identity) is set to compile, but .Cosmos projects don't compile any source themselves!" Condition="$(Compile) != ''"/>
-    <CreateProperty Value="true" Condition="$(BinFormat) == 'elf'">
-      <Output PropertyName="IsELF" TaskParameter="Value"/>
-    </CreateProperty>
-    <CreateProperty Value="false" Condition="$(BinFormat) == 'bin'">
-      <Output PropertyName="IsELF" TaskParameter="Value"/>
-    </CreateProperty>
-    <Cosmos.Build.MSBuild.IL2CPU DebugMode="$(DebugMode)" DebugEnabled="$(DebugEnabled)" StackCorruptionDetectionEnabled="$(StackCorruptionDetectionEnabled)" StackCorruptionDetectionLevel="$(StackCorruptionDetectionLevel)" TraceAssemblies="$(TraceAssemblies)" IgnoreDebugStubAttribute="$(IgnoreDebugStubAttribute)" DebugCom="1" UseNAsm="true" References="@(CosmosReferences)" OutputFilename="$(TargetDir)$(MSBuildProjectName).asm" EnableLogging="true" EmitDebugSymbols="$(DebugSymbols)" CosmosBuildDir="$(CosmosDir)\Build" WorkingDir="$(TargetDir)"/>
-    <Cosmos.Build.MSBuild.NAsm InputFile="$(TargetDir)$(MSBuildProjectName).asm" OutputFile="$(TargetDir)$(MSBuildProjectName).obj" IsELF="$(IsELF)" ExePath="$(NasmFile)"/>
-    <!-- ELF only -->
-    <!-- 16 MB 0x1000000 as per hpa (syslinux) is a good spot. For now just put some dummy values. 16 and 32 MB. Later size better. -->
-    <Cosmos.Build.MSBuild.Ld CosmosBuildDir="$(CosmosDir)\Build" WorkingDir="$(TargetDir)" Arguments="-Ttext 0x2000000 -Tdata 0x1000000 -e Kernel_Start -o '$(TargetDir)$(MSBuildProjectName).bin' '$(TargetDir)$(MSBuildProjectName).obj'" Condition="$(IsELF) == 'true'"/>
-    <Cosmos.Build.MSBuild.ExtractMapFromElfFile InputFile="$(TargetDir)$(MSBuildProjectName).bin" DebugInfoFile="$(TargetDir)$(MSBuildProjectName).cdb" WorkingDir="$(TargetDir)" CosmosBuildDir="$(CosmosDir)\Build" Condition="$(IsELF) == 'true'"/>
-    <CreateItem Include="$(TargetDir)$(MSBuildProjectName).bin" Condition="$(IsELF) == 'true'">
-      <Output TaskParameter="Include" ItemName="TempFilesToCopy"/>
-    </CreateItem>
-    <!--End of ELF only-->
-    <!--binary only-->
-    <Cosmos.Build.MSBuild.ReadNAsmMapToDebugInfo InputBaseDir="$(TargetDir)" DebugInfoFile="$(TargetDir)$(MSBuildProjectName).cdb" Condition="$(IsELF) == 'false'"/>
-    <Move SourceFiles="$(TargetDir)$(MSBuildProjectName).obj" DestinationFiles="$(TargetDir)$(MSBuildProjectName).bin" Condition="$(IsELF) == 'false'"/>
-    <!--end of binary only-->
-    <!-- We dont build ISO in MSBuild any more because not all targets need it and it takes time. But we do delete it, so we dont have out of date outputs. -->
-    <!-- <MakeISO InputFile="$(TargetDir)$(MSBuildProjectName).bin" OutputFile="$(TargetDir)$(MSBuildProjectName).iso" CosmosBuildDir="$(CosmosDir)\Build" /> -->
-    <Delete Files="$(TargetDir)$(MSBuildProjectName).iso"/>
-  </Target>
-</Project>
diff --git a/Demos/Guess/Guess.csproj b/Demos/Guess/Guess.csproj
deleted file mode 100644
index 143418e2e..000000000
--- a/Demos/Guess/Guess.csproj
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard1.5</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\source\Cosmos.System\Cosmos.System.csproj" />
-    <ProjectReference Include="..\..\source\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />
-    <ProjectReference Include="..\Cosmos.TestRunner.TestController\Cosmos.TestRunner.TestController.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/Demos/Guess/GuessBoot.project.json b/Demos/Guess/GuessBoot.project.json
deleted file mode 100644
index b388d70ef..000000000
--- a/Demos/Guess/GuessBoot.project.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "runtimes": {
-    "win": {}
-  },
-  "frameworks": {
-    "netstandard1.6": {}
-  }
-}
diff --git a/Demos/Guess/GuessKernel.csproj b/Demos/Guess/GuessKernel.csproj
new file mode 100644
index 000000000..c15b3cf46
--- /dev/null
+++ b/Demos/Guess/GuessKernel.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard1.5</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Remove="*" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Cosmos.Common" Version="1.0.0" />
+    <PackageReference Include="Cosmos.System" Version="1.0.0" />
+    <PackageReference Include="Cosmos.Debug.Kernel" Version="1.0.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/Demos/Guess/GuessBoot.Cosmos b/Demos/Guess/GuessKernelBoot.Cosmos
similarity index 53%
rename from Demos/Guess/GuessBoot.Cosmos
rename to Demos/Guess/GuessKernelBoot.Cosmos
index 99ca7fc52..f1f2a4edf 100644
--- a/Demos/Guess/GuessBoot.Cosmos
+++ b/Demos/Guess/GuessKernelBoot.Cosmos
@@ -1,9 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <TargetFramework>netstandard1.5</TargetFramework>
-    <ProjectGuid>{5b2c0369-7a84-4113-892c-f71b50e1da12}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
-
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugEnabled>True</DebugEnabled>
     <DebugMode>Source</DebugMode>
@@ -20,21 +21,15 @@
     <Profile>VMware</Profile>
     <Description>Use VMware Player or Workstation to deploy and debug.</Description>
   </PropertyGroup>
-
   <ItemGroup>
-    <Content Include="Cosmos.bxrc">
-      <SubType>Content</SubType>
-    </Content>
-    <None Include="Cosmos.targets" />
+    <PackageReference Include="Cosmos.Core.Plugs" Version="*" />
   </ItemGroup>
-
   <ItemGroup>
-    <ProjectReference Include="..\..\source\Cosmos.Core.Plugs.Asm\Cosmos.Core.Plugs.Asm.csproj" />
-    <ProjectReference Include="..\..\source\Cosmos.Core.Plugs\Cosmos.Core.Plugs.csproj" />
-    <ProjectReference Include="..\..\source\Cosmos.Debug.Kernel.Plugs.Asm\Cosmos.Debug.Kernel.Plugs.Asm.csproj" />
-    <ProjectReference Include="..\..\source\Cosmos.System.Plugs\Cosmos.System.Plugs.csproj" />
-    <ProjectReference Include="..\Guess\GuessKernel.csproj" />
+    <ProjectReference Include="..\Guess\GuessKernel.csproj">
+      <Name>GuessKernel</Name>
+      <Project>{e35e0dbf-555f-4d38-8f28-acdfa9dc97bd}</Project>
+      <Private>True</Private>
+    </ProjectReference>
   </ItemGroup>
-
-  <Import Project="Cosmos.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Cosmos\Cosmos.targets" />
 </Project>
diff --git a/Setup/Cosmos.iss b/Setup/Cosmos.iss
index a27adf44f..3bfc24eab 100644
--- a/Setup/Cosmos.iss
+++ b/Setup/Cosmos.iss
@@ -129,7 +129,7 @@ UseRelativePaths=True
 
 [Run]
 Filename: "{app}\Build\Tools\nuget.exe"; Parameters: "init ""{app}\Kernel\packages"" ""{app}\Kernel\packages"""; WorkingDir: "{app}"; Description: "Install Kernel Packages"; StatusMsg: "Installing Kernel Packages"
-Filename: "{app}\Build\Tools\nuget.exe"; Parameters: "sources Add -Name ""Cosmos"" -Source ""{app}\Kernel\packages"""; WorkingDir: "{app}"; Description: "Install Kernel Packages"; StatusMsg: "Installing Kernel Packages"
+Filename: "{app}\Build\Tools\nuget.exe"; Parameters: "sources Add -Name ""Cosmos Local Package Feed"" -Source ""{app}\Kernel\packages"""; WorkingDir: "{app}"; Description: "Install Kernel Packages"; StatusMsg: "Installing Kernel Packages"
 Filename: "{app}\Build\Tools\VSIXBootstrapper.exe"; Parameters: "/q /a /u:Cosmos.VS.ProjectSystem"; Description: "Remove Cosmos Project System"; StatusMsg: "Removing Visual Studio Extension: Cosmos Project System"
 Filename: "{app}\Build\Tools\VSIXBootstrapper.exe"; Parameters: "/q /a Cosmos.VS.ProjectSystem.vsix"; WorkingDir: "{app}"; Description: "Install Cosmos Project System"; StatusMsg: "Installing Visual Studio Extension: Cosmos Project System"
 
diff --git a/nuget.config b/nuget.config
index f403dd086..b10bd9875 100644
--- a/nuget.config
+++ b/nuget.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <packageSources>
-        <add key="Cosmos" value="https://www.myget.org/F/cosmos/api/v3/index.json" />
+        <add key="Cosmos MyGet Feed" value="https://www.myget.org/F/cosmos/api/v3/index.json" />
         <add key="NUnit" value="https://www.myget.org/F/nunit/api/v3/index.json" />
         <add key="AppVeyor NUnit Adapter CI Feed" value="https://ci.appveyor.com/nuget/nunit3-vs-adapter" />
     </packageSources>