diff --git a/Source/ArachnaeSwarm/.vs/ArachnaeSwarm/v17/.suo b/Source/ArachnaeSwarm/.vs/ArachnaeSwarm/v17/.suo
index 2fd480a..16a3d9e 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 83a4c28..15b33f0 100644
--- a/Source/ArachnaeSwarm/.vs/ArachnaeSwarm/v17/DocumentLayout.json
+++ b/Source/ArachnaeSwarm/.vs/ArachnaeSwarm/v17/DocumentLayout.json
@@ -1,13 +1,13 @@
 {
   "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\\verb\\verb_shootmeltbeam.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\\verb\\verb_shootmeltbeam.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
       "RelativeMoniker": "D:0:0:{EAE0DB6B-E282-C812-7F5A-6D13E9D24581}|ArachnaeSwarm.csproj|solutionrelative:verb\\verb_shootmeltbeam.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\\verb\\compcleave.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\\verb\\compcleave.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
       "RelativeMoniker": "D:0:0:{EAE0DB6B-E282-C812-7F5A-6D13E9D24581}|ArachnaeSwarm.csproj|solutionrelative:verb\\compcleave.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
     }
   ],
@@ -28,11 +28,11 @@
               "$type": "Document",
               "DocumentIndex": 0,
               "Title": "Verb_ShootMeltBeam.cs",
-              "DocumentMoniker": "D:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\ArachnaeSwarm\\Source\\ArachnaeSwarm\\Verb\\Verb_ShootMeltBeam.cs",
+              "DocumentMoniker": "C:\\Steam\\steamapps\\common\\RimWorld\\Mods\\ArachnaeSwarm\\Source\\ArachnaeSwarm\\Verb\\Verb_ShootMeltBeam.cs",
               "RelativeDocumentMoniker": "Verb\\Verb_ShootMeltBeam.cs",
-              "ToolTip": "D:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\ArachnaeSwarm\\Source\\ArachnaeSwarm\\Verb\\Verb_ShootMeltBeam.cs",
+              "ToolTip": "C:\\Steam\\steamapps\\common\\RimWorld\\Mods\\ArachnaeSwarm\\Source\\ArachnaeSwarm\\Verb\\Verb_ShootMeltBeam.cs",
               "RelativeToolTip": "Verb\\Verb_ShootMeltBeam.cs",
-              "ViewState": "AgIAAAAAAAAAAAAAAAAAAA8AAAAyAAAAAAAAAA==",
+              "ViewState": "AQIAAAAAAAAAAAAAAADwvwAAAAAAAAAA",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
               "WhenOpened": "2025-09-09T03:04:00.299Z",
               "EditorCaption": ""
@@ -41,9 +41,9 @@
               "$type": "Document",
               "DocumentIndex": 1,
               "Title": "CompCleave.cs",
-              "DocumentMoniker": "D:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\ArachnaeSwarm\\Source\\ArachnaeSwarm\\Verb\\CompCleave.cs",
+              "DocumentMoniker": "C:\\Steam\\steamapps\\common\\RimWorld\\Mods\\ArachnaeSwarm\\Source\\ArachnaeSwarm\\Verb\\CompCleave.cs",
               "RelativeDocumentMoniker": "Verb\\CompCleave.cs",
-              "ToolTip": "D:\\SteamLibrary\\steamapps\\common\\RimWorld\\Mods\\ArachnaeSwarm\\Source\\ArachnaeSwarm\\Verb\\CompCleave.cs",
+              "ToolTip": "C:\\Steam\\steamapps\\common\\RimWorld\\Mods\\ArachnaeSwarm\\Source\\ArachnaeSwarm\\Verb\\CompCleave.cs",
               "RelativeToolTip": "Verb\\CompCleave.cs",
               "ViewState": "AgIAAAAAAAAAAAAAAAAAAAwAAAAmAAAAAAAAAA==",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
