diff --git a/Content.Client/Content.Client.csproj b/Content.Client/Content.Client.csproj
index 176f4607e0..6fad7de4a6 100644
--- a/Content.Client/Content.Client.csproj
+++ b/Content.Client/Content.Client.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>Content.Client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ContentAssemblyTarget>..\bin\Client\Assemblies\</ContentAssemblyTarget>
+    <ContentAssemblyTarget>..\bin\Client\Resources\Assemblies\</ContentAssemblyTarget>
     <!--
     This copies all dependencies,
     but on the plus side it's automatically located in the right place.
diff --git a/Content.Server/Content.Server.csproj b/Content.Server/Content.Server.csproj
index 379273c01c..07b85bcc33 100644
--- a/Content.Server/Content.Server.csproj
+++ b/Content.Server/Content.Server.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>Content.Server</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ContentAssemblyTarget>..\bin\Server\Assemblies\</ContentAssemblyTarget>
+    <ContentAssemblyTarget>..\bin\Server\Resources\Assemblies\</ContentAssemblyTarget>
     <OutputPath>..\bin\Content.Server\</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
diff --git a/SpaceStation14Content.sln b/SpaceStation14Content.sln
index 358c5829f8..1d44f24b88 100644
--- a/SpaceStation14Content.sln
+++ b/SpaceStation14Content.sln
@@ -51,116 +51,116 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SFML", "SFML", "{1780DA39-F
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x86 = Debug|x86
-		Release|x86 = Release|x86
 		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|x86.ActiveCfg = Debug|x86
-		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|x86.Build.0 = Debug|x86
-		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|x86.ActiveCfg = Release|x86
-		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|x86.Build.0 = Release|x86
 		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|x64.ActiveCfg = Debug|x64
 		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|x64.Build.0 = Debug|x64
+		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|x86.ActiveCfg = Debug|x86
+		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|x86.Build.0 = Debug|x86
 		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|x64.ActiveCfg = Release|x64
 		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|x64.Build.0 = Release|x64
-		{0529F740-0000-0000-0000-000000000000}.Debug|x86.ActiveCfg = Debug|x86
-		{0529F740-0000-0000-0000-000000000000}.Debug|x86.Build.0 = Debug|x86
-		{0529F740-0000-0000-0000-000000000000}.Release|x86.ActiveCfg = Release|x86
-		{0529F740-0000-0000-0000-000000000000}.Release|x86.Build.0 = Release|x86
+		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|x86.ActiveCfg = Release|x86
+		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|x86.Build.0 = Release|x86
 		{0529F740-0000-0000-0000-000000000000}.Debug|x64.ActiveCfg = Debug|x64
 		{0529F740-0000-0000-0000-000000000000}.Debug|x64.Build.0 = Debug|x64
+		{0529F740-0000-0000-0000-000000000000}.Debug|x86.ActiveCfg = Debug|x86
+		{0529F740-0000-0000-0000-000000000000}.Debug|x86.Build.0 = Debug|x86
 		{0529F740-0000-0000-0000-000000000000}.Release|x64.ActiveCfg = Release|x64
 		{0529F740-0000-0000-0000-000000000000}.Release|x64.Build.0 = Release|x64
-		{B04AAE71-0000-0000-0000-000000000000}.Debug|x86.ActiveCfg = Debug|x86
-		{B04AAE71-0000-0000-0000-000000000000}.Debug|x86.Build.0 = Debug|x86
-		{B04AAE71-0000-0000-0000-000000000000}.Release|x86.ActiveCfg = Release|x86
-		{B04AAE71-0000-0000-0000-000000000000}.Release|x86.Build.0 = Release|x86
+		{0529F740-0000-0000-0000-000000000000}.Release|x86.ActiveCfg = Release|x86
+		{0529F740-0000-0000-0000-000000000000}.Release|x86.Build.0 = Release|x86
 		{B04AAE71-0000-0000-0000-000000000000}.Debug|x64.ActiveCfg = Debug|x64
 		{B04AAE71-0000-0000-0000-000000000000}.Debug|x64.Build.0 = Debug|x64
+		{B04AAE71-0000-0000-0000-000000000000}.Debug|x86.ActiveCfg = Debug|x86
+		{B04AAE71-0000-0000-0000-000000000000}.Debug|x86.Build.0 = Debug|x86
 		{B04AAE71-0000-0000-0000-000000000000}.Release|x64.ActiveCfg = Release|x64
 		{B04AAE71-0000-0000-0000-000000000000}.Release|x64.Build.0 = Release|x64
-		{302B877E-0000-0000-0000-000000000000}.Debug|x86.ActiveCfg = Debug|x86
-		{302B877E-0000-0000-0000-000000000000}.Debug|x86.Build.0 = Debug|x86
-		{302B877E-0000-0000-0000-000000000000}.Release|x86.ActiveCfg = Release|x86
-		{302B877E-0000-0000-0000-000000000000}.Release|x86.Build.0 = Release|x86
+		{B04AAE71-0000-0000-0000-000000000000}.Release|x86.ActiveCfg = Release|x86
+		{B04AAE71-0000-0000-0000-000000000000}.Release|x86.Build.0 = Release|x86
 		{302B877E-0000-0000-0000-000000000000}.Debug|x64.ActiveCfg = Debug|x64
 		{302B877E-0000-0000-0000-000000000000}.Debug|x64.Build.0 = Debug|x64
+		{302B877E-0000-0000-0000-000000000000}.Debug|x86.ActiveCfg = Debug|x86
+		{302B877E-0000-0000-0000-000000000000}.Debug|x86.Build.0 = Debug|x86
 		{302B877E-0000-0000-0000-000000000000}.Release|x64.ActiveCfg = Release|x64
 		{302B877E-0000-0000-0000-000000000000}.Release|x64.Build.0 = Release|x64
-		{0C31DFDF-0000-0000-0000-000000000000}.Debug|x86.ActiveCfg = Debug|x86
-		{0C31DFDF-0000-0000-0000-000000000000}.Debug|x86.Build.0 = Debug|x86
-		{0C31DFDF-0000-0000-0000-000000000000}.Release|x86.ActiveCfg = Release|x86
-		{0C31DFDF-0000-0000-0000-000000000000}.Release|x86.Build.0 = Release|x86
+		{302B877E-0000-0000-0000-000000000000}.Release|x86.ActiveCfg = Release|x86
+		{302B877E-0000-0000-0000-000000000000}.Release|x86.Build.0 = Release|x86
 		{0C31DFDF-0000-0000-0000-000000000000}.Debug|x64.ActiveCfg = Debug|x64
 		{0C31DFDF-0000-0000-0000-000000000000}.Debug|x64.Build.0 = Debug|x64
+		{0C31DFDF-0000-0000-0000-000000000000}.Debug|x86.ActiveCfg = Debug|x86
+		{0C31DFDF-0000-0000-0000-000000000000}.Debug|x86.Build.0 = Debug|x86
 		{0C31DFDF-0000-0000-0000-000000000000}.Release|x64.ActiveCfg = Release|x64
 		{0C31DFDF-0000-0000-0000-000000000000}.Release|x64.Build.0 = Release|x64
-		{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Debug|x86.ActiveCfg = Debug|x86
-		{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Debug|x86.Build.0 = Debug|x86
-		{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Release|x86.ActiveCfg = Release|x86
-		{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Release|x86.Build.0 = Release|x86
+		{0C31DFDF-0000-0000-0000-000000000000}.Release|x86.ActiveCfg = Release|x86
+		{0C31DFDF-0000-0000-0000-000000000000}.Release|x86.Build.0 = Release|x86
 		{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Debug|x64.ActiveCfg = Debug|x64
 		{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Debug|x64.Build.0 = Debug|x64
+		{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Debug|x86.ActiveCfg = Debug|x86
+		{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Debug|x86.Build.0 = Debug|x86
 		{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Release|x64.ActiveCfg = Release|x64
 		{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Release|x64.Build.0 = Release|x64
-		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|x86.ActiveCfg = Debug|x86
-		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|x86.Build.0 = Debug|x86
-		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|x86.ActiveCfg = Release|x86
-		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|x86.Build.0 = Release|x86
+		{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Release|x86.ActiveCfg = Release|x86
+		{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Release|x86.Build.0 = Release|x86
 		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|x64.ActiveCfg = Debug|x64
 		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|x64.Build.0 = Debug|x64
+		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|x86.ActiveCfg = Debug|x86
+		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|x86.Build.0 = Debug|x86
 		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|x64.ActiveCfg = Release|x64
 		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|x64.Build.0 = Release|x64
-		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|x86.ActiveCfg = Debug|x86
-		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|x86.Build.0 = Debug|x86
-		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|x86.ActiveCfg = Release|x86
-		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|x86.Build.0 = Release|x86
+		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|x86.ActiveCfg = Release|x86
+		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|x86.Build.0 = Release|x86
 		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|x64.ActiveCfg = Debug|x64
 		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|x64.Build.0 = Debug|x64
+		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|x86.ActiveCfg = Debug|x86
+		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|x86.Build.0 = Debug|x86
 		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|x64.ActiveCfg = Release|x64
 		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|x64.Build.0 = Release|x64
-		{59250BAF-0000-0000-0000-000000000000}.Debug|x86.ActiveCfg = Debug|x86
-		{59250BAF-0000-0000-0000-000000000000}.Debug|x86.Build.0 = Debug|x86
-		{59250BAF-0000-0000-0000-000000000000}.Release|x86.ActiveCfg = Release|x86
-		{59250BAF-0000-0000-0000-000000000000}.Release|x86.Build.0 = Release|x86
+		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|x86.ActiveCfg = Release|x86
+		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|x86.Build.0 = Release|x86
 		{59250BAF-0000-0000-0000-000000000000}.Debug|x64.ActiveCfg = Debug|x64
 		{59250BAF-0000-0000-0000-000000000000}.Debug|x64.Build.0 = Debug|x64
+		{59250BAF-0000-0000-0000-000000000000}.Debug|x86.ActiveCfg = Debug|x86
+		{59250BAF-0000-0000-0000-000000000000}.Debug|x86.Build.0 = Debug|x86
 		{59250BAF-0000-0000-0000-000000000000}.Release|x64.ActiveCfg = Release|x64
 		{59250BAF-0000-0000-0000-000000000000}.Release|x64.Build.0 = Release|x64
+		{59250BAF-0000-0000-0000-000000000000}.Release|x86.ActiveCfg = Release|x86
+		{59250BAF-0000-0000-0000-000000000000}.Release|x86.Build.0 = Release|x86
+		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Debug|x64.ActiveCfg = Debug|x86
+		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Debug|x64.Build.0 = Debug|x86
 		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Debug|x86.ActiveCfg = Debug|x86
 		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Debug|x86.Build.0 = Debug|x86
+		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Release|x64.ActiveCfg = Debug|x86
+		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Release|x64.Build.0 = Debug|x86
 		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Release|x86.ActiveCfg = Debug|x86
 		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Release|x86.Build.0 = Debug|x86
-		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Debug|x64.ActiveCfg = Debug|x64
-		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Debug|x64.Build.0 = Debug|x64
-		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Release|x64.ActiveCfg = Debug|x64
-		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Release|x64.Build.0 = Debug|x64
-		{31D24303-F6A9-4D53-BB03-A73EDCB3186D}.Debug|x86.ActiveCfg = Debug|x86
-		{31D24303-F6A9-4D53-BB03-A73EDCB3186D}.Debug|x86.Build.0 = Debug|x86
-		{31D24303-F6A9-4D53-BB03-A73EDCB3186D}.Release|x86.ActiveCfg = Release|x86
-		{31D24303-F6A9-4D53-BB03-A73EDCB3186D}.Release|x86.Build.0 = Release|x86
 		{31D24303-F6A9-4D53-BB03-A73EDCB3186D}.Debug|x64.ActiveCfg = Debug|x64
 		{31D24303-F6A9-4D53-BB03-A73EDCB3186D}.Debug|x64.Build.0 = Debug|x64
-		{31D24303-F6A9-4D53-BB03-A73EDCB3186D}.Release|x86.ActiveCfg = Release|x64
+		{31D24303-F6A9-4D53-BB03-A73EDCB3186D}.Debug|x86.ActiveCfg = Debug|x86
+		{31D24303-F6A9-4D53-BB03-A73EDCB3186D}.Debug|x86.Build.0 = Debug|x86
+		{31D24303-F6A9-4D53-BB03-A73EDCB3186D}.Release|x64.ActiveCfg = Release|x64
 		{31D24303-F6A9-4D53-BB03-A73EDCB3186D}.Release|x64.Build.0 = Release|x64
-		{46786269-57B9-48E7-AA4F-8F4D84609FE6}.Debug|x86.ActiveCfg = Debug|x86
-		{46786269-57B9-48E7-AA4F-8F4D84609FE6}.Debug|x86.Build.0 = Debug|x86
-		{46786269-57B9-48E7-AA4F-8F4D84609FE6}.Release|x86.ActiveCfg = Release|x86
-		{46786269-57B9-48E7-AA4F-8F4D84609FE6}.Release|x86.Build.0 = Release|x86
+		{31D24303-F6A9-4D53-BB03-A73EDCB3186D}.Release|x86.ActiveCfg = Release|x64
+		{31D24303-F6A9-4D53-BB03-A73EDCB3186D}.Release|x86.Build.0 = Release|x86
 		{46786269-57B9-48E7-AA4F-8F4D84609FE6}.Debug|x64.ActiveCfg = Debug|x64
 		{46786269-57B9-48E7-AA4F-8F4D84609FE6}.Debug|x64.Build.0 = Debug|x64
+		{46786269-57B9-48E7-AA4F-8F4D84609FE6}.Debug|x86.ActiveCfg = Debug|x86
+		{46786269-57B9-48E7-AA4F-8F4D84609FE6}.Debug|x86.Build.0 = Debug|x86
 		{46786269-57B9-48E7-AA4F-8F4D84609FE6}.Release|x64.ActiveCfg = Release|x64
 		{46786269-57B9-48E7-AA4F-8F4D84609FE6}.Release|x64.Build.0 = Release|x64
-		{D17DE83D-A592-461F-8AF2-53F9E22E1D0F}.Debug|x86.ActiveCfg = Debug|x86
-		{D17DE83D-A592-461F-8AF2-53F9E22E1D0F}.Debug|x86.Build.0 = Debug|x86
-		{D17DE83D-A592-461F-8AF2-53F9E22E1D0F}.Release|x86.ActiveCfg = Release|x86
-		{D17DE83D-A592-461F-8AF2-53F9E22E1D0F}.Release|x86.Build.0 = Release|x86
+		{46786269-57B9-48E7-AA4F-8F4D84609FE6}.Release|x86.ActiveCfg = Release|x86
+		{46786269-57B9-48E7-AA4F-8F4D84609FE6}.Release|x86.Build.0 = Release|x86
 		{D17DE83D-A592-461F-8AF2-53F9E22E1D0F}.Debug|x64.ActiveCfg = Debug|x64
 		{D17DE83D-A592-461F-8AF2-53F9E22E1D0F}.Debug|x64.Build.0 = Debug|x64
+		{D17DE83D-A592-461F-8AF2-53F9E22E1D0F}.Debug|x86.ActiveCfg = Debug|x86
+		{D17DE83D-A592-461F-8AF2-53F9E22E1D0F}.Debug|x86.Build.0 = Debug|x86
 		{D17DE83D-A592-461F-8AF2-53F9E22E1D0F}.Release|x64.ActiveCfg = Release|x64
 		{D17DE83D-A592-461F-8AF2-53F9E22E1D0F}.Release|x64.Build.0 = Release|x64
+		{D17DE83D-A592-461F-8AF2-53F9E22E1D0F}.Release|x86.ActiveCfg = Release|x86
+		{D17DE83D-A592-461F-8AF2-53F9E22E1D0F}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE