diff --git a/Content.Client/Content.Client.csproj b/Content.Client/Content.Client.csproj
index 9afcc2f905..d4dc29a563 100644
--- a/Content.Client/Content.Client.csproj
+++ b/Content.Client/Content.Client.csproj
@@ -18,7 +18,7 @@
     This copies all dependencies,
     but on the plus side it's automatically located in the right place.
     -->
-    <OutputPath>..\bin\Client\Assemblies\</OutputPath>
+    <OutputPath>..\bin\Content.Client\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
@@ -30,7 +30,7 @@
     This copies all dependencies,
     but on the plus side it's automatically located in the right place.
     -->
-    <OutputPath>..\bin\Client\Assemblies\</OutputPath>
+    <OutputPath>..\bin\Content.Client\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -75,4 +75,24 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Choose>
+    <When Condition="'$(OS)'=='Windows_NT' Or '$(OS)'=='Windows'">
+      <PropertyGroup>
+        <PostBuildEvent>
+        if not exist "..\Client\Assemblies" (
+          mkdir ..\Client\Assemblies\
+        )
+        copy Content.* ..\Client\Assemblies\
+        </PostBuildEvent>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+          <PostBuildEvent>
+           mkdir -p ../Client/Assemblies/
+           cp Content.* ../Client/Assemblies/
+         </PostBuildEvent>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
 </Project>
diff --git a/Content.Server/Content.Server.csproj b/Content.Server/Content.Server.csproj
index 696d93e37a..13f5203249 100644
--- a/Content.Server/Content.Server.csproj
+++ b/Content.Server/Content.Server.csproj
@@ -18,7 +18,7 @@
     This copies all dependencies,
     but on the plus side it's automatically located in the right place.
     -->
-    <OutputPath>..\bin\Server\Assemblies\</OutputPath>
+    <OutputPath>..\bin\Content.Server\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
@@ -30,7 +30,7 @@
     This copies all dependencies,
     but on the plus side it's automatically located in the right place.
     -->
-    <OutputPath>..\bin\Server\Assemblies\</OutputPath>
+    <OutputPath>..\bin\Content.Server\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -71,4 +71,24 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Choose>
+    <When Condition="'$(OS)'=='Windows_NT' Or '$(OS)'=='Windows'">
+      <PropertyGroup>
+        <PostBuildEvent>
+        if not exist "..\Server\Assemblies" (
+          mkdir ..\Server\Assemblies\
+        )
+        copy Content.* ..\Server\Assemblies\
+        </PostBuildEvent>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+          <PostBuildEvent>
+           mkdir -p ../Server/Assemblies/
+           cp Content.* ../Server/Assemblies/
+         </PostBuildEvent>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
 </Project>
diff --git a/engine b/engine
index 51b13c47de..6af8422e21 160000
--- a/engine
+++ b/engine
@@ -1 +1 @@
-Subproject commit 51b13c47de700b2687a45a7b54c1451395b97305
+Subproject commit 6af8422e21805fb311a8526374815d417ce0dd7d