diff --git a/src/Benchmarking_Net45/Benchmarking.csproj b/src/Benchmarking/Benchmarking.csproj
similarity index 98%
rename from src/Benchmarking_Net45/Benchmarking.csproj
rename to src/Benchmarking/Benchmarking.csproj
index 8984457f2bf..ec1d0ac5181 100644
--- a/src/Benchmarking_Net45/Benchmarking.csproj
+++ b/src/Benchmarking/Benchmarking.csproj
@@ -18,7 +18,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\Benchmarking\bin\Debug\</OutputPath>
+    <OutputPath>..\Benchmarking\bin\Net45\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -27,7 +27,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\Benchmarking\bin\Release\</OutputPath>
+    <OutputPath>..\Benchmarking\bin\Net45\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -43,29 +43,27 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Benchmarking\**\*.cs">
-		<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
-	</Compile>
-    <None Include="..\Benchmarking\App.config" />
+    <Compile Include="**\*.cs" />
+    <None Include="App.config" />
     <None Include="paket.references" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Elasticsearch.Net_Net45\Elasticsearch.Net.csproj">
+    <ProjectReference Include="..\Elasticsearch.Net\Elasticsearch.Net.csproj">
       <Project>{e97ccf40-0ba6-43fe-9f2d-58d454134088}</Project>
       <Name>Elasticsearch.Net</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Nest_Net45\Nest.csproj">
+    <ProjectReference Include="..\Nest\Nest.csproj">
       <Project>{072ba7da-7b60-407d-8b6e-95e3186be70c}</Project>
       <Name>Nest</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Tests_Net45\Tests.csproj">
+    <ProjectReference Include="..\Tests\Tests.csproj">
       <Project>{37164c11-88ef-4428-803a-9aa24fb8b44d}</Project>
       <Name>Tests</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\.paket\paket.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- 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.
   <Target Name="BeforeBuild">
   </Target>
@@ -458,4 +456,4 @@
       </ItemGroup>
     </When>
   </Choose>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Benchmarking/Benchmarking.project.json b/src/Benchmarking/Benchmarking.project.json
new file mode 100644
index 00000000000..faf891318d9
--- /dev/null
+++ b/src/Benchmarking/Benchmarking.project.json
@@ -0,0 +1,8 @@
+{
+  "frameworks": {
+    "net45": {}
+  },
+  "runtimes": {
+    "win": {}
+  }
+}
\ No newline at end of file
diff --git a/src/Benchmarking/Benchmarking.project.lock.json b/src/Benchmarking/Benchmarking.project.lock.json
new file mode 100644
index 00000000000..47378cc7551
--- /dev/null
+++ b/src/Benchmarking/Benchmarking.project.lock.json
@@ -0,0 +1,13 @@
+{
+  "locked": false,
+  "version": 1,
+  "targets": {
+    ".NETFramework,Version=v4.5": {},
+    ".NETFramework,Version=v4.5/win": {}
+  },
+  "libraries": {},
+  "projectFileDependencyGroups": {
+    "": [],
+    ".NETFramework,Version=v4.5": []
+  }
+}
\ No newline at end of file
diff --git a/src/Benchmarking_Net45/paket.references b/src/Benchmarking/paket.references
similarity index 100%
rename from src/Benchmarking_Net45/paket.references
rename to src/Benchmarking/paket.references
diff --git a/src/CodeGeneration/CodeGeneration.LowLevelClient_Net45/CodeGeneration.LowLevelClient.csproj b/src/CodeGeneration/CodeGeneration.LowLevelClient/CodeGeneration.LowLevelClient.csproj
similarity index 92%
rename from src/CodeGeneration/CodeGeneration.LowLevelClient_Net45/CodeGeneration.LowLevelClient.csproj
rename to src/CodeGeneration/CodeGeneration.LowLevelClient/CodeGeneration.LowLevelClient.csproj
index aa25ed64f73..2d1b478ee47 100644
--- a/src/CodeGeneration/CodeGeneration.LowLevelClient_Net45/CodeGeneration.LowLevelClient.csproj
+++ b/src/CodeGeneration/CodeGeneration.LowLevelClient/CodeGeneration.LowLevelClient.csproj
@@ -19,7 +19,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\CodeGeneration.LowLevelClient\bin\Debug\</OutputPath>
+    <OutputPath>..\CodeGeneration.LowLevelClient\bin\Net45\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -28,7 +28,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\CodeGeneration.LowLevelClient\bin\Release\</OutputPath>
+    <OutputPath>..\CodeGeneration.LowLevelClient\bin\Net45\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -47,20 +47,13 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\CodeGeneration.LowLevelClient\**\*.cs">
-      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
-    </Compile>
-	<Content Include="..\CodeGeneration.LowLevelClient\**\*.json" Exclude="..\CodeGeneration.LowLevelClient\project.json;..\CodeGeneration.LowLevelClient\project.lock.json;">
-		<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
-	</Content>
-    <None Include="..\CodeGeneration.LowLevelClient\App.config" />
+    <Compile Include="**\*.cs" />
+    <None Include="App.config" />
     <None Include="paket.references" />
