diff --git a/server/FSO.Server.Api.Core/FSO.Server.Api.Core.csproj b/server/FSO.Server.Api.Core/FSO.Server.Api.Core.csproj
index 2d98db3..07dc6df 100755
--- a/server/FSO.Server.Api.Core/FSO.Server.Api.Core.csproj
+++ b/server/FSO.Server.Api.Core/FSO.Server.Api.Core.csproj
@@ -1,11 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
-
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
   </PropertyGroup>
-
   <ItemGroup>
     <None Remove="MailTemplates\MailBan.html" />
     <None Remove="MailTemplates\MailBase.html" />
@@ -15,7 +13,6 @@
     <None Remove="MailTemplates\MailRegistrationToken.html" />
     <None Remove="MailTemplates\MailUnban.html" />
   </ItemGroup>
-
   <ItemGroup>
     <Content Include="MailTemplates\MailBan.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -39,21 +36,16 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-
   <ItemGroup>
     <Folder Include="wwwroot\" />
   </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="AWSSDK.Core" Version="3.3.103.48" />
     <PackageReference Include="AWSSDK.S3" Version="3.3.104.36" />
     <PackageReference Include="Microsoft.AspNetCore.All" Version="2.2.7" />
-    <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.AspNetCore.Cors" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.8" />
     <PackageReference Include="Octokit" Version="0.36.0" />
-    <PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.1" />
   </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\FSO.Server.Common\FSO.Server.Common.csproj" />
     <ProjectReference Include="..\FSO.Server.Database\FSO.Server.Database.csproj" />
@@ -62,5 +54,4 @@
     <ProjectReference Include="..\tso.common\FSO.Common.csproj" />
     <ProjectReference Include="..\tso.files\FSO.Files.csproj" />
   </ItemGroup>
-
 </Project>
\ No newline at end of file
diff --git a/server/FSO.Server.Common/FSO.Server.Common.csproj b/server/FSO.Server.Common/FSO.Server.Common.csproj
index 19a04cc..a69ae16 100644
--- a/server/FSO.Server.Common/FSO.Server.Common.csproj
+++ b/server/FSO.Server.Common/FSO.Server.Common.csproj
@@ -1,105 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{39B61962-FE43-4B64-8E57-8F793737FFFE}</ProjectGuid>
+    <TargetFramework>net45</TargetFramework>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>FSO.Server.Common</RootNamespace>
-    <AssemblyName>FSO.Server.Common</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <UseVSHostingProcess>true</UseVSHostingProcess>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseVSHostingProcess>true</UseVSHostingProcess>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ServerRelease|AnyCPU'">
     <OutputPath>bin\ServerRelease\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="crypto, Version=1.8.0.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
-      <HintPath>..\packages\Portable.BouncyCastle.1.8.0\lib\net45\crypto.dll</HintPath>
-    </Reference>
-    <Reference Include="JWT, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Portable.JWT.1.0.5\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\JWT.dll</HintPath>
-    </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
       <HintPath>..\packages/Newtonsoft.Json.13.0.1/lib/net45/Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Ninject, Version=3.0.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
-      <HintPath>..\packages\Portable.Ninject.3.3.1\lib\net40-client\Ninject.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ApiAbstract.cs" />
-    <Compile Include="Config\AWSConfig.cs" />
-    <Compile Include="Config\GithubConfig.cs" />
-    <Compile Include="Epoch.cs" />
-    <Compile Include="IAPIController.cs" />
-    <Compile Include="IPAddress.cs" />
-    <Compile Include="IPEndPointUtils.cs" />
-    <Compile Include="JsonWebToken\JWTConfiguration.cs" />
-    <Compile Include="JsonWebToken\JWTokenFactory.cs" />
-    <Compile Include="JsonWebToken\JWTUser.cs" />
-    <Compile Include="PacketLogger.cs" />
-    <Compile Include="PasswordHasher.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="IServerDebugger.cs" />
-    <Compile Include="ServerVersion.cs" />
-    <Compile Include="Session\IAriesSession.cs" />
-    <Compile Include="Session\IGluonSession.cs" />
-    <Compile Include="ShutdownType.cs" />
+    <ProjectReference Include="..\tso.common\FSO.Common.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
-    <None Include="packages.config" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+    <PackageReference Include="Portable.BouncyCastle" Version="1.8.0" />
+    <PackageReference Include="Portable.JWT" Version="1.0.5" />
+    <PackageReference Include="Portable.Ninject" Version="3.3.1" />
+    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\tso.common\FSO.Common.csproj">
-      <Project>{c42962a1-8796-4f47-9dcd-79ed5904d8ca}</Project>
-      <Name>FSO.Common</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- 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>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
diff --git a/server/FSO.Server.Database/FSO.Server.Database.csproj b/server/FSO.Server.Database/FSO.Server.Database.csproj
index bb64af6..9c02794 100755
--- a/server/FSO.Server.Database/FSO.Server.Database.csproj
+++ b/server/FSO.Server.Database/FSO.Server.Database.csproj
@@ -1,44 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{430ACD60-E798-43F0-AD61-8B5A35DF6AB2}</ProjectGuid>
+    <TargetFramework>net45</TargetFramework>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>FSO.Server.Database</RootNamespace>
-    <AssemblyName>FSO.Server.Database</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <UseVSHostingProcess>true</UseVSHostingProcess>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseVSHostingProcess>true</UseVSHostingProcess>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ServerRelease|AnyCPU'">
     <OutputPath>bin\ServerRelease\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
@@ -46,9 +15,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>Libs\MyBatis\Castle.DynamicProxy.dll</HintPath>
     </Reference>
-    <Reference Include="Dapper, Version=1.40.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapper.1.42\lib\net45\Dapper.dll</HintPath>
-    </Reference>
     <Reference Include="IBatisNet.Common, Version=1.6.2.0, Culture=neutral, PublicKeyToken=ed781d9fc396c6ca, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>Libs\MyBatis\IBatisNet.Common.dll</HintPath>
@@ -65,161 +31,16 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>Libs\MyBatis\log4net.dll</HintPath>
     </Reference>
-    <Reference Include="MySql.Data, Version=6.9.7.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
-      <HintPath>..\packages\MySql.Data.6.9.7\lib\net45\MySql.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="Ninject, Version=3.0.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
-      <HintPath>..\packages\Portable.Ninject.3.3.1\lib\net40-client\Ninject.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="DatabaseConfiguration.cs" />
-    <Compile Include="DatabaseModule.cs" />
     <Content Include="DatabaseScripts\changes\0026_freevote.sql">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="DatabaseScripts\changes\0027_tuning_presets.sql">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Compile Include="DA\AbstractSqlDA.cs" />
-    <Compile Include="DA\AuthTickets\AuthTicket.cs" />
-    <Compile Include="DA\AuthTickets\IAuthTickets.cs" />
-    <Compile Include="DA\AuthTickets\SqlAuthTickets.cs" />
-    <Compile Include="DA\AvatarClaims\DbAvatarClaim.cs" />
-    <Compile Include="DA\AvatarClaims\IAvatarClaims.cs" />
-    <Compile Include="DA\AvatarClaims\SqlAvatarClaims.cs" />
-    <Compile Include="DA\Avatars\DbAvatar.cs" />
-    <Compile Include="DA\Avatars\DbAvatarSummary.cs" />
-    <Compile Include="DA\Avatars\DbJobLevel.cs" />
-    <Compile Include="DA\Avatars\IAvatars.cs" />
-    <Compile Include="DA\Avatars\SqlAvatars.cs" />
-    <Compile Include="DA\Bans\DbBan.cs" />
-    <Compile Include="DA\Bans\IBans.cs" />
-    <Compile Include="DA\Bans\SqlBans.cs" />
-    <Compile Include="DA\Bonus\DbBonus.cs" />
-    <Compile Include="DA\Bonus\DbBonusMetrics.cs" />
-    <Compile Include="DA\Bonus\IBonus.cs" />
-    <Compile Include="DA\Bonus\SqlBonus.cs" />
-    <Compile Include="DA\Bookmarks\DbBookmark.cs" />
-    <Compile Include="DA\Bookmarks\IBookmarks.cs" />
-    <Compile Include="DA\Bookmarks\SqlBookmarks.cs" />
-    <Compile Include="DA\Bulletin\DbBulletinPost.cs" />
-    <Compile Include="DA\Bulletin\IBulletinPosts.cs" />
-    <Compile Include="DA\Bulletin\SqlBulletinPosts.cs" />
-    <Compile Include="DA\DbChanges\DbChange.cs" />
-    <Compile Include="DA\DbEvents\DbEvent.cs" />
-    <Compile Include="DA\DbEvents\DbGenericAvatarParticipation.cs" />
-    <Compile Include="DA\DbEvents\IEvents.cs" />
-    <Compile Include="DA\DbEvents\SqlEvents.cs" />
-    <Compile Include="DA\DynPayouts\DbDynPayout.cs" />
-    <Compile Include="DA\DynPayouts\DbTransSummary.cs" />
-    <Compile Include="DA\DynPayouts\IDynPayouts.cs" />
-    <Compile Include="DA\DynPayouts\SqlDynPayouts.cs" />
-    <Compile Include="DA\Elections\DbElectionCandidate.cs" />
-    <Compile Include="DA\Elections\DbElectionCycle.cs" />
-    <Compile Include="DA\Elections\DbElectionCycleMail.cs" />
-    <Compile Include="DA\Elections\DbElectionFreeVote.cs" />
-    <Compile Include="DA\Elections\DbElectionVote.cs" />
-    <Compile Include="DA\Elections\DbMayorRating.cs" />
-    <Compile Include="DA\Elections\IElections.cs" />
-    <Compile Include="DA\Elections\SqlElections.cs" />
-    <Compile Include="DA\EmailConfirmations\EmailConfirmation.cs" />
-    <Compile Include="DA\EmailConfirmations\IEmailConfirmations.cs" />
-    <Compile Include="DA\EmailConfirmations\SqlEmailConfirmations.cs" />
-    <Compile Include="DA\GlobalCooldowns\DbGlobalCooldowns.cs" />
-    <Compile Include="DA\GlobalCooldowns\IGlobalCooldowns.cs" />
-    <Compile Include="DA\GlobalCooldowns\SqlGlobalCooldowns.cs" />
-    <Compile Include="DA\Hosts\DbHost.cs" />
-    <Compile Include="DA\Hosts\IHosts.cs" />
-    <Compile Include="DA\Hosts\SqlHosts.cs" />
-    <Compile Include="DA\IDA.cs" />
-    <Compile Include="DA\IDAFactory.cs" />
-    <Compile Include="DA\Inbox\DbInboxMsg.cs" />
-    <Compile Include="DA\Inbox\IInbox.cs" />
-    <Compile Include="DA\Inbox\SqlInbox.cs" />
-    <Compile Include="DA\ISqlContext.cs" />
-    <Compile Include="DA\LotAdmit\DbLotAdmit.cs" />
-    <Compile Include="DA\LotAdmit\ILotAdmit.cs" />
-    <Compile Include="DA\LotAdmit\SqlLotAdmit.cs" />
-    <Compile Include="DA\LotClaims\DbLotClaim.cs" />
-    <Compile Include="DA\LotClaims\ILotClaims.cs" />
-    <Compile Include="DA\LotClaims\SqlLotsClaims.cs" />
-    <Compile Include="DA\Lots\DbLot.cs" />
-    <Compile Include="DA\Lots\DbLotServerTicket.cs" />
-    <Compile Include="DA\Lots\ILots.cs" />
-    <Compile Include="DA\Lots\SqlLots.cs" />
-    <Compile Include="DA\LotTop100\ILotTop100.cs" />
-    <Compile Include="DA\LotTop100\DbLotTop100.cs" />
-    <Compile Include="DA\LotTop100\SqlLotTop100.cs" />
-    <Compile Include="DA\LotVisits\LotVisitUtils.cs" />
-    <Compile Include="DA\LotVisitTotals\DbLotVisitTotal.cs" />
-    <Compile Include="DA\LotVisitTotals\ILotVisitTotals.cs" />
-    <Compile Include="DA\LotVisits\DbLotVisit.cs" />
-    <Compile Include="DA\LotVisits\ILotVisits.cs" />
-    <Compile Include="DA\LotVisits\SqlLotVisits.cs" />
-    <Compile Include="DA\LotVisitTotals\SqlLotVisitTotals.cs" />
-    <Compile Include="DA\MySqlContext.cs" />
-    <Compile Include="DA\Neighborhoods\DbNeighborhood.cs" />
-    <Compile Include="DA\Neighborhoods\DbNhoodBan.cs" />
-    <Compile Include="DA\Neighborhoods\INeighborhoods.cs" />
-    <Compile Include="DA\Neighborhoods\SqlNeighborhoods.cs" />
-    <Compile Include="DA\Objects\DbObject.cs" />
-    <Compile Include="DA\Objects\DbObjectAttribute.cs" />
-    <Compile Include="DA\Objects\IObjects.cs" />
-    <Compile Include="DA\Objects\SqlObjects.cs" />
-    <Compile Include="DA\Outfits\DbOutfit.cs" />
-    <Compile Include="DA\Outfits\IOutfits.cs" />
-    <Compile Include="DA\Outfits\SqlOutfits.cs" />
-    <Compile Include="DA\Relationships\DbRelationship.cs" />
-    <Compile Include="DA\Relationships\IRelationships.cs" />
-    <Compile Include="DA\Relationships\SqlRelationships.cs" />
-    <Compile Include="DA\Roommates\DbRoommate.cs" />
-    <Compile Include="DA\Roommates\IRoommates.cs" />
-    <Compile Include="DA\Roommates\SqlRoommates.cs" />
-    <Compile Include="DA\Shards\IShards.cs" />
-    <Compile Include="DA\Shards\Shard.cs" />
-    <Compile Include="DA\Shards\ShardTicket.cs" />
-    <Compile Include="DA\Shards\SqlShards.cs" />
-    <Compile Include="DA\SqlDA.cs" />
-    <Compile Include="DA\MySqlDAFactory.cs" />
-    <Compile Include="DA\Tasks\DbTask.cs" />
-    <Compile Include="DA\Tasks\ITasks.cs" />
-    <Compile Include="DA\Tasks\SqlTasks.cs" />
-    <Compile Include="DA\Transactions\ITransactions.cs" />
-    <Compile Include="DA\Transactions\SqlTransactions.cs" />
-    <Compile Include="DA\Tuning\DbTuning.cs" />
-    <Compile Include="DA\Tuning\DbTuningPreset.cs" />
-    <Compile Include="DA\Tuning\ITuning.cs" />
-    <Compile Include="DA\Tuning\SqlTuning.cs" />
-    <Compile Include="DA\Updates\DbUpdate.cs" />
-    <Compile Include="DA\Updates\DbUpdateAddon.cs" />
-    <Compile Include="DA\Updates\DbUpdateBranch.cs" />
-    <Compile Include="DA\Updates\IUpdates.cs" />
-    <Compile Include="DA\Updates\SqlUpdates.cs" />
-    <Compile Include="DA\Users\DbAuthAttempt.cs" />
-    <Compile Include="DA\Users\IUsers.cs" />
-    <Compile Include="DA\Users\SqlUsers.cs" />
-    <Compile Include="DA\Users\User.cs" />
-    <Compile Include="DA\Users\UserAuthenticate.cs" />
-    <Compile Include="DA\Utils\BufferedInsert.cs" />
-    <Compile Include="DA\Utils\FilterOptions.cs" />
-    <Compile Include="DA\Utils\PagedList.cs" />
-    <Compile Include="Management\DbChangeTool.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
     <Content Include="DatabaseScripts\changes\0017_inbox_events.sql">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -262,17 +83,10 @@
     <Content Include="DatabaseScripts\manifest.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\FSO.Server.Common\FSO.Server.Common.csproj">
-      <Project>{39b61962-fe43-4b64-8e57-8f793737fffe}</Project>
-      <Name>FSO.Server.Common</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\tso.common\FSO.Common.csproj">
-      <Project>{c42962a1-8796-4f47-9dcd-79ed5904d8ca}</Project>
-      <Name>FSO.Common</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\FSO.Server.Common\FSO.Server.Common.csproj" />
+    <ProjectReference Include="..\tso.common\FSO.Common.csproj" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="DatabaseScripts\changes\0003_max_roomates.sql">
@@ -351,13 +165,14 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- 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>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Dapper" Version="1.42" />
+    <PackageReference Include="MySql.Data" Version="6.9.7" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+    <PackageReference Include="Portable.Ninject" Version="3.3.1" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/server/FSO.Server.Debug/FSO.Server.Debug.csproj b/server/FSO.Server.Debug/FSO.Server.Debug.csproj
index 265e38e..44c726e 100755
--- a/server/FSO.Server.Debug/FSO.Server.Debug.csproj
+++ b/server/FSO.Server.Debug/FSO.Server.Debug.csproj
@@ -1,176 +1,39 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{7296CCEC-F459-4071-A9D2-9A07DCC29210}</ProjectGuid>
+    <TargetFramework>net45</TargetFramework>
     <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>FSO.Server.Debug</RootNamespace>
-    <AssemblyName>FSO.Server.Debug</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <UseVSHostingProcess>true</UseVSHostingProcess>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <UseWindowsForms>true</UseWindowsForms>
+    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
     <UseVSHostingProcess>true</UseVSHostingProcess>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ServerRelease|AnyCPU'">
     <OutputPath>bin\ServerRelease\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Be.Windows.Forms.HexBox, Version=1.5.0.30785, Culture=neutral, PublicKeyToken=e0e5adf0ebc99863, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>libs\Be.Windows.Forms.HexBox.dll</HintPath>
     </Reference>
-    <Reference Include="Common.Logging, Version=3.4.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
-      <HintPath>..\packages\Common.Logging.3.4.1\lib\net40\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Common.Logging.Core, Version=3.4.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
-      <HintPath>..\packages\Common.Logging.Core.3.4.1\lib\net40\Common.Logging.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Mina.NET, Version=2.0.11.0, Culture=neutral, PublicKeyToken=bc4dde96e5154fe5, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mina.2.0.11\lib\net40\Mina.NET.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="Ninject, Version=3.0.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
-      <HintPath>..\packages\Portable.Ninject.3.3.1\lib\net40-client\Ninject.dll</HintPath>
-    </Reference>
     <Reference Include="ScintillaNET">
       <HintPath>libs\ScintillaNET.dll</HintPath>
     </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="PacketAnalyzer\ByteCountPacketAnalyzer.cs" />
-    <Compile Include="PacketAnalyzer\ConstantsPacketAnalyzer.cs" />
-    <Compile Include="PacketAnalyzer\ContentPacketAnalyzer.cs" />
-    <Compile Include="PacketAnalyzer\IPacketAnalyzer.cs" />
-    <Compile Include="PacketAnalyzer\PascalStringPacketAnalyzer.cs" />
-    <Compile Include="NetworkDebugger.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="NetworkDebugger.Designer.cs">
-      <DependentUpon>NetworkDebugger.cs</DependentUpon>
-    </Compile>
-    <Compile Include="NetworkStash.cs" />
-    <Compile Include="PacketAnalyzer\VariableLengthStringAnalyzer.cs" />
-    <Compile Include="PacketView.cs">
+    <Compile Update="PacketView.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="PacketView.designer.cs">
-      <DependentUpon>PacketView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="RawPacketReference.cs" />
-    <Compile Include="StringDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="StringDialog.designer.cs">
-      <DependentUpon>StringDialog.cs</DependentUpon>
-    </Compile>
-    <EmbeddedResource Include="NetworkDebugger.resx">
-      <DependentUpon>NetworkDebugger.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PacketView.resx">
-      <DependentUpon>PacketView.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <EmbeddedResource Include="StringDialog.resx">
-      <DependentUpon>StringDialog.cs</DependentUpon>
-    </EmbeddedResource>
-    <None Include="packages.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\FSO.Common.DatabaseService\FSO.Common.DatabaseService.csproj">
-      <Project>{c051793d-1a9c-4554-9bb8-bafdc01a096a}</Project>
-      <Name>FSO.Common.DatabaseService</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\FSO.Server.Common\FSO.Server.Common.csproj">
-      <Project>{39b61962-fe43-4b64-8e57-8f793737fffe}</Project>
-      <Name>FSO.Server.Common</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\FSO.Server.Protocol\FSO.Server.Protocol.csproj">
-      <Project>{a08ade32-27e2-44f4-bc52-11a16c56baa8}</Project>
-      <Name>FSO.Server.Protocol</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\tso.common\FSO.Common.csproj">
-      <Project>{c42962a1-8796-4f47-9dcd-79ed5904d8ca}</Project>
-      <Name>FSO.Common</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\tso.content\FSO.Content.csproj">
-      <Project>{c0068df7-f2e8-4399-846d-556bf9a35c00}</Project>
-      <Name>FSO.Content</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\tso.files\FSO.Files.csproj">
-      <Project>{18583453-a970-4ac5-83b1-2d6bfdf94c24}</Project>
-      <Name>FSO.Files</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\tso.vitaboy.model\FSO.Vitaboy.csproj">
-      <Project>{9d9558a9-755e-43f9-8bb6-b26f365f5042}</Project>
-      <Name>FSO.Vitaboy</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\FSO.Common.DatabaseService\FSO.Common.DatabaseService.csproj" />
+    <ProjectReference Include="..\FSO.Server.Common\FSO.Server.Common.csproj" />
+    <ProjectReference Include="..\FSO.Server.Protocol\FSO.Server.Protocol.csproj" />
+    <ProjectReference Include="..\tso.common\FSO.Common.csproj" />
+    <ProjectReference Include="..\tso.content\FSO.Content.csproj" />
+    <ProjectReference Include="..\tso.files\FSO.Files.csproj" />
+    <ProjectReference Include="..\tso.vitaboy.model\FSO.Vitaboy.csproj" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Resources\" />
@@ -178,12 +41,14 @@
   <ItemGroup>
     <Content Include="libs\Be.Windows.Forms.HexBox.dll" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- 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>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+  <ItemGroup>
+    <PackageReference Include="Common.Logging" Version="3.4.1" />
+    <PackageReference Include="Common.Logging.Core" Version="3.4.1" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.3.0" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="Mina" Version="2.0.11" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+    <PackageReference Include="Portable.Ninject" Version="3.3.1" />
+    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/server/FSO.Server.Domain/FSO.Server.Domain.csproj b/server/FSO.Server.Domain/FSO.Server.Domain.csproj
index b3c885f..29cb890 100755
--- a/server/FSO.Server.Domain/FSO.Server.Domain.csproj
+++ b/server/FSO.Server.Domain/FSO.Server.Domain.csproj
@@ -1,95 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{A1D9ABA0-0105-436D-8F8C-2418DB768080}</ProjectGuid>
+    <TargetFramework>net45</TargetFramework>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>FSO.Server.Domain</RootNamespace>
-    <AssemblyName>FSO.Server.Domain</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <UseVSHostingProcess>true</UseVSHostingProcess>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseVSHostingProcess>true</UseVSHostingProcess>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ServerRelease|AnyCPU'">
     <OutputPath>bin\ServerRelease\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ninject, Version=3.0.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
-      <HintPath>..\packages\Portable.Ninject.3.3.1\lib\net40-client\Ninject.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
+    <ProjectReference Include="..\FSO.Common.Domain\FSO.Common.Domain.csproj" />
+    <ProjectReference Include="..\FSO.Server.Common\FSO.Server.Common.csproj" />
+    <ProjectReference Include="..\FSO.Server.Database\FSO.Server.Database.csproj" />
+    <ProjectReference Include="..\FSO.Server.Protocol\FSO.Server.Protocol.csproj" />
+    <ProjectReference Include="..\tso.common\FSO.Common.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Domain\Shards.cs" />
-    <Compile Include="IGluonHostPool.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="Portable.Ninject" Version="3.3.1" />
+    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\FSO.Common.Domain\FSO.Common.Domain.csproj">
-      <Project>{9848faf5-444a-48cc-a26a-8115d8c4fb52}</Project>
-      <Name>FSO.Common.Domain</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\FSO.Server.Common\FSO.Server.Common.csproj">
-      <Project>{39b61962-fe43-4b64-8e57-8f793737fffe}</Project>
-      <Name>FSO.Server.Common</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\FSO.Server.Database\FSO.Server.Database.csproj">
-      <Project>{430acd60-e798-43f0-ad61-8b5a35df6ab2}</Project>
-      <Name>FSO.Server.Database</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\FSO.Server.Protocol\FSO.Server.Protocol.csproj">
-      <Project>{a08ade32-27e2-44f4-bc52-11a16c56baa8}</Project>
-      <Name>FSO.Server.Protocol</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\tso.common\FSO.Common.csproj">
-      <Project>{c42962a1-8796-4f47-9dcd-79ed5904d8ca}</Project>
-      <Name>FSO.Common</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- 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>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
diff --git a/server/FSO.Server.Protocol/FSO.Server.Protocol.csproj b/server/FSO.Server.Protocol/FSO.Server.Protocol.csproj
index 58fefe5..008a4c8 100755
--- a/server/FSO.Server.Protocol/FSO.Server.Protocol.csproj
+++ b/server/FSO.Server.Protocol/FSO.Server.Protocol.csproj
@@ -1,229 +1,36 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{A08ADE32-27E2-44F4-BC52-11A16C56BAA8}</ProjectGuid>
+    <TargetFramework>net45</TargetFramework>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>FSO.Server.Protocol</RootNamespace>
-    <AssemblyName>FSO.Server.Protocol</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <UseVSHostingProcess>true</UseVSHostingProcess>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseVSHostingProcess>true</UseVSHostingProcess>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ServerRelease|AnyCPU'">
     <OutputPath>bin\ServerRelease\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Common.Logging, Version=3.4.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
-      <HintPath>..\packages\Common.Logging.3.4.1\lib\net40\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Common.Logging.Core, Version=3.4.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
-      <HintPath>..\packages\Common.Logging.Core.3.4.1\lib\net40\Common.Logging.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Mina.NET, Version=2.0.11.0, Culture=neutral, PublicKeyToken=bc4dde96e5154fe5, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mina.2.0.11\lib\net40\Mina.NET.dll</HintPath>
-    </Reference>
-    <Reference Include="Ninject, Version=3.0.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
-      <HintPath>..\packages\Portable.Ninject.3.3.1\lib\net40-client\Ninject.dll</HintPath>
-    </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.5.7\lib\net45\NLog.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
     <Reference Include="System.Configuration" />
-    <Reference Include="System.Core" />
     <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Transactions" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Aries\AriesPackets.cs" />
-    <Compile Include="Aries\AriesProtocol.cs" />
-    <Compile Include="Aries\AriesProtocolDecoder.cs" />
-    <Compile Include="Aries\AriesProtocolEncoder.cs" />
-    <Compile Include="Aries\AriesProtocolLogger.cs" />
-    <Compile Include="Aries\AriesPacketType.cs" />
-    <Compile Include="Aries\IAriesPacket.cs" />
-    <Compile Include="Aries\Packets\AnswerAccepted.cs" />
-    <Compile Include="Aries\Packets\AnswerChallenge.cs" />
-    <Compile Include="Aries\Packets\RequestChallenge.cs" />
-    <Compile Include="Aries\Packets\RequestChallengeResponse.cs" />
-    <Compile Include="Aries\Packets\RequestClientSession.cs" />
-    <Compile Include="Aries\Packets\RequestClientSessionResponse.cs" />
-    <Compile Include="Authorization\AuthRequest.cs" />
-    <Compile Include="Authorization\AuthResult.cs" />
-    <Compile Include="CitySelector\AvatarAppearanceType.cs" />
-    <Compile Include="CitySelector\AvatarData.cs" />
-    <Compile Include="CitySelector\AvatarGender.cs" />
-    <Compile Include="CitySelector\InitialConnectServletRequest.cs" />
-    <Compile Include="CitySelector\InitialConnectServletResult.cs" />
-    <Compile Include="CitySelector\ShardSelectorServletRequest.cs" />
-    <Compile Include="CitySelector\ShardSelectorServletResponse.cs" />
-    <Compile Include="CitySelector\ShardStatus.cs" />
-    <Compile Include="CitySelector\ShardStatusItem.cs" />
-    <Compile Include="CitySelector\UserAuthorized.cs" />
-    <Compile Include="CitySelector\XMLErrorMessage.cs" />
-    <Compile Include="Electron\AbstractElectronPacket.cs" />
-    <Compile Include="Electron\ElectronPackets.cs" />
-    <Compile Include="Electron\ElectronPacketType.cs" />
-    <Compile Include="Electron\IElectronPacket.cs" />
-    <Compile Include="Electron\Model\ChangeRoommateResponseStatus.cs" />
-    <Compile Include="Electron\Model\ChangeRoommateType.cs" />
-    <Compile Include="Electron\Model\FindAvatarResponseStatus.cs" />
-    <Compile Include="Electron\Model\FindLotResponseStatus.cs" />
-    <Compile Include="Electron\Model\IActionRequest.cs" />
-    <Compile Include="Electron\Model\IActionResponse.cs" />
-    <Compile Include="Electron\Model\ModerationRequestType.cs" />
-    <Compile Include="Electron\Packets\AvatarRetireRequest.cs" />
-    <Compile Include="Electron\Packets\BulletinRequest.cs" />
-    <Compile Include="Electron\Packets\BulletinResponse.cs" />
-    <Compile Include="Electron\Packets\ChangeRoommateRequest.cs" />
-    <Compile Include="Electron\Packets\ChangeRoommateResponse.cs" />
-    <Compile Include="Electron\Packets\FSOVMProtocolMessage.cs" />
-    <Compile Include="Electron\Packets\GlobalTuningUpdate.cs" />
-    <Compile Include="Electron\Packets\MailRequest.cs" />
-    <Compile Include="Electron\Packets\MailResponse.cs" />
-    <Compile Include="Electron\Packets\ModerationRequest.cs" />
-    <Compile Include="Electron\Packets\FindAvatarResponse.cs" />
-    <Compile Include="Electron\Packets\FindLotResponse.cs" />
-    <Compile Include="Electron\Packets\CreateASimResponse.cs" />
-    <Compile Include="Electron\Packets\FindAvatarRequest.cs" />
-    <Compile Include="Electron\Packets\FSOVMDirectToClient.cs" />
-    <Compile Include="Electron\Packets\FSOVMCommand.cs" />
-    <Compile Include="Electron\Packets\FSOVMTickBroadcast.cs" />
-    <Compile Include="Electron\Packets\InstantMessage.cs" />
-    <Compile Include="Electron\Packets\FindLotRequest.cs" />
-    <Compile Include="Electron\Packets\KeepAlive.cs" />
-    <Compile Include="Electron\Packets\NhoodCandidateList.cs" />
-    <Compile Include="Electron\Packets\NhoodRequest.cs" />
-    <Compile Include="Electron\Packets\NhoodResponse.cs" />
-    <Compile Include="Electron\Packets\PurchaseLotRequest.cs" />
-    <Compile Include="Electron\Packets\PurchaseLotResponse.cs" />
-    <Compile Include="Gluon\AbstractElectronPacket.cs" />
-    <Compile Include="Gluon\GluonPackets.cs" />
-    <Compile Include="Gluon\GluonPacketType.cs" />
-    <Compile Include="Gluon\IGluonPacket.cs" />
-    <Compile Include="Gluon\Model\ChangeType.cs" />
-    <Compile Include="Gluon\Model\ClaimAction.cs" />
-    <Compile Include="Gluon\Model\ClaimType.cs" />
-    <Compile Include="Gluon\Packets\AdvertiseCapacity.cs" />
-    <Compile Include="Gluon\Packets\CityNotify.cs" />
-    <Compile Include="Gluon\Packets\HealthPing.cs" />
-    <Compile Include="Gluon\Packets\HealthPingResponse.cs" />
-    <Compile Include="Gluon\Packets\IGluonCall.cs" />
-    <Compile Include="Gluon\Packets\MatchmakerNotify.cs" />
-    <Compile Include="Gluon\Packets\NotifyLotRoommateChange.cs" />
-    <Compile Include="Gluon\Packets\RequestLotClientTermination.cs" />
-    <Compile Include="Gluon\Packets\RequestTask.cs" />
-    <Compile Include="Gluon\Packets\RequestTaskResponse.cs" />
-    <Compile Include="Gluon\Packets\SendCityMail.cs" />
-    <Compile Include="Gluon\Packets\ShardShutdownCompleteResponse.cs" />
-    <Compile Include="Gluon\Packets\ShardShutdownRequest.cs" />
-    <Compile Include="Gluon\Packets\TransferClaim.cs" />
-    <Compile Include="Gluon\Packets\TransferClaimResponse.cs" />
-    <Compile Include="Gluon\Packets\TuningChanged.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Utils\ChallengeResponse.cs" />
-    <Compile Include="Utils\SslClientFilter.cs" />
-    <Compile Include="Utils\CustomCumulativeProtocolDecoder.cs" />
-    <Compile Include="Voltron\AbstractVoltronPacket.cs" />
-    <Compile Include="Voltron\cTSONetMessageParameter.cs" />
-    <Compile Include="Voltron\DataService\AvatarSkills.cs" />
-    <Compile Include="Voltron\DataService\Bookmark.cs" />
-    <Compile Include="Voltron\DataService\Avatar.cs" />
-    <Compile Include="Voltron\DataService\AvatarAppearance.cs" />
-    <Compile Include="Voltron\DataService\cITSOProperty.cs" />
-    <Compile Include="Voltron\DataService\clsid.cs" />
-    <Compile Include="Voltron\DataService\cTSOSerializer.cs" />
-    <Compile Include="Voltron\DataService\cTSOValue.cs" />
-    <Compile Include="Voltron\DataService\Location.cs" />
-    <Compile Include="Voltron\DataService\Lot.cs" />
-    <Compile Include="Voltron\Model\Gender.cs" />
-    <Compile Include="Voltron\Model\RPCRequest.cs" />
-    <Compile Include="Voltron\IVoltronPacket.cs" />
-    <Compile Include="Voltron\Model\MagicNumberEnum.cs" />
-    <Compile Include="Voltron\Model\Sender.cs" />
-    <Compile Include="Voltron\Model\SkinTone.cs" />
-    <Compile Include="Voltron\Packets\AnnouncementMsgPDU.cs" />
-    <Compile Include="Voltron\Packets\ChatMsgPDU.cs" />
-    <Compile Include="Voltron\Packets\ServerByePDU.cs" />
-    <Compile Include="Voltron\Packets\ClientByePDU.cs" />
-    <Compile Include="Voltron\Packets\ClientOnlinePDU.cs" />
-    <Compile Include="Voltron\Packets\DataServiceWrapperPDU.cs" />
-    <Compile Include="Voltron\Packets\DBRequestWrapperPDU.cs" />
-    <Compile Include="Voltron\Packets\FindPlayerPDU.cs" />
-    <Compile Include="Voltron\Packets\FindPlayerResponsePDU.cs" />
-    <Compile Include="Voltron\Packets\HostOnlinePDU.cs" />
-    <Compile Include="Voltron\Packets\OccupantArrivedPDU.cs" />
-    <Compile Include="Voltron\Packets\RSGZWrapperPDU.cs" />
-    <Compile Include="Voltron\Packets\SetIgnoreListPDU.cs" />
-    <Compile Include="Voltron\Packets\SetIgnoreListResponsePDU.cs" />
-    <Compile Include="Voltron\Packets\SetInvinciblePDU.cs" />
-    <Compile Include="Voltron\Packets\TransmitCreateAvatarNotificationPDU.cs" />
-    <Compile Include="Voltron\Packets\VariableVoltronPacket.cs" />
-    <Compile Include="Voltron\VoltronPackets.cs" />
-    <Compile Include="Voltron\VoltronPacketType.cs" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
-    <None Include="packages.config" />
+    <ProjectReference Include="..\FSO.Server.Common\FSO.Server.Common.csproj" />
+    <ProjectReference Include="..\tso.common\FSO.Common.csproj" />
+    <ProjectReference Include="..\tso.files\FSO.Files.csproj" />
   </ItemGroup>
-  <ItemGroup />
   <ItemGroup>
