diff --git a/Routing.sln b/Routing.sln
index 20ee6412a4..7480402ac3 100644
--- a/Routing.sln
+++ b/Routing.sln
@@ -1,66 +1,66 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
+VisualStudioVersion = 12.0.30327.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.Routing.net45", "src\Microsoft.AspNet.Routing\Microsoft.AspNet.Routing.net45.csproj", "{16537084-C16D-4885-B90F-18BAC218F85B}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{0E966C37-7334-4D96-AAF6-9F49FBD166E3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.Routing.k10", "src\Microsoft.AspNet.Routing\Microsoft.AspNet.Routing.k10.csproj", "{1366B89C-F603-4088-B313-FA053C51BAC6}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{C3ADD55B-B9C7-4061-8AD4-6A70D1AE3B2E}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{95359B4B-4C85-4B44-A75B-0621905C4CF6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.Routing.Tests.net45", "test\Microsoft.AspNet.Routing.Tests\Microsoft.AspNet.Routing.Tests.net45.csproj", "{3775A966-0876-45C3-A67F-0E544BC48D55}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Routing", "src\Microsoft.AspNet.Routing\Microsoft.AspNet.Routing.kproj", "{1EE54D32-6CED-4206-ACF5-3DC1DD39D228}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RoutingSample.Web.net45", "samples\RoutingSample.Web\RoutingSample.Web.net45.csproj", "{976D31DB-FF19-49FC-A993-D61514BBE968}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Routing.Tests", "test\Microsoft.AspNet.Routing.Tests\Microsoft.AspNet.Routing.Tests.kproj", "{636D79ED-7B32-487C-BDA5-D2A1AAA97371}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.Routing.Tests.k10", "test\Microsoft.AspNet.Routing.Tests\Microsoft.AspNet.Routing.Tests.k10.csproj", "{83E74560-2C7F-415E-A324-BB31D41E2466}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RoutingSample.Web.k10", "samples\RoutingSample.Web\RoutingSample.Web.k10.csproj", "{AB84AD9C-77B7-465F-990A-4E3FEE1E5025}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RoutingSample.Web", "samples\RoutingSample.Web\RoutingSample.Web.kproj", "{DB94E647-C73A-4F52-A126-AA7544CCF33B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{16537084-C16D-4885-B90F-18BAC218F85B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{16537084-C16D-4885-B90F-18BAC218F85B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{16537084-C16D-4885-B90F-18BAC218F85B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{16537084-C16D-4885-B90F-18BAC218F85B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1366B89C-F603-4088-B313-FA053C51BAC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1366B89C-F603-4088-B313-FA053C51BAC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1366B89C-F603-4088-B313-FA053C51BAC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1366B89C-F603-4088-B313-FA053C51BAC6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3775A966-0876-45C3-A67F-0E544BC48D55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3775A966-0876-45C3-A67F-0E544BC48D55}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3775A966-0876-45C3-A67F-0E544BC48D55}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3775A966-0876-45C3-A67F-0E544BC48D55}.Release|Any CPU.Build.0 = Release|Any CPU
-		{976D31DB-FF19-49FC-A993-D61514BBE968}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{976D31DB-FF19-49FC-A993-D61514BBE968}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{976D31DB-FF19-49FC-A993-D61514BBE968}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{976D31DB-FF19-49FC-A993-D61514BBE968}.Release|Any CPU.Build.0 = Release|Any CPU
-		{83E74560-2C7F-415E-A324-BB31D41E2466}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{83E74560-2C7F-415E-A324-BB31D41E2466}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{83E74560-2C7F-415E-A324-BB31D41E2466}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{83E74560-2C7F-415E-A324-BB31D41E2466}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AB84AD9C-77B7-465F-990A-4E3FEE1E5025}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AB84AD9C-77B7-465F-990A-4E3FEE1E5025}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AB84AD9C-77B7-465F-990A-4E3FEE1E5025}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AB84AD9C-77B7-465F-990A-4E3FEE1E5025}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1EE54D32-6CED-4206-ACF5-3DC1DD39D228}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{1EE54D32-6CED-4206-ACF5-3DC1DD39D228}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{1EE54D32-6CED-4206-ACF5-3DC1DD39D228}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{1EE54D32-6CED-4206-ACF5-3DC1DD39D228}.Debug|x86.ActiveCfg = Debug|x86
+		{1EE54D32-6CED-4206-ACF5-3DC1DD39D228}.Debug|x86.Build.0 = Debug|x86
+		{1EE54D32-6CED-4206-ACF5-3DC1DD39D228}.Release|Any CPU.ActiveCfg = Release|x86
+		{1EE54D32-6CED-4206-ACF5-3DC1DD39D228}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{1EE54D32-6CED-4206-ACF5-3DC1DD39D228}.Release|Mixed Platforms.Build.0 = Release|x86
+		{1EE54D32-6CED-4206-ACF5-3DC1DD39D228}.Release|x86.ActiveCfg = Release|x86
+		{1EE54D32-6CED-4206-ACF5-3DC1DD39D228}.Release|x86.Build.0 = Release|x86
+		{636D79ED-7B32-487C-BDA5-D2A1AAA97371}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{636D79ED-7B32-487C-BDA5-D2A1AAA97371}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{636D79ED-7B32-487C-BDA5-D2A1AAA97371}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{636D79ED-7B32-487C-BDA5-D2A1AAA97371}.Debug|x86.ActiveCfg = Debug|x86
+		{636D79ED-7B32-487C-BDA5-D2A1AAA97371}.Debug|x86.Build.0 = Debug|x86
+		{636D79ED-7B32-487C-BDA5-D2A1AAA97371}.Release|Any CPU.ActiveCfg = Release|x86
+		{636D79ED-7B32-487C-BDA5-D2A1AAA97371}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{636D79ED-7B32-487C-BDA5-D2A1AAA97371}.Release|Mixed Platforms.Build.0 = Release|x86
+		{636D79ED-7B32-487C-BDA5-D2A1AAA97371}.Release|x86.ActiveCfg = Release|x86
+		{636D79ED-7B32-487C-BDA5-D2A1AAA97371}.Release|x86.Build.0 = Release|x86
+		{DB94E647-C73A-4F52-A126-AA7544CCF33B}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{DB94E647-C73A-4F52-A126-AA7544CCF33B}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{DB94E647-C73A-4F52-A126-AA7544CCF33B}.Debug|x86.ActiveCfg = Debug|x86
+		{DB94E647-C73A-4F52-A126-AA7544CCF33B}.Debug|x86.Build.0 = Debug|x86
+		{DB94E647-C73A-4F52-A126-AA7544CCF33B}.Release|Any CPU.ActiveCfg = Release|x86
+		{DB94E647-C73A-4F52-A126-AA7544CCF33B}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{DB94E647-C73A-4F52-A126-AA7544CCF33B}.Release|Mixed Platforms.Build.0 = Release|x86
+		{DB94E647-C73A-4F52-A126-AA7544CCF33B}.Release|x86.ActiveCfg = Release|x86
+		{DB94E647-C73A-4F52-A126-AA7544CCF33B}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{16537084-C16D-4885-B90F-18BAC218F85B} = {0E966C37-7334-4D96-AAF6-9F49FBD166E3}
-		{1366B89C-F603-4088-B313-FA053C51BAC6} = {0E966C37-7334-4D96-AAF6-9F49FBD166E3}
-		{976D31DB-FF19-49FC-A993-D61514BBE968} = {C3ADD55B-B9C7-4061-8AD4-6A70D1AE3B2E}
-		{AB84AD9C-77B7-465F-990A-4E3FEE1E5025} = {C3ADD55B-B9C7-4061-8AD4-6A70D1AE3B2E}
-		{3775A966-0876-45C3-A67F-0E544BC48D55} = {95359B4B-4C85-4B44-A75B-0621905C4CF6}
-		{83E74560-2C7F-415E-A324-BB31D41E2466} = {95359B4B-4C85-4B44-A75B-0621905C4CF6}
+		{1EE54D32-6CED-4206-ACF5-3DC1DD39D228} = {0E966C37-7334-4D96-AAF6-9F49FBD166E3}
+		{636D79ED-7B32-487C-BDA5-D2A1AAA97371} = {95359B4B-4C85-4B44-A75B-0621905C4CF6}
+		{DB94E647-C73A-4F52-A126-AA7544CCF33B} = {C3ADD55B-B9C7-4061-8AD4-6A70D1AE3B2E}
 	EndGlobalSection
 EndGlobal