-    <None Include="..\CodeGeneration.LowLevelClient\**\*.cshtml">
-      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
-    </None>
+    <None Include="**\*.cshtml" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- 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.
   <Target Name="BeforeBuild">
   </Target>
@@ -162,4 +155,4 @@
       </ItemGroup>
     </When>
   </Choose>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/CodeGeneration/CodeGeneration.LowLevelClient/CodeGeneration.LowLevelClient.project.json b/src/CodeGeneration/CodeGeneration.LowLevelClient/CodeGeneration.LowLevelClient.project.json
new file mode 100644
index 00000000000..faf891318d9
--- /dev/null
+++ b/src/CodeGeneration/CodeGeneration.LowLevelClient/CodeGeneration.LowLevelClient.project.json
@@ -0,0 +1,8 @@
+{
+  "frameworks": {
+    "net45": {}
+  },
+  "runtimes": {
+    "win": {}
+  }
+}
\ No newline at end of file
diff --git a/src/CodeGeneration/CodeGeneration.LowLevelClient/CodeGeneration.LowLevelClient.project.lock.json b/src/CodeGeneration/CodeGeneration.LowLevelClient/CodeGeneration.LowLevelClient.project.lock.json
new file mode 100644
index 00000000000..47378cc7551
--- /dev/null
+++ b/src/CodeGeneration/CodeGeneration.LowLevelClient/CodeGeneration.LowLevelClient.project.lock.json
@@ -0,0 +1,13 @@
+{
+  "locked": false,
+  "version": 1,
+  "targets": {
+    ".NETFramework,Version=v4.5": {},
+    ".NETFramework,Version=v4.5/win": {}
+  },
+  "libraries": {},
+  "projectFileDependencyGroups": {
+    "": [],
+    ".NETFramework,Version=v4.5": []
+  }
+}
\ No newline at end of file
diff --git a/src/CodeGeneration/CodeGeneration.LowLevelClient_Net45/paket.references b/src/CodeGeneration/CodeGeneration.LowLevelClient/paket.references
similarity index 100%
rename from src/CodeGeneration/CodeGeneration.LowLevelClient_Net45/paket.references
rename to src/CodeGeneration/CodeGeneration.LowLevelClient/paket.references
diff --git a/src/CodeGeneration/CodeGeneration.LowLevelClient_Net45/razormachine.readme.txt b/src/CodeGeneration/CodeGeneration.LowLevelClient/razormachine.readme.txt
similarity index 100%
rename from src/CodeGeneration/CodeGeneration.LowLevelClient_Net45/razormachine.readme.txt
rename to src/CodeGeneration/CodeGeneration.LowLevelClient/razormachine.readme.txt
diff --git a/src/CodeGeneration/Nest.Litterateur_Net45/Nest.Litterateur.csproj b/src/CodeGeneration/Nest.Litterateur/Nest.Litterateur.csproj
similarity index 95%
rename from src/CodeGeneration/Nest.Litterateur_Net45/Nest.Litterateur.csproj
rename to src/CodeGeneration/Nest.Litterateur/Nest.Litterateur.csproj
index bb6f8d4dd14..d1bfecd7304 100644
--- a/src/CodeGeneration/Nest.Litterateur_Net45/Nest.Litterateur.csproj
+++ b/src/CodeGeneration/Nest.Litterateur/Nest.Litterateur.csproj
@@ -20,7 +20,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\Nest.Litterateur\bin\Debug\</OutputPath>
+    <OutputPath>..\Nest.Litterateur\bin\Net45\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -29,7 +29,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\Nest.Litterateur\bin\Release\</OutputPath>
+    <OutputPath>..\Nest.Litterateur\bin\Net45\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -39,14 +39,12 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Nest.Litterateur\**\*.cs">
-		<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
-	</Compile>
-    <None Include="..\Nest.Litterateur\App.config" />
+    <Compile Include="**\*.cs" />
+    <None Include="App.config" />
     <None Include="paket.references" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- 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.
   <Target Name="BeforeBuild">
   </Target>
