diff --git a/Configuration.sln b/Configuration.sln
index 0ba8a54..2873bdc 100644
--- a/Configuration.sln
+++ b/Configuration.sln
@@ -1,23 +1,23 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.30401.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.21628.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.ConfigurationModel", "src\Microsoft.AspNet.ConfigurationModel\Microsoft.AspNet.ConfigurationModel.kproj", "{62BD48B5-BB0C-4C2C-9C4B-04CF75CDCCF1}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F141E2D0-F9B8-4ADB-A19A-7B6FF4CA19A1}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{B54371FF-B920-46C8-8D55-6B19DBB43EBF}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.ConfigurationModel.Json", "src\Microsoft.AspNet.ConfigurationModel.Json\Microsoft.AspNet.ConfigurationModel.Json.kproj", "{4C4CD1BC-4411-4AFD-9D04-147053F0E259}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.ConfigurationModel.Json", "src\Microsoft.Framework.ConfigurationModel.Json\Microsoft.Framework.ConfigurationModel.Json.kproj", "{4C4CD1BC-4411-4AFD-9D04-147053F0E259}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.ConfigurationModel.Xml", "src\Microsoft.AspNet.ConfigurationModel.Xml\Microsoft.AspNet.ConfigurationModel.Xml.kproj", "{1BEC97C1-56B9-4B2B-A95A-C0DF72F1E96A}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.ConfigurationModel.Xml", "src\Microsoft.Framework.ConfigurationModel.Xml\Microsoft.Framework.ConfigurationModel.Xml.kproj", "{1BEC97C1-56B9-4B2B-A95A-C0DF72F1E96A}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.ConfigurationModel.Json.Test", "test\Microsoft.AspNet.ConfigurationModel.Json.Test\Microsoft.AspNet.ConfigurationModel.Json.Test.kproj", "{AE8F8C20-9ED9-4A16-9565-27DF77683789}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.ConfigurationModel.Json.Test", "test\Microsoft.Framework.ConfigurationModel.Json.Test\Microsoft.Framework.ConfigurationModel.Json.Test.kproj", "{AE8F8C20-9ED9-4A16-9565-27DF77683789}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.ConfigurationModel.Xml.Test", "test\Microsoft.AspNet.ConfigurationModel.Xml.Test\Microsoft.AspNet.ConfigurationModel.Xml.Test.kproj", "{0786C785-944A-4423-96A6-4E7BFDB4A1B0}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.ConfigurationModel.Xml.Test", "test\Microsoft.Framework.ConfigurationModel.Xml.Test\Microsoft.Framework.ConfigurationModel.Xml.Test.kproj", "{0786C785-944A-4423-96A6-4E7BFDB4A1B0}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.ConfigurationModel.Test", "test\Microsoft.AspNet.ConfigurationModel.Test\Microsoft.AspNet.ConfigurationModel.Test.kproj", "{8777C77E-CA2A-42C1-90CD-2EA9CBF28937}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.ConfigurationModel.Test", "test\Microsoft.Framework.ConfigurationModel.Test\Microsoft.Framework.ConfigurationModel.Test.kproj", "{8777C77E-CA2A-42C1-90CD-2EA9CBF28937}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.ConfigurationModel", "src\Microsoft.Framework.ConfigurationModel\Microsoft.Framework.ConfigurationModel.kproj", "{62BD48B5-BB0C-4C2C-9C4B-04CF75CDCCF1}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -25,35 +25,40 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{4C4CD1BC-4411-4AFD-9D04-147053F0E259}.Debug|x86.ActiveCfg = Debug|x86
+		{4C4CD1BC-4411-4AFD-9D04-147053F0E259}.Debug|x86.Build.0 = Debug|x86
+		{4C4CD1BC-4411-4AFD-9D04-147053F0E259}.Release|x86.ActiveCfg = Release|x86
+		{4C4CD1BC-4411-4AFD-9D04-147053F0E259}.Release|x86.Build.0 = Release|x86
+		{1BEC97C1-56B9-4B2B-A95A-C0DF72F1E96A}.Debug|x86.ActiveCfg = Debug|x86
+		{1BEC97C1-56B9-4B2B-A95A-C0DF72F1E96A}.Debug|x86.Build.0 = Debug|x86
+		{1BEC97C1-56B9-4B2B-A95A-C0DF72F1E96A}.Release|x86.ActiveCfg = Release|x86
+		{1BEC97C1-56B9-4B2B-A95A-C0DF72F1E96A}.Release|x86.Build.0 = Release|x86
+		{AE8F8C20-9ED9-4A16-9565-27DF77683789}.Debug|x86.ActiveCfg = Debug|x86
+		{AE8F8C20-9ED9-4A16-9565-27DF77683789}.Debug|x86.Build.0 = Debug|x86
+		{AE8F8C20-9ED9-4A16-9565-27DF77683789}.Release|x86.ActiveCfg = Release|x86
+		{AE8F8C20-9ED9-4A16-9565-27DF77683789}.Release|x86.Build.0 = Release|x86
+		{0786C785-944A-4423-96A6-4E7BFDB4A1B0}.Debug|x86.ActiveCfg = Debug|x86
+		{0786C785-944A-4423-96A6-4E7BFDB4A1B0}.Debug|x86.Build.0 = Debug|x86
+		{0786C785-944A-4423-96A6-4E7BFDB4A1B0}.Release|x86.ActiveCfg = Release|x86
+		{0786C785-944A-4423-96A6-4E7BFDB4A1B0}.Release|x86.Build.0 = Release|x86
+		{8777C77E-CA2A-42C1-90CD-2EA9CBF28937}.Debug|x86.ActiveCfg = Debug|x86
+		{8777C77E-CA2A-42C1-90CD-2EA9CBF28937}.Debug|x86.Build.0 = Debug|x86
+		{8777C77E-CA2A-42C1-90CD-2EA9CBF28937}.Release|x86.ActiveCfg = Release|x86
+		{8777C77E-CA2A-42C1-90CD-2EA9CBF28937}.Release|x86.Build.0 = Release|x86
 		{62BD48B5-BB0C-4C2C-9C4B-04CF75CDCCF1}.Debug|x86.ActiveCfg = Debug|x86
 		{62BD48B5-BB0C-4C2C-9C4B-04CF75CDCCF1}.Debug|x86.Build.0 = Debug|x86
 		{62BD48B5-BB0C-4C2C-9C4B-04CF75CDCCF1}.Release|x86.ActiveCfg = Release|x86
 		{62BD48B5-BB0C-4C2C-9C4B-04CF75CDCCF1}.Release|x86.Build.0 = Release|x86
