diff --git a/1.6/1.6/Assemblies/ArachnaeSwarm.dll b/1.6/1.6/Assemblies/ArachnaeSwarm.dll
index 4060780..de23dbc 100644
Binary files a/1.6/1.6/Assemblies/ArachnaeSwarm.dll and b/1.6/1.6/Assemblies/ArachnaeSwarm.dll differ
diff --git a/Source/ArachnaeSwarm/.vs/ArachnaeSwarm/FileContentIndex/246827df-5ce2-499c-a980-ca54136ea978.vsidx b/Source/ArachnaeSwarm/.vs/ArachnaeSwarm/FileContentIndex/246827df-5ce2-499c-a980-ca54136ea978.vsidx
new file mode 100644
index 0000000..272ac49
Binary files /dev/null and b/Source/ArachnaeSwarm/.vs/ArachnaeSwarm/FileContentIndex/246827df-5ce2-499c-a980-ca54136ea978.vsidx differ
diff --git a/Source/ArachnaeSwarm/.vs/ArachnaeSwarm/FileContentIndex/3e921b08-6c7d-4dba-8db3-f560dc6628c8.vsidx b/Source/ArachnaeSwarm/.vs/ArachnaeSwarm/FileContentIndex/3e921b08-6c7d-4dba-8db3-f560dc6628c8.vsidx
new file mode 100644
index 0000000..398daa3
Binary files /dev/null and b/Source/ArachnaeSwarm/.vs/ArachnaeSwarm/FileContentIndex/3e921b08-6c7d-4dba-8db3-f560dc6628c8.vsidx differ
diff --git a/Source/ArachnaeSwarm/.vs/ArachnaeSwarm/FileContentIndex/84051f76-965f-4736-9f66-fcd231d9d114.vsidx b/Source/ArachnaeSwarm/.vs/ArachnaeSwarm/FileContentIndex/84051f76-965f-4736-9f66-fcd231d9d114.vsidx
new file mode 100644
index 0000000..4b95eb9
Binary files /dev/null and b/Source/ArachnaeSwarm/.vs/ArachnaeSwarm/FileContentIndex/84051f76-965f-4736-9f66-fcd231d9d114.vsidx differ
diff --git a/Source/ArachnaeSwarm/.vs/ArachnaeSwarm/FileContentIndex/960c6b4b-ddbd-4f0e-a300-694a8e25ff6b.vsidx b/Source/ArachnaeSwarm/.vs/ArachnaeSwarm/FileContentIndex/960c6b4b-ddbd-4f0e-a300-694a8e25ff6b.vsidx
new file mode 100644
index 0000000..8b78e54
Binary files /dev/null and b/Source/ArachnaeSwarm/.vs/ArachnaeSwarm/FileContentIndex/960c6b4b-ddbd-4f0e-a300-694a8e25ff6b.vsidx differ
diff --git a/Source/ArachnaeSwarm/.vs/ArachnaeSwarm/FileContentIndex/dd5ec4b1-a0dd-4d4a-b836-40df7fec24a3.vsidx b/Source/ArachnaeSwarm/.vs/ArachnaeSwarm/FileContentIndex/dd5ec4b1-a0dd-4d4a-b836-40df7fec24a3.vsidx
new file mode 100644
index 0000000..7de7d15
Binary files /dev/null and b/Source/ArachnaeSwarm/.vs/ArachnaeSwarm/FileContentIndex/dd5ec4b1-a0dd-4d4a-b836-40df7fec24a3.vsidx differ
diff --git a/Source/ArachnaeSwarm/.vs/ArachnaeSwarm/v17/.suo b/Source/ArachnaeSwarm/.vs/ArachnaeSwarm/v17/.suo
new file mode 100644
index 0000000..0d4ccce
Binary files /dev/null and b/Source/ArachnaeSwarm/.vs/ArachnaeSwarm/v17/.suo differ
diff --git a/Source/ArachnaeSwarm/.vs/ArachnaeSwarm/v17/DocumentLayout.json b/Source/ArachnaeSwarm/.vs/ArachnaeSwarm/v17/DocumentLayout.json
new file mode 100644
index 0000000..81b55d9
--- /dev/null
+++ b/Source/ArachnaeSwarm/.vs/ArachnaeSwarm/v17/DocumentLayout.json
@@ -0,0 +1,23 @@
+{
+  "Version": 1,
+  "WorkspaceRootPath": "C:\\Steam\\steamapps\\common\\RimWorld\\Mods\\ArachnaeSwarm\\Source\\ArachnaeSwarm\\",
+  "Documents": [],
+  "DocumentGroupContainers": [
+    {
+      "Orientation": 0,
+      "VerticalTabListWidth": 256,
+      "DocumentGroups": [
+        {
+          "DockedWidth": 200,
+          "SelectedChildIndex": -1,
+          "Children": [
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Source/ArachnaeSwarm/CompDelayedTerrainSpawn.cs b/Source/ArachnaeSwarm/ARA_BuildingTerrainSpawn/CompDelayedTerrainSpawn.cs
similarity index 100%
rename from Source/ArachnaeSwarm/CompDelayedTerrainSpawn.cs
rename to Source/ArachnaeSwarm/ARA_BuildingTerrainSpawn/CompDelayedTerrainSpawn.cs
diff --git a/Source/ArachnaeSwarm/CompProperties_DelayedTerrainSpawn.cs b/Source/ArachnaeSwarm/ARA_BuildingTerrainSpawn/CompProperties_DelayedTerrainSpawn.cs
similarity index 100%
rename from Source/ArachnaeSwarm/CompProperties_DelayedTerrainSpawn.cs
rename to Source/ArachnaeSwarm/ARA_BuildingTerrainSpawn/CompProperties_DelayedTerrainSpawn.cs
diff --git a/Source/ArachnaeSwarm/CompAbilityEffect_BindDrone.cs b/Source/ArachnaeSwarm/ARA_HiveMind/CompAbilityEffect_BindDrone.cs
similarity index 100%
rename from Source/ArachnaeSwarm/CompAbilityEffect_BindDrone.cs
rename to Source/ArachnaeSwarm/ARA_HiveMind/CompAbilityEffect_BindDrone.cs
diff --git a/Source/ArachnaeSwarm/CompProperties_AbilityBindDrone.cs b/Source/ArachnaeSwarm/ARA_HiveMind/CompProperties_AbilityBindDrone.cs
similarity index 100%
rename from Source/ArachnaeSwarm/CompProperties_AbilityBindDrone.cs
rename to Source/ArachnaeSwarm/ARA_HiveMind/CompProperties_AbilityBindDrone.cs
diff --git a/Source/ArachnaeSwarm/HediffCompProperties_HiveMindDrone.cs b/Source/ArachnaeSwarm/ARA_HiveMind/HediffCompProperties_HiveMindDrone.cs
similarity index 100%
rename from Source/ArachnaeSwarm/HediffCompProperties_HiveMindDrone.cs
rename to Source/ArachnaeSwarm/ARA_HiveMind/HediffCompProperties_HiveMindDrone.cs
diff --git a/Source/ArachnaeSwarm/HediffComp_HiveMindDrone.cs b/Source/ArachnaeSwarm/ARA_HiveMind/HediffComp_HiveMindDrone.cs
similarity index 100%
rename from Source/ArachnaeSwarm/HediffComp_HiveMindDrone.cs
rename to Source/ArachnaeSwarm/ARA_HiveMind/HediffComp_HiveMindDrone.cs
diff --git a/Source/ArachnaeSwarm/Hediff_HiveMindDrone.cs b/Source/ArachnaeSwarm/ARA_HiveMind/Hediff_HiveMindDrone.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Hediff_HiveMindDrone.cs
rename to Source/ArachnaeSwarm/ARA_HiveMind/Hediff_HiveMindDrone.cs
diff --git a/Source/ArachnaeSwarm/Hediff_HiveMindMaster.cs b/Source/ArachnaeSwarm/ARA_HiveMind/Hediff_HiveMindMaster.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Hediff_HiveMindMaster.cs
rename to Source/ArachnaeSwarm/ARA_HiveMind/Hediff_HiveMindMaster.cs
diff --git a/Source/ArachnaeSwarm/CompAbilityEffect_BodyPartCheck.cs b/Source/ArachnaeSwarm/ARA_QueenAbility/CompAbilityEffect_BodyPartCheck.cs
similarity index 100%
rename from Source/ArachnaeSwarm/CompAbilityEffect_BodyPartCheck.cs
rename to Source/ArachnaeSwarm/ARA_QueenAbility/CompAbilityEffect_BodyPartCheck.cs
diff --git a/Source/ArachnaeSwarm/CompAbilityEffect_NeedCost.cs b/Source/ArachnaeSwarm/ARA_QueenAbility/CompAbilityEffect_NeedCost.cs
similarity index 100%
rename from Source/ArachnaeSwarm/CompAbilityEffect_NeedCost.cs
rename to Source/ArachnaeSwarm/ARA_QueenAbility/CompAbilityEffect_NeedCost.cs
diff --git a/Source/ArachnaeSwarm/CompAbilityEffect_SprayLiquidMulti.cs b/Source/ArachnaeSwarm/ARA_QueenAbility/CompAbilityEffect_SprayLiquidMulti.cs
similarity index 100%
rename from Source/ArachnaeSwarm/CompAbilityEffect_SprayLiquidMulti.cs
rename to Source/ArachnaeSwarm/ARA_QueenAbility/CompAbilityEffect_SprayLiquidMulti.cs
diff --git a/Source/ArachnaeSwarm/CompProperties_AbilitySprayLiquidMulti.cs b/Source/ArachnaeSwarm/ARA_QueenAbility/CompProperties_AbilitySprayLiquidMulti.cs
similarity index 100%
rename from Source/ArachnaeSwarm/CompProperties_AbilitySprayLiquidMulti.cs
rename to Source/ArachnaeSwarm/ARA_QueenAbility/CompProperties_AbilitySprayLiquidMulti.cs
diff --git a/Source/ArachnaeSwarm/CompProperties_SpawnPawnFromList.cs b/Source/ArachnaeSwarm/ARA_SpawnPawnFromList/CompProperties_SpawnPawnFromList.cs
similarity index 100%
rename from Source/ArachnaeSwarm/CompProperties_SpawnPawnFromList.cs
rename to Source/ArachnaeSwarm/ARA_SpawnPawnFromList/CompProperties_SpawnPawnFromList.cs
diff --git a/Source/ArachnaeSwarm/CompSpawnPawnFromList.cs b/Source/ArachnaeSwarm/ARA_SpawnPawnFromList/CompSpawnPawnFromList.cs
similarity index 100%
rename from Source/ArachnaeSwarm/CompSpawnPawnFromList.cs
rename to Source/ArachnaeSwarm/ARA_SpawnPawnFromList/CompSpawnPawnFromList.cs
diff --git a/Source/ArachnaeSwarm/JobDriver_Incubate.cs b/Source/ArachnaeSwarm/ARA_SpawnPawnFromList/JobDriver_Incubate.cs
similarity index 100%
rename from Source/ArachnaeSwarm/JobDriver_Incubate.cs
rename to Source/ArachnaeSwarm/ARA_SpawnPawnFromList/JobDriver_Incubate.cs
diff --git a/Source/ArachnaeSwarm/CompAdvancedTraining.cs b/Source/ArachnaeSwarm/ARA_TrainingWork/CompAdvancedTraining.cs
similarity index 100%
rename from Source/ArachnaeSwarm/CompAdvancedTraining.cs
rename to Source/ArachnaeSwarm/ARA_TrainingWork/CompAdvancedTraining.cs
diff --git a/Source/ArachnaeSwarm/JobGiver_Grower.cs b/Source/ArachnaeSwarm/ARA_TrainingWork/JobGiver_Grower.cs
similarity index 100%
rename from Source/ArachnaeSwarm/JobGiver_Grower.cs
rename to Source/ArachnaeSwarm/ARA_TrainingWork/JobGiver_Grower.cs
diff --git a/Source/ArachnaeSwarm/ThinkNode_ConditionalAnimalShouldDoGrowingWork.cs b/Source/ArachnaeSwarm/ARA_TrainingWork/ThinkNode_ConditionalAnimalShouldDoGrowingWork.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ThinkNode_ConditionalAnimalShouldDoGrowingWork.cs
rename to Source/ArachnaeSwarm/ARA_TrainingWork/ThinkNode_ConditionalAnimalShouldDoGrowingWork.cs
diff --git a/Source/ArachnaeSwarm/TrainingSystem_Patcher.cs b/Source/ArachnaeSwarm/ARA_TrainingWork/TrainingSystem_Patcher.cs
similarity index 100%
rename from Source/ArachnaeSwarm/TrainingSystem_Patcher.cs
rename to Source/ArachnaeSwarm/ARA_TrainingWork/TrainingSystem_Patcher.cs
diff --git a/Source/ArachnaeSwarm/WorkGiver_ArachnaeSow.cs b/Source/ArachnaeSwarm/ARA_TrainingWork/WorkGiver_ArachnaeSow.cs
similarity index 100%
rename from Source/ArachnaeSwarm/WorkGiver_ArachnaeSow.cs
rename to Source/ArachnaeSwarm/ARA_TrainingWork/WorkGiver_ArachnaeSow.cs
diff --git a/Source/ArachnaeSwarm/ArachnaeSwarm.csproj b/Source/ArachnaeSwarm/ArachnaeSwarm.csproj
index 97942aa..2a93bed 100644
--- a/Source/ArachnaeSwarm/ArachnaeSwarm.csproj
+++ b/Source/ArachnaeSwarm/ArachnaeSwarm.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -68,34 +68,33 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="CompProperties_SpawnPawnFromList.cs" />
-    <Compile Include="CompSpawnPawnFromList.cs" />
-    <Compile Include="JobDriver_Incubate.cs" />
-    <Compile Include="CompProperties_AbilitySprayLiquidMulti.cs" />
-    <Compile Include="CompAbilityEffect_SprayLiquidMulti.cs" />
-    <Compile Include="Building_Incubator.cs" />
+    <Compile Include="ARA_SpawnPawnFromList\CompProperties_SpawnPawnFromList.cs" />
+    <Compile Include="ARA_SpawnPawnFromList\CompSpawnPawnFromList.cs" />
+    <Compile Include="ARA_SpawnPawnFromList\JobDriver_Incubate.cs" />
+    <Compile Include="ARA_QueenAbility\CompProperties_AbilitySprayLiquidMulti.cs" />
+    <Compile Include="ARA_QueenAbility\CompAbilityEffect_SprayLiquidMulti.cs" />
     <Compile Include="Hediffs\Hediff_CurseFlame.cs" />
-    <Compile Include="CompAbilityEffect_NeedCost.cs" />
-    <Compile Include="CompAbilityEffect_BodyPartCheck.cs" />
-    <Compile Include="Hediff_HiveMindMaster.cs" />
-    <Compile Include="Hediff_HiveMindDrone.cs" />
-    <Compile Include="HediffCompProperties_HiveMindDrone.cs" />
-    <Compile Include="HediffComp_HiveMindDrone.cs" />
-    <Compile Include="CompAbilityEffect_BindDrone.cs" />
-    <Compile Include="CompProperties_AbilityBindDrone.cs" />
+    <Compile Include="ARA_QueenAbility\CompAbilityEffect_NeedCost.cs" />
+    <Compile Include="ARA_QueenAbility\CompAbilityEffect_BodyPartCheck.cs" />
+    <Compile Include="ARA_HiveMind\Hediff_HiveMindMaster.cs" />
+    <Compile Include="ARA_HiveMind\Hediff_HiveMindDrone.cs" />
+    <Compile Include="ARA_HiveMind\HediffCompProperties_HiveMindDrone.cs" />
+    <Compile Include="ARA_HiveMind\HediffComp_HiveMindDrone.cs" />
+    <Compile Include="ARA_HiveMind\CompAbilityEffect_BindDrone.cs" />
+    <Compile Include="ARA_HiveMind\CompProperties_AbilityBindDrone.cs" />
     <Compile Include="JobGiver_MaintainBuildings.cs" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MainHarmony.cs" />
-    <Compile Include="ThinkNode_ConditionalAnimalShouldDoGrowingWork.cs" />
-    <Compile Include="CompAdvancedTraining.cs" />
-    <Compile Include="JobGiver_Grower.cs" />
-    <Compile Include="WorkGiver_ArachnaeSow.cs" />
-    <Compile Include="TrainingSystem_Patcher.cs" />
+    <Compile Include="ARA_TrainingWork\ThinkNode_ConditionalAnimalShouldDoGrowingWork.cs" />
+    <Compile Include="ARA_TrainingWork\CompAdvancedTraining.cs" />
+    <Compile Include="ARA_TrainingWork\JobGiver_Grower.cs" />
+    <Compile Include="ARA_TrainingWork\WorkGiver_ArachnaeSow.cs" />
+    <Compile Include="ARA_TrainingWork\TrainingSystem_Patcher.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="CompProperties_DelayedTerrainSpawn.cs" />
-    <Compile Include="CompDelayedTerrainSpawn.cs" />
+    <Compile Include="ARA_BuildingTerrainSpawn\CompProperties_DelayedTerrainSpawn.cs" />
+    <Compile Include="ARA_BuildingTerrainSpawn\CompDelayedTerrainSpawn.cs" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="WULA_AutoMechCarrier\CompAutoMechCarrier.cs" />
diff --git a/Source/ArachnaeSwarm/ArachnaeSwarm.sln b/Source/ArachnaeSwarm/ArachnaeSwarm.sln
new file mode 100644
index 0000000..c96f4f7
--- /dev/null
+++ b/Source/ArachnaeSwarm/ArachnaeSwarm.sln
@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.9.34622.214
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArachnaeSwarm", "ArachnaeSwarm.csproj", "{EAE0DB6B-E282-C812-7F5A-6D13E9D24581}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{EAE0DB6B-E282-C812-7F5A-6D13E9D24581}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EAE0DB6B-E282-C812-7F5A-6D13E9D24581}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EAE0DB6B-E282-C812-7F5A-6D13E9D24581}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EAE0DB6B-E282-C812-7F5A-6D13E9D24581}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {FE399944-77F4-4046-9966-ADB9E0644BF6}
+	EndGlobalSection
+EndGlobal
diff --git a/Source/ArachnaeSwarm/Building_Incubator.cs b/Source/ArachnaeSwarm/Building_Incubator.cs
deleted file mode 100644
index cb2e948..0000000
--- a/Source/ArachnaeSwarm/Building_Incubator.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using UnityEngine;
-using Verse;
-
-namespace ArachnaeSwarm
-{
-    public class Building_Incubator : Building
-    {
-        public CompSpawnPawnFromList SpawnComp => GetComp<CompSpawnPawnFromList>();
-
-        public override Graphic Graphic
-        {
-            get
-            {
-                if (SpawnComp != null && SpawnComp.IsHatching && SpawnComp.Props.hatchingGraphicData != null)
-                {
-                    return SpawnComp.Props.hatchingGraphicData.Graphic;
-                }
-                return base.Graphic;
-            }
-        }
-    }
-}
\ No newline at end of file