diff --git a/samples/RoutingSample.Web/RoutingSample.Web.kproj b/samples/RoutingSample.Web/RoutingSample.Web.kproj
new file mode 100644
index 0000000000..114f38c6b5
--- /dev/null
+++ b/samples/RoutingSample.Web/RoutingSample.Web.kproj
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="__ToolsVersion__" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">12.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\ProjectK\Microsoft.Web.ProjectK.Props" Condition="'$(VSToolsPath)' != ''" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>db94e647-c73a-4f52-a126-aa7544ccf33b</ProjectGuid>
+    <OutputType>Web</OutputType>
+    <ActiveTargetFramework>k10</ActiveTargetFramework>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
+  </PropertyGroup>
+  <PropertyGroup>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
+    <DevelopmentServerPort>28778</DevelopmentServerPort>
+  </PropertyGroup>
+  <ItemGroup>
+    <Content Include="Project.json" />
+    <Content Include="web.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="DelegateRouteEndpoint.cs" />
+    <Compile Include="DictionaryExtensions.cs" />
+    <Compile Include="PrefixRoute.cs" />
+    <Compile Include="RouteCollectionExtensions.cs" />
+    <Compile Include="Startup.cs" />
+  </ItemGroup>
+  <Import Project="$(VSToolsPath)\ProjectK\Microsoft.Web.ProjectK.targets" Condition="'$(VSToolsPath)' != ''" />
+</Project>
\ No newline at end of file
diff --git a/samples/RoutingSample.Web/project.json b/samples/RoutingSample.Web/project.json
index 0728f63770..cf6de718fb 100644
--- a/samples/RoutingSample.Web/project.json
+++ b/samples/RoutingSample.Web/project.json
@@ -4,7 +4,7 @@
     "Helios": "0.1-alpha-*",
     "Microsoft.AspNet.Abstractions" : "0.1-alpha-*",
     "Microsoft.AspNet.Routing" : "",