diff --git a/Source/ArachnaeSwarm/ARA_HuggingFace/CompAbilityEffect_Possess.cs b/Source/ArachnaeSwarm/Abilities/ARA_HuggingFace/CompAbilityEffect_Possess.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_HuggingFace/CompAbilityEffect_Possess.cs
rename to Source/ArachnaeSwarm/Abilities/ARA_HuggingFace/CompAbilityEffect_Possess.cs
diff --git a/Source/ArachnaeSwarm/ARA_HuggingFace/CompProperties_AbilityPossess.cs b/Source/ArachnaeSwarm/Abilities/ARA_HuggingFace/CompProperties_AbilityPossess.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_HuggingFace/CompProperties_AbilityPossess.cs
rename to Source/ArachnaeSwarm/Abilities/ARA_HuggingFace/CompProperties_AbilityPossess.cs
diff --git a/Source/ArachnaeSwarm/ARA_HuggingFace/Hediff_Possession.cs b/Source/ArachnaeSwarm/Abilities/ARA_HuggingFace/Hediff_Possession.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_HuggingFace/Hediff_Possession.cs
rename to Source/ArachnaeSwarm/Abilities/ARA_HuggingFace/Hediff_Possession.cs
diff --git a/Source/ArachnaeSwarm/ARA_HuggingFace/OriginalPawnData.cs b/Source/ArachnaeSwarm/Abilities/ARA_HuggingFace/OriginalPawnData.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_HuggingFace/OriginalPawnData.cs
rename to Source/ArachnaeSwarm/Abilities/ARA_HuggingFace/OriginalPawnData.cs
diff --git a/Source/ArachnaeSwarm/ARA_HuggingFace/PawnDataUtility.cs b/Source/ArachnaeSwarm/Abilities/ARA_HuggingFace/PawnDataUtility.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_HuggingFace/PawnDataUtility.cs
rename to Source/ArachnaeSwarm/Abilities/ARA_HuggingFace/PawnDataUtility.cs
diff --git a/Source/ArachnaeSwarm/ARA_HuggingFace/Verb_JumpAndCastOnLanding.cs b/Source/ArachnaeSwarm/Abilities/ARA_HuggingFace/Verb_JumpAndCastOnLanding.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_HuggingFace/Verb_JumpAndCastOnLanding.cs
rename to Source/ArachnaeSwarm/Abilities/ARA_HuggingFace/Verb_JumpAndCastOnLanding.cs
diff --git a/Source/ArachnaeSwarm/Morphable/Building_Morphable.cs b/Source/ArachnaeSwarm/Abilities/ARA_Morphable/Building_Morphable.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Morphable/Building_Morphable.cs
rename to Source/ArachnaeSwarm/Abilities/ARA_Morphable/Building_Morphable.cs
diff --git a/Source/ArachnaeSwarm/Morphable/CompAbilityEffect_Transform.cs b/Source/ArachnaeSwarm/Abilities/ARA_Morphable/CompAbilityEffect_Transform.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Morphable/CompAbilityEffect_Transform.cs
rename to Source/ArachnaeSwarm/Abilities/ARA_Morphable/CompAbilityEffect_Transform.cs
diff --git a/Source/ArachnaeSwarm/Morphable/CompMorphable.cs b/Source/ArachnaeSwarm/Abilities/ARA_Morphable/CompMorphable.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Morphable/CompMorphable.cs
rename to Source/ArachnaeSwarm/Abilities/ARA_Morphable/CompMorphable.cs
diff --git a/Source/ArachnaeSwarm/Morphable/CompProperties_AbilityTransform.cs b/Source/ArachnaeSwarm/Abilities/ARA_Morphable/CompProperties_AbilityTransform.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Morphable/CompProperties_AbilityTransform.cs
rename to Source/ArachnaeSwarm/Abilities/ARA_Morphable/CompProperties_AbilityTransform.cs
diff --git a/Source/ArachnaeSwarm/Morphable/CompProperties_Morphable.cs b/Source/ArachnaeSwarm/Abilities/ARA_Morphable/CompProperties_Morphable.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Morphable/CompProperties_Morphable.cs
rename to Source/ArachnaeSwarm/Abilities/ARA_Morphable/CompProperties_Morphable.cs
diff --git a/Source/ArachnaeSwarm/ARA_QueenAbility/CompAbilityEffect_BodyPartCheck.cs b/Source/ArachnaeSwarm/Abilities/ARA_QueenAbility/CompAbilityEffect_BodyPartCheck.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_QueenAbility/CompAbilityEffect_BodyPartCheck.cs
rename to Source/ArachnaeSwarm/Abilities/ARA_QueenAbility/CompAbilityEffect_BodyPartCheck.cs
diff --git a/Source/ArachnaeSwarm/ARA_QueenAbility/CompAbilityEffect_NeedCost.cs b/Source/ArachnaeSwarm/Abilities/ARA_QueenAbility/CompAbilityEffect_NeedCost.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_QueenAbility/CompAbilityEffect_NeedCost.cs
rename to Source/ArachnaeSwarm/Abilities/ARA_QueenAbility/CompAbilityEffect_NeedCost.cs
diff --git a/Source/ArachnaeSwarm/ARA_QueenAbility/CompAbilityEffect_ResearchPrereq.cs b/Source/ArachnaeSwarm/Abilities/ARA_QueenAbility/CompAbilityEffect_ResearchPrereq.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_QueenAbility/CompAbilityEffect_ResearchPrereq.cs
rename to Source/ArachnaeSwarm/Abilities/ARA_QueenAbility/CompAbilityEffect_ResearchPrereq.cs
diff --git a/Source/ArachnaeSwarm/ARA_QueenAbility/CompAbilityEffect_SprayLiquidMulti.cs b/Source/ArachnaeSwarm/Abilities/ARA_QueenAbility/CompAbilityEffect_SprayLiquidMulti.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_QueenAbility/CompAbilityEffect_SprayLiquidMulti.cs
rename to Source/ArachnaeSwarm/Abilities/ARA_QueenAbility/CompAbilityEffect_SprayLiquidMulti.cs
diff --git a/Source/ArachnaeSwarm/ARA_QueenAbility/CompProperties_AbilitySprayLiquidMulti.cs b/Source/ArachnaeSwarm/Abilities/ARA_QueenAbility/CompProperties_AbilitySprayLiquidMulti.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_QueenAbility/CompProperties_AbilitySprayLiquidMulti.cs
rename to Source/ArachnaeSwarm/Abilities/ARA_QueenAbility/CompProperties_AbilitySprayLiquidMulti.cs
diff --git a/Source/ArachnaeSwarm/CompAbilityEffect_LaunchMultiProjectile.cs b/Source/ArachnaeSwarm/Abilities/CompAbilityEffect_LaunchMultiProjectile.cs
similarity index 100%
rename from Source/ArachnaeSwarm/CompAbilityEffect_LaunchMultiProjectile.cs
rename to Source/ArachnaeSwarm/Abilities/CompAbilityEffect_LaunchMultiProjectile.cs
diff --git a/Source/ArachnaeSwarm/CompAbilityEffect_PsychicBrainburn.cs b/Source/ArachnaeSwarm/Abilities/PsychicBrainburn/CompAbilityEffect_PsychicBrainburn.cs
similarity index 100%
rename from Source/ArachnaeSwarm/CompAbilityEffect_PsychicBrainburn.cs
rename to Source/ArachnaeSwarm/Abilities/PsychicBrainburn/CompAbilityEffect_PsychicBrainburn.cs
diff --git a/Source/ArachnaeSwarm/CompProperties_PsychicBrainburn.cs b/Source/ArachnaeSwarm/Abilities/PsychicBrainburn/CompProperties_PsychicBrainburn.cs
similarity index 100%
rename from Source/ArachnaeSwarm/CompProperties_PsychicBrainburn.cs
rename to Source/ArachnaeSwarm/Abilities/PsychicBrainburn/CompProperties_PsychicBrainburn.cs
diff --git a/Source/ArachnaeSwarm/Abilities/CompAbilityEffect_TrackingCharge.cs b/Source/ArachnaeSwarm/Abilities/TrackingCharge/CompAbilityEffect_TrackingCharge.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Abilities/CompAbilityEffect_TrackingCharge.cs
rename to Source/ArachnaeSwarm/Abilities/TrackingCharge/CompAbilityEffect_TrackingCharge.cs
diff --git a/Source/ArachnaeSwarm/Abilities/CompProperties_TrackingCharge.cs b/Source/ArachnaeSwarm/Abilities/TrackingCharge/CompProperties_TrackingCharge.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Abilities/CompProperties_TrackingCharge.cs
rename to Source/ArachnaeSwarm/Abilities/TrackingCharge/CompProperties_TrackingCharge.cs
diff --git a/Source/ArachnaeSwarm/Abilities/PawnFlyer_TrackingCharge.cs b/Source/ArachnaeSwarm/Abilities/TrackingCharge/PawnFlyer_TrackingCharge.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Abilities/PawnFlyer_TrackingCharge.cs
rename to Source/ArachnaeSwarm/Abilities/TrackingCharge/PawnFlyer_TrackingCharge.cs
diff --git a/Source/ArachnaeSwarm/Abilities/Verb_CastAbilityTrackingCharge.cs b/Source/ArachnaeSwarm/Abilities/TrackingCharge/Verb_CastAbilityTrackingCharge.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Abilities/Verb_CastAbilityTrackingCharge.cs
rename to Source/ArachnaeSwarm/Abilities/TrackingCharge/Verb_CastAbilityTrackingCharge.cs
diff --git a/Source/ArachnaeSwarm/ArachnaeSwarm.csproj b/Source/ArachnaeSwarm/ArachnaeSwarm.csproj
index edcf401..db96b24 100644
--- a/Source/ArachnaeSwarm/ArachnaeSwarm.csproj
+++ b/Source/ArachnaeSwarm/ArachnaeSwarm.csproj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0"
-  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<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>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -69,165 +68,166 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ARA_CustomUniqueWeapon\CompCustomUniqueWeapon.cs" />
-    <Compile Include="ARA_CustomUniqueWeapon\CompProperties_CustomUniqueWeapon.cs" />
-    <Compile Include="ARA_GiveHediffsInRangeToRace\HediffCompProperties_GiveHediffsInRangeToRace.cs" />
-    <Compile Include="ARA_GiveHediffsInRangeToRace\HediffComp_GiveHediffsInRangeToRace.cs" />
-    <Compile Include="ARA_SpawnPawnFromList\CompProperties_SpawnPawnFromList.cs" />
-    <Compile Include="ARA_SpawnPawnFromList\CompSpawnPawnFromList.cs" />
-    <Compile Include="ARA_SpawnPawnFromList\JobDriver_Incubate.cs" />
-    <Compile Include="ARA_SpawnPawnFromList\CompQueuedPawnSpawner.cs" />
-    <Compile Include="ARA_SpawnPawnFromList\ProductionContracts.cs" />
-    <Compile Include="ARA_SpawnPawnFromList\JobDriver_AddToQueue.cs" />
-    <Compile Include="ARA_QueenAbility\CompProperties_AbilitySprayLiquidMulti.cs" />
-    <Compile Include="ARA_QueenAbility\CompAbilityEffect_SprayLiquidMulti.cs" />
-    <Compile Include="DRM_HediffCurseFlame\Hediff_CurseFlame.cs" />
-    <Compile Include="ARA_QueenAbility\CompAbilityEffect_NeedCost.cs" />
-    <Compile Include="ARA_QueenAbility\CompAbilityEffect_BodyPartCheck.cs" />
-    <Compile Include="ARA_QueenAbility\CompAbilityEffect_ResearchPrereq.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\HediffComp_HiveMindMaster.cs" />
-    <Compile Include="ARA_HiveMind\CompAbilityEffect_BindDrone.cs" />
-    <Compile Include="ARA_HiveMind\CompProperties_AbilityBindDrone.cs" />
-    <Compile Include="ARA_SpawnPawnFromList\JobGiver_MaintainBuildings.cs" />
-    <Compile Include="Verb\CompCleave.cs" />
-    <Compile Include="Verb\CompMultiStrike.cs" />
-    <Compile Include="Verb\VerbPropertiesExplosiveBeam.cs" />
-    <Compile Include="Verb\VerbProperties_Excalibur.cs" />
-    <Compile Include="Verb\VerbProperties_WeaponStealBeam.cs" />
-    <Compile Include="Verb\Verb_MeleeAttack_Cleave.cs" />
-    <Compile Include="Verb\Verb_MeleeAttack_MultiStrike.cs" />
-    <Compile Include="Verb\Verb_ShootArc.cs" />
-    <Compile Include="Verb\Verb_ShootBeamExplosive.cs" />
-    <Compile Include="Verb\Verb_ShootMeltBeam.cs" />
-    <Compile Include="Verb\Verb_ShootShotgun.cs" />
-    <Compile Include="Verb\Verb_ShootWeaponStealBeam.cs" />
+    <Compile Include="Thing_Comps\ARA_CustomUniqueWeapon\CompCustomUniqueWeapon.cs" />
+    <Compile Include="Thing_Comps\ARA_CustomUniqueWeapon\CompProperties_CustomUniqueWeapon.cs" />
+    <Compile Include="Pawn_Comps\ARA_GiveHediffsInRangeToRace\HediffCompProperties_GiveHediffsInRangeToRace.cs" />
+    <Compile Include="Pawn_Comps\ARA_GiveHediffsInRangeToRace\HediffComp_GiveHediffsInRangeToRace.cs" />
+    <Compile Include="Building_Comps\ARA_SpawnPawnFromList\CompProperties_SpawnPawnFromList.cs" />
+    <Compile Include="Building_Comps\ARA_SpawnPawnFromList\CompSpawnPawnFromList.cs" />
+    <Compile Include="Building_Comps\ARA_SpawnPawnFromList\JobDriver_Incubate.cs" />
+    <Compile Include="Building_Comps\ARA_SpawnPawnFromList\CompQueuedPawnSpawner.cs" />
+    <Compile Include="Building_Comps\ARA_SpawnPawnFromList\ProductionContracts.cs" />
+    <Compile Include="Building_Comps\ARA_SpawnPawnFromList\JobDriver_AddToQueue.cs" />
+    <Compile Include="Abilities\ARA_QueenAbility\CompProperties_AbilitySprayLiquidMulti.cs" />
+    <Compile Include="Abilities\ARA_QueenAbility\CompAbilityEffect_SprayLiquidMulti.cs" />
+    <Compile Include="Hediffs\DRM_HediffCurseFlame\Hediff_CurseFlame.cs" />
+    <Compile Include="Abilities\ARA_QueenAbility\CompAbilityEffect_NeedCost.cs" />
+    <Compile Include="Abilities\ARA_QueenAbility\CompAbilityEffect_BodyPartCheck.cs" />
+    <Compile Include="Abilities\ARA_QueenAbility\CompAbilityEffect_ResearchPrereq.cs" />
+    <Compile Include="Hediffs\ARA_HiveMind\Hediff_HiveMindMaster.cs" />
+    <Compile Include="Hediffs\ARA_HiveMind\Hediff_HiveMindDrone.cs" />
+    <Compile Include="Hediffs\ARA_HiveMind\HediffCompProperties_HiveMindDrone.cs" />
+    <Compile Include="Hediffs\ARA_HiveMind\HediffComp_HiveMindDrone.cs" />
+    <Compile Include="Hediffs\ARA_HiveMind\HediffComp_HiveMindMaster.cs" />
+    <Compile Include="Hediffs\ARA_HiveMind\CompAbilityEffect_BindDrone.cs" />
+    <Compile Include="Hediffs\ARA_HiveMind\CompProperties_AbilityBindDrone.cs" />
+    <Compile Include="Building_Comps\ARA_SpawnPawnFromList\JobGiver_MaintainBuildings.cs" />
+    <Compile Include="Verbs\Cleave\CompCleave.cs" />
+    <Compile Include="Verbs\MultiStrike\CompMultiStrike.cs" />
+    <Compile Include="Verbs\ExplosiveBeam\VerbPropertiesExplosiveBeam.cs" />
+    <Compile Include="Verbs\VerbProperties_Excalibur.cs" />
+    <Compile Include="Verbs\WeaponStealBeam\VerbProperties_WeaponStealBeam.cs" />
+    <Compile Include="Verbs\Cleave\Verb_MeleeAttack_Cleave.cs" />
+    <Compile Include="Verbs\MultiStrike\Verb_MeleeAttack_MultiStrike.cs" />
+    <Compile Include="Verbs\Verb_ShootArc.cs" />
+    <Compile Include="Verbs\ExplosiveBeam\Verb_ShootBeamExplosive.cs" />
+    <Compile Include="Verbs\Verb_ShootMeltBeam.cs" />
+    <Compile Include="Verbs\Verb_ShootShotgun.cs" />
+    <Compile Include="Verbs\WeaponStealBeam\Verb_ShootWeaponStealBeam.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ARA_CompHediffGiver\CompHediffGiver.cs" />
-    <Compile Include="ARA_CompHediffGiver\CompProperties_HediffGiver.cs" />
-    <Compile Include="ARA_CompMilkableArachnae\CompMilkableArachnae.cs" />
-    <Compile Include="ARA_CompMilkableArachnae\CompProperties_MilkableArachnae.cs" />
+    <Compile Include="Pawn_Comps\ARA_CompHediffGiver\CompHediffGiver.cs" />
+    <Compile Include="Pawn_Comps\ARA_CompHediffGiver\CompProperties_HediffGiver.cs" />
+    <Compile Include="Pawn_Comps\ARA_CompMilkableArachnae\CompMilkableArachnae.cs" />
+    <Compile Include="Pawn_Comps\ARA_CompMilkableArachnae\CompProperties_MilkableArachnae.cs" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MainHarmony.cs" />
-    <Compile Include="ARA_TrainingWork\JobPlant\ThinkNode_ConditionalAnimalShouldDoGrowingWork.cs" />
-    <Compile Include="ARA_TrainingWork\CompAdvancedTraining.cs" />
-    <Compile Include="ARA_TrainingWork\JobPlant\JobGiver_Grower.cs" />
-    <Compile Include="ARA_TrainingWork\JobPlant\WorkGiver_ArachnaeSow.cs" />
-    <Compile Include="ARA_TrainingWork\TrainingSystem_Patcher.cs" />
+    <Compile Include="Pawn_Comps\ARA_TrainingWork\JobPlant\ThinkNode_ConditionalAnimalShouldDoGrowingWork.cs" />
+    <Compile Include="Pawn_Comps\ARA_TrainingWork\CompAdvancedTraining.cs" />
+    <Compile Include="Pawn_Comps\ARA_TrainingWork\JobPlant\JobGiver_Grower.cs" />
+    <Compile Include="Pawn_Comps\ARA_TrainingWork\JobPlant\WorkGiver_ArachnaeSow.cs" />
+    <Compile Include="Pawn_Comps\ARA_TrainingWork\TrainingSystem_Patcher.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ARA_BuildingTerrainSpawn\CompProperties_DelayedTerrainSpawn.cs" />
-    <Compile Include="ARA_BuildingTerrainSpawn\CompDelayedTerrainSpawn.cs" />
+    <Compile Include="Building_Comps\ARA_BuildingTerrainSpawn\CompProperties_DelayedTerrainSpawn.cs" />
+    <Compile Include="Building_Comps\ARA_BuildingTerrainSpawn\CompDelayedTerrainSpawn.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ARA_AutoMechCarrier\CompAutoMechCarrier.cs" />
-    <Compile Include="ARA_AutoMechCarrier\CompProperties_AutoMechCarrier.cs" />
-    <Compile Include="ARA_AutoMechCarrier\PawnProductionEntry.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" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ARA_CompInteractiveProducer\CompInteractiveProducer.cs" />
-    <Compile Include="ARA_CompInteractiveProducer\JobDriver_StartProduction.cs" />
-    <Compile Include="ARA_CompInteractiveProducer\CompRefuelableNutrition.cs" />
-    <Compile Include="Building_NutrientVat.cs" />
-    <Compile Include="DefModExtension_NutrientVat.cs" />
-    <Compile Include="ARA_CompInteractiveProducer\DataContracts.cs" />
-    <Compile Include="ARA_CompInteractiveProducer\CompTemperatureRuinableDamage.cs" />
-    <Compile Include="ARA_CompInteractiveProducer\CompQueuedInteractiveProducer.cs" />
-    <Compile Include="ARA_CompInteractiveProducer\JobDriver_AddProcessToQueue.cs" />
+    <Compile Include="Building_Comps\ARA_CompInteractiveProducer\CompInteractiveProducer.cs" />
+    <Compile Include="Building_Comps\ARA_CompInteractiveProducer\JobDriver_StartProduction.cs" />
+    <Compile Include="Building_Comps\ARA_CompInteractiveProducer\CompRefuelableNutrition.cs" />
+    <Compile Include="Building_Comps\ARA_NutrientVat\Building_NutrientVat.cs" />
+    <Compile Include="Building_Comps\ARA_NutrientVat\DefModExtension_NutrientVat.cs" />
+    <Compile Include="Building_Comps\ARA_CompInteractiveProducer\DataContracts.cs" />
+    <Compile Include="Building_Comps\ARA_CompInteractiveProducer\CompTemperatureRuinableDamage.cs" />
+    <Compile Include="Building_Comps\ARA_CompInteractiveProducer\CompQueuedInteractiveProducer.cs" />
+    <Compile Include="Building_Comps\ARA_CompInteractiveProducer\JobDriver_AddProcessToQueue.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ARA_HuggingFace\Hediff_Possession.cs" />
-    <Compile Include="ARA_HuggingFace\PawnDataUtility.cs" />
-    <Compile Include="ARA_HuggingFace\CompAbilityEffect_Possess.cs" />
-    <Compile Include="ARA_HuggingFace\CompProperties_AbilityPossess.cs" />
-    <Compile Include="ARA_HuggingFace\Verb_JumpAndCastOnLanding.cs" />
-    <Compile Include="ARA_HuggingFace\OriginalPawnData.cs" />
+    <Compile Include="Abilities\ARA_HuggingFace\Hediff_Possession.cs" />
+    <Compile Include="Abilities\ARA_HuggingFace\PawnDataUtility.cs" />
+    <Compile Include="Abilities\ARA_HuggingFace\CompAbilityEffect_Possess.cs" />
+    <Compile Include="Abilities\ARA_HuggingFace\CompProperties_AbilityPossess.cs" />
+    <Compile Include="Abilities\ARA_HuggingFace\Verb_JumpAndCastOnLanding.cs" />
+    <Compile Include="Abilities\ARA_HuggingFace\OriginalPawnData.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ARA_TrainingWork\JobClean\ARA_TrainableDefOf_Cleaning.cs" />
-    <Compile Include="ARA_TrainingWork\JobClean\JobGiver_Cleaner.cs" />
-    <Compile Include="ARA_TrainingWork\JobClean\ThinkNode_ConditionalAnimalShouldDoCleaningWork.cs" />
-    <Compile Include="ARA_TrainingWork\JobClean\WorkGiver_ArachnaeClean.cs" />
+    <Compile Include="Pawn_Comps\ARA_TrainingWork\JobClean\ARA_TrainableDefOf_Cleaning.cs" />
+    <Compile Include="Pawn_Comps\ARA_TrainingWork\JobClean\JobGiver_Cleaner.cs" />
+    <Compile Include="Pawn_Comps\ARA_TrainingWork\JobClean\ThinkNode_ConditionalAnimalShouldDoCleaningWork.cs" />
+    <Compile Include="Pawn_Comps\ARA_TrainingWork\JobClean\WorkGiver_ArachnaeClean.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="HediffComp_Temperature.cs" />
-    <Compile Include="CompPawnFlight.cs" />
-    <Compile Include="CompProperties_PawnFlight.cs" />
-    <Compile Include="HarmonyPatches.cs" />
-    <Compile Include="OPToxicGas.cs" />
-    <Compile Include="PawnRenderNodeWorker_AttachmentBody_NoFlight.cs" />
+    <Compile Include="Hediffs\HediffComp_Temperature.cs" />
+    <Compile Include="Pawn_Comps\ARA_Flight\CompPawnFlight.cs" />
+    <Compile Include="Pawn_Comps\ARA_Flight\CompProperties_PawnFlight.cs" />
+    <Compile Include="Pawn_Comps\ARA_Flight\Pawn_FlightTrackerPatches.cs" />
+    <Compile Include="Thing_Comps\OPToxicGas.cs" />
+    <Compile Include="Pawn_Comps\ARA_Flight\PawnRenderNodeWorker_AttachmentBody_NoFlight.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="CompAbilityEffect_LaunchMultiProjectile.cs" />
-    <Compile Include="Building_TrapReleaseRandom.cs" />
+    <Compile Include="Abilities\CompAbilityEffect_LaunchMultiProjectile.cs" />
+    <Compile Include="Building_Comps\ARA_HunterTrap\Building_TrapReleaseRandom.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Abilities\CompAbilityEffect_TrackingCharge.cs" />
-    <Compile Include="Abilities\CompProperties_TrackingCharge.cs" />
-    <Compile Include="Abilities\PawnFlyer_TrackingCharge.cs" />
-    <Compile Include="Abilities\Verb_CastAbilityTrackingCharge.cs" />
+    <Compile Include="Abilities\TrackingCharge\CompAbilityEffect_TrackingCharge.cs" />
+    <Compile Include="Abilities\TrackingCharge\CompProperties_TrackingCharge.cs" />
+    <Compile Include="Abilities\TrackingCharge\PawnFlyer_TrackingCharge.cs" />
+    <Compile Include="Abilities\TrackingCharge\Verb_CastAbilityTrackingCharge.cs" />
     <Compile Include="Abilities\CompAbilityEffect_DRM_Deaddustpop.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="HediffComp_SpawnPawnOnRemoved.cs" />