@@ -124,4 +122,4 @@
       </ItemGroup>
     </When>
   </Choose>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/CodeGeneration/Nest.Litterateur/Nest.Litterateur.project.json b/src/CodeGeneration/Nest.Litterateur/Nest.Litterateur.project.json
new file mode 100644
index 00000000000..faf891318d9
--- /dev/null
+++ b/src/CodeGeneration/Nest.Litterateur/Nest.Litterateur.project.json
@@ -0,0 +1,8 @@
+{
+  "frameworks": {
+    "net45": {}
+  },
+  "runtimes": {
+    "win": {}
+  }
+}
\ No newline at end of file
diff --git a/src/CodeGeneration/Nest.Litterateur/Nest.Litterateur.project.lock.json b/src/CodeGeneration/Nest.Litterateur/Nest.Litterateur.project.lock.json
new file mode 100644
index 00000000000..47378cc7551
--- /dev/null
+++ b/src/CodeGeneration/Nest.Litterateur/Nest.Litterateur.project.lock.json
@@ -0,0 +1,13 @@
+{
+  "locked": false,
+  "version": 1,
+  "targets": {
+    ".NETFramework,Version=v4.5": {},
+    ".NETFramework,Version=v4.5/win": {}
+  },
+  "libraries": {},
+  "projectFileDependencyGroups": {
+    "": [],
+    ".NETFramework,Version=v4.5": []
+  }
+}
\ No newline at end of file
diff --git a/src/CodeGeneration/Nest.Litterateur_Net45/paket.references b/src/CodeGeneration/Nest.Litterateur/paket.references
similarity index 100%
rename from src/CodeGeneration/Nest.Litterateur_Net45/paket.references
rename to src/CodeGeneration/Nest.Litterateur/paket.references
diff --git a/src/Elasticsearch.Net_Net45/Elasticsearch.Net.csproj b/src/Elasticsearch.Net/Elasticsearch.Net.csproj
similarity index 88%
rename from src/Elasticsearch.Net_Net45/Elasticsearch.Net.csproj
rename to src/Elasticsearch.Net/Elasticsearch.Net.csproj
index e80edfede46..74d58b5df98 100644
--- a/src/Elasticsearch.Net_Net45/Elasticsearch.Net.csproj
+++ b/src/Elasticsearch.Net/Elasticsearch.Net.csproj
@@ -18,7 +18,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\Elasticsearch.Net\bin\Debug\</OutputPath>
+    <OutputPath>..\Elasticsearch.Net\bin\Net45\Debug\</OutputPath>
     <DefineConstants>TRACE;DEBUG;NET45</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -29,11 +29,11 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\Elasticsearch.Net\bin\Release\</OutputPath>
+    <OutputPath>..\Elasticsearch.Net\bin\Net45\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>..\Elasticsearch.Net\bin\Release\Elasticsearch.Net.XML</DocumentationFile>
+    <DocumentationFile>..\Elasticsearch.Net\bin\Net45\Release\Elasticsearch.Net.XML</DocumentationFile>
     <NoWarn>1591,1572,1571,1573,1587,1570</NoWarn>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -54,9 +54,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Elasticsearch.Net\**\*.cs">
-      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
-    </Compile>
+    <Compile Include="**\*.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="paket.references" />
@@ -65,7 +63,7 @@
     <Folder Include="Domain\Response\" />
   </ItemGroup> -->
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- 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.
   <Target Name="BeforeBuild">
   </Target>