-    "Microsoft.AspNet.ConfigurationModel": "0.1-alpha-*"
+    "Microsoft.AspNet.ConfigurationModel" : "0.1-alpha-*"
   },
   "configurations": {
     "net45": { },
diff --git a/src/Microsoft.AspNet.Routing/Microsoft.AspNet.Routing.kproj b/src/Microsoft.AspNet.Routing/Microsoft.AspNet.Routing.kproj
new file mode 100644
index 0000000000..c6fd49fc0e
--- /dev/null
+++ b/src/Microsoft.AspNet.Routing/Microsoft.AspNet.Routing.kproj
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="__ToolsVersion__" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">12.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\ProjectK\Microsoft.Web.ProjectK.Props" Condition="'$(VSToolsPath)' != ''" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>1ee54d32-6ced-4206-acf5-3dc1dd39d228</ProjectGuid>
+    <OutputType>Library</OutputType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
+  </PropertyGroup>
+  <PropertyGroup>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <Content Include="Project.json" />
+    <Content Include="Resources.resx" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="BuilderExtensions.cs" />
+    <Compile Include="IRouteCollection.cs" />
+    <Compile Include="IRouteConstraint.cs" />
+    <Compile Include="IRouter.cs" />
+    <Compile Include="NotNullAttribute.cs" />
+    <Compile Include="Properties\Resources.Designer.cs" />
+    <Compile Include="RegexConstraint.cs" />
+    <Compile Include="RouteCollection.cs" />
+    <Compile Include="RouteCollectionExtensions.cs" />
+    <Compile Include="RouteConstraintBuilder.cs" />
+    <Compile Include="RouteConstraintMatcher.cs" />
+    <Compile Include="RouteContext.cs" />
+    <Compile Include="RouteDirection.cs" />
+    <Compile Include="RouterMiddleware.cs" />
+    <Compile Include="RouteValueDictionary.cs" />
+    <Compile Include="Template\Template.cs" />
+    <Compile Include="Template\TemplateBinder.cs" />
+    <Compile Include="Template\TemplateMatcher.cs" />
+    <Compile Include="Template\TemplateParser.cs" />
+    <Compile Include="Template\TemplatePart.cs" />
+    <Compile Include="Template\TemplateRoute.cs" />
+    <Compile Include="Template\TemplateSegment.cs" />
+    <Compile Include="VirtualPathContext.cs" />
+  </ItemGroup>
+  <Import Project="$(VSToolsPath)\ProjectK\Microsoft.Web.ProjectK.targets" Condition="'$(VSToolsPath)' != ''" />
+</Project>
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Routing.Tests/Microsoft.AspNet.Routing.Tests.kproj b/test/Microsoft.AspNet.Routing.Tests/Microsoft.AspNet.Routing.Tests.kproj
new file mode 100644
index 0000000000..3afa0da4a3
--- /dev/null
+++ b/test/Microsoft.AspNet.Routing.Tests/Microsoft.AspNet.Routing.Tests.kproj
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="__ToolsVersion__" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">12.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\ProjectK\Microsoft.Web.ProjectK.Props" Condition="'$(VSToolsPath)' != ''" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>636d79ed-7b32-487c-bda5-d2a1aaa97371</ProjectGuid>
+    <OutputType>Library</OutputType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
+  </PropertyGroup>
+  <PropertyGroup>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <Content Include="Project.json" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ConstraintMatcherTests.cs" />
+    <Compile Include="ConstraintsBuilderTests.cs" />
+    <Compile Include="RegexConstraintTests.cs" />
+    <Compile Include="RouteCollectionTest.cs" />
+    <Compile Include="RouteValueDictionaryTests.cs" />
+    <Compile Include="Template\TemplateBinderTests.cs" />
+    <Compile Include="Template\TemplateMatcherTests.cs" />
+    <Compile Include="Template\TemplateParserTests.cs" />
+    <Compile Include="Template\TemplateRouteTests.cs" />
+  </ItemGroup>
+  <Import Project="$(VSToolsPath)\ProjectK\Microsoft.Web.ProjectK.targets" Condition="'$(VSToolsPath)' != ''" />
+</Project>
\ No newline at end of file