diff --git a/XTMF2.sln b/XTMF2.sln
index 7b8e474..7ca1ac5 100644
--- a/XTMF2.sln
+++ b/XTMF2.sln
@@ -28,42 +28,104 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XTMF2.GUI.Tests", "tests\XT
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XTMF2.Run", "src\XTMF2.Run\XTMF2.Run.csproj", "{F6999FCE-4C4F-4CF6-9B70-0DEA31FB5E6D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XTMF2.GUI", "src\XTMF2.GUI\XTMF2.GUI.csproj", "{8C8E1A2B-3D4F-4E5C-9A1B-2C3D4E5F6A7B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XTMF2.GUI", "src\XTMF2.GUI\XTMF2.GUI.csproj", "{A16D11CD-0D70-4558-8CEA-52F0601C215A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XTMF2.Client", "XTMF2.Client", "{C8EE62EB-FB4F-2E7A-ABC1-8B3BF6E0080E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{57F8ED33-2002-472E-8F77-37D2C27C0ED0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{57F8ED33-2002-472E-8F77-37D2C27C0ED0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{57F8ED33-2002-472E-8F77-37D2C27C0ED0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{57F8ED33-2002-472E-8F77-37D2C27C0ED0}.Debug|x64.Build.0 = Debug|Any CPU
+		{57F8ED33-2002-472E-8F77-37D2C27C0ED0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{57F8ED33-2002-472E-8F77-37D2C27C0ED0}.Debug|x86.Build.0 = Debug|Any CPU
 		{57F8ED33-2002-472E-8F77-37D2C27C0ED0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{57F8ED33-2002-472E-8F77-37D2C27C0ED0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{57F8ED33-2002-472E-8F77-37D2C27C0ED0}.Release|x64.ActiveCfg = Release|Any CPU
+		{57F8ED33-2002-472E-8F77-37D2C27C0ED0}.Release|x64.Build.0 = Release|Any CPU
+		{57F8ED33-2002-472E-8F77-37D2C27C0ED0}.Release|x86.ActiveCfg = Release|Any CPU
+		{57F8ED33-2002-472E-8F77-37D2C27C0ED0}.Release|x86.Build.0 = Release|Any CPU
 		{5E0E170B-5A98-41C0-A9AB-4A0ED28C5CF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5E0E170B-5A98-41C0-A9AB-4A0ED28C5CF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5E0E170B-5A98-41C0-A9AB-4A0ED28C5CF1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5E0E170B-5A98-41C0-A9AB-4A0ED28C5CF1}.Debug|x64.Build.0 = Debug|Any CPU
+		{5E0E170B-5A98-41C0-A9AB-4A0ED28C5CF1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5E0E170B-5A98-41C0-A9AB-4A0ED28C5CF1}.Debug|x86.Build.0 = Debug|Any CPU
 		{5E0E170B-5A98-41C0-A9AB-4A0ED28C5CF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5E0E170B-5A98-41C0-A9AB-4A0ED28C5CF1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5E0E170B-5A98-41C0-A9AB-4A0ED28C5CF1}.Release|x64.ActiveCfg = Release|Any CPU
+		{5E0E170B-5A98-41C0-A9AB-4A0ED28C5CF1}.Release|x64.Build.0 = Release|Any CPU
+		{5E0E170B-5A98-41C0-A9AB-4A0ED28C5CF1}.Release|x86.ActiveCfg = Release|Any CPU
+		{5E0E170B-5A98-41C0-A9AB-4A0ED28C5CF1}.Release|x86.Build.0 = Release|Any CPU
 		{A4FC5ADC-58CA-429A-9626-EF07907AFB28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A4FC5ADC-58CA-429A-9626-EF07907AFB28}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A4FC5ADC-58CA-429A-9626-EF07907AFB28}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A4FC5ADC-58CA-429A-9626-EF07907AFB28}.Debug|x64.Build.0 = Debug|Any CPU
+		{A4FC5ADC-58CA-429A-9626-EF07907AFB28}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A4FC5ADC-58CA-429A-9626-EF07907AFB28}.Debug|x86.Build.0 = Debug|Any CPU
 		{A4FC5ADC-58CA-429A-9626-EF07907AFB28}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A4FC5ADC-58CA-429A-9626-EF07907AFB28}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A4FC5ADC-58CA-429A-9626-EF07907AFB28}.Release|x64.ActiveCfg = Release|Any CPU
+		{A4FC5ADC-58CA-429A-9626-EF07907AFB28}.Release|x64.Build.0 = Release|Any CPU
+		{A4FC5ADC-58CA-429A-9626-EF07907AFB28}.Release|x86.ActiveCfg = Release|Any CPU
+		{A4FC5ADC-58CA-429A-9626-EF07907AFB28}.Release|x86.Build.0 = Release|Any CPU
 		{627244F8-E275-4001-937C-F2D496E72B91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{627244F8-E275-4001-937C-F2D496E72B91}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{627244F8-E275-4001-937C-F2D496E72B91}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{627244F8-E275-4001-937C-F2D496E72B91}.Debug|x64.Build.0 = Debug|Any CPU
+		{627244F8-E275-4001-937C-F2D496E72B91}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{627244F8-E275-4001-937C-F2D496E72B91}.Debug|x86.Build.0 = Debug|Any CPU
 		{627244F8-E275-4001-937C-F2D496E72B91}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{627244F8-E275-4001-937C-F2D496E72B91}.Release|Any CPU.Build.0 = Release|Any CPU
+		{627244F8-E275-4001-937C-F2D496E72B91}.Release|x64.ActiveCfg = Release|Any CPU
+		{627244F8-E275-4001-937C-F2D496E72B91}.Release|x64.Build.0 = Release|Any CPU
+		{627244F8-E275-4001-937C-F2D496E72B91}.Release|x86.ActiveCfg = Release|Any CPU
+		{627244F8-E275-4001-937C-F2D496E72B91}.Release|x86.Build.0 = Release|Any CPU
 		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|x64.Build.0 = Debug|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|x86.Build.0 = Debug|Any CPU
 		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|x64.ActiveCfg = Release|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|x64.Build.0 = Release|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|x86.ActiveCfg = Release|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|x86.Build.0 = Release|Any CPU
 		{F6999FCE-4C4F-4CF6-9B70-0DEA31FB5E6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F6999FCE-4C4F-4CF6-9B70-0DEA31FB5E6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F6999FCE-4C4F-4CF6-9B70-0DEA31FB5E6D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F6999FCE-4C4F-4CF6-9B70-0DEA31FB5E6D}.Debug|x64.Build.0 = Debug|Any CPU
+		{F6999FCE-4C4F-4CF6-9B70-0DEA31FB5E6D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F6999FCE-4C4F-4CF6-9B70-0DEA31FB5E6D}.Debug|x86.Build.0 = Debug|Any CPU
 		{F6999FCE-4C4F-4CF6-9B70-0DEA31FB5E6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F6999FCE-4C4F-4CF6-9B70-0DEA31FB5E6D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8C8E1A2B-3D4F-4E5C-9A1B-2C3D4E5F6A7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8C8E1A2B-3D4F-4E5C-9A1B-2C3D4E5F6A7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8C8E1A2B-3D4F-4E5C-9A1B-2C3D4E5F6A7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8C8E1A2B-3D4F-4E5C-9A1B-2C3D4E5F6A7B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F6999FCE-4C4F-4CF6-9B70-0DEA31FB5E6D}.Release|x64.ActiveCfg = Release|Any CPU
+		{F6999FCE-4C4F-4CF6-9B70-0DEA31FB5E6D}.Release|x64.Build.0 = Release|Any CPU
+		{F6999FCE-4C4F-4CF6-9B70-0DEA31FB5E6D}.Release|x86.ActiveCfg = Release|Any CPU
+		{F6999FCE-4C4F-4CF6-9B70-0DEA31FB5E6D}.Release|x86.Build.0 = Release|Any CPU
+		{A16D11CD-0D70-4558-8CEA-52F0601C215A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A16D11CD-0D70-4558-8CEA-52F0601C215A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A16D11CD-0D70-4558-8CEA-52F0601C215A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A16D11CD-0D70-4558-8CEA-52F0601C215A}.Debug|x64.Build.0 = Debug|Any CPU
+		{A16D11CD-0D70-4558-8CEA-52F0601C215A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A16D11CD-0D70-4558-8CEA-52F0601C215A}.Debug|x86.Build.0 = Debug|Any CPU
+		{A16D11CD-0D70-4558-8CEA-52F0601C215A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A16D11CD-0D70-4558-8CEA-52F0601C215A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A16D11CD-0D70-4558-8CEA-52F0601C215A}.Release|x64.ActiveCfg = Release|Any CPU
+		{A16D11CD-0D70-4558-8CEA-52F0601C215A}.Release|x64.Build.0 = Release|Any CPU
+		{A16D11CD-0D70-4558-8CEA-52F0601C215A}.Release|x86.ActiveCfg = Release|Any CPU
+		{A16D11CD-0D70-4558-8CEA-52F0601C215A}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -75,7 +137,8 @@ Global
 		{627244F8-E275-4001-937C-F2D496E72B91} = {77789778-93F5-46A6-9114-CCE855E5919C}
 		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890} = {77789778-93F5-46A6-9114-CCE855E5919C}
 		{F6999FCE-4C4F-4CF6-9B70-0DEA31FB5E6D} = {9040CC77-712E-414D-8453-391F9F348218}
-		{8C8E1A2B-3D4F-4E5C-9A1B-2C3D4E5F6A7B} = {9040CC77-712E-414D-8453-391F9F348218}
+		{A16D11CD-0D70-4558-8CEA-52F0601C215A} = {9040CC77-712E-414D-8453-391F9F348218}
+		{C8EE62EB-FB4F-2E7A-ABC1-8B3BF6E0080E} = {9040CC77-712E-414D-8453-391F9F348218}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {15025AE3-C5AA-4CD4-BC38-D1C1BA8904AF}
diff --git a/src/XTMF2.Client/XTMF2.RunServer.csproj b/src/XTMF2.Client/XTMF2.RunServer.csproj
index fe96c57..dccff50 100644
--- a/src/XTMF2.Client/XTMF2.RunServer.csproj
+++ b/src/XTMF2.Client/XTMF2.RunServer.csproj
@@ -8,6 +8,9 @@
     <OutputTypeEx>exe</OutputTypeEx>
     <StartupObject></StartupObject>
     <Nullable>enable</Nullable>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+    <OutputPath>..\..\..\XTMF2-Dev\</OutputPath>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/XTMF2.GUI/XTMF2.GUI.csproj b/src/XTMF2.GUI/XTMF2.GUI.csproj
index 14843ff..adbb2dd 100644
--- a/src/XTMF2.GUI/XTMF2.GUI.csproj
+++ b/src/XTMF2.GUI/XTMF2.GUI.csproj
@@ -7,6 +7,9 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+    <OutputPath>..\..\..\XTMF2-Dev\</OutputPath>
   </PropertyGroup>
 
   <ItemGroup>
@@ -33,7 +36,8 @@
     </EmbeddedResource>
   </ItemGroup>
 
-  <ItemGroup>    <AvaloniaResource Include="Resources\XTMF_icon.png"/>
+  <ItemGroup>    
+    <AvaloniaResource Include="Resources\XTMF_icon.png"/>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/XTMF2/XTMF2.csproj b/src/XTMF2/XTMF2.csproj
index 7dca667..2ed9354 100644
--- a/src/XTMF2/XTMF2.csproj
+++ b/src/XTMF2/XTMF2.csproj
@@ -10,6 +10,9 @@
     <Description>eXtensible Travel Modelling Framework</Description>
     <RepositoryType>https://github.com/TravelModellingGroup/XTMF2.git</RepositoryType>
     <Nullable>enable</Nullable>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+    <OutputPath>..\..\..\XTMF2-Dev\</OutputPath>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/tests/XTMF2.GUI.Tests/XTMF2.GUI.Tests.csproj b/tests/XTMF2.GUI.Tests/XTMF2.GUI.Tests.csproj
index 28736e9..6f69750 100644
--- a/tests/XTMF2.GUI.Tests/XTMF2.GUI.Tests.csproj
+++ b/tests/XTMF2.GUI.Tests/XTMF2.GUI.Tests.csproj
@@ -6,21 +6,6 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Content Include="..\..\src\XTMF2.Client\bin\$(Configuration)\$(TargetFramework)\XTMF2.RunServer.deps.json" Link="XTMF2.Client.deps.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\..\src\XTMF2.Client\bin\$(Configuration)\$(TargetFramework)\XTMF2.RunServer.runtimeconfig.json" Link="XTMF2.Client.runtimeconfig.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\..\src\XTMF2.Run\bin\$(Configuration)\$(TargetFramework)\XTMF2.Run.deps.json" Link="XTMF2.Run.deps.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\..\src\XTMF2.Run\bin\$(Configuration)\$(TargetFramework)\XTMF2.Run.runtimeconfig.json" Link="XTMF2.Run.runtimeconfig.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     <PackageReference Include="MSTest.TestAdapter" Version="4.0.2" />
diff --git a/tests/XTMF2.UnitTests/XTMF2.UnitTests.csproj b/tests/XTMF2.UnitTests/XTMF2.UnitTests.csproj
index 5b1e733..4370ea6 100644
--- a/tests/XTMF2.UnitTests/XTMF2.UnitTests.csproj
+++ b/tests/XTMF2.UnitTests/XTMF2.UnitTests.csproj
@@ -5,21 +5,6 @@
     <RootNamespace>XTMF2.UnitTests</RootNamespace>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Content Include="..\..\src\XTMF2.Client\bin\$(Configuration)\$(TargetFramework)\XTMF2.RunServer.deps.json" Link="XTMF2.Client.deps.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\..\src\XTMF2.Client\bin\$(Configuration)\$(TargetFramework)\XTMF2.RunServer.runtimeconfig.json" Link="XTMF2.Client.runtimeconfig.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\..\src\XTMF2.Run\bin\$(Configuration)\$(TargetFramework)\XTMF2.Run.deps.json" Link="XTMF2.Run.deps.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\..\src\XTMF2.Run\bin\$(Configuration)\$(TargetFramework)\XTMF2.Run.runtimeconfig.json" Link="XTMF2.Run.runtimeconfig.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     <PackageReference Include="MSTest.TestAdapter" Version="4.0.2" />