+    <Compile Include="Hediffs\HediffComp_SpawnPawnOnRemoved.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Projectiles\BulletWithTrail.cs" />
-    <Compile Include="Projectiles\ExplosiveTrackingBulletDef.cs" />
-    <Compile Include="Projectiles\Projectile_ConfigurableHellsphereCannon.cs" />
-    <Compile Include="Projectiles\Projectile_CruiseMissile.cs" />
-    <Compile Include="Projectiles\Projectile_ExplosiveTrackingBullet.cs" />
-    <Compile Include="Projectiles\Projectile_ExplosiveWithTrail.cs" />
-    <Compile Include="Projectiles\Projectile_TrackingBullet.cs" />
-    <Compile Include="Projectiles\Projectile_WulaPenetratingBeam.cs" />
-    <Compile Include="Projectiles\Projectile_WulaPenetratingBullet.cs" />
-    <Compile Include="Projectiles\TrackingBulletDef.cs" />
+    <Compile Include="Verbs\Projectiles\BulletWithTrail.cs" />
+    <Compile Include="Verbs\Projectiles\ExplosiveTrackingBulletDef.cs" />
+    <Compile Include="Verbs\Projectiles\Projectile_ConfigurableHellsphereCannon.cs" />
+    <Compile Include="Verbs\Projectiles\Projectile_CruiseMissile.cs" />
+    <Compile Include="Verbs\Projectiles\Projectile_ExplosiveTrackingBullet.cs" />
+    <Compile Include="Verbs\Projectiles\Projectile_ExplosiveWithTrail.cs" />
+    <Compile Include="Verbs\Projectiles\Projectile_TrackingBullet.cs" />
+    <Compile Include="Verbs\Projectiles\Projectile_WulaPenetratingBeam.cs" />
+    <Compile Include="Verbs\Projectiles\Projectile_WulaPenetratingBullet.cs" />
+    <Compile Include="Verbs\Projectiles\TrackingBulletDef.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="HediffComp_NecroticTransformation.cs" />
-    <Compile Include="Hediff_NecroticVirus_Configurable.cs" />
-    <Compile Include="NecroticTransformationUtility.cs" />
-    <Compile Include="ProphecyGearEffect.cs" />
-    <Compile Include="Hediff_ConfigurableMutant.cs" />
-    <Compile Include="HediffComp_Symbiosis.cs" />
-    <Compile Include="HediffGiver_RandomWithSeverity.cs" />
-    <Compile Include="CompHunterExplosion.cs" />
-    <Compile Include="CompProperties_HunterExplosion.cs" />
-    <Compile Include="TrapReleaseRandomExtension.cs" />
+    <Compile Include="Hediffs\ARA_ConfigurableMutant\HediffComp_NecroticTransformation.cs" />
+    <Compile Include="Hediffs\ARA_ConfigurableMutant\Hediff_NecroticVirus_Configurable.cs" />
+    <Compile Include="Hediffs\ARA_ConfigurableMutant\NecroticTransformationUtility.cs" />
+    <Compile Include="Hediffs\ProphecyGearEffect.cs" />
+    <Compile Include="Hediffs\ARA_ConfigurableMutant\Hediff_ConfigurableMutant.cs" />
+    <Compile Include="Hediffs\ARA_ConfigurableMutant\HediffComp_Symbiosis.cs" />
+    <Compile Include="Hediffs\HediffGiver_RandomWithSeverity.cs" />
+    <Compile Include="Building_Comps\ARA_HunterTrap\CompHunterExplosion.cs" />
+    <Compile Include="Building_Comps\ARA_HunterTrap\CompProperties_HunterExplosion.cs" />
+    <Compile Include="Building_Comps\ARA_HunterTrap\TrapReleaseRandomExtension.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Morphable\CompProperties_Morphable.cs" />
-    <Compile Include="Morphable\CompMorphable.cs" />
-    <Compile Include="Morphable\CompProperties_AbilityTransform.cs" />
-    <Compile Include="Morphable\CompAbilityEffect_Transform.cs" />
-    <Compile Include="Morphable\Building_Morphable.cs" />
+    <Compile Include="Abilities\ARA_Morphable\CompProperties_Morphable.cs" />
+    <Compile Include="Abilities\ARA_Morphable\CompMorphable.cs" />
+    <Compile Include="Abilities\ARA_Morphable\CompProperties_AbilityTransform.cs" />
+    <Compile Include="Abilities\ARA_Morphable\CompAbilityEffect_Transform.cs" />
+    <Compile Include="Abilities\ARA_Morphable\Building_Morphable.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="HediffCompProperties_TerrainBasedSeverity.cs" />
-    <Compile Include="HediffComp_TerrainBasedSeverity.cs" />
-    <Compile Include="CompAbilityEffect_PsychicBrainburn.cs" />
-    <Compile Include="CompProperties_PsychicBrainburn.cs" />
-    <Compile Include="Building_SmartThermostat.cs" />
+    <Compile Include="Hediffs\HediffComp_TerrainBasedSeverity\HediffCompProperties_TerrainBasedSeverity.cs" />
+    <Compile Include="Hediffs\HediffComp_TerrainBasedSeverity\HediffComp_TerrainBasedSeverity.cs" />
+    <Compile Include="Abilities\PsychicBrainburn\CompAbilityEffect_PsychicBrainburn.cs" />
+    <Compile Include="Abilities\PsychicBrainburn\CompProperties_PsychicBrainburn.cs" />
+    <Compile Include="Building_Comps\ARA_CompTempControl\Building_SmartThermostat.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="WULA_HediffDamgeShield\DRMDamageShield.cs" />
-    <Compile Include="WULA_HediffDamgeShield\Hediff_DamageShield.cs" />
+    <Compile Include="Hediffs\WULA_HediffDamgeShield\DRMDamageShield.cs" />
+    <Compile Include="Hediffs\WULA_HediffDamgeShield\Hediff_DamageShield.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="WULA_MutiFuelSpawner\IFuelSource.cs" />
-    <Compile Include="WULA_MutiFuelSpawner\CompMultiFuelSpawner.cs" />
-    <Compile Include="WULA_MutiFuelSpawner\CompRefuelableWithKey.cs" />
-    <Compile Include="WULA_MutiFuelSpawner\Patch_CompRefuelableWithKey.cs" />
-    <Compile Include="WULA_MutiFuelSpawner\CompRefuelableNutrition_WithKey.cs" />
+    <Compile Include="Building_Comps\WULA_MutiFuelSpawner\IFuelSource.cs" />
+    <Compile Include="Building_Comps\WULA_MutiFuelSpawner\CompMultiFuelSpawner.cs" />
+    <Compile Include="Building_Comps\WULA_MutiFuelSpawner\CompRefuelableWithKey.cs" />
+    <Compile Include="Building_Comps\WULA_MutiFuelSpawner\Patch_CompRefuelableWithKey.cs" />
+    <Compile Include="Building_Comps\WULA_MutiFuelSpawner\CompRefuelableNutrition_WithKey.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Utils\CompTempControl_Fixed.cs" />
+    <Compile Include="Building_Comps\ARA_CompTempControl\CompTempControl_Fixed.cs" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- 自定义清理任务，删除obj文件夹中的临时文件 -->
   <Target Name="CleanDebugFiles" AfterTargets="Build">
