diff --git a/1.6/1.6/Assemblies/ArachnaeSwarm.dll b/1.6/1.6/Assemblies/ArachnaeSwarm.dll
index df3ad42..41433c4 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/v17/.suo b/Source/ArachnaeSwarm/.vs/ArachnaeSwarm/v17/.suo
index 8534389..5b27f30 100644
Binary files a/Source/ArachnaeSwarm/.vs/ArachnaeSwarm/v17/.suo 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
index 28775af..b6dcdf4 100644
--- a/Source/ArachnaeSwarm/.vs/ArachnaeSwarm/v17/DocumentLayout.json
+++ b/Source/ArachnaeSwarm/.vs/ArachnaeSwarm/v17/DocumentLayout.json
@@ -1,25 +1,25 @@
 {
   "Version": 1,
-  "WorkspaceRootPath": "D:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\ArachnaeSwarm\\Source\\ArachnaeSwarm\\",
+  "WorkspaceRootPath": "C:\\Steam\\steamapps\\common\\RimWorld\\Mods\\ArachnaeSwarm\\Source\\ArachnaeSwarm\\",
   "Documents": [
     {
-      "AbsoluteMoniker": "D:0:0:{EAE0DB6B-E282-C812-7F5A-6D13E9D24581}|ArachnaeSwarm.csproj|d:\\steamlibrary\\steamapps\\common\\rimworld\\mods\\arachnaeswarm\\source\\arachnaeswarm\\pawn_comps\\ara_nodeswarmlifetime\\compnodeswarmlifetime.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+      "AbsoluteMoniker": "D:0:0:{EAE0DB6B-E282-C812-7F5A-6D13E9D24581}|ArachnaeSwarm.csproj|c:\\steam\\steamapps\\common\\rimworld\\mods\\arachnaeswarm\\source\\arachnaeswarm\\pawn_comps\\ara_nodeswarmlifetime\\compnodeswarmlifetime.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
       "RelativeMoniker": "D:0:0:{EAE0DB6B-E282-C812-7F5A-6D13E9D24581}|ArachnaeSwarm.csproj|solutionrelative:pawn_comps\\ara_nodeswarmlifetime\\compnodeswarmlifetime.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
     },
     {
-      "AbsoluteMoniker": "D:0:0:{EAE0DB6B-E282-C812-7F5A-6D13E9D24581}|ArachnaeSwarm.csproj|d:\\steamlibrary\\steamapps\\common\\rimworld\\mods\\arachnaeswarm\\source\\arachnaeswarm\\pawn_comps\\ara_nodeswarmlifetime\\compproperties_nodeswarmlifetime.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+      "AbsoluteMoniker": "D:0:0:{EAE0DB6B-E282-C812-7F5A-6D13E9D24581}|ArachnaeSwarm.csproj|C:\\Steam\\steamapps\\common\\RimWorld\\Mods\\ArachnaeSwarm\\Source\\ArachnaeSwarm\\pawn_comps\\ara_nodeswarmlifetime\\compproperties_nodeswarmlifetime.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
       "RelativeMoniker": "D:0:0:{EAE0DB6B-E282-C812-7F5A-6D13E9D24581}|ArachnaeSwarm.csproj|solutionrelative:pawn_comps\\ara_nodeswarmlifetime\\compproperties_nodeswarmlifetime.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
     },
     {
-      "AbsoluteMoniker": "D:0:0:{EAE0DB6B-E282-C812-7F5A-6D13E9D24581}|ArachnaeSwarm.csproj|d:\\steamlibrary\\steamapps\\common\\rimworld\\mods\\arachnaeswarm\\source\\arachnaeswarm\\pawn_comps\\ara_givehediffsinrangetorace\\hediffcomp_givehediffsinrangetorace.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+      "AbsoluteMoniker": "D:0:0:{EAE0DB6B-E282-C812-7F5A-6D13E9D24581}|ArachnaeSwarm.csproj|C:\\Steam\\steamapps\\common\\RimWorld\\Mods\\ArachnaeSwarm\\Source\\ArachnaeSwarm\\pawn_comps\\ara_givehediffsinrangetorace\\hediffcomp_givehediffsinrangetorace.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
       "RelativeMoniker": "D:0:0:{EAE0DB6B-E282-C812-7F5A-6D13E9D24581}|ArachnaeSwarm.csproj|solutionrelative:pawn_comps\\ara_givehediffsinrangetorace\\hediffcomp_givehediffsinrangetorace.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
     },
     {
-      "AbsoluteMoniker": "D:0:0:{EAE0DB6B-E282-C812-7F5A-6D13E9D24581}|ArachnaeSwarm.csproj|d:\\steamlibrary\\steamapps\\common\\rimworld\\mods\\arachnaeswarm\\source\\arachnaeswarm\\pawn_comps\\ara_fighter_invisible\\compfighterinvisible.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+      "AbsoluteMoniker": "D:0:0:{EAE0DB6B-E282-C812-7F5A-6D13E9D24581}|ArachnaeSwarm.csproj|C:\\Steam\\steamapps\\common\\RimWorld\\Mods\\ArachnaeSwarm\\Source\\ArachnaeSwarm\\pawn_comps\\ara_fighter_invisible\\compfighterinvisible.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
       "RelativeMoniker": "D:0:0:{EAE0DB6B-E282-C812-7F5A-6D13E9D24581}|ArachnaeSwarm.csproj|solutionrelative:pawn_comps\\ara_fighter_invisible\\compfighterinvisible.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
     },
     {
-      "AbsoluteMoniker": "D:0:0:{EAE0DB6B-E282-C812-7F5A-6D13E9D24581}|ArachnaeSwarm.csproj|d:\\steamlibrary\\steamapps\\common\\rimworld\\mods\\arachnaeswarm\\source\\arachnaeswarm\\pawn_comps\\ara_fighter_invisible\\compproperties_fighterinvisible.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+      "AbsoluteMoniker": "D:0:0:{EAE0DB6B-E282-C812-7F5A-6D13E9D24581}|ArachnaeSwarm.csproj|C:\\Steam\\steamapps\\common\\RimWorld\\Mods\\ArachnaeSwarm\\Source\\ArachnaeSwarm\\pawn_comps\\ara_fighter_invisible\\compproperties_fighterinvisible.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
       "RelativeMoniker": "D:0:0:{EAE0DB6B-E282-C812-7F5A-6D13E9D24581}|ArachnaeSwarm.csproj|solutionrelative:pawn_comps\\ara_fighter_invisible\\compproperties_fighterinvisible.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
     }
   ],
@@ -32,71 +32,67 @@
           "DockedWidth": 200,
           "SelectedChildIndex": 5,
           "Children": [
-            {
-              "$type": "Document",
-              "DocumentIndex": 2,
-              "Title": "HediffComp_GiveHediffsInRangeToRace.cs",
-              "DocumentMoniker": "D:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\ArachnaeSwarm\\Source\\ArachnaeSwarm\\Pawn_Comps\\ARA_GiveHediffsInRangeToRace\\HediffComp_GiveHediffsInRangeToRace.cs",
-              "RelativeDocumentMoniker": "Pawn_Comps\\ARA_GiveHediffsInRangeToRace\\HediffComp_GiveHediffsInRangeToRace.cs",
-              "ToolTip": "D:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\ArachnaeSwarm\\Source\\ArachnaeSwarm\\Pawn_Comps\\ARA_GiveHediffsInRangeToRace\\HediffComp_GiveHediffsInRangeToRace.cs",
-              "RelativeToolTip": "Pawn_Comps\\ARA_GiveHediffsInRangeToRace\\HediffComp_GiveHediffsInRangeToRace.cs",
-              "ViewState": "AgIAAAAAAAAAAAAAAAAAABEAAAAXAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2025-09-25T03:08:41.128Z",
-              "EditorCaption": ""
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 3,
-              "Title": "CompFighterInvisible.cs",
-              "DocumentMoniker": "D:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\ArachnaeSwarm\\Source\\ArachnaeSwarm\\Pawn_Comps\\ARA_Fighter_Invisible\\CompFighterInvisible.cs",
-              "RelativeDocumentMoniker": "Pawn_Comps\\ARA_Fighter_Invisible\\CompFighterInvisible.cs",
-              "ToolTip": "D:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\ArachnaeSwarm\\Source\\ArachnaeSwarm\\Pawn_Comps\\ARA_Fighter_Invisible\\CompFighterInvisible.cs",
-              "RelativeToolTip": "Pawn_Comps\\ARA_Fighter_Invisible\\CompFighterInvisible.cs",
-              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2025-09-25T03:08:39.152Z",
-              "EditorCaption": ""
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 4,
-              "Title": "CompProperties_FighterInvisible.cs",
-              "DocumentMoniker": "D:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\ArachnaeSwarm\\Source\\ArachnaeSwarm\\Pawn_Comps\\ARA_Fighter_Invisible\\CompProperties_FighterInvisible.cs",
-              "RelativeDocumentMoniker": "Pawn_Comps\\ARA_Fighter_Invisible\\CompProperties_FighterInvisible.cs",
-              "ToolTip": "D:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\ArachnaeSwarm\\Source\\ArachnaeSwarm\\Pawn_Comps\\ARA_Fighter_Invisible\\CompProperties_FighterInvisible.cs",
-              "RelativeToolTip": "Pawn_Comps\\ARA_Fighter_Invisible\\CompProperties_FighterInvisible.cs",
-              "ViewState": "AgIAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2025-09-25T03:06:36.76Z",
-              "EditorCaption": ""
-            },
             {
               "$type": "Bookmark",
               "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
             },
+            {
+              "$type": "Document",
+              "DocumentIndex": 2,
+              "Title": "HediffComp_GiveHediffsInRangeToRace.cs",
+              "DocumentMoniker": "C:\\Steam\\steamapps\\common\\RimWorld\\Mods\\ArachnaeSwarm\\Source\\ArachnaeSwarm\\Pawn_Comps\\ARA_GiveHediffsInRangeToRace\\HediffComp_GiveHediffsInRangeToRace.cs",
+              "RelativeDocumentMoniker": "Pawn_Comps\\ARA_GiveHediffsInRangeToRace\\HediffComp_GiveHediffsInRangeToRace.cs",
+              "ToolTip": "C:\\Steam\\steamapps\\common\\RimWorld\\Mods\\ArachnaeSwarm\\Source\\ArachnaeSwarm\\Pawn_Comps\\ARA_GiveHediffsInRangeToRace\\HediffComp_GiveHediffsInRangeToRace.cs",
+              "RelativeToolTip": "Pawn_Comps\\ARA_GiveHediffsInRangeToRace\\HediffComp_GiveHediffsInRangeToRace.cs",
+              "ViewState": "AgIAAAAAAAAAAAAAAAAAABEAAAAXAAAAAAAAAA==",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+              "WhenOpened": "2025-09-25T03:08:41.128Z"
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 3,
+              "Title": "CompFighterInvisible.cs",
+              "DocumentMoniker": "C:\\Steam\\steamapps\\common\\RimWorld\\Mods\\ArachnaeSwarm\\Source\\ArachnaeSwarm\\Pawn_Comps\\ARA_Fighter_Invisible\\CompFighterInvisible.cs",
+              "RelativeDocumentMoniker": "Pawn_Comps\\ARA_Fighter_Invisible\\CompFighterInvisible.cs",
+              "ToolTip": "C:\\Steam\\steamapps\\common\\RimWorld\\Mods\\ArachnaeSwarm\\Source\\ArachnaeSwarm\\Pawn_Comps\\ARA_Fighter_Invisible\\CompFighterInvisible.cs",
+              "RelativeToolTip": "Pawn_Comps\\ARA_Fighter_Invisible\\CompFighterInvisible.cs",
+              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+              "WhenOpened": "2025-09-25T03:08:39.152Z"
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 4,
+              "Title": "CompProperties_FighterInvisible.cs",
+              "DocumentMoniker": "C:\\Steam\\steamapps\\common\\RimWorld\\Mods\\ArachnaeSwarm\\Source\\ArachnaeSwarm\\Pawn_Comps\\ARA_Fighter_Invisible\\CompProperties_FighterInvisible.cs",
+              "RelativeDocumentMoniker": "Pawn_Comps\\ARA_Fighter_Invisible\\CompProperties_FighterInvisible.cs",
+              "ToolTip": "C:\\Steam\\steamapps\\common\\RimWorld\\Mods\\ArachnaeSwarm\\Source\\ArachnaeSwarm\\Pawn_Comps\\ARA_Fighter_Invisible\\CompProperties_FighterInvisible.cs",
+              "RelativeToolTip": "Pawn_Comps\\ARA_Fighter_Invisible\\CompProperties_FighterInvisible.cs",
+              "ViewState": "AgIAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAA==",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+              "WhenOpened": "2025-09-25T03:06:36.76Z"
+            },
             {
               "$type": "Document",
               "DocumentIndex": 1,
               "Title": "CompProperties_NodeSwarmLifetime.cs",
-              "DocumentMoniker": "D:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\ArachnaeSwarm\\Source\\ArachnaeSwarm\\Pawn_Comps\\ARA_NodeSwarmLifetime\\CompProperties_NodeSwarmLifetime.cs",
+              "DocumentMoniker": "C:\\Steam\\steamapps\\common\\RimWorld\\Mods\\ArachnaeSwarm\\Source\\ArachnaeSwarm\\Pawn_Comps\\ARA_NodeSwarmLifetime\\CompProperties_NodeSwarmLifetime.cs",
               "RelativeDocumentMoniker": "Pawn_Comps\\ARA_NodeSwarmLifetime\\CompProperties_NodeSwarmLifetime.cs",
-              "ToolTip": "D:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\ArachnaeSwarm\\Source\\ArachnaeSwarm\\Pawn_Comps\\ARA_NodeSwarmLifetime\\CompProperties_NodeSwarmLifetime.cs",
+              "ToolTip": "C:\\Steam\\steamapps\\common\\RimWorld\\Mods\\ArachnaeSwarm\\Source\\ArachnaeSwarm\\Pawn_Comps\\ARA_NodeSwarmLifetime\\CompProperties_NodeSwarmLifetime.cs",
               "RelativeToolTip": "Pawn_Comps\\ARA_NodeSwarmLifetime\\CompProperties_NodeSwarmLifetime.cs",
               "ViewState": "AgIAAAAAAAAAAAAAAAAAAB8AAAABAAAAAAAAAA==",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2025-09-25T02:13:12.615Z",
-              "EditorCaption": ""
+              "WhenOpened": "2025-09-25T02:13:12.615Z"
             },
             {
               "$type": "Document",
               "DocumentIndex": 0,
               "Title": "CompNodeSwarmLifetime.cs",
-              "DocumentMoniker": "D:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\ArachnaeSwarm\\Source\\ArachnaeSwarm\\Pawn_Comps\\ARA_NodeSwarmLifetime\\CompNodeSwarmLifetime.cs",
+              "DocumentMoniker": "C:\\Steam\\steamapps\\common\\RimWorld\\Mods\\ArachnaeSwarm\\Source\\ArachnaeSwarm\\Pawn_Comps\\ARA_NodeSwarmLifetime\\CompNodeSwarmLifetime.cs",
               "RelativeDocumentMoniker": "Pawn_Comps\\ARA_NodeSwarmLifetime\\CompNodeSwarmLifetime.cs",
-              "ToolTip": "D:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\ArachnaeSwarm\\Source\\ArachnaeSwarm\\Pawn_Comps\\ARA_NodeSwarmLifetime\\CompNodeSwarmLifetime.cs",
+              "ToolTip": "C:\\Steam\\steamapps\\common\\RimWorld\\Mods\\ArachnaeSwarm\\Source\\ArachnaeSwarm\\Pawn_Comps\\ARA_NodeSwarmLifetime\\CompNodeSwarmLifetime.cs",
               "RelativeToolTip": "Pawn_Comps\\ARA_NodeSwarmLifetime\\CompNodeSwarmLifetime.cs",
-              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAA==",
+              "ViewState": "AQIAAAAAAAAAAAAAAADwvwAAAAAAAAAA",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
               "WhenOpened": "2025-09-25T02:13:09.974Z",
               "EditorCaption": ""
diff --git a/Source/ArachnaeSwarm/ArachnaeSwarm.csproj b/Source/ArachnaeSwarm/ArachnaeSwarm.csproj
index be72e18..15261f2 100644
--- a/Source/ArachnaeSwarm/ArachnaeSwarm.csproj
+++ b/Source/ArachnaeSwarm/ArachnaeSwarm.csproj
@@ -97,12 +97,12 @@
     <Compile Include="Abilities\TrackingCharge\CompProperties_TrackingCharge.cs" />
     <Compile Include="Abilities\TrackingCharge\PawnFlyer_TrackingCharge.cs" />
     <Compile Include="Abilities\TrackingCharge\Verb_CastAbilityTrackingCharge.cs" />
-    <Compile Include="ARA_HediffDefOf.cs" />
+    <Compile Include="Hediffs\ARA_HediffDefOf.cs" />
     <Compile Include="Building_Comps\ARA_BuildingTerrainSpawn\CompDelayedTerrainSpawn.cs" />
     <Compile Include="Building_Comps\ARA_BuildingTerrainSpawn\CompProperties_DelayedTerrainSpawn.cs" />
     <Compile Include="Building_Comps\ARA_CompInteractiveProducer\CompInteractiveProducer.cs" />
     <Compile Include="Building_Comps\ARA_CompInteractiveProducer\CompQueuedInteractiveProducer.cs" />
-    <Compile Include="Building_Comps\ARA_CompInteractiveProducer\CompRefuelableNutrition.cs" />
+    <Compile Include="Building_Comps\CompRefuelableNutrition.cs" />
     <Compile Include="Building_Comps\ARA_CompInteractiveProducer\CompTemperatureRuinableDamage.cs" />
     <Compile Include="Building_Comps\ARA_CompInteractiveProducer\DataContracts.cs" />
     <Compile Include="Building_Comps\ARA_CompInteractiveProducer\JobDriver_AddProcessToQueue.cs" />
@@ -158,7 +158,7 @@
     <Compile Include="Hediffs\WULA_HediffDamgeShield\DRMDamageShield.cs" />
     <Compile Include="Hediffs\WULA_HediffDamgeShield\Hediff_DamageShield.cs" />
     <Compile Include="MainHarmony.cs" />
-    <Compile Include="CompAndPatch_GiveHediffOnShot.cs" />
+    <Compile Include="Thing_Comps\CompAndPatch_GiveHediffOnShot.cs" />
     <Compile Include="Pawn_Comps\ARA_AutoMechCarrier\CompAutoMechCarrier.cs" />
     <Compile Include="Pawn_Comps\ARA_AutoMechCarrier\CompProperties_AutoMechCarrier.cs" />
     <Compile Include="Pawn_Comps\ARA_AutoMechCarrier\PawnProductionEntry.cs" />
@@ -188,8 +188,8 @@
     <Compile Include="Thing_Comps\ARA_CustomUniqueWeapon\CompCustomUniqueWeapon.cs" />
     <Compile Include="Thing_Comps\ARA_CustomUniqueWeapon\CompProperties_CustomUniqueWeapon.cs" />
     <Compile Include="Thing_Comps\ARA_IngestionOutcomeDoer_GiveHediff\IngestionOutcomeDoer_GiveHediffByRace.cs" />
-    <Compile Include="Thing_Comps\Filth_Toxic.cs" />
-    <Compile Include="Thing_Comps\OPToxicGas.cs" />
+    <Compile Include="Thing_Comps\OPToxicGas\Filth_Toxic.cs" />
+    <Compile Include="Thing_Comps\OPToxicGas\OPToxicGas.cs" />
     <Compile Include="Verbs\Cleave\CompCleave.cs" />
     <Compile Include="Verbs\Cleave\Verb_MeleeAttack_Cleave.cs" />
     <Compile Include="Verbs\ExplosiveBeam\Verb_ShootBeamExplosive.cs" />
@@ -214,21 +214,21 @@
     <Compile Include="Verbs\Verb_ShootSprayMulti.cs" />
     <Compile Include="Verbs\WeaponStealBeam\Verb_ShootWeaponStealBeam.cs" />
     <Compile Include="Verbs\WeaponStealBeam\VerbProperties_WeaponStealBeam.cs" />
-    <Compile Include="Building_ARANutrientDispenser.cs" />
-    <Compile Include="ARAFoodDispenserProperties.cs" />
-    <Compile Include="Patch_DispenserFoodSearch.cs" />
-    <Compile Include="Buildings\Building_CatastropheMissileSilo.cs" />
-    <Compile Include="World\WorldObject_CatastropheMissile.cs" />
+    <Compile Include="Buildings\Building_ARANutrientDispenser\Building_ARANutrientDispenser.cs" />
+    <Compile Include="Buildings\Building_ARANutrientDispenser\ARAFoodDispenserProperties.cs" />
+    <Compile Include="Buildings\Building_ARANutrientDispenser\Patch_DispenserFoodSearch.cs" />
+    <Compile Include="Buildings\Building_CatastropheMissileSilo\Building_CatastropheMissileSilo.cs" />
+    <Compile Include="Buildings\Building_CatastropheMissileSilo\WorldObject_CatastropheMissile.cs" />
     <Compile Include="HarmonyPatches\Patch_ForceTargetable.cs" />
-    <Compile Include="Comps\CompForceTargetable.cs" />
+    <Compile Include="Building_Comps\CompForceTargetable.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Wormhole\Building_WormholePortal_A.cs" />
-    <Compile Include="Wormhole\Building_WormholePortal_B.cs" />
-    <Compile Include="Wormhole\CompLaunchableWormhole.cs" />
-    <Compile Include="Wormhole\JobDriver_DeployWormhole.cs" />
-    <Compile Include="Wormhole\TravelingWormhole.cs" />
-    <Compile Include="Wormhole\DefModExtension_TravelingWormhole.cs" />
+    <Compile Include="Buildings\Wormhole\Building_WormholePortal_A.cs" />
+    <Compile Include="Buildings\Wormhole\Building_WormholePortal_B.cs" />
+    <Compile Include="Buildings\Wormhole\CompLaunchableWormhole.cs" />
+    <Compile Include="Buildings\Wormhole\JobDriver_DeployWormhole.cs" />
+    <Compile Include="Buildings\Wormhole\TravelingWormhole.cs" />
+    <Compile Include="Buildings\Wormhole\DefModExtension_TravelingWormhole.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- 自定义清理任务，删除obj文件夹中的临时文件 -->
diff --git a/Source/ArachnaeSwarm/Comps/CompForceTargetable.cs b/Source/ArachnaeSwarm/Building_Comps/CompForceTargetable.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Comps/CompForceTargetable.cs
rename to Source/ArachnaeSwarm/Building_Comps/CompForceTargetable.cs
diff --git a/Source/ArachnaeSwarm/Building_Comps/ARA_CompInteractiveProducer/CompRefuelableNutrition.cs b/Source/ArachnaeSwarm/Building_Comps/CompRefuelableNutrition.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Building_Comps/ARA_CompInteractiveProducer/CompRefuelableNutrition.cs
rename to Source/ArachnaeSwarm/Building_Comps/CompRefuelableNutrition.cs
diff --git a/Source/ArachnaeSwarm/ARAFoodDispenserProperties.cs b/Source/ArachnaeSwarm/Buildings/Building_ARANutrientDispenser/ARAFoodDispenserProperties.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARAFoodDispenserProperties.cs
rename to Source/ArachnaeSwarm/Buildings/Building_ARANutrientDispenser/ARAFoodDispenserProperties.cs
diff --git a/Source/ArachnaeSwarm/Building_ARANutrientDispenser.cs b/Source/ArachnaeSwarm/Buildings/Building_ARANutrientDispenser/Building_ARANutrientDispenser.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Building_ARANutrientDispenser.cs
rename to Source/ArachnaeSwarm/Buildings/Building_ARANutrientDispenser/Building_ARANutrientDispenser.cs
diff --git a/Source/ArachnaeSwarm/Patch_DispenserFoodSearch.cs b/Source/ArachnaeSwarm/Buildings/Building_ARANutrientDispenser/Patch_DispenserFoodSearch.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Patch_DispenserFoodSearch.cs
rename to Source/ArachnaeSwarm/Buildings/Building_ARANutrientDispenser/Patch_DispenserFoodSearch.cs
diff --git a/Source/ArachnaeSwarm/Buildings/Building_CatastropheMissileSilo.cs b/Source/ArachnaeSwarm/Buildings/Building_CatastropheMissileSilo/Building_CatastropheMissileSilo.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Buildings/Building_CatastropheMissileSilo.cs
rename to Source/ArachnaeSwarm/Buildings/Building_CatastropheMissileSilo/Building_CatastropheMissileSilo.cs
diff --git a/Source/ArachnaeSwarm/World/WorldObject_CatastropheMissile.cs b/Source/ArachnaeSwarm/Buildings/Building_CatastropheMissileSilo/WorldObject_CatastropheMissile.cs
similarity index 100%
rename from Source/ArachnaeSwarm/World/WorldObject_CatastropheMissile.cs
rename to Source/ArachnaeSwarm/Buildings/Building_CatastropheMissileSilo/WorldObject_CatastropheMissile.cs
diff --git a/Source/ArachnaeSwarm/Wormhole/Building_WormholePortal_A.cs b/Source/ArachnaeSwarm/Buildings/Wormhole/Building_WormholePortal_A.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Wormhole/Building_WormholePortal_A.cs
rename to Source/ArachnaeSwarm/Buildings/Wormhole/Building_WormholePortal_A.cs
diff --git a/Source/ArachnaeSwarm/Wormhole/Building_WormholePortal_B.cs b/Source/ArachnaeSwarm/Buildings/Wormhole/Building_WormholePortal_B.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Wormhole/Building_WormholePortal_B.cs
rename to Source/ArachnaeSwarm/Buildings/Wormhole/Building_WormholePortal_B.cs
diff --git a/Source/ArachnaeSwarm/Wormhole/CompLaunchableWormhole.cs b/Source/ArachnaeSwarm/Buildings/Wormhole/CompLaunchableWormhole.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Wormhole/CompLaunchableWormhole.cs
rename to Source/ArachnaeSwarm/Buildings/Wormhole/CompLaunchableWormhole.cs
diff --git a/Source/ArachnaeSwarm/Wormhole/DefModExtension_TravelingWormhole.cs b/Source/ArachnaeSwarm/Buildings/Wormhole/DefModExtension_TravelingWormhole.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Wormhole/DefModExtension_TravelingWormhole.cs
rename to Source/ArachnaeSwarm/Buildings/Wormhole/DefModExtension_TravelingWormhole.cs
diff --git a/Source/ArachnaeSwarm/Wormhole/JobDriver_DeployWormhole.cs b/Source/ArachnaeSwarm/Buildings/Wormhole/JobDriver_DeployWormhole.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Wormhole/JobDriver_DeployWormhole.cs
rename to Source/ArachnaeSwarm/Buildings/Wormhole/JobDriver_DeployWormhole.cs
diff --git a/Source/ArachnaeSwarm/Wormhole/TravelingWormhole.cs b/Source/ArachnaeSwarm/Buildings/Wormhole/TravelingWormhole.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Wormhole/TravelingWormhole.cs
rename to Source/ArachnaeSwarm/Buildings/Wormhole/TravelingWormhole.cs
diff --git a/Source/ArachnaeSwarm/ARA_HediffDefOf.cs b/Source/ArachnaeSwarm/Hediffs/ARA_HediffDefOf.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_HediffDefOf.cs
rename to Source/ArachnaeSwarm/Hediffs/ARA_HediffDefOf.cs
diff --git a/Source/ArachnaeSwarm/CompAndPatch_GiveHediffOnShot.cs b/Source/ArachnaeSwarm/Thing_Comps/CompAndPatch_GiveHediffOnShot.cs
similarity index 100%
rename from Source/ArachnaeSwarm/CompAndPatch_GiveHediffOnShot.cs
rename to Source/ArachnaeSwarm/Thing_Comps/CompAndPatch_GiveHediffOnShot.cs
diff --git a/Source/ArachnaeSwarm/Thing_Comps/Filth_Toxic.cs b/Source/ArachnaeSwarm/Thing_Comps/OPToxicGas/Filth_Toxic.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Thing_Comps/Filth_Toxic.cs
rename to Source/ArachnaeSwarm/Thing_Comps/OPToxicGas/Filth_Toxic.cs
diff --git a/Source/ArachnaeSwarm/Thing_Comps/OPToxicGas.cs b/Source/ArachnaeSwarm/Thing_Comps/OPToxicGas/OPToxicGas.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Thing_Comps/OPToxicGas.cs
rename to Source/ArachnaeSwarm/Thing_Comps/OPToxicGas/OPToxicGas.cs