diff --git a/CommonBuildProps.proj b/CommonBuildProps-legacy.proj
similarity index 100%
rename from CommonBuildProps.proj
rename to CommonBuildProps-legacy.proj
diff --git a/InfraLib/InfraLib.fsproj b/InfraLib/InfraLib-legacy.fsproj
similarity index 97%
rename from InfraLib/InfraLib.fsproj
rename to InfraLib/InfraLib-legacy.fsproj
index 2ecea7f8..dc74b30d 100644
--- a/InfraLib/InfraLib.fsproj
+++ b/InfraLib/InfraLib-legacy.fsproj
@@ -55,7 +55,7 @@
     <Compile Include="Git.fs" />
     <Compile Include="Taiga.fs" />
   </ItemGroup>
-  <Import Project="..\CommonBuildProps.proj" />
+  <Import Project="..\CommonBuildProps-legacy.proj" />
   <Import Condition="'$(FSharpTargetsPath)' != ''" Project="$(FSharpTargetsPath)" />
   <Target Name="BeforeBuild">
     <Message Condition="'$(FSharpTargetsPath)' == ''" Importance="High" Text="F# SDK path was not found!" />
@@ -67,4 +67,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/fsx.sln b/fsx-legacy.sln
similarity index 95%
rename from fsx.sln
rename to fsx-legacy.sln
index 24680f44..829d3ce8 100644
--- a/fsx.sln
+++ b/fsx-legacy.sln
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "InfraLib", "InfraLib\InfraLib.fsproj", "{4634F264-784E-42DA-B5A1-FE72125DEAFC}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "InfraLib", "InfraLib\InfraLib-legacy.fsproj", "{4634F264-784E-42DA-B5A1-FE72125DEAFC}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "fsxc", "fsxc\fsxc.fsproj", "{56DA5F03-8F7F-44AB-B692-5A24DB134A8B}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "fsxc", "fsxc\fsxc-legacy.fsproj", "{56DA5F03-8F7F-44AB-B692-5A24DB134A8B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{8E1108BE-590F-4C6D-8496-A8AAEB8594D8}"
 	ProjectSection(SolutionItems) = preProject
diff --git a/fsxc/fsxc.fsproj b/fsxc/fsxc-legacy.fsproj
similarity index 98%
rename from fsxc/fsxc.fsproj
rename to fsxc/fsxc-legacy.fsproj
index 083d76f3..cadd6e14 100644
--- a/fsxc/fsxc.fsproj
+++ b/fsxc/fsxc-legacy.fsproj
@@ -54,7 +54,7 @@
     <Compile Include="Program.fs" />
     <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="..\CommonBuildProps.proj" />
+  <Import Project="..\CommonBuildProps-legacy.proj" />
   <Import Condition="'$(FSharpTargetsPath)' != ''" Project="$(FSharpTargetsPath)" />
   <Target Name="BeforeBuild">
     <Message Condition="'$(FSharpTargetsPath)' == ''" Importance="High" Text="F# SDK path was not found!" />
diff --git a/scripts/build.sh b/scripts/build.sh
index d6bb56a6..21f4f8ad 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -7,4 +7,4 @@ if [ ! -f ./build.config ]; then
 fi
 source build.config
 
-$BuildTool fsx.sln
+$BuildTool fsx-legacy.sln
diff --git a/scripts/install.sh b/scripts/install.sh
index c10a74fe..36c4246b 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -7,7 +7,7 @@ if [ ! -f ./build.config ]; then
 fi
 source build.config
 
-$BuildTool fsx.sln /p:Configuration=Release
+$BuildTool fsx-legacy.sln /p:Configuration=Release
 
 FSX_INSTALL_DIR="$Prefix/lib/fsx"
 BIN_INSTALL_DIR="$Prefix/bin"
diff --git a/scripts/make.fsx b/scripts/make.fsx
index 6d5745c4..a44f75c9 100755
--- a/scripts/make.fsx
+++ b/scripts/make.fsx
@@ -166,7 +166,7 @@ let BuildSolution
     | _ -> ()
 
 let JustBuild binaryConfig =
-    let solFile = "fsx.sln"
+    let solFile = "fsx-legacy.sln"
 
     Network.RunNugetCommand
         NugetExe
diff --git a/test/testRefNugetLib.fsx b/test/testRefNugetLib.fsx
index 018cdc1f..2ccc283d 100755
--- a/test/testRefNugetLib.fsx
+++ b/test/testRefNugetLib.fsx
@@ -8,7 +8,8 @@ open System.Linq
 open Microsoft.Build.Construction
 
 let sol =
-    SolutionFile.Parse <| Path.Combine(__SOURCE_DIRECTORY__, "..", "fsx.sln")
+    SolutionFile.Parse
+    <| Path.Combine(__SOURCE_DIRECTORY__, "..", "fsx-legacy.sln")
 
 for (proj: string) in
     (sol
diff --git a/test/testRefNugetLibNewFormat.fsx b/test/testRefNugetLibNewFormat.fsx
index 2ae80153..05969152 100755
--- a/test/testRefNugetLibNewFormat.fsx
+++ b/test/testRefNugetLibNewFormat.fsx
@@ -8,7 +8,8 @@ open System.Linq
 open Microsoft.Build.Construction
 
 let sol =
-    SolutionFile.Parse <| Path.Combine(__SOURCE_DIRECTORY__, "..", "fsx.sln")
+    SolutionFile.Parse
+    <| Path.Combine(__SOURCE_DIRECTORY__, "..", "fsx-legacy.sln")
 
 for (proj: string) in
     (sol
diff --git a/test/testRefNugetLibNewFormatWithVersion.fsx b/test/testRefNugetLibNewFormatWithVersion.fsx
index 54708c9b..8b77725f 100755
--- a/test/testRefNugetLibNewFormatWithVersion.fsx
+++ b/test/testRefNugetLibNewFormatWithVersion.fsx
@@ -8,7 +8,8 @@ open System.Linq
 open Microsoft.Build.Construction
 
 let sol =
-    SolutionFile.Parse <| Path.Combine(__SOURCE_DIRECTORY__, "..", "fsx.sln")
+    SolutionFile.Parse
+    <| Path.Combine(__SOURCE_DIRECTORY__, "..", "fsx-legacy.sln")
 
 for (proj: string) in
     (sol