diff --git a/TShockAPI/TShockAPI.csproj b/TShockAPI/TShockAPI.csproj
index 33a7a409..2eed28be 100644
--- a/TShockAPI/TShockAPI.csproj
+++ b/TShockAPI/TShockAPI.csproj
@@ -54,14 +54,18 @@
     </Reference>
   </ItemGroup>
 
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(ConfigurationName)'=='Debug'">
-    <Copy SourceFiles="$(OutputPath)\TShockAPI.dll" DestinationFolder="$(OutputPath)\ServerPlugins" SkipUnchangedFiles="false" />
-    <Copy SourceFiles="$(OutputPath)\TShockAPI.deps.json" DestinationFolder="$(OutputPath)\ServerPlugins" SkipUnchangedFiles="false" />
-    <Copy SourceFiles="$(OutputPath)\TShockAPI.pdb" DestinationFolder="$(OutputPath)\ServerPlugins" SkipUnchangedFiles="false" />
-    <Copy SourceFiles="$(OutputPath)\TShockAPI.xml" DestinationFolder="$(OutputPath)\ServerPlugins" SkipUnchangedFiles="false" />
-    <Copy SourceFiles="$(OutputPath)\System.Data.SQLite.dll" DestinationFolder="$(OutputPath)\ServerPlugins" SkipUnchangedFiles="false" />
-    <Copy SourceFiles="$(OutputPath)\HttpServer.dll" DestinationFolder="$(OutputPath)\ServerPlugins" SkipUnchangedFiles="false" />
-    <Copy SourceFiles="$(OutputPath)\MySql.Data.dll" DestinationFolder="$(OutputPath)\ServerPlugins" SkipUnchangedFiles="false" />
+  <Target Name="MoveToBinFolder" AfterTargets="FinalCleanup;PostBuildEvent;Publish">
+    <ItemGroup>
+      <MoveBinariesForDebug Include="$(TargetDir)*" Exclude="$(TargetDir)\TerrariaServer*;$(TargetDir)\TShock*" />
+      <MoveBinariesForPublish Include="$(PublishDir)*" Exclude="$(PublishDir)\TerrariaServer*;$(PublishDir)\TShock*" />
+      <TShockDebug Include="$(TargetDir)\TShock*" />
+      <TShockPublish Include="$(PublishDir)\TShock*" />
+    </ItemGroup>
+
+    <Move SourceFiles="@(MoveBinariesForDebug)" DestinationFolder="$(TargetDir)bin" ContinueOnError="true" />
+    <Move SourceFiles="@(MoveBinariesForPublish)" DestinationFolder="$(PublishDir)bin" ContinueOnError="true" />
+    <Copy SourceFiles="@(TShockDebug)" DestinationFolder="$(TargetDir)ServerPlugins" />
+    <Copy SourceFiles="@(TShockPublish)" DestinationFolder="$(PublishDir)ServerPlugins" />
   </Target>
 
 </Project>
diff --git a/TerrariaServerAPI b/TerrariaServerAPI
index 1e651bc3..d9935022 160000
--- a/TerrariaServerAPI
+++ b/TerrariaServerAPI
@@ -1 +1 @@
-Subproject commit 1e651bc3193a42016aa5cc12f64f8c3bd5d897af
+Subproject commit d9935022b6ec3ea089d63e2ed8a7225668ce32cb