@@ -73,4 +71,4 @@
   </Target>
   -->
   <Import Project="..\..\.paket\paket.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Elasticsearch.Net/Elasticsearch.Net.project.json b/src/Elasticsearch.Net/Elasticsearch.Net.project.json
new file mode 100644
index 00000000000..faf891318d9
--- /dev/null
+++ b/src/Elasticsearch.Net/Elasticsearch.Net.project.json
@@ -0,0 +1,8 @@
+{
+  "frameworks": {
+    "net45": {}
+  },
+  "runtimes": {
+    "win": {}
+  }
+}
\ No newline at end of file
diff --git a/src/Elasticsearch.Net/Elasticsearch.Net.project.lock.json b/src/Elasticsearch.Net/Elasticsearch.Net.project.lock.json
new file mode 100644
index 00000000000..47378cc7551
--- /dev/null
+++ b/src/Elasticsearch.Net/Elasticsearch.Net.project.lock.json
@@ -0,0 +1,13 @@
+{
+  "locked": false,
+  "version": 1,
+  "targets": {
+    ".NETFramework,Version=v4.5": {},
+    ".NETFramework,Version=v4.5/win": {}
+  },
+  "libraries": {},
+  "projectFileDependencyGroups": {
+    "": [],
+    ".NETFramework,Version=v4.5": []
+  }
+}
\ No newline at end of file
diff --git a/src/Elasticsearch.Net_Net45/paket.references b/src/Elasticsearch.Net/paket.references
similarity index 100%
rename from src/Elasticsearch.Net_Net45/paket.references
rename to src/Elasticsearch.Net/paket.references
diff --git a/src/Elasticsearch.sln b/src/Elasticsearch.sln
index d6d375f87f1..347c1d96fd4 100644
--- a/src/Elasticsearch.sln
+++ b/src/Elasticsearch.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.24720.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nest", "Nest_Net45\Nest.csproj", "{072BA7DA-7B60-407D-8B6E-95E3186BE70C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nest", "Nest\Nest.csproj", "{072BA7DA-7B60-407D-8B6E-95E3186BE70C}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Build", "_Build", "{432D5575-2347-4D3C-BF8C-3E38410C46CA}"
 	ProjectSection(SolutionItems) = preProject
@@ -23,21 +23,21 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Build", "_Build", "{432D55
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Code Generation", "Code Generation", "{93331BEE-0AA0-47B7-B1D2-BD5BD31634D1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeGeneration.LowLevelClient", "CodeGeneration\CodeGeneration.LowLevelClient_Net45\CodeGeneration.LowLevelClient.csproj", "{56A87048-9065-459B-826D-3DF68B409845}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeGeneration.LowLevelClient", "CodeGeneration\CodeGeneration.LowLevelClient\CodeGeneration.LowLevelClient.csproj", "{56A87048-9065-459B-826D-3DF68B409845}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elasticsearch.Net", "Elasticsearch.Net_Net45\Elasticsearch.Net.csproj", "{E97CCF40-0BA6-43FE-9F2D-58D454134088}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elasticsearch.Net", "Elasticsearch.Net\Elasticsearch.Net.csproj", "{E97CCF40-0BA6-43FE-9F2D-58D454134088}"
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "scripts", "..\build\scripts\scripts.fsproj", "{28328694-2598-44D3-BB25-8B6C3FBDD3EF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests_Net45\Tests.csproj", "{37164C11-88EF-4428-803A-9AA24FB8B44D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{37164C11-88EF-4428-803A-9AA24FB8B44D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nest.Litterateur", "CodeGeneration\Nest.Litterateur_Net45\Nest.Litterateur.csproj", "{98400F59-4BA8-4534-9A78-9C7FA0B42901}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nest.Litterateur", "CodeGeneration\Nest.Litterateur\Nest.Litterateur.csproj", "{98400F59-4BA8-4534-9A78-9C7FA0B42901}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Performance", "Performance", "{71B3D359-87E2-4F62-82A2-A624DD3BF402}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Benchmarking", "Benchmarking_Net45\Benchmarking.csproj", "{9BB0AB7E-F08E-4D3E-A9E7-7C71318E8666}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Benchmarking", "Benchmarking\Benchmarking.csproj", "{9BB0AB7E-F08E-4D3E-A9E7-7C71318E8666}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiling", "Profiling_Net45\Profiling.csproj", "{523B5383-B67D-462F-825D-FAE057E6B17D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiling", "Profiling\Profiling.csproj", "{523B5383-B67D-462F-825D-FAE057E6B17D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/Nest_Net45/Nest.csproj b/src/Nest/Nest.csproj
similarity index 94%
rename from src/Nest_Net45/Nest.csproj
rename to src/Nest/Nest.csproj
index 3456aee9a1e..2f02c895d29 100644
--- a/src/Nest_Net45/Nest.csproj
+++ b/src/Nest/Nest.csproj
@@ -18,13 +18,13 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\Nest\bin\Debug\</OutputPath>
+    <OutputPath>..\Nest\bin\Net45\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>BasicCorrectnessRules.ruleset</CodeAnalysisRuleSet>
     <PlatformTarget>AnyCPU</PlatformTarget>
-    <DocumentationFile>..\Nest\bin\Debug\Nest.XML</DocumentationFile>
+    <DocumentationFile>..\Nest\bin\Net45\Debug\Nest.XML</DocumentationFile>
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <NoWarn>1591,1572,1571,1573,1587,1570</NoWarn>
     <Prefer32Bit>false</Prefer32Bit>
@@ -32,12 +32,12 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>True</Optimize>
-    <OutputPath>..\Nest\bin\Release\</OutputPath>
+    <OutputPath>..\Nest\bin\Net45\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>..\Nest\bin\Release\Nest.XML</DocumentationFile>
+    <DocumentationFile>..\Nest\bin\Net45\Release\Nest.XML</DocumentationFile>
     <NoWarn>1591,1572,1571,1573,1587,1570</NoWarn>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -56,9 +56,7 @@
     <Reference Include="System.ServiceModel" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Nest\**\*.cs" >
-		<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
-    </Compile>
+    <Compile Include="**\*.cs" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
@@ -78,7 +76,7 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Elasticsearch.Net_Net45\Elasticsearch.Net.csproj">
+    <ProjectReference Include="..\Elasticsearch.Net\Elasticsearch.Net.csproj">
       <Project>{E97CCF40-0BA6-43FE-9F2D-58D454134088}</Project>
       <Name>Elasticsearch.Net</Name>
     </ProjectReference>
@@ -87,7 +85,7 @@
     <None Include="paket.references" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- 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.
   <Target Name="BeforeBuild">
   </Target>
@@ -151,4 +149,4 @@
       </ItemGroup>
     </When>
   </Choose>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Nest/Nest.project.json b/src/Nest/Nest.project.json
new file mode 100644
index 00000000000..faf891318d9
--- /dev/null
+++ b/src/Nest/Nest.project.json
@@ -0,0 +1,8 @@
+{
+  "frameworks": {
+    "net45": {}
+  },
+  "runtimes": {
+    "win": {}
+  }
+}
\ No newline at end of file
diff --git a/src/Nest/Nest.project.lock.json b/src/Nest/Nest.project.lock.json
new file mode 100644
index 00000000000..47378cc7551
--- /dev/null
+++ b/src/Nest/Nest.project.lock.json
@@ -0,0 +1,13 @@
+{
+  "locked": false,
+  "version": 1,
+  "targets": {
+    ".NETFramework,Version=v4.5": {},
+    ".NETFramework,Version=v4.5/win": {}
+  },
+  "libraries": {},
+  "projectFileDependencyGroups": {
+    "": [],
+    ".NETFramework,Version=v4.5": []
+  }
+}
\ No newline at end of file
diff --git a/src/Nest_Net45/paket.references b/src/Nest/paket.references
similarity index 100%
rename from src/Nest_Net45/paket.references
rename to src/Nest/paket.references
diff --git a/src/Nest_Net45/nCrunchTemp_80e242c1-5c9f-4303-9b2c-f687541e03c6 b/src/Nest_Net45/nCrunchTemp_80e242c1-5c9f-4303-9b2c-f687541e03c6
deleted file mode 100644
index cd162fb41f6..00000000000
Binary files a/src/Nest_Net45/nCrunchTemp_80e242c1-5c9f-4303-9b2c-f687541e03c6 and /dev/null differ
diff --git a/src/Profiling_Net45/Profiling.csproj b/src/Profiling/Profiling.csproj
similarity index 98%
rename from src/Profiling_Net45/Profiling.csproj
rename to src/Profiling/Profiling.csproj
index bb978d20260..2bd2cf18603 100644
--- a/src/Profiling_Net45/Profiling.csproj
+++ b/src/Profiling/Profiling.csproj
@@ -18,7 +18,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\Profiling\bin\Debug\</OutputPath>
+    <OutputPath>..\Profiling\bin\Net45\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -27,7 +27,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\Profiling\bin\Release\</OutputPath>
+    <OutputPath>..\Profiling\bin\Net45\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -43,29 +43,27 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Profiling\**\*.cs">
-      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
-    </Compile>
-    <None Include="..\Profiling\App.config" />
+    <Compile Include="**\*.cs" />
+    <None Include="App.config" />
     <None Include="paket.references" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Elasticsearch.Net_Net45\Elasticsearch.Net.csproj">
+    <ProjectReference Include="..\Elasticsearch.Net\Elasticsearch.Net.csproj">
       <Project>{e97ccf40-0ba6-43fe-9f2d-58d454134088}</Project>
       <Name>Elasticsearch.Net</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Nest_Net45\Nest.csproj">
+    <ProjectReference Include="..\Nest\Nest.csproj">
       <Project>{072ba7da-7b60-407d-8b6e-95e3186be70c}</Project>
       <Name>Nest</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Tests_Net45\Tests.csproj">
+    <ProjectReference Include="..\Tests\Tests.csproj">
       <Project>{37164c11-88ef-4428-803a-9aa24fb8b44d}</Project>
       <Name>Tests</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\.paket\paket.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- 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.
   <Target Name="BeforeBuild">
   </Target>
@@ -636,4 +634,4 @@
   </Choose>
   <Import Project="..\..\packages\xunit.core\build\$(__paket__xunit_core_props).props" Condition="Exists('..\..\packages\xunit.core\build\$(__paket__xunit_core_props).props')" Label="Paket" />
   <Import Project="..\..\packages\JetBrains.Profiler.Kernel.Windows.Api\build\JetBrains.Profiler.Kernel.Windows.Api.Targets" Condition="Exists('..\..\packages\JetBrains.Profiler.Kernel.Windows.Api\build\JetBrains.Profiler.Kernel.Windows.Api.Targets')" Label="Paket" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Profiling/Profiling.project.json b/src/Profiling/Profiling.project.json
new file mode 100644
index 00000000000..faf891318d9
--- /dev/null
+++ b/src/Profiling/Profiling.project.json
@@ -0,0 +1,8 @@
+{
+  "frameworks": {
+    "net45": {}
+  },
+  "runtimes": {
+    "win": {}
+  }
+}
\ No newline at end of file
diff --git a/src/Profiling/Profiling.project.lock.json b/src/Profiling/Profiling.project.lock.json
new file mode 100644
index 00000000000..47378cc7551
--- /dev/null
+++ b/src/Profiling/Profiling.project.lock.json
@@ -0,0 +1,13 @@
+{
+  "locked": false,
+  "version": 1,
+  "targets": {
+    ".NETFramework,Version=v4.5": {},
+    ".NETFramework,Version=v4.5/win": {}
+  },
+  "libraries": {},
+  "projectFileDependencyGroups": {
+    "": [],
+    ".NETFramework,Version=v4.5": []
+  }
+}
\ No newline at end of file
diff --git a/src/Profiling_Net45/paket.references b/src/Profiling/paket.references
similarity index 100%
rename from src/Profiling_Net45/paket.references
rename to src/Profiling/paket.references
diff --git a/src/Tests/Cat/CatAliases/CatAliasesApiTests.cs b/src/Tests/Cat/CatAliases/CatAliasesApiTests.cs
index 27dcd2cb713..51de4b522b5 100644
--- a/src/Tests/Cat/CatAliases/CatAliasesApiTests.cs
+++ b/src/Tests/Cat/CatAliases/CatAliasesApiTests.cs
@@ -28,5 +28,4 @@ protected override void ExpectResponse(ICatResponse<CatAliasesRecord> response)
 			response.Records.Should().NotBeEmpty().And.Contain(a => a.Alias == "projects-alias");
 		}
 	}
-
 }