-    <ProjectReference Include="..\FSO.Server.Common\FSO.Server.Common.csproj">
-      <Project>{39b61962-fe43-4b64-8e57-8f793737fffe}</Project>
-      <Name>FSO.Server.Common</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\tso.common\FSO.Common.csproj">
-      <Project>{c42962a1-8796-4f47-9dcd-79ed5904d8ca}</Project>
-      <Name>FSO.Common</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\tso.files\FSO.Files.csproj">
-      <Project>{18583453-a970-4ac5-83b1-2d6bfdf94c24}</Project>
-      <Name>FSO.Files</Name>
-    </ProjectReference>
+    <PackageReference Include="Common.Logging" Version="3.4.1" />
+    <PackageReference Include="Common.Logging.Core" Version="3.4.1" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.3.0" />
+    <PackageReference Include="Mina" Version="2.0.11" />
+    <PackageReference Include="NLog" Version="4.5.7" />
+    <PackageReference Include="Portable.Ninject" Version="3.3.1" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- 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>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
diff --git a/server/MySim.Server.sln b/server/MySim.Server.sln
new file mode 100644
index 0000000..f5c0a8a
--- /dev/null
+++ b/server/MySim.Server.sln
@@ -0,0 +1,72 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.002.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "server", "server", "{DE9F1DBC-27C5-4BC3-8516-6071FFE86B92}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FSO.Server.Api.Core", "FSO.Server.Api.Core\FSO.Server.Api.Core.csproj", "{02B79DD0-1D96-4C2C-9E5D-E21B8DDBC9E4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSO.Server.Common", "FSO.Server.Common\FSO.Server.Common.csproj", "{39B61962-FE43-4B64-8E57-8F793737FFFE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSO.Server.Database", "FSO.Server.Database\FSO.Server.Database.csproj", "{430ACD60-E798-43F0-AD61-8B5A35DF6AB2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSO.Server.Debug", "FSO.Server.Debug\FSO.Server.Debug.csproj", "{7296CCEC-F459-4071-A9D2-9A07DCC29210}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSO.Server.Domain", "FSO.Server.Domain\FSO.Server.Domain.csproj", "{A1D9ABA0-0105-436D-8F8C-2418DB768080}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSO.Server.Protocol", "FSO.Server.Protocol\FSO.Server.Protocol.csproj", "{A08ADE32-27E2-44F4-BC52-11A16C56BAA8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSO.Common", "tso.common\FSO.Common.csproj", "{C42962A1-8796-4F47-9DCD-79ED5904D8CA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSO.Files", "tso.files\FSO.Files.csproj", "{18583453-A970-4AC5-83B1-2D6BFDF94C24}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{02B79DD0-1D96-4C2C-9E5D-E21B8DDBC9E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{02B79DD0-1D96-4C2C-9E5D-E21B8DDBC9E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{02B79DD0-1D96-4C2C-9E5D-E21B8DDBC9E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{02B79DD0-1D96-4C2C-9E5D-E21B8DDBC9E4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{39B61962-FE43-4B64-8E57-8F793737FFFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{39B61962-FE43-4B64-8E57-8F793737FFFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{39B61962-FE43-4B64-8E57-8F793737FFFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{39B61962-FE43-4B64-8E57-8F793737FFFE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{430ACD60-E798-43F0-AD61-8B5A35DF6AB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{430ACD60-E798-43F0-AD61-8B5A35DF6AB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{430ACD60-E798-43F0-AD61-8B5A35DF6AB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{430ACD60-E798-43F0-AD61-8B5A35DF6AB2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7296CCEC-F459-4071-A9D2-9A07DCC29210}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7296CCEC-F459-4071-A9D2-9A07DCC29210}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7296CCEC-F459-4071-A9D2-9A07DCC29210}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7296CCEC-F459-4071-A9D2-9A07DCC29210}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A1D9ABA0-0105-436D-8F8C-2418DB768080}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A1D9ABA0-0105-436D-8F8C-2418DB768080}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A1D9ABA0-0105-436D-8F8C-2418DB768080}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A1D9ABA0-0105-436D-8F8C-2418DB768080}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A08ADE32-27E2-44F4-BC52-11A16C56BAA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A08ADE32-27E2-44F4-BC52-11A16C56BAA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A08ADE32-27E2-44F4-BC52-11A16C56BAA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A08ADE32-27E2-44F4-BC52-11A16C56BAA8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C42962A1-8796-4F47-9DCD-79ED5904D8CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C42962A1-8796-4F47-9DCD-79ED5904D8CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C42962A1-8796-4F47-9DCD-79ED5904D8CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C42962A1-8796-4F47-9DCD-79ED5904D8CA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{18583453-A970-4AC5-83B1-2D6BFDF94C24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{18583453-A970-4AC5-83B1-2D6BFDF94C24}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{18583453-A970-4AC5-83B1-2D6BFDF94C24}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{18583453-A970-4AC5-83B1-2D6BFDF94C24}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{02B79DD0-1D96-4C2C-9E5D-E21B8DDBC9E4} = {DE9F1DBC-27C5-4BC3-8516-6071FFE86B92}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A6208BB0-8CE4-44ED-9E24-BA84CEEFF636}
+	EndGlobalSection
+EndGlobal
diff --git a/server/ZTSO.Server.sln b/server/ZTSO.Server.sln
deleted file mode 100644
index 7d2b6ba..0000000
--- a/server/ZTSO.Server.sln
+++ /dev/null
@@ -1,30 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.5.002.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "server", "server", "{DE9F1DBC-27C5-4BC3-8516-6071FFE86B92}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FSO.Server.Api.Core", "FSO.Server.Api.Core\FSO.Server.Api.Core.csproj", "{02B79DD0-1D96-4C2C-9E5D-E21B8DDBC9E4}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{02B79DD0-1D96-4C2C-9E5D-E21B8DDBC9E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{02B79DD0-1D96-4C2C-9E5D-E21B8DDBC9E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{02B79DD0-1D96-4C2C-9E5D-E21B8DDBC9E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{02B79DD0-1D96-4C2C-9E5D-E21B8DDBC9E4}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{02B79DD0-1D96-4C2C-9E5D-E21B8DDBC9E4} = {DE9F1DBC-27C5-4BC3-8516-6071FFE86B92}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {A6208BB0-8CE4-44ED-9E24-BA84CEEFF636}
-	EndGlobalSection
-EndGlobal
diff --git a/server/tso.common/FSO.Common.csproj b/server/tso.common/FSO.Common.csproj
index a3e11f0..66b0fba 100755
--- a/server/tso.common/FSO.Common.csproj
+++ b/server/tso.common/FSO.Common.csproj
@@ -1,22 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{C42962A1-8796-4F47-9DCD-79ED5904D8CA}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>FSO.Common</RootNamespace>
-    <AssemblyName>FSO.Common</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>3.5</OldToolsVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -32,236 +16,46 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Prefer32Bit>false</Prefer32Bit>
     <UseVSHostingProcess>true</UseVSHostingProcess>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
     <UseVSHostingProcess>true</UseVSHostingProcess>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=3.4.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
-      <HintPath>..\packages\Common.Logging.3.4.1\lib\net40\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Common.Logging.Core, Version=3.4.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
-      <HintPath>..\packages\Common.Logging.Core.3.4.1\lib\net40\Common.Logging.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ServerRelease|AnyCPU'">
     <OutputPath>bin\ServerRelease\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ServerRelease|x86'">
     <OutputPath>bin\x86\ServerRelease\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>net45</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Mina.NET, Version=2.0.11.0, Culture=neutral, PublicKeyToken=bc4dde96e5154fe5, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mina.2.0.11\lib\net40\Mina.NET.dll</HintPath>
-    </Reference>
-    <Reference Include="MonoGame.Framework, Version=3.6.0.1625, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MonoGame.Framework.Portable.3.6.0.1625\lib\portable-net45+win8+wpa81\MonoGame.Framework.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="Ninject, Version=3.0.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
-      <HintPath>..\packages\Portable.Ninject.3.3.1\lib\net40-client\Ninject.dll</HintPath>
-    </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.5.7\lib\net45\NLog.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Collections.Immutable, Version=1.2.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Collections.Immutable.1.5.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
-    </Reference>
     <Reference Include="System.Configuration" />
-    <Reference Include="System.Core">
-    </Reference>
     <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Transactions" />
     <Reference Include="System.Web" />