diff --git a/Source/ArachnaeSwarm/ARA_BuildingTerrainSpawn/CompDelayedTerrainSpawn.cs b/Source/ArachnaeSwarm/Building_Comps/ARA_BuildingTerrainSpawn/CompDelayedTerrainSpawn.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_BuildingTerrainSpawn/CompDelayedTerrainSpawn.cs
rename to Source/ArachnaeSwarm/Building_Comps/ARA_BuildingTerrainSpawn/CompDelayedTerrainSpawn.cs
diff --git a/Source/ArachnaeSwarm/ARA_BuildingTerrainSpawn/CompProperties_DelayedTerrainSpawn.cs b/Source/ArachnaeSwarm/Building_Comps/ARA_BuildingTerrainSpawn/CompProperties_DelayedTerrainSpawn.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_BuildingTerrainSpawn/CompProperties_DelayedTerrainSpawn.cs
rename to Source/ArachnaeSwarm/Building_Comps/ARA_BuildingTerrainSpawn/CompProperties_DelayedTerrainSpawn.cs
diff --git a/Source/ArachnaeSwarm/ARA_CompInteractiveProducer/CompInteractiveProducer.cs b/Source/ArachnaeSwarm/Building_Comps/ARA_CompInteractiveProducer/CompInteractiveProducer.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_CompInteractiveProducer/CompInteractiveProducer.cs
rename to Source/ArachnaeSwarm/Building_Comps/ARA_CompInteractiveProducer/CompInteractiveProducer.cs
diff --git a/Source/ArachnaeSwarm/ARA_CompInteractiveProducer/CompQueuedInteractiveProducer.cs b/Source/ArachnaeSwarm/Building_Comps/ARA_CompInteractiveProducer/CompQueuedInteractiveProducer.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_CompInteractiveProducer/CompQueuedInteractiveProducer.cs
rename to Source/ArachnaeSwarm/Building_Comps/ARA_CompInteractiveProducer/CompQueuedInteractiveProducer.cs
diff --git a/Source/ArachnaeSwarm/ARA_CompInteractiveProducer/CompRefuelableNutrition.cs b/Source/ArachnaeSwarm/Building_Comps/ARA_CompInteractiveProducer/CompRefuelableNutrition.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_CompInteractiveProducer/CompRefuelableNutrition.cs
rename to Source/ArachnaeSwarm/Building_Comps/ARA_CompInteractiveProducer/CompRefuelableNutrition.cs
diff --git a/Source/ArachnaeSwarm/ARA_CompInteractiveProducer/CompTemperatureRuinableDamage.cs b/Source/ArachnaeSwarm/Building_Comps/ARA_CompInteractiveProducer/CompTemperatureRuinableDamage.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_CompInteractiveProducer/CompTemperatureRuinableDamage.cs
rename to Source/ArachnaeSwarm/Building_Comps/ARA_CompInteractiveProducer/CompTemperatureRuinableDamage.cs
diff --git a/Source/ArachnaeSwarm/ARA_CompInteractiveProducer/DataContracts.cs b/Source/ArachnaeSwarm/Building_Comps/ARA_CompInteractiveProducer/DataContracts.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_CompInteractiveProducer/DataContracts.cs
rename to Source/ArachnaeSwarm/Building_Comps/ARA_CompInteractiveProducer/DataContracts.cs
diff --git a/Source/ArachnaeSwarm/ARA_CompInteractiveProducer/JobDriver_AddProcessToQueue.cs b/Source/ArachnaeSwarm/Building_Comps/ARA_CompInteractiveProducer/JobDriver_AddProcessToQueue.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_CompInteractiveProducer/JobDriver_AddProcessToQueue.cs
rename to Source/ArachnaeSwarm/Building_Comps/ARA_CompInteractiveProducer/JobDriver_AddProcessToQueue.cs
diff --git a/Source/ArachnaeSwarm/ARA_CompInteractiveProducer/JobDriver_StartProduction.cs b/Source/ArachnaeSwarm/Building_Comps/ARA_CompInteractiveProducer/JobDriver_StartProduction.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_CompInteractiveProducer/JobDriver_StartProduction.cs
rename to Source/ArachnaeSwarm/Building_Comps/ARA_CompInteractiveProducer/JobDriver_StartProduction.cs
diff --git a/Source/ArachnaeSwarm/Building_SmartThermostat.cs b/Source/ArachnaeSwarm/Building_Comps/ARA_CompTempControl/Building_SmartThermostat.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Building_SmartThermostat.cs
rename to Source/ArachnaeSwarm/Building_Comps/ARA_CompTempControl/Building_SmartThermostat.cs
diff --git a/Source/ArachnaeSwarm/Utils/CompTempControl_Fixed.cs b/Source/ArachnaeSwarm/Building_Comps/ARA_CompTempControl/CompTempControl_Fixed.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Utils/CompTempControl_Fixed.cs
rename to Source/ArachnaeSwarm/Building_Comps/ARA_CompTempControl/CompTempControl_Fixed.cs
diff --git a/Source/ArachnaeSwarm/Building_TrapReleaseRandom.cs b/Source/ArachnaeSwarm/Building_Comps/ARA_HunterTrap/Building_TrapReleaseRandom.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Building_TrapReleaseRandom.cs
rename to Source/ArachnaeSwarm/Building_Comps/ARA_HunterTrap/Building_TrapReleaseRandom.cs
diff --git a/Source/ArachnaeSwarm/CompHunterExplosion.cs b/Source/ArachnaeSwarm/Building_Comps/ARA_HunterTrap/CompHunterExplosion.cs
similarity index 100%
rename from Source/ArachnaeSwarm/CompHunterExplosion.cs
rename to Source/ArachnaeSwarm/Building_Comps/ARA_HunterTrap/CompHunterExplosion.cs
diff --git a/Source/ArachnaeSwarm/CompProperties_HunterExplosion.cs b/Source/ArachnaeSwarm/Building_Comps/ARA_HunterTrap/CompProperties_HunterExplosion.cs
similarity index 100%
rename from Source/ArachnaeSwarm/CompProperties_HunterExplosion.cs
rename to Source/ArachnaeSwarm/Building_Comps/ARA_HunterTrap/CompProperties_HunterExplosion.cs
diff --git a/Source/ArachnaeSwarm/TrapReleaseRandomExtension.cs b/Source/ArachnaeSwarm/Building_Comps/ARA_HunterTrap/TrapReleaseRandomExtension.cs
similarity index 100%
rename from Source/ArachnaeSwarm/TrapReleaseRandomExtension.cs
rename to Source/ArachnaeSwarm/Building_Comps/ARA_HunterTrap/TrapReleaseRandomExtension.cs
diff --git a/Source/ArachnaeSwarm/Building_NutrientVat.cs b/Source/ArachnaeSwarm/Building_Comps/ARA_NutrientVat/Building_NutrientVat.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Building_NutrientVat.cs
rename to Source/ArachnaeSwarm/Building_Comps/ARA_NutrientVat/Building_NutrientVat.cs
diff --git a/Source/ArachnaeSwarm/DefModExtension_NutrientVat.cs b/Source/ArachnaeSwarm/Building_Comps/ARA_NutrientVat/DefModExtension_NutrientVat.cs
similarity index 100%
rename from Source/ArachnaeSwarm/DefModExtension_NutrientVat.cs
rename to Source/ArachnaeSwarm/Building_Comps/ARA_NutrientVat/DefModExtension_NutrientVat.cs
diff --git a/Source/ArachnaeSwarm/ARA_SpawnPawnFromList/CompProperties_SpawnPawnFromList.cs b/Source/ArachnaeSwarm/Building_Comps/ARA_SpawnPawnFromList/CompProperties_SpawnPawnFromList.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_SpawnPawnFromList/CompProperties_SpawnPawnFromList.cs
rename to Source/ArachnaeSwarm/Building_Comps/ARA_SpawnPawnFromList/CompProperties_SpawnPawnFromList.cs
diff --git a/Source/ArachnaeSwarm/ARA_SpawnPawnFromList/CompQueuedPawnSpawner.cs b/Source/ArachnaeSwarm/Building_Comps/ARA_SpawnPawnFromList/CompQueuedPawnSpawner.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_SpawnPawnFromList/CompQueuedPawnSpawner.cs
rename to Source/ArachnaeSwarm/Building_Comps/ARA_SpawnPawnFromList/CompQueuedPawnSpawner.cs
diff --git a/Source/ArachnaeSwarm/ARA_SpawnPawnFromList/CompSpawnPawnFromList.cs b/Source/ArachnaeSwarm/Building_Comps/ARA_SpawnPawnFromList/CompSpawnPawnFromList.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_SpawnPawnFromList/CompSpawnPawnFromList.cs
rename to Source/ArachnaeSwarm/Building_Comps/ARA_SpawnPawnFromList/CompSpawnPawnFromList.cs
diff --git a/Source/ArachnaeSwarm/ARA_SpawnPawnFromList/JobDriver_AddToQueue.cs b/Source/ArachnaeSwarm/Building_Comps/ARA_SpawnPawnFromList/JobDriver_AddToQueue.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_SpawnPawnFromList/JobDriver_AddToQueue.cs
rename to Source/ArachnaeSwarm/Building_Comps/ARA_SpawnPawnFromList/JobDriver_AddToQueue.cs
diff --git a/Source/ArachnaeSwarm/ARA_SpawnPawnFromList/JobDriver_Incubate.cs b/Source/ArachnaeSwarm/Building_Comps/ARA_SpawnPawnFromList/JobDriver_Incubate.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_SpawnPawnFromList/JobDriver_Incubate.cs
rename to Source/ArachnaeSwarm/Building_Comps/ARA_SpawnPawnFromList/JobDriver_Incubate.cs
diff --git a/Source/ArachnaeSwarm/ARA_SpawnPawnFromList/JobGiver_MaintainBuildings.cs b/Source/ArachnaeSwarm/Building_Comps/ARA_SpawnPawnFromList/JobGiver_MaintainBuildings.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_SpawnPawnFromList/JobGiver_MaintainBuildings.cs
rename to Source/ArachnaeSwarm/Building_Comps/ARA_SpawnPawnFromList/JobGiver_MaintainBuildings.cs
diff --git a/Source/ArachnaeSwarm/ARA_SpawnPawnFromList/ProductionContracts.cs b/Source/ArachnaeSwarm/Building_Comps/ARA_SpawnPawnFromList/ProductionContracts.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_SpawnPawnFromList/ProductionContracts.cs
rename to Source/ArachnaeSwarm/Building_Comps/ARA_SpawnPawnFromList/ProductionContracts.cs
diff --git a/Source/ArachnaeSwarm/WULA_MutiFuelSpawner/CompMultiFuelSpawner.cs b/Source/ArachnaeSwarm/Building_Comps/WULA_MutiFuelSpawner/CompMultiFuelSpawner.cs
similarity index 100%
rename from Source/ArachnaeSwarm/WULA_MutiFuelSpawner/CompMultiFuelSpawner.cs
rename to Source/ArachnaeSwarm/Building_Comps/WULA_MutiFuelSpawner/CompMultiFuelSpawner.cs
diff --git a/Source/ArachnaeSwarm/WULA_MutiFuelSpawner/CompRefuelableNutrition_WithKey.cs b/Source/ArachnaeSwarm/Building_Comps/WULA_MutiFuelSpawner/CompRefuelableNutrition_WithKey.cs
similarity index 100%
rename from Source/ArachnaeSwarm/WULA_MutiFuelSpawner/CompRefuelableNutrition_WithKey.cs
rename to Source/ArachnaeSwarm/Building_Comps/WULA_MutiFuelSpawner/CompRefuelableNutrition_WithKey.cs
diff --git a/Source/ArachnaeSwarm/WULA_MutiFuelSpawner/CompRefuelableWithKey.cs b/Source/ArachnaeSwarm/Building_Comps/WULA_MutiFuelSpawner/CompRefuelableWithKey.cs
similarity index 100%
rename from Source/ArachnaeSwarm/WULA_MutiFuelSpawner/CompRefuelableWithKey.cs
rename to Source/ArachnaeSwarm/Building_Comps/WULA_MutiFuelSpawner/CompRefuelableWithKey.cs
diff --git a/Source/ArachnaeSwarm/WULA_MutiFuelSpawner/IFuelSource.cs b/Source/ArachnaeSwarm/Building_Comps/WULA_MutiFuelSpawner/IFuelSource.cs
similarity index 100%
rename from Source/ArachnaeSwarm/WULA_MutiFuelSpawner/IFuelSource.cs
rename to Source/ArachnaeSwarm/Building_Comps/WULA_MutiFuelSpawner/IFuelSource.cs
diff --git a/Source/ArachnaeSwarm/WULA_MutiFuelSpawner/Patch_CompRefuelableWithKey.cs b/Source/ArachnaeSwarm/Building_Comps/WULA_MutiFuelSpawner/Patch_CompRefuelableWithKey.cs
similarity index 100%
rename from Source/ArachnaeSwarm/WULA_MutiFuelSpawner/Patch_CompRefuelableWithKey.cs
rename to Source/ArachnaeSwarm/Building_Comps/WULA_MutiFuelSpawner/Patch_CompRefuelableWithKey.cs
diff --git a/Source/ArachnaeSwarm/HediffComp_NecroticTransformation.cs b/Source/ArachnaeSwarm/Hediffs/ARA_ConfigurableMutant/HediffComp_NecroticTransformation.cs
similarity index 100%
rename from Source/ArachnaeSwarm/HediffComp_NecroticTransformation.cs
rename to Source/ArachnaeSwarm/Hediffs/ARA_ConfigurableMutant/HediffComp_NecroticTransformation.cs
diff --git a/Source/ArachnaeSwarm/HediffComp_Symbiosis.cs b/Source/ArachnaeSwarm/Hediffs/ARA_ConfigurableMutant/HediffComp_Symbiosis.cs
similarity index 100%
rename from Source/ArachnaeSwarm/HediffComp_Symbiosis.cs
rename to Source/ArachnaeSwarm/Hediffs/ARA_ConfigurableMutant/HediffComp_Symbiosis.cs
diff --git a/Source/ArachnaeSwarm/Hediff_ConfigurableMutant.cs b/Source/ArachnaeSwarm/Hediffs/ARA_ConfigurableMutant/Hediff_ConfigurableMutant.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Hediff_ConfigurableMutant.cs
rename to Source/ArachnaeSwarm/Hediffs/ARA_ConfigurableMutant/Hediff_ConfigurableMutant.cs
diff --git a/Source/ArachnaeSwarm/Hediff_NecroticVirus_Configurable.cs b/Source/ArachnaeSwarm/Hediffs/ARA_ConfigurableMutant/Hediff_NecroticVirus_Configurable.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Hediff_NecroticVirus_Configurable.cs
rename to Source/ArachnaeSwarm/Hediffs/ARA_ConfigurableMutant/Hediff_NecroticVirus_Configurable.cs
diff --git a/Source/ArachnaeSwarm/NecroticTransformationUtility.cs b/Source/ArachnaeSwarm/Hediffs/ARA_ConfigurableMutant/NecroticTransformationUtility.cs
similarity index 100%
rename from Source/ArachnaeSwarm/NecroticTransformationUtility.cs
rename to Source/ArachnaeSwarm/Hediffs/ARA_ConfigurableMutant/NecroticTransformationUtility.cs
diff --git a/Source/ArachnaeSwarm/ARA_HiveMind/CompAbilityEffect_BindDrone.cs b/Source/ArachnaeSwarm/Hediffs/ARA_HiveMind/CompAbilityEffect_BindDrone.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_HiveMind/CompAbilityEffect_BindDrone.cs
rename to Source/ArachnaeSwarm/Hediffs/ARA_HiveMind/CompAbilityEffect_BindDrone.cs
diff --git a/Source/ArachnaeSwarm/ARA_HiveMind/CompProperties_AbilityBindDrone.cs b/Source/ArachnaeSwarm/Hediffs/ARA_HiveMind/CompProperties_AbilityBindDrone.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_HiveMind/CompProperties_AbilityBindDrone.cs
rename to Source/ArachnaeSwarm/Hediffs/ARA_HiveMind/CompProperties_AbilityBindDrone.cs
diff --git a/Source/ArachnaeSwarm/ARA_HiveMind/HediffCompProperties_HiveMindDrone.cs b/Source/ArachnaeSwarm/Hediffs/ARA_HiveMind/HediffCompProperties_HiveMindDrone.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_HiveMind/HediffCompProperties_HiveMindDrone.cs
rename to Source/ArachnaeSwarm/Hediffs/ARA_HiveMind/HediffCompProperties_HiveMindDrone.cs
diff --git a/Source/ArachnaeSwarm/ARA_HiveMind/HediffComp_HiveMindDrone.cs b/Source/ArachnaeSwarm/Hediffs/ARA_HiveMind/HediffComp_HiveMindDrone.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_HiveMind/HediffComp_HiveMindDrone.cs
rename to Source/ArachnaeSwarm/Hediffs/ARA_HiveMind/HediffComp_HiveMindDrone.cs
diff --git a/Source/ArachnaeSwarm/ARA_HiveMind/HediffComp_HiveMindMaster.cs b/Source/ArachnaeSwarm/Hediffs/ARA_HiveMind/HediffComp_HiveMindMaster.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_HiveMind/HediffComp_HiveMindMaster.cs
rename to Source/ArachnaeSwarm/Hediffs/ARA_HiveMind/HediffComp_HiveMindMaster.cs
diff --git a/Source/ArachnaeSwarm/ARA_HiveMind/Hediff_HiveMindDrone.cs b/Source/ArachnaeSwarm/Hediffs/ARA_HiveMind/Hediff_HiveMindDrone.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_HiveMind/Hediff_HiveMindDrone.cs
rename to Source/ArachnaeSwarm/Hediffs/ARA_HiveMind/Hediff_HiveMindDrone.cs
diff --git a/Source/ArachnaeSwarm/ARA_HiveMind/Hediff_HiveMindMaster.cs b/Source/ArachnaeSwarm/Hediffs/ARA_HiveMind/Hediff_HiveMindMaster.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_HiveMind/Hediff_HiveMindMaster.cs
rename to Source/ArachnaeSwarm/Hediffs/ARA_HiveMind/Hediff_HiveMindMaster.cs
diff --git a/Source/ArachnaeSwarm/DRM_HediffCurseFlame/Hediff_CurseFlame.cs b/Source/ArachnaeSwarm/Hediffs/DRM_HediffCurseFlame/Hediff_CurseFlame.cs
similarity index 100%
rename from Source/ArachnaeSwarm/DRM_HediffCurseFlame/Hediff_CurseFlame.cs
rename to Source/ArachnaeSwarm/Hediffs/DRM_HediffCurseFlame/Hediff_CurseFlame.cs
diff --git a/Source/ArachnaeSwarm/HediffComp_SpawnPawnOnRemoved.cs b/Source/ArachnaeSwarm/Hediffs/HediffComp_SpawnPawnOnRemoved.cs
similarity index 100%
rename from Source/ArachnaeSwarm/HediffComp_SpawnPawnOnRemoved.cs
rename to Source/ArachnaeSwarm/Hediffs/HediffComp_SpawnPawnOnRemoved.cs
diff --git a/Source/ArachnaeSwarm/HediffComp_Temperature.cs b/Source/ArachnaeSwarm/Hediffs/HediffComp_Temperature.cs
similarity index 100%
rename from Source/ArachnaeSwarm/HediffComp_Temperature.cs
rename to Source/ArachnaeSwarm/Hediffs/HediffComp_Temperature.cs
diff --git a/Source/ArachnaeSwarm/HediffCompProperties_TerrainBasedSeverity.cs b/Source/ArachnaeSwarm/Hediffs/HediffComp_TerrainBasedSeverity/HediffCompProperties_TerrainBasedSeverity.cs
similarity index 100%
rename from Source/ArachnaeSwarm/HediffCompProperties_TerrainBasedSeverity.cs
rename to Source/ArachnaeSwarm/Hediffs/HediffComp_TerrainBasedSeverity/HediffCompProperties_TerrainBasedSeverity.cs
diff --git a/Source/ArachnaeSwarm/HediffComp_TerrainBasedSeverity.cs b/Source/ArachnaeSwarm/Hediffs/HediffComp_TerrainBasedSeverity/HediffComp_TerrainBasedSeverity.cs
similarity index 100%
rename from Source/ArachnaeSwarm/HediffComp_TerrainBasedSeverity.cs
rename to Source/ArachnaeSwarm/Hediffs/HediffComp_TerrainBasedSeverity/HediffComp_TerrainBasedSeverity.cs
diff --git a/Source/ArachnaeSwarm/HediffGiver_RandomWithSeverity.cs b/Source/ArachnaeSwarm/Hediffs/HediffGiver_RandomWithSeverity.cs
similarity index 100%
rename from Source/ArachnaeSwarm/HediffGiver_RandomWithSeverity.cs
rename to Source/ArachnaeSwarm/Hediffs/HediffGiver_RandomWithSeverity.cs
diff --git a/Source/ArachnaeSwarm/ProphecyGearEffect.cs b/Source/ArachnaeSwarm/Hediffs/ProphecyGearEffect.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ProphecyGearEffect.cs
rename to Source/ArachnaeSwarm/Hediffs/ProphecyGearEffect.cs
diff --git a/Source/ArachnaeSwarm/WULA_HediffDamgeShield/DRMDamageShield.cs b/Source/ArachnaeSwarm/Hediffs/WULA_HediffDamgeShield/DRMDamageShield.cs
similarity index 100%
rename from Source/ArachnaeSwarm/WULA_HediffDamgeShield/DRMDamageShield.cs
rename to Source/ArachnaeSwarm/Hediffs/WULA_HediffDamgeShield/DRMDamageShield.cs
diff --git a/Source/ArachnaeSwarm/WULA_HediffDamgeShield/Hediff_DamageShield.cs b/Source/ArachnaeSwarm/Hediffs/WULA_HediffDamgeShield/Hediff_DamageShield.cs
similarity index 100%
rename from Source/ArachnaeSwarm/WULA_HediffDamgeShield/Hediff_DamageShield.cs
rename to Source/ArachnaeSwarm/Hediffs/WULA_HediffDamgeShield/Hediff_DamageShield.cs
diff --git a/Source/ArachnaeSwarm/ARA_AutoMechCarrier/CompAutoMechCarrier.cs b/Source/ArachnaeSwarm/Pawn_Comps/ARA_AutoMechCarrier/CompAutoMechCarrier.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_AutoMechCarrier/CompAutoMechCarrier.cs
rename to Source/ArachnaeSwarm/Pawn_Comps/ARA_AutoMechCarrier/CompAutoMechCarrier.cs
diff --git a/Source/ArachnaeSwarm/ARA_AutoMechCarrier/CompProperties_AutoMechCarrier.cs b/Source/ArachnaeSwarm/Pawn_Comps/ARA_AutoMechCarrier/CompProperties_AutoMechCarrier.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_AutoMechCarrier/CompProperties_AutoMechCarrier.cs
rename to Source/ArachnaeSwarm/Pawn_Comps/ARA_AutoMechCarrier/CompProperties_AutoMechCarrier.cs
diff --git a/Source/ArachnaeSwarm/ARA_AutoMechCarrier/PawnProductionEntry.cs b/Source/ArachnaeSwarm/Pawn_Comps/ARA_AutoMechCarrier/PawnProductionEntry.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_AutoMechCarrier/PawnProductionEntry.cs
rename to Source/ArachnaeSwarm/Pawn_Comps/ARA_AutoMechCarrier/PawnProductionEntry.cs
diff --git a/Source/ArachnaeSwarm/ARA_CompHediffGiver/CompHediffGiver.cs b/Source/ArachnaeSwarm/Pawn_Comps/ARA_CompHediffGiver/CompHediffGiver.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_CompHediffGiver/CompHediffGiver.cs
rename to Source/ArachnaeSwarm/Pawn_Comps/ARA_CompHediffGiver/CompHediffGiver.cs
diff --git a/Source/ArachnaeSwarm/ARA_CompHediffGiver/CompProperties_HediffGiver.cs b/Source/ArachnaeSwarm/Pawn_Comps/ARA_CompHediffGiver/CompProperties_HediffGiver.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_CompHediffGiver/CompProperties_HediffGiver.cs
rename to Source/ArachnaeSwarm/Pawn_Comps/ARA_CompHediffGiver/CompProperties_HediffGiver.cs
diff --git a/Source/ArachnaeSwarm/ARA_CompMilkableArachnae/CompMilkableArachnae.cs b/Source/ArachnaeSwarm/Pawn_Comps/ARA_CompMilkableArachnae/CompMilkableArachnae.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_CompMilkableArachnae/CompMilkableArachnae.cs
rename to Source/ArachnaeSwarm/Pawn_Comps/ARA_CompMilkableArachnae/CompMilkableArachnae.cs
diff --git a/Source/ArachnaeSwarm/ARA_CompMilkableArachnae/CompProperties_MilkableArachnae.cs b/Source/ArachnaeSwarm/Pawn_Comps/ARA_CompMilkableArachnae/CompProperties_MilkableArachnae.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_CompMilkableArachnae/CompProperties_MilkableArachnae.cs
rename to Source/ArachnaeSwarm/Pawn_Comps/ARA_CompMilkableArachnae/CompProperties_MilkableArachnae.cs
diff --git a/Source/ArachnaeSwarm/CompPawnFlight.cs b/Source/ArachnaeSwarm/Pawn_Comps/ARA_Flight/CompPawnFlight.cs
similarity index 100%
rename from Source/ArachnaeSwarm/CompPawnFlight.cs
rename to Source/ArachnaeSwarm/Pawn_Comps/ARA_Flight/CompPawnFlight.cs
diff --git a/Source/ArachnaeSwarm/CompProperties_PawnFlight.cs b/Source/ArachnaeSwarm/Pawn_Comps/ARA_Flight/CompProperties_PawnFlight.cs
similarity index 100%
rename from Source/ArachnaeSwarm/CompProperties_PawnFlight.cs
rename to Source/ArachnaeSwarm/Pawn_Comps/ARA_Flight/CompProperties_PawnFlight.cs
diff --git a/Source/ArachnaeSwarm/PawnRenderNodeWorker_AttachmentBody_NoFlight.cs b/Source/ArachnaeSwarm/Pawn_Comps/ARA_Flight/PawnRenderNodeWorker_AttachmentBody_NoFlight.cs
similarity index 100%
rename from Source/ArachnaeSwarm/PawnRenderNodeWorker_AttachmentBody_NoFlight.cs
rename to Source/ArachnaeSwarm/Pawn_Comps/ARA_Flight/PawnRenderNodeWorker_AttachmentBody_NoFlight.cs
diff --git a/Source/ArachnaeSwarm/HarmonyPatches.cs b/Source/ArachnaeSwarm/Pawn_Comps/ARA_Flight/Pawn_FlightTrackerPatches.cs
similarity index 100%
rename from Source/ArachnaeSwarm/HarmonyPatches.cs
rename to Source/ArachnaeSwarm/Pawn_Comps/ARA_Flight/Pawn_FlightTrackerPatches.cs
diff --git a/Source/ArachnaeSwarm/ARA_GiveHediffsInRangeToRace/HediffCompProperties_GiveHediffsInRangeToRace.cs b/Source/ArachnaeSwarm/Pawn_Comps/ARA_GiveHediffsInRangeToRace/HediffCompProperties_GiveHediffsInRangeToRace.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_GiveHediffsInRangeToRace/HediffCompProperties_GiveHediffsInRangeToRace.cs
rename to Source/ArachnaeSwarm/Pawn_Comps/ARA_GiveHediffsInRangeToRace/HediffCompProperties_GiveHediffsInRangeToRace.cs
diff --git a/Source/ArachnaeSwarm/ARA_GiveHediffsInRangeToRace/HediffComp_GiveHediffsInRangeToRace.cs b/Source/ArachnaeSwarm/Pawn_Comps/ARA_GiveHediffsInRangeToRace/HediffComp_GiveHediffsInRangeToRace.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_GiveHediffsInRangeToRace/HediffComp_GiveHediffsInRangeToRace.cs
rename to Source/ArachnaeSwarm/Pawn_Comps/ARA_GiveHediffsInRangeToRace/HediffComp_GiveHediffsInRangeToRace.cs
diff --git a/Source/ArachnaeSwarm/ARA_TrainingWork/CompAdvancedTraining.cs b/Source/ArachnaeSwarm/Pawn_Comps/ARA_TrainingWork/CompAdvancedTraining.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_TrainingWork/CompAdvancedTraining.cs
rename to Source/ArachnaeSwarm/Pawn_Comps/ARA_TrainingWork/CompAdvancedTraining.cs
diff --git a/Source/ArachnaeSwarm/ARA_TrainingWork/JobClean/ARA_TrainableDefOf_Cleaning.cs b/Source/ArachnaeSwarm/Pawn_Comps/ARA_TrainingWork/JobClean/ARA_TrainableDefOf_Cleaning.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_TrainingWork/JobClean/ARA_TrainableDefOf_Cleaning.cs
rename to Source/ArachnaeSwarm/Pawn_Comps/ARA_TrainingWork/JobClean/ARA_TrainableDefOf_Cleaning.cs
diff --git a/Source/ArachnaeSwarm/ARA_TrainingWork/JobClean/JobGiver_Cleaner.cs b/Source/ArachnaeSwarm/Pawn_Comps/ARA_TrainingWork/JobClean/JobGiver_Cleaner.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_TrainingWork/JobClean/JobGiver_Cleaner.cs
rename to Source/ArachnaeSwarm/Pawn_Comps/ARA_TrainingWork/JobClean/JobGiver_Cleaner.cs
diff --git a/Source/ArachnaeSwarm/ARA_TrainingWork/JobClean/ThinkNode_ConditionalAnimalShouldDoCleaningWork.cs b/Source/ArachnaeSwarm/Pawn_Comps/ARA_TrainingWork/JobClean/ThinkNode_ConditionalAnimalShouldDoCleaningWork.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_TrainingWork/JobClean/ThinkNode_ConditionalAnimalShouldDoCleaningWork.cs
rename to Source/ArachnaeSwarm/Pawn_Comps/ARA_TrainingWork/JobClean/ThinkNode_ConditionalAnimalShouldDoCleaningWork.cs
diff --git a/Source/ArachnaeSwarm/ARA_TrainingWork/JobClean/WorkGiver_ArachnaeClean.cs b/Source/ArachnaeSwarm/Pawn_Comps/ARA_TrainingWork/JobClean/WorkGiver_ArachnaeClean.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_TrainingWork/JobClean/WorkGiver_ArachnaeClean.cs
rename to Source/ArachnaeSwarm/Pawn_Comps/ARA_TrainingWork/JobClean/WorkGiver_ArachnaeClean.cs
diff --git a/Source/ArachnaeSwarm/ARA_TrainingWork/JobPlant/JobGiver_Grower.cs b/Source/ArachnaeSwarm/Pawn_Comps/ARA_TrainingWork/JobPlant/JobGiver_Grower.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_TrainingWork/JobPlant/JobGiver_Grower.cs
rename to Source/ArachnaeSwarm/Pawn_Comps/ARA_TrainingWork/JobPlant/JobGiver_Grower.cs
diff --git a/Source/ArachnaeSwarm/ARA_TrainingWork/JobPlant/ThinkNode_ConditionalAnimalShouldDoGrowingWork.cs b/Source/ArachnaeSwarm/Pawn_Comps/ARA_TrainingWork/JobPlant/ThinkNode_ConditionalAnimalShouldDoGrowingWork.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_TrainingWork/JobPlant/ThinkNode_ConditionalAnimalShouldDoGrowingWork.cs
rename to Source/ArachnaeSwarm/Pawn_Comps/ARA_TrainingWork/JobPlant/ThinkNode_ConditionalAnimalShouldDoGrowingWork.cs
diff --git a/Source/ArachnaeSwarm/ARA_TrainingWork/JobPlant/WorkGiver_ArachnaeSow.cs b/Source/ArachnaeSwarm/Pawn_Comps/ARA_TrainingWork/JobPlant/WorkGiver_ArachnaeSow.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_TrainingWork/JobPlant/WorkGiver_ArachnaeSow.cs
rename to Source/ArachnaeSwarm/Pawn_Comps/ARA_TrainingWork/JobPlant/WorkGiver_ArachnaeSow.cs
diff --git a/Source/ArachnaeSwarm/ARA_TrainingWork/TrainingSystem_Patcher.cs b/Source/ArachnaeSwarm/Pawn_Comps/ARA_TrainingWork/TrainingSystem_Patcher.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_TrainingWork/TrainingSystem_Patcher.cs
rename to Source/ArachnaeSwarm/Pawn_Comps/ARA_TrainingWork/TrainingSystem_Patcher.cs
diff --git a/Source/ArachnaeSwarm/ARA_CustomUniqueWeapon/CompCustomUniqueWeapon.cs b/Source/ArachnaeSwarm/Thing_Comps/ARA_CustomUniqueWeapon/CompCustomUniqueWeapon.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_CustomUniqueWeapon/CompCustomUniqueWeapon.cs
rename to Source/ArachnaeSwarm/Thing_Comps/ARA_CustomUniqueWeapon/CompCustomUniqueWeapon.cs
diff --git a/Source/ArachnaeSwarm/ARA_CustomUniqueWeapon/CompProperties_CustomUniqueWeapon.cs b/Source/ArachnaeSwarm/Thing_Comps/ARA_CustomUniqueWeapon/CompProperties_CustomUniqueWeapon.cs
similarity index 100%
rename from Source/ArachnaeSwarm/ARA_CustomUniqueWeapon/CompProperties_CustomUniqueWeapon.cs
rename to Source/ArachnaeSwarm/Thing_Comps/ARA_CustomUniqueWeapon/CompProperties_CustomUniqueWeapon.cs
diff --git a/Source/ArachnaeSwarm/OPToxicGas.cs b/Source/ArachnaeSwarm/Thing_Comps/OPToxicGas.cs
similarity index 100%
rename from Source/ArachnaeSwarm/OPToxicGas.cs
rename to Source/ArachnaeSwarm/Thing_Comps/OPToxicGas.cs
diff --git a/Source/ArachnaeSwarm/Verb/CompCleave.cs b/Source/ArachnaeSwarm/Verbs/Cleave/CompCleave.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Verb/CompCleave.cs
rename to Source/ArachnaeSwarm/Verbs/Cleave/CompCleave.cs
diff --git a/Source/ArachnaeSwarm/Verb/Verb_MeleeAttack_Cleave.cs b/Source/ArachnaeSwarm/Verbs/Cleave/Verb_MeleeAttack_Cleave.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Verb/Verb_MeleeAttack_Cleave.cs
rename to Source/ArachnaeSwarm/Verbs/Cleave/Verb_MeleeAttack_Cleave.cs
diff --git a/Source/ArachnaeSwarm/Verb/VerbPropertiesExplosiveBeam.cs b/Source/ArachnaeSwarm/Verbs/ExplosiveBeam/VerbPropertiesExplosiveBeam.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Verb/VerbPropertiesExplosiveBeam.cs
rename to Source/ArachnaeSwarm/Verbs/ExplosiveBeam/VerbPropertiesExplosiveBeam.cs
diff --git a/Source/ArachnaeSwarm/Verb/Verb_ShootBeamExplosive.cs b/Source/ArachnaeSwarm/Verbs/ExplosiveBeam/Verb_ShootBeamExplosive.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Verb/Verb_ShootBeamExplosive.cs
rename to Source/ArachnaeSwarm/Verbs/ExplosiveBeam/Verb_ShootBeamExplosive.cs
diff --git a/Source/ArachnaeSwarm/Verb/CompMultiStrike.cs b/Source/ArachnaeSwarm/Verbs/MultiStrike/CompMultiStrike.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Verb/CompMultiStrike.cs
rename to Source/ArachnaeSwarm/Verbs/MultiStrike/CompMultiStrike.cs
diff --git a/Source/ArachnaeSwarm/Verb/Verb_MeleeAttack_MultiStrike.cs b/Source/ArachnaeSwarm/Verbs/MultiStrike/Verb_MeleeAttack_MultiStrike.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Verb/Verb_MeleeAttack_MultiStrike.cs
rename to Source/ArachnaeSwarm/Verbs/MultiStrike/Verb_MeleeAttack_MultiStrike.cs
diff --git a/Source/ArachnaeSwarm/Projectiles/BulletWithTrail.cs b/Source/ArachnaeSwarm/Verbs/Projectiles/BulletWithTrail.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Projectiles/BulletWithTrail.cs
rename to Source/ArachnaeSwarm/Verbs/Projectiles/BulletWithTrail.cs
diff --git a/Source/ArachnaeSwarm/Projectiles/ExplosiveTrackingBulletDef.cs b/Source/ArachnaeSwarm/Verbs/Projectiles/ExplosiveTrackingBulletDef.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Projectiles/ExplosiveTrackingBulletDef.cs
rename to Source/ArachnaeSwarm/Verbs/Projectiles/ExplosiveTrackingBulletDef.cs
diff --git a/Source/ArachnaeSwarm/Projectiles/Projectile_ConfigurableHellsphereCannon.cs b/Source/ArachnaeSwarm/Verbs/Projectiles/Projectile_ConfigurableHellsphereCannon.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Projectiles/Projectile_ConfigurableHellsphereCannon.cs
rename to Source/ArachnaeSwarm/Verbs/Projectiles/Projectile_ConfigurableHellsphereCannon.cs
diff --git a/Source/ArachnaeSwarm/Projectiles/Projectile_CruiseMissile.cs b/Source/ArachnaeSwarm/Verbs/Projectiles/Projectile_CruiseMissile.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Projectiles/Projectile_CruiseMissile.cs
rename to Source/ArachnaeSwarm/Verbs/Projectiles/Projectile_CruiseMissile.cs
diff --git a/Source/ArachnaeSwarm/Projectiles/Projectile_ExplosiveTrackingBullet.cs b/Source/ArachnaeSwarm/Verbs/Projectiles/Projectile_ExplosiveTrackingBullet.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Projectiles/Projectile_ExplosiveTrackingBullet.cs
rename to Source/ArachnaeSwarm/Verbs/Projectiles/Projectile_ExplosiveTrackingBullet.cs
diff --git a/Source/ArachnaeSwarm/Projectiles/Projectile_ExplosiveWithTrail.cs b/Source/ArachnaeSwarm/Verbs/Projectiles/Projectile_ExplosiveWithTrail.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Projectiles/Projectile_ExplosiveWithTrail.cs
rename to Source/ArachnaeSwarm/Verbs/Projectiles/Projectile_ExplosiveWithTrail.cs
diff --git a/Source/ArachnaeSwarm/Projectiles/Projectile_TrackingBullet.cs b/Source/ArachnaeSwarm/Verbs/Projectiles/Projectile_TrackingBullet.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Projectiles/Projectile_TrackingBullet.cs
rename to Source/ArachnaeSwarm/Verbs/Projectiles/Projectile_TrackingBullet.cs
diff --git a/Source/ArachnaeSwarm/Projectiles/Projectile_WulaPenetratingBeam.cs b/Source/ArachnaeSwarm/Verbs/Projectiles/Projectile_WulaPenetratingBeam.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Projectiles/Projectile_WulaPenetratingBeam.cs
rename to Source/ArachnaeSwarm/Verbs/Projectiles/Projectile_WulaPenetratingBeam.cs
diff --git a/Source/ArachnaeSwarm/Projectiles/Projectile_WulaPenetratingBullet.cs b/Source/ArachnaeSwarm/Verbs/Projectiles/Projectile_WulaPenetratingBullet.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Projectiles/Projectile_WulaPenetratingBullet.cs
rename to Source/ArachnaeSwarm/Verbs/Projectiles/Projectile_WulaPenetratingBullet.cs
diff --git a/Source/ArachnaeSwarm/Projectiles/TrackingBulletDef.cs b/Source/ArachnaeSwarm/Verbs/Projectiles/TrackingBulletDef.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Projectiles/TrackingBulletDef.cs
rename to Source/ArachnaeSwarm/Verbs/Projectiles/TrackingBulletDef.cs
diff --git a/Source/ArachnaeSwarm/Verb/VerbProperties_Excalibur.cs b/Source/ArachnaeSwarm/Verbs/VerbProperties_Excalibur.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Verb/VerbProperties_Excalibur.cs
rename to Source/ArachnaeSwarm/Verbs/VerbProperties_Excalibur.cs
diff --git a/Source/ArachnaeSwarm/Verb/Verb_ShootArc.cs b/Source/ArachnaeSwarm/Verbs/Verb_ShootArc.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Verb/Verb_ShootArc.cs
rename to Source/ArachnaeSwarm/Verbs/Verb_ShootArc.cs
diff --git a/Source/ArachnaeSwarm/Verb/Verb_ShootMeltBeam.cs b/Source/ArachnaeSwarm/Verbs/Verb_ShootMeltBeam.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Verb/Verb_ShootMeltBeam.cs
rename to Source/ArachnaeSwarm/Verbs/Verb_ShootMeltBeam.cs
diff --git a/Source/ArachnaeSwarm/Verb/Verb_ShootShotgun.cs b/Source/ArachnaeSwarm/Verbs/Verb_ShootShotgun.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Verb/Verb_ShootShotgun.cs
rename to Source/ArachnaeSwarm/Verbs/Verb_ShootShotgun.cs
diff --git a/Source/ArachnaeSwarm/Verb/VerbProperties_WeaponStealBeam.cs b/Source/ArachnaeSwarm/Verbs/WeaponStealBeam/VerbProperties_WeaponStealBeam.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Verb/VerbProperties_WeaponStealBeam.cs
rename to Source/ArachnaeSwarm/Verbs/WeaponStealBeam/VerbProperties_WeaponStealBeam.cs
diff --git a/Source/ArachnaeSwarm/Verb/Verb_ShootWeaponStealBeam.cs b/Source/ArachnaeSwarm/Verbs/WeaponStealBeam/Verb_ShootWeaponStealBeam.cs
similarity index 100%
rename from Source/ArachnaeSwarm/Verb/Verb_ShootWeaponStealBeam.cs
rename to Source/ArachnaeSwarm/Verbs/WeaponStealBeam/Verb_ShootWeaponStealBeam.cs