-		{4C4CD1BC-4411-4AFD-9D04-147053F0E259}.Debug|x86.ActiveCfg = Debug|x86
-		{4C4CD1BC-4411-4AFD-9D04-147053F0E259}.Release|x86.ActiveCfg = Release|x86
-		{4C4CD1BC-4411-4AFD-9D04-147053F0E259}.Release|x86.Build.0 = Release|x86
-		{1BEC97C1-56B9-4B2B-A95A-C0DF72F1E96A}.Debug|x86.ActiveCfg = Debug|x86
-		{1BEC97C1-56B9-4B2B-A95A-C0DF72F1E96A}.Release|x86.ActiveCfg = Release|x86
-		{1BEC97C1-56B9-4B2B-A95A-C0DF72F1E96A}.Release|x86.Build.0 = Release|x86
-		{AE8F8C20-9ED9-4A16-9565-27DF77683789}.Debug|x86.ActiveCfg = Debug|x86
-		{AE8F8C20-9ED9-4A16-9565-27DF77683789}.Release|x86.ActiveCfg = Release|x86
-		{AE8F8C20-9ED9-4A16-9565-27DF77683789}.Release|x86.Build.0 = Release|x86
-		{0786C785-944A-4423-96A6-4E7BFDB4A1B0}.Debug|x86.ActiveCfg = Debug|x86
-		{0786C785-944A-4423-96A6-4E7BFDB4A1B0}.Release|x86.ActiveCfg = Release|x86
-		{0786C785-944A-4423-96A6-4E7BFDB4A1B0}.Release|x86.Build.0 = Release|x86
-		{8777C77E-CA2A-42C1-90CD-2EA9CBF28937}.Debug|x86.ActiveCfg = Debug|x86
-		{8777C77E-CA2A-42C1-90CD-2EA9CBF28937}.Release|x86.ActiveCfg = Release|x86
-		{8777C77E-CA2A-42C1-90CD-2EA9CBF28937}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{62BD48B5-BB0C-4C2C-9C4B-04CF75CDCCF1} = {F141E2D0-F9B8-4ADB-A19A-7B6FF4CA19A1}
 		{4C4CD1BC-4411-4AFD-9D04-147053F0E259} = {F141E2D0-F9B8-4ADB-A19A-7B6FF4CA19A1}
 		{1BEC97C1-56B9-4B2B-A95A-C0DF72F1E96A} = {F141E2D0-F9B8-4ADB-A19A-7B6FF4CA19A1}
 		{AE8F8C20-9ED9-4A16-9565-27DF77683789} = {B54371FF-B920-46C8-8D55-6B19DBB43EBF}
 		{0786C785-944A-4423-96A6-4E7BFDB4A1B0} = {B54371FF-B920-46C8-8D55-6B19DBB43EBF}
 		{8777C77E-CA2A-42C1-90CD-2EA9CBF28937} = {B54371FF-B920-46C8-8D55-6B19DBB43EBF}
+		{62BD48B5-BB0C-4C2C-9C4B-04CF75CDCCF1} = {F141E2D0-F9B8-4ADB-A19A-7B6FF4CA19A1}
 	EndGlobalSection
 EndGlobal
diff --git a/src/Microsoft.Framework.ConfigurationModel.Json/Microsoft.AspNet.ConfigurationModel.Json.kproj b/src/Microsoft.Framework.ConfigurationModel.Json/Microsoft.Framework.ConfigurationModel.Json.kproj
similarity index 97%
rename from src/Microsoft.Framework.ConfigurationModel.Json/Microsoft.AspNet.ConfigurationModel.Json.kproj
rename to src/Microsoft.Framework.ConfigurationModel.Json/Microsoft.Framework.ConfigurationModel.Json.kproj
index 7b57390..a3e323e 100644
--- a/src/Microsoft.Framework.ConfigurationModel.Json/Microsoft.AspNet.ConfigurationModel.Json.kproj
+++ b/src/Microsoft.Framework.ConfigurationModel.Json/Microsoft.Framework.ConfigurationModel.Json.kproj
@@ -1,30 +1,30 @@
-<?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>4c4cd1bc-4411-4afd-9d04-147053f0e259</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="JsonConfigurationExtension.cs" />
-    <Compile Include="JsonConfigurationSource.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs" />
-  </ItemGroup>
-  <Import Project="$(VSToolsPath)\ProjectK\Microsoft.Web.ProjectK.targets" Condition="'$(VSToolsPath)' != ''" />
+<?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>4c4cd1bc-4411-4afd-9d04-147053f0e259</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="JsonConfigurationExtension.cs" />
+    <Compile Include="JsonConfigurationSource.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\Resources.Designer.cs" />
+  </ItemGroup>
+  <Import Project="$(VSToolsPath)\ProjectK\Microsoft.Web.ProjectK.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.Framework.ConfigurationModel.Xml/Microsoft.AspNet.ConfigurationModel.Xml.kproj b/src/Microsoft.Framework.ConfigurationModel.Xml/Microsoft.Framework.ConfigurationModel.Xml.kproj
similarity index 97%
rename from src/Microsoft.Framework.ConfigurationModel.Xml/Microsoft.AspNet.ConfigurationModel.Xml.kproj
rename to src/Microsoft.Framework.ConfigurationModel.Xml/Microsoft.Framework.ConfigurationModel.Xml.kproj
index 40301b3..f0fb401 100644
--- a/src/Microsoft.Framework.ConfigurationModel.Xml/Microsoft.AspNet.ConfigurationModel.Xml.kproj
+++ b/src/Microsoft.Framework.ConfigurationModel.Xml/Microsoft.Framework.ConfigurationModel.Xml.kproj
@@ -1,30 +1,30 @@
-<?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>1bec97c1-56b9-4b2b-a95a-c0df72f1e96a</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="Properties\Resources.Designer.cs" />
-    <Compile Include="XmlConfigurationExtension.cs" />
-    <Compile Include="XmlConfigurationSource.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <Import Project="$(VSToolsPath)\ProjectK\Microsoft.Web.ProjectK.targets" Condition="'$(VSToolsPath)' != ''" />
+<?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>1bec97c1-56b9-4b2b-a95a-c0df72f1e96a</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="Properties\Resources.Designer.cs" />
+    <Compile Include="XmlConfigurationExtension.cs" />
+    <Compile Include="XmlConfigurationSource.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <Import Project="$(VSToolsPath)\ProjectK\Microsoft.Web.ProjectK.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.Framework.ConfigurationModel/Microsoft.AspNet.ConfigurationModel.kproj b/src/Microsoft.Framework.ConfigurationModel/Microsoft.Framework.ConfigurationModel.kproj
similarity index 97%
rename from src/Microsoft.Framework.ConfigurationModel/Microsoft.AspNet.ConfigurationModel.kproj
rename to src/Microsoft.Framework.ConfigurationModel/Microsoft.Framework.ConfigurationModel.kproj
index f0defce..cb3094d 100644
--- a/src/Microsoft.Framework.ConfigurationModel/Microsoft.AspNet.ConfigurationModel.kproj
+++ b/src/Microsoft.Framework.ConfigurationModel/Microsoft.Framework.ConfigurationModel.kproj
@@ -1,42 +1,42 @@
-<?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>62bd48b5-bb0c-4c2c-9c4b-04cf75cdccf1</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="Configuration.cs" />
-    <Compile Include="ConfigurationExtensions.cs" />
-    <Compile Include="ConfigurationFocus.cs" />
-    <Compile Include="Constants.cs" />
-    <Compile Include="IConfiguration.cs" />
-    <Compile Include="AssemblyNeutralAttribute.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs" />
-    <Compile Include="Sources\BaseConfigurationSource.cs" />
-    <Compile Include="Sources\CommandLineConfigurationSource.cs" />
-    <Compile Include="Sources\EnvironmentVariablesConfigurationSource.cs" />
-    <Compile Include="Sources\ICommitableConfigurationSource.cs" />
-    <Compile Include="Sources\IConfigurationSource.cs" />
-    <Compile Include="Sources\IConfigurationSourceContainer.cs" />
-    <Compile Include="Sources\IniFileConfigurationSource.cs" />
-    <Compile Include="Sources\MemoryConfigurationSource.cs" />
-  </ItemGroup>
-  <Import Project="$(VSToolsPath)\ProjectK\Microsoft.Web.ProjectK.targets" Condition="'$(VSToolsPath)' != ''" />
+<?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>62bd48b5-bb0c-4c2c-9c4b-04cf75cdccf1</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="Configuration.cs" />
+    <Compile Include="ConfigurationExtensions.cs" />
+    <Compile Include="ConfigurationFocus.cs" />
+    <Compile Include="Constants.cs" />
+    <Compile Include="IConfiguration.cs" />
+    <Compile Include="AssemblyNeutralAttribute.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\Resources.Designer.cs" />
+    <Compile Include="Sources\BaseConfigurationSource.cs" />
+    <Compile Include="Sources\CommandLineConfigurationSource.cs" />
+    <Compile Include="Sources\EnvironmentVariablesConfigurationSource.cs" />
+    <Compile Include="Sources\ICommitableConfigurationSource.cs" />
+    <Compile Include="Sources\IConfigurationSource.cs" />
+    <Compile Include="Sources\IConfigurationSourceContainer.cs" />
+    <Compile Include="Sources\IniFileConfigurationSource.cs" />
+    <Compile Include="Sources\MemoryConfigurationSource.cs" />
+  </ItemGroup>
+  <Import Project="$(VSToolsPath)\ProjectK\Microsoft.Web.ProjectK.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/test/Microsoft.Framework.ConfigurationModel.Json.Test/Microsoft.AspNet.ConfigurationModel.Json.Test.kproj b/test/Microsoft.Framework.ConfigurationModel.Json.Test/Microsoft.Framework.ConfigurationModel.Json.Test.kproj
similarity index 97%
rename from test/Microsoft.Framework.ConfigurationModel.Json.Test/Microsoft.AspNet.ConfigurationModel.Json.Test.kproj
rename to test/Microsoft.Framework.ConfigurationModel.Json.Test/Microsoft.Framework.ConfigurationModel.Json.Test.kproj
index 79054d0..8fc2b7e 100644
--- a/test/Microsoft.Framework.ConfigurationModel.Json.Test/Microsoft.AspNet.ConfigurationModel.Json.Test.kproj
+++ b/test/Microsoft.Framework.ConfigurationModel.Json.Test/Microsoft.Framework.ConfigurationModel.Json.Test.kproj
@@ -1,27 +1,27 @@
-<?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>ae8f8c20-9ed9-4a16-9565-27df77683789</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <ActiveTargetFramework>net45</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>
-  <ItemGroup>
-    <Content Include="Project.json" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="JsonConfigurationSourceTest.cs" />
-  </ItemGroup>
-  <Import Project="$(VSToolsPath)\ProjectK\Microsoft.Web.ProjectK.targets" Condition="'$(VSToolsPath)' != ''" />
+<?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>ae8f8c20-9ed9-4a16-9565-27df77683789</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <ActiveTargetFramework>net45</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>
+  <ItemGroup>
+    <Content Include="Project.json" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="JsonConfigurationSourceTest.cs" />
+  </ItemGroup>
+  <Import Project="$(VSToolsPath)\ProjectK\Microsoft.Web.ProjectK.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/test/Microsoft.Framework.ConfigurationModel.Test/Microsoft.AspNet.ConfigurationModel.Test.kproj b/test/Microsoft.Framework.ConfigurationModel.Test/Microsoft.Framework.ConfigurationModel.Test.kproj
similarity index 97%
rename from test/Microsoft.Framework.ConfigurationModel.Test/Microsoft.AspNet.ConfigurationModel.Test.kproj
rename to test/Microsoft.Framework.ConfigurationModel.Test/Microsoft.Framework.ConfigurationModel.Test.kproj
index efee95e..592f283 100644
--- a/test/Microsoft.Framework.ConfigurationModel.Test/Microsoft.AspNet.ConfigurationModel.Test.kproj
+++ b/test/Microsoft.Framework.ConfigurationModel.Test/Microsoft.Framework.ConfigurationModel.Test.kproj
@@ -1,28 +1,28 @@
-<?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>8777c77e-ca2a-42c1-90cd-2ea9cbf28937</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="ConfigurationTest.cs" />
-    <Compile Include="EnvironmentVariablesConfigurationSourceTest.cs" />
-    <Compile Include="IniFileConfigurationSourceTest.cs" />
-  </ItemGroup>
-  <Import Project="$(VSToolsPath)\ProjectK\Microsoft.Web.ProjectK.targets" Condition="'$(VSToolsPath)' != ''" />
+<?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>8777c77e-ca2a-42c1-90cd-2ea9cbf28937</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="ConfigurationTest.cs" />
+    <Compile Include="EnvironmentVariablesConfigurationSourceTest.cs" />
+    <Compile Include="IniFileConfigurationSourceTest.cs" />
+  </ItemGroup>
+  <Import Project="$(VSToolsPath)\ProjectK\Microsoft.Web.ProjectK.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/test/Microsoft.Framework.ConfigurationModel.Xml.Test/Microsoft.AspNet.ConfigurationModel.Xml.Test.kproj b/test/Microsoft.Framework.ConfigurationModel.Xml.Test/Microsoft.Framework.ConfigurationModel.Xml.Test.kproj
similarity index 97%
rename from test/Microsoft.Framework.ConfigurationModel.Xml.Test/Microsoft.AspNet.ConfigurationModel.Xml.Test.kproj
rename to test/Microsoft.Framework.ConfigurationModel.Xml.Test/Microsoft.Framework.ConfigurationModel.Xml.Test.kproj
index 07dfdb0..e6895eb 100644
--- a/test/Microsoft.Framework.ConfigurationModel.Xml.Test/Microsoft.AspNet.ConfigurationModel.Xml.Test.kproj
+++ b/test/Microsoft.Framework.ConfigurationModel.Xml.Test/Microsoft.Framework.ConfigurationModel.Xml.Test.kproj
@@ -1,26 +1,26 @@
-<?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>0786c785-944a-4423-96a6-4e7bfdb4a1b0</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="XmlConfigurationSourceTest.cs" />
-  </ItemGroup>
-  <Import Project="$(VSToolsPath)\ProjectK\Microsoft.Web.ProjectK.targets" Condition="'$(VSToolsPath)' != ''" />
+<?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>0786c785-944a-4423-96a6-4e7bfdb4a1b0</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="XmlConfigurationSourceTest.cs" />
+  </ItemGroup>
+  <Import Project="$(VSToolsPath)\ProjectK\Microsoft.Web.ProjectK.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file