-    <Reference Include="System.Xml.Linq">
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions">
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Audio\MP3Player.cs" />
-    <Compile Include="ClientEpoch.cs" />
-    <Compile Include="Content\ContentID.cs" />
-    <Compile Include="Content\IContentProvider.cs" />
-    <Compile Include="Content\IContentReference.cs" />
-    <Compile Include="Enum\LotCategory.cs" />
-    <Compile Include="Enum\Top100Category.cs" />
-    <Compile Include="FSOEnvironment.cs" />
-    <Compile Include="IniConfig.cs" />
-    <Compile Include="Enum\UserReferenceType.cs" />
-    <Compile Include="MeshSimplify\MSRef.cs" />
-    <Compile Include="MeshSimplify\MSTriangle.cs" />
-    <Compile Include="MeshSimplify\Simplify.cs" />
-    <Compile Include="MeshSimplify\SymmetricMatrix.cs" />
-    <Compile Include="MeshSimplify\MSVertex.cs" />
-    <Compile Include="Model\DynamicTuning.cs" />
-    <Compile Include="Model\DynTuningEntry.cs" />
-    <Compile Include="Model\IntersectRectSet.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Rendering\CachableTexture2D.cs" />
-    <Compile Include="Rendering\Emoji\EmojiCache.cs" />
-    <Compile Include="Rendering\Emoji\EmojiDictionary.cs" />
-    <Compile Include="Rendering\Emoji\EmojiProvider.cs" />
-    <Compile Include="Rendering\Framework\3DComponent.cs" />
-    <Compile Include="Rendering\Framework\3DLayer.cs" />
-    <Compile Include="Rendering\Framework\3DScene.cs" />
-    <Compile Include="Rendering\Framework\3DTargetScene.cs" />
-    <Compile Include="Rendering\Framework\Camera\BasicCamera.cs" />
-    <Compile Include="Rendering\Framework\Camera\ICamera.cs" />
-    <Compile Include="Rendering\Framework\Camera\ManualCamera.cs" />
-    <Compile Include="Rendering\Framework\Camera\OrthographicCamera.cs" />
-    <Compile Include="Rendering\Framework\CursorManager.cs" />
-    <Compile Include="Rendering\Framework\Game.cs" />
-    <Compile Include="Rendering\Framework\GameScreen.cs" />
-    <Compile Include="Rendering\Framework\I3DGeometry.cs" />
-    <Compile Include="Rendering\Framework\IGraphicsLayer.cs" />
-    <Compile Include="Rendering\Framework\IO\ClipboardHandler.cs" />
-    <Compile Include="Rendering\Framework\IO\IDepthProvider.cs" />
-    <Compile Include="Rendering\Framework\IO\IFocusableUI.cs" />
-    <Compile Include="Rendering\Framework\IO\InputManager.cs" />
-    <Compile Include="Rendering\Framework\IO\MouseEvent.cs" />
-    <Compile Include="Rendering\Framework\Model\UIState.cs" />
-    <Compile Include="Rendering\Framework\Model\UpdateState.cs" />
-    <Compile Include="Rendering\Framework\Shapes\3DCube.cs" />
-    <Compile Include="Rendering\Framework\UpdateHookDelegate.cs" />
-    <Compile Include="Rendering\Framework\3DAbstract.cs" />
-    <Compile Include="Rendering\TextureInfo.cs" />
-    <Compile Include="Rendering\TimeOfDayConfig.cs" />
-    <Compile Include="Security\AvatarPermissions.cs" />
-    <Compile Include="Security\ISecurityContext.cs" />
-    <Compile Include="Security\NullSecurityContext.cs" />
-    <Compile Include="Serialization\ISerializationContext.cs" />
-    <Compile Include="Serialization\Primitives\cTSOGenericData.cs" />
-    <Compile Include="Serialization\Primitives\cTSONetMessageStandard.cs" />
-    <Compile Include="Serialization\Primitives\cTSOProperty.cs" />
-    <Compile Include="Serialization\Primitives\cTSOTopicUpdateMessage.cs" />
-    <Compile Include="Serialization\SerializationContext.cs" />
-    <Compile Include="Serialization\ModelSerializer.cs" />
-    <Compile Include="Serialization\IModelSerializer.cs" />
-    <Compile Include="Serialization\IoBufferDeserializable.cs" />
-    <Compile Include="Serialization\IoBufferSerializable.cs" />
-    <Compile Include="Serialization\IoBufferUtils.cs" />
-    <Compile Include="Serialization\TypeSerializers\cTSOValueBooleanMap.cs" />
-    <Compile Include="Serialization\TypeSerializers\cTSOValueBooleanVector.cs" />
-    <Compile Include="Serialization\TypeSerializers\cTSOValueGenericData.cs" />
-    <Compile Include="Serialization\TypeSerializers\cTSOValueUInt32Vector.cs" />
-    <Compile Include="Serialization\TypeSerializers\cTSOValueBoolean.cs" />
-    <Compile Include="Serialization\TypeSerializers\cTSOValueDecorated.cs" />
-    <Compile Include="Serialization\TypeSerializers\cTSOValueSByte.cs" />
-    <Compile Include="Serialization\TypeSerializers\cTSOValueByte.cs" />
-    <Compile Include="Serialization\TypeSerializers\cTSOValueSByteVector.cs" />
-    <Compile Include="Serialization\TypeSerializers\cTSOValueByteVector.cs" />
-    <Compile Include="Serialization\TypeSerializers\cTSOValueString.cs" />
-    <Compile Include="Serialization\TypeSerializers\cTSOValueStringVector.cs" />
-    <Compile Include="Serialization\TypeSerializers\cTSOValueUInt16.cs" />
-    <Compile Include="Serialization\TypeSerializers\cTSOValueUInt32.cs" />
-    <Compile Include="Serialization\TypeSerializers\cTSOValueUInt64.cs" />
-    <Compile Include="TS1\TS1Curve.cs" />
-    <Compile Include="Utils\AssemblyUtils.cs" />
-    <Compile Include="Utils\Base64JsonConverter.cs" />
-    <Compile Include="Utils\BBCodeParser.cs" />
-    <Compile Include="Utils\Binding.cs" />
-    <Compile Include="Utils\Cache\CacheKey.cs" />
-    <Compile Include="Utils\Cache\FileSystemCache.cs" />
-    <Compile Include="Utils\Cache\ICache.cs" />
-    <Compile Include="Utils\Callback.cs" />
-    <Compile Include="Utils\CollectionUtils.cs" />
-    <Compile Include="Utils\CurLoader.cs" />
-    <Compile Include="Utils\DebugUtils.cs" />
-    <Compile Include="Utils\DirectionUtils.cs" />
-    <Compile Include="Utils\DotPath.cs" />
-    <Compile Include="Utils\FeatureLevelTest.cs" />
-    <Compile Include="Utils\FileUtils.cs" />
-    <Compile Include="Utils\GameThread.cs" />
-    <Compile Include="Utils\HTMLPrinter.cs" />
-    <Compile Include="Utils\IffPrinter.cs" />
-    <Compile Include="Utils\ITimedCachable.cs" />
-    <Compile Include="Utils\IXMLEntity.cs" />
-    <Compile Include="Utils\LinqUtils.cs" />
-    <Compile Include="Utils\MoneyFormatter.cs" />
-    <Compile Include="Utils\PathCaseTools.cs" />
-    <Compile Include="Utils\Promise.cs" />
-    <Compile Include="Utils\PPXDepthEngine.cs" />
-    <Compile Include="Utils\StateMachine.cs" />
-    <Compile Include="Utils\TextureGenerator.cs" />
-    <Compile Include="Utils\TextureUtils.cs" />
-    <Compile Include="Utils\TimedReferenceCache.cs" />
-    <Compile Include="Utils\TSOTime.cs" />
-    <Compile Include="Utils\ValuePointer.cs" />
-    <Compile Include="Utils\XMLList.cs" />
-    <Compile Include="WorldGeometry\MeshProjector.cs" />
-    <Compile Include="WorldGeometry\Paths\LinePath.cs" />
-    <Compile Include="WorldGeometry\Paths\SVGParser.cs" />
-    <Compile Include="WorldGeometry\RoadGeometry.cs" />
-    <Compile Include="WorldGeometry\SimplifiedHeightmap.cs" />
-    <Compile Include="WorldGeometry\TS1RoadTemplates.cs" />
-    <Compile Include="WorldGeometry\Utils\TriangleSet.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Other\libs\mp3sharp\mp3sharp\Mp3Sharp.csproj">
-      <Project>{834cab58-648d-47cc-ac6f-d01c08c809a4}</Project>
-      <Name>Mp3Sharp</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\Other\libs\mp3sharp\mp3sharp\Mp3Sharp.csproj" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Content\SDL2.dll" />
@@ -292,16 +86,21 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
-    <None Include="packages.config" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Common.Logging" Version="3.4.1" />
+    <PackageReference Include="Common.Logging.Core" Version="3.4.1" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.3.0" />
+    <PackageReference Include="Mina" Version="2.0.11" />
+    <PackageReference Include="MonoGame.Framework.Portable" Version="3.6.0.1625" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+    <PackageReference Include="NLog" Version="4.5.7" />
+    <PackageReference Include="Portable.Ninject" Version="3.3.1" />
+    <PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Remove="Content\IContent.cs" />
   </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- 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>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
diff --git a/server/tso.files/FSO.Files.csproj b/server/tso.files/FSO.Files.csproj
index 6c47203..23f3152 100755
--- a/server/tso.files/FSO.Files.csproj
+++ b/server/tso.files/FSO.Files.csproj
@@ -1,22 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{18583453-A970-4AC5-83B1-2D6BFDF94C24}</ProjectGuid>
+    <TargetFramework>net45</TargetFramework>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>FSO.Files</RootNamespace>
-    <AssemblyName>FSO.Files</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>3.5</OldToolsVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -32,196 +17,40 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <UseVSHostingProcess>true</UseVSHostingProcess>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <UseVSHostingProcess>true</UseVSHostingProcess>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ServerRelease|x86'">
     <OutputPath>bin\x86\ServerRelease\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ServerRelease|AnyCPU'">
     <OutputPath>bin\ServerRelease\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="bz2portable, Version=0.86.0.518, Culture=neutral, PublicKeyToken=43072770b20d93eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\bz2portable.1.0.1\lib\bz2portable.dll</HintPath>
-    </Reference>
-    <Reference Include="deltaq, Version=1.0.0.0, Culture=neutral, PublicKeyToken=4ec66318c45104d7, processorArchitecture=MSIL">
-      <HintPath>..\packages\deltaq.1.0.1\lib\deltaq.dll</HintPath>
-    </Reference>
-    <Reference Include="MonoGame.Framework, Version=3.6.0.1625, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MonoGame.Framework.Portable.3.6.0.1625\lib\portable-net45+win8+wpa81\MonoGame.Framework.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="xxHashSharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\xxHashSharp.1.0.0\lib\net45\xxHashSharp.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Formats\IFF\Chunks\ARRY.cs" />
-    <Compile Include="Formats\IFF\Chunks\FCNS.cs" />
-    <Compile Include="Formats\IFF\Chunks\HOUS.cs" />
-    <Compile Include="Formats\IFF\Chunks\PART.cs" />
-    <Compile Include="Formats\IFF\Chunks\PNG.cs" />
-    <Compile Include="Formats\IFF\Chunks\CARR.cs" />
-    <Compile Include="Formats\IFF\Chunks\FAMI.cs" />
-    <Compile Include="Formats\IFF\Chunks\FAMs.cs" />
-    <Compile Include="Formats\IFF\Chunks\FSOM.cs" />
-    <Compile Include="Formats\IFF\Chunks\FSOR.cs" />
-    <Compile Include="Formats\IFF\Chunks\FSOV.cs" />
-    <Compile Include="Formats\IFF\Chunks\IffFieldEncode.cs" />
-    <Compile Include="Formats\IFF\Chunks\MTEX.cs" />
-    <Compile Include="Formats\IFF\Chunks\NBRS.cs" />
-    <Compile Include="Formats\IFF\Chunks\NGBH.cs" />
-    <Compile Include="Formats\IFF\Chunks\OBJM.cs" />
-    <Compile Include="Formats\IFF\Chunks\OBJT.cs" />
-    <Compile Include="Formats\IFF\Chunks\SIMI.cs" />
-    <Compile Include="Formats\IFF\Chunks\THMB.cs" />
-    <Compile Include="Formats\IFF\Chunks\TRCN.cs" />
-    <Compile Include="Formats\IFF\Chunks\TREE.cs" />
-    <Compile Include="Formats\IFF\Chunks\TTAT.cs" />
-    <Compile Include="Formats\IFF\Chunks\WALm.cs" />
-    <Compile Include="Formats\tsodata\BulletinItem.cs" />
-    <Compile Include="Formats\tsodata\TSODataDefinition.cs" />
-    <Compile Include="Formats\IFF\ChunkRuntimeInfo.cs" />
-    <Compile Include="Formats\IFF\Chunks\PIFF.cs" />
-    <Compile Include="Formats\IFF\Chunks\SPR2FrameEncoder.cs" />
-    <Compile Include="Formats\IFF\Chunks\TPRP.cs" />
-    <Compile Include="Formats\IFF\IffRuntimeInfo.cs" />
-    <Compile Include="Formats\IFF\PIFFRegistry.cs" />
-    <Compile Include="Formats\PiffEncoder.cs" />
-    <Compile Include="Formats\tsodata\MessageItem.cs" />
-    <Compile Include="Formats\tsodata\TSOp.cs" />
-    <Compile Include="HIT\Patch.cs" />
-    <Compile Include="ImageLoader.cs" />
-    <Compile Include="FAR1\FAR1Archive.cs" />
-    <Compile Include="Formats\DBPF\DBPFEntry.cs" />
-    <Compile Include="Formats\DBPF\DBPFFile.cs" />
-    <Compile Include="Formats\IFF\AbstractIffChunk.cs" />
-    <Compile Include="Formats\IFF\Chunks\BCON.cs" />
-    <Compile Include="Formats\IFF\Chunks\BHAV.cs" />
-    <Compile Include="Formats\IFF\Chunks\BMP.cs" />
-    <Compile Include="Formats\IFF\Chunks\FWAV.cs" />
-    <Compile Include="Formats\IFF\Chunks\GLOB.cs" />
-    <Compile Include="Formats\IFF\Chunks\TTAs.cs" />
-    <Compile Include="Formats\IFF\Chunks\OBJf.cs" />
-    <Compile Include="Formats\IFF\Chunks\CTSS.cs" />
-    <Compile Include="Formats\IFF\Chunks\DGRP.cs" />
-    <Compile Include="Formats\IFF\Chunks\OBJD.cs" />
-    <Compile Include="Formats\IFF\Chunks\PALT.cs" />
-    <Compile Include="Formats\IFF\Chunks\SLOT.cs" />
-    <Compile Include="Formats\IFF\Chunks\SPR.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Formats\IFF\Chunks\SPR2.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Formats\IFF\Chunks\STR.cs" />
-    <Compile Include="Formats\IFF\Chunks\TTAB.cs" />
-    <Compile Include="Formats\IFF\IffFile.cs" />
-    <Compile Include="Formats\OTF\OTFFile.cs" />
-    <Compile Include="HIT\EVT.cs" />
-    <Compile Include="HIT\FSC.cs" />
-    <Compile Include="HIT\HITConstants.cs" />
-    <Compile Include="HIT\HITFile.cs" />
-    <Compile Include="HIT\Hitlist.cs" />
-    <Compile Include="HIT\Hot.cs" />
-    <Compile Include="HIT\HSM.cs" />
-    <Compile Include="HIT\TLO.cs" />
-    <Compile Include="HIT\Track.cs" />
-    <Compile Include="Endian.cs" />
-    <Compile Include="FAR1\FarEntry.cs" />
-    <Compile Include="FAR3\Decompresser.cs" />
-    <Compile Include="FAR3\FAR3Archive.cs" />
-    <Compile Include="FAR3\Far3Entry.cs" />
-    <Compile Include="FAR3\FAR3Exception.cs" />
-    <Compile Include="ImageLoaderHelpers.cs" />
-    <Compile Include="IniFile.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="RC\DGRP3DGeometry.cs" />
-    <Compile Include="RC\DGRP3DMesh.cs" />
-    <Compile Include="RC\DGRP3DVert.cs" />
-    <Compile Include="RC\DGRPRCParams.cs" />
-    <Compile Include="RC\FSOF.cs" />
-    <Compile Include="RC\NBHm.cs" />
-    <Compile Include="RC\OBJReader.cs" />
-    <Compile Include="RC\Utils\DepthTreatment.cs" />
-    <Compile Include="Tuning.cs" />
-    <Compile Include="Utils\BCFReadProxy.cs" />
-    <Compile Include="Utils\CurLoader.cs" />
-    <Compile Include="Utils\DiffGenerator.cs" />
-    <Compile Include="Utils\IFileInfoUtilizer.cs" />
-    <Compile Include="Utils\IoWriter.cs" />
-    <Compile Include="Utils\IoBuffer.cs" />
-    <Compile Include="Utils\ITextureProvider.cs" />
-    <Compile Include="Utils\IWorldTextureProvider.cs" />
-    <Compile Include="Utils\WorldTexture.cs" />
-    <Compile Include="UTK\UTKFile2.cs" />
-    <Compile Include="XA\XAFile.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.0">
       <Visible>False</Visible>
@@ -245,21 +74,16 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Other\libs\TargaImagePCL\TargaImagePCL.csproj">
-      <Project>{d8232422-9d79-4200-a981-eb70ed82ccf3}</Project>
-      <Name>TargaImagePCL</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\tso.common\FSO.Common.csproj">
-      <Project>{c42962a1-8796-4f47-9dcd-79ed5904d8ca}</Project>
-      <Name>FSO.Common</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\Other\libs\TargaImagePCL\TargaImagePCL.csproj" />
+    <ProjectReference Include="..\tso.common\FSO.Common.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="bz2portable" Version="1.0.1" />
+    <PackageReference Include="deltaq" Version="1.0.1" />
+    <PackageReference Include="MonoGame.Framework.Portable" Version="3.6.0.1625" />
+    <PackageReference Include="xxHashSharp" Version="1.0.0" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Remove="Formats\IFF\Chunks\ISPR.cs" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- 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>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file