diff --git a/src/Tests_Net45/Tests.csproj b/src/Tests/Tests.csproj
similarity index 98%
rename from src/Tests_Net45/Tests.csproj
rename to src/Tests/Tests.csproj
index 1a7901fa963..7431d127d9e 100644
--- a/src/Tests_Net45/Tests.csproj
+++ b/src/Tests/Tests.csproj
@@ -18,7 +18,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\Tests\bin\Debug\</OutputPath>
+    <OutputPath>..\Tests\bin\Net45\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\Tests\bin\Release\</OutputPath>
+    <OutputPath>..\Tests\bin\Net45\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -43,24 +43,18 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Tests\**\*.cs">
-      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
-    </Compile>
-    <None Include="..\Tests\**\*.asciidoc">
-      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
-    </None>
+    <Compile Include=".\**\*.cs" />
+    <None Include="**\*.asciidoc" />
     <None Include="paket.references" />
-    <Content Include="..\Tests\**\*.png">
-      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
-    </Content>
-    <None Include="..\Tests\tests.yaml" />
+    <Content Include="**\*.png" />
+    <None Include="tests.yaml" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Elasticsearch.Net_Net45\Elasticsearch.Net.csproj">
+    <ProjectReference Include="..\Elasticsearch.Net\Elasticsearch.Net.csproj">
       <Project>{E97CCF40-0BA6-43FE-9F2D-58D454134088}</Project>
       <Name>Elasticsearch.Net</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Nest_Net45\Nest.csproj">
+    <ProjectReference Include="..\Nest\Nest.csproj">
       <Project>{072ba7da-7b60-407d-8b6e-95e3186be70c}</Project>
       <Name>Nest</Name>
     </ProjectReference>
@@ -790,4 +784,4 @@
     </When>
   </Choose>
   <Import Project="..\..\packages\xunit.core\build\$(__paket__xunit_core_props).props" Condition="Exists('..\..\packages\xunit.core\build\$(__paket__xunit_core_props).props')" Label="Paket" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Tests/Tests.project.json b/src/Tests/Tests.project.json
new file mode 100644
index 00000000000..faf891318d9
--- /dev/null
+++ b/src/Tests/Tests.project.json
@@ -0,0 +1,8 @@
+{
+  "frameworks": {
+    "net45": {}
+  },
+  "runtimes": {
+    "win": {}
+  }
+}
\ No newline at end of file
diff --git a/src/Tests/Tests.project.lock.json b/src/Tests/Tests.project.lock.json
new file mode 100644
index 00000000000..47378cc7551
--- /dev/null
+++ b/src/Tests/Tests.project.lock.json
@@ -0,0 +1,13 @@
+{
+  "locked": false,
+  "version": 1,
+  "targets": {
+    ".NETFramework,Version=v4.5": {},
+    ".NETFramework,Version=v4.5/win": {}
+  },
+  "libraries": {},
+  "projectFileDependencyGroups": {
+    "": [],
+    ".NETFramework,Version=v4.5": []
+  }
+}
\ No newline at end of file
diff --git a/src/Tests_Net45/paket.references b/src/Tests/paket.references
similarity index 100%
rename from src/Tests_Net45/paket.references
rename to src/Tests/paket.references
diff --git a/src/Tests/tests.yaml b/src/Tests/tests.yaml
index 74cf2393ae3..0ea63a0af78 100644
--- a/src/Tests/tests.yaml
+++ b/src/Tests/tests.yaml
@@ -1,5 +1,5 @@
 # mode either u (unit test), i (integration test) or m (mixed mode)
-mode: m
+mode: u
 # the elasticsearch version that should be started
 elasticsearch_version: 2.2.0
 # whether we want to forcefully reseed on the node, if you are starting the tests with a node already running