diff --git a/FsharpExchangeDotNetCore.sln b/FX.sln
similarity index 75%
rename from FsharpExchangeDotNetCore.sln
rename to FX.sln
index ffa0671..f19bcee 100644
--- a/FsharpExchangeDotNetCore.sln
+++ b/FX.sln
@@ -1,35 +1,35 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FsharpExchange.Tests", "src\FsharpExchange.Tests\FsharpExchange.Tests.csproj", "{984CE32C-454B-4FF1-B388-203DFD2CEAD8}"
-EndProject
-Project("{f2a71f9b-5d33-465a-a702-920d77279786}") = "FsharpExchangeDotNetStandard", "src\FsharpExchangeDotNetStandard\FsharpExchangeDotNetStandard.fsproj", "{10A328B6-51E8-40DD-B6D8-361AFAEFABFA}"
-EndProject
-Project("{f2a71f9b-5d33-465a-a702-920d77279786}") = "FsharpExchangeDotNetCoreApp", "src\FsharpExchangeDotNetCoreApp\FsharpExchangeDotNetCoreApp.fsproj", "{E741A563-9A64-49B9-8506-DEEB03DB340C}"
-EndProject
-Project("{f2a71f9b-5d33-465a-a702-920d77279786}") = "WebSocketApp", "src\WebSocketApp\WebSocketApp.fsproj", "{E41ECB40-3CD7-473B-9B73-6BDE00BD74B4}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{984CE32C-454B-4FF1-B388-203DFD2CEAD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{984CE32C-454B-4FF1-B388-203DFD2CEAD8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{984CE32C-454B-4FF1-B388-203DFD2CEAD8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{984CE32C-454B-4FF1-B388-203DFD2CEAD8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{10A328B6-51E8-40DD-B6D8-361AFAEFABFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{10A328B6-51E8-40DD-B6D8-361AFAEFABFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{10A328B6-51E8-40DD-B6D8-361AFAEFABFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{10A328B6-51E8-40DD-B6D8-361AFAEFABFA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E741A563-9A64-49B9-8506-DEEB03DB340C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E741A563-9A64-49B9-8506-DEEB03DB340C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E741A563-9A64-49B9-8506-DEEB03DB340C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E741A563-9A64-49B9-8506-DEEB03DB340C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E41ECB40-3CD7-473B-9B73-6BDE00BD74B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E41ECB40-3CD7-473B-9B73-6BDE00BD74B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E41ECB40-3CD7-473B-9B73-6BDE00BD74B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E41ECB40-3CD7-473B-9B73-6BDE00BD74B4}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FX.Tests", "src\FX.Tests\FX.Tests.csproj", "{984CE32C-454B-4FF1-B388-203DFD2CEAD8}"
+EndProject
+Project("{f2a71f9b-5d33-465a-a702-920d77279786}") = "FX.Core", "src\FX.Core\FX.Core.fsproj", "{10A328B6-51E8-40DD-B6D8-361AFAEFABFA}"
+EndProject
+Project("{f2a71f9b-5d33-465a-a702-920d77279786}") = "FX.Console", "src\FX.Console\FX.Console.fsproj", "{E741A563-9A64-49B9-8506-DEEB03DB340C}"
+EndProject
+Project("{f2a71f9b-5d33-465a-a702-920d77279786}") = "WebSocketApp", "src\WebSocketApp\WebSocketApp.fsproj", "{E41ECB40-3CD7-473B-9B73-6BDE00BD74B4}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{984CE32C-454B-4FF1-B388-203DFD2CEAD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{984CE32C-454B-4FF1-B388-203DFD2CEAD8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{984CE32C-454B-4FF1-B388-203DFD2CEAD8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{984CE32C-454B-4FF1-B388-203DFD2CEAD8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{10A328B6-51E8-40DD-B6D8-361AFAEFABFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{10A328B6-51E8-40DD-B6D8-361AFAEFABFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{10A328B6-51E8-40DD-B6D8-361AFAEFABFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{10A328B6-51E8-40DD-B6D8-361AFAEFABFA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E741A563-9A64-49B9-8506-DEEB03DB340C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E741A563-9A64-49B9-8506-DEEB03DB340C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E741A563-9A64-49B9-8506-DEEB03DB340C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E741A563-9A64-49B9-8506-DEEB03DB340C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E41ECB40-3CD7-473B-9B73-6BDE00BD74B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E41ECB40-3CD7-473B-9B73-6BDE00BD74B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E41ECB40-3CD7-473B-9B73-6BDE00BD74B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E41ECB40-3CD7-473B-9B73-6BDE00BD74B4}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+EndGlobal
diff --git a/src/FsharpExchangeDotNetCoreApp/FsharpExchangeDotNetCoreApp.fsproj b/src/FX.Console/FX.Console.fsproj
similarity index 73%
rename from src/FsharpExchangeDotNetCoreApp/FsharpExchangeDotNetCoreApp.fsproj
rename to src/FX.Console/FX.Console.fsproj
index a7e5155..3471e0c 100644
--- a/src/FsharpExchangeDotNetCoreApp/FsharpExchangeDotNetCoreApp.fsproj
+++ b/src/FX.Console/FX.Console.fsproj
@@ -1,16 +1,16 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="Program.fs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\FsharpExchangeDotNetStandard\FsharpExchangeDotNetStandard.fsproj" />
-    <PackageReference Include="FSharp.Core" Version="6.0.1" />
-  </ItemGroup>
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Program.fs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\FX.Core\FX.Core.fsproj" />
+    <PackageReference Include="FSharp.Core" Version="6.0.1" />
+  </ItemGroup>
+</Project>
diff --git a/src/FsharpExchangeDotNetCoreApp/Program.fs b/src/FX.Console/Program.fs
similarity index 100%
rename from src/FsharpExchangeDotNetCoreApp/Program.fs
rename to src/FX.Console/Program.fs
diff --git a/src/FsharpExchangeDotNetStandard/BasicTypes.fs b/src/FX.Core/BasicTypes.fs
similarity index 100%
rename from src/FsharpExchangeDotNetStandard/BasicTypes.fs
rename to src/FX.Core/BasicTypes.fs
diff --git a/src/FsharpExchangeDotNetStandard/Exchange.fs b/src/FX.Core/Exchange.fs
similarity index 100%
rename from src/FsharpExchangeDotNetStandard/Exchange.fs
rename to src/FX.Core/Exchange.fs
diff --git a/src/FsharpExchangeDotNetStandard/FsharpExchangeDotNetStandard.fsproj b/src/FX.Core/FX.Core.fsproj
similarity index 100%
rename from src/FsharpExchangeDotNetStandard/FsharpExchangeDotNetStandard.fsproj
rename to src/FX.Core/FX.Core.fsproj
diff --git a/src/FsharpExchangeDotNetStandard/MemoryStorageLayer.fs b/src/FX.Core/MemoryStorageLayer.fs
similarity index 100%
rename from src/FsharpExchangeDotNetStandard/MemoryStorageLayer.fs
rename to src/FX.Core/MemoryStorageLayer.fs
diff --git a/src/FsharpExchangeDotNetStandard/OrderBook.fs b/src/FX.Core/OrderBook.fs
similarity index 100%
rename from src/FsharpExchangeDotNetStandard/OrderBook.fs
rename to src/FX.Core/OrderBook.fs
diff --git a/src/FsharpExchangeDotNetStandard/RedisStorageLayer.fs b/src/FX.Core/RedisStorageLayer.fs
similarity index 100%
rename from src/FsharpExchangeDotNetStandard/RedisStorageLayer.fs
rename to src/FX.Core/RedisStorageLayer.fs
diff --git a/src/FsharpExchange.Tests/BasicTests.cs b/src/FX.Tests/BasicTests.cs
similarity index 100%
rename from src/FsharpExchange.Tests/BasicTests.cs
rename to src/FX.Tests/BasicTests.cs
diff --git a/src/FsharpExchange.Tests/FsharpExchange.Tests.csproj b/src/FX.Tests/FX.Tests.csproj
similarity index 84%
rename from src/FsharpExchange.Tests/FsharpExchange.Tests.csproj
rename to src/FX.Tests/FX.Tests.csproj
index 1f2af8e..b71a6da 100644
--- a/src/FsharpExchange.Tests/FsharpExchange.Tests.csproj
+++ b/src/FX.Tests/FX.Tests.csproj
@@ -1,21 +1,21 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.9.0" />
-    <PackageReference Include="FSharp.Core" Version="6.0.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
-    <PackageReference Include="StackExchange.Redis" Version="2.0.513" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Remove="Class1.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\FsharpExchangeDotNetStandard\FsharpExchangeDotNetStandard.fsproj" />
-  </ItemGroup>
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="NUnit" Version="3.9.0" />
+    <PackageReference Include="FSharp.Core" Version="6.0.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
+    <PackageReference Include="StackExchange.Redis" Version="2.0.513" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Remove="Class1.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\FX.Core\FX.Core.fsproj" />
+  </ItemGroup>
+</Project>
diff --git a/src/FsharpExchange.Tests/LimitOrders.cs b/src/FX.Tests/LimitOrders.cs
similarity index 100%
rename from src/FsharpExchange.Tests/LimitOrders.cs
rename to src/FX.Tests/LimitOrders.cs
diff --git a/src/FsharpExchange.Tests/MakerOnlyOrders.cs b/src/FX.Tests/MakerOnlyOrders.cs
similarity index 100%
rename from src/FsharpExchange.Tests/MakerOnlyOrders.cs
rename to src/FX.Tests/MakerOnlyOrders.cs
diff --git a/src/FsharpExchange.Tests/MarketOrders.cs b/src/FX.Tests/MarketOrders.cs
similarity index 100%
rename from src/FsharpExchange.Tests/MarketOrders.cs
rename to src/FX.Tests/MarketOrders.cs
diff --git a/src/FsharpExchange.Tests/RedisIntegrationTests.cs b/src/FX.Tests/RedisIntegrationTests.cs
similarity index 100%
rename from src/FsharpExchange.Tests/RedisIntegrationTests.cs
rename to src/FX.Tests/RedisIntegrationTests.cs
diff --git a/src/WebSocketApp/WebSocketApp.fsproj b/src/WebSocketApp/WebSocketApp.fsproj
index 4394d58..b4e536b 100644
--- a/src/WebSocketApp/WebSocketApp.fsproj
+++ b/src/WebSocketApp/WebSocketApp.fsproj
@@ -1,34 +1,34 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <DebugType>portable</DebugType>
-    <AssemblyName>WebSocketApp</AssemblyName>
-    <OutputType>Exe</OutputType>
-    <EnableDefaultContentItems>false</EnableDefaultContentItems>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Folder Include="Middleware\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Watch Include="Views\_Layout.cshtml" />
-    <Watch Include="Views\Partial.cshtml" />
-    <Watch Include="Views\Index.cshtml" />
-    <Content Include="Views\*.cshtml;WebRoot\**\*">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="WebRoot\main.css" />
-    <Compile Include="Models.fs" />
-    <Compile Include="Middleware\WebSocketMiddleware.fs" />
-    <Compile Include="Program.fs" />
-    <None Include="web.config" CopyToOutputDirectory="PreserveNewest" />
-    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.*" />
-    <PackageReference Include="Giraffe" Version="3.1.0" />
-    <PackageReference Include="Giraffe.Razor" Version="1.3.*" />
-    <Watch Include="**\*.cshtml" Exclude="bin\**\*" />
-    <PackageReference Include="Microsoft.AspNetCore.WebSockets" Version="2.1.1" />
-    <PackageReference Include="TaskBuilder.fs" Version="2.1.0" />
-    <ProjectReference Include="..\FsharpExchangeDotNetStandard\FsharpExchangeDotNetStandard.fsproj" />
-  </ItemGroup>
-</Project>
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <DebugType>portable</DebugType>
+    <AssemblyName>WebSocketApp</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <EnableDefaultContentItems>false</EnableDefaultContentItems>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Folder Include="Middleware\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Watch Include="Views\_Layout.cshtml" />
+    <Watch Include="Views\Partial.cshtml" />
+    <Watch Include="Views\Index.cshtml" />
+    <Content Include="Views\*.cshtml;WebRoot\**\*">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="WebRoot\main.css" />
+    <Compile Include="Models.fs" />
+    <Compile Include="Middleware\WebSocketMiddleware.fs" />
+    <Compile Include="Program.fs" />
+    <None Include="web.config" CopyToOutputDirectory="PreserveNewest" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.*" />
+    <PackageReference Include="Giraffe" Version="3.1.0" />
+    <PackageReference Include="Giraffe.Razor" Version="1.3.*" />
+    <Watch Include="**\*.cshtml" Exclude="bin\**\*" />
+    <PackageReference Include="Microsoft.AspNetCore.WebSockets" Version="2.1.1" />
+    <PackageReference Include="TaskBuilder.fs" Version="2.1.0" />
+    <ProjectReference Include="..\FX.Core\FX.Core.fsproj" />
+  </ItemGroup>
+</Project>