diff --git a/CHANGELOG.md b/CHANGELOG.md
index 495d954..d43ea61 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,17 @@
 # 1.2
 
-Changes:
+**Changes:**
 
 - Cocoon Weaver Gene
 - Spawn Spelopede Gene (Can re changed to spawn Megascarabs or other insects)
+- Queens & Caste Logic (see below)
 
-Internal:
+**Internal:**
 
 - Renamed Abilities to have _ability_ in their name, to not exactly match the gene-defnames.
+- Moved Insect-Incubator & Insect-Breeder to Hive Category and Folders
 
-Fixes: 
+**Fixes:**
 
 - Cockeater Ability has now Icon of Cockeater Gene
 - Cockeater now leaves a bite wound!
@@ -31,7 +33,7 @@ In general, the logic is the following:
 I am not sure if I want to have a specific mapping defining that Queen can only mate with certain Drones, let me know how you feel about it. 
 *Queens can be male*. I just used the female-term, but implementation is gender-neutral. 
 
-ToDo: 
+**ToDo:**
 
 - Icons: Cocoon, Spelopede Spawn
 - Sound: Spelopede Spawn
diff --git a/Common/Defs/GeneDefs/GeneDefs_Breeding.xml b/Common/Defs/GeneDefs/GeneDefs_Breeding.xml
index a2d7d7e..7482459 100644
--- a/Common/Defs/GeneDefs/GeneDefs_Breeding.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_Breeding.xml
@@ -13,27 +13,6 @@
     <biostatMet>-1</biostatMet>
   </GeneDef>
   
-  <GeneDef>
-    <defName>rjw_genes_insectincubator</defName>
-    <label>InsectIncubator</label>	
-    <description>Pawns with this gene are able to hold more insect eggs.</description>
-    <iconPath>Genes/Icons/More_Egg_Space</iconPath>
-    <displayOrderInCategory>52</displayOrderInCategory>
-    <displayCategory>rjw_genes_breeding</displayCategory>
-    <biostatCpx>1</biostatCpx>
-    <biostatMet>-1</biostatMet>
-  </GeneDef>
-
-  <GeneDef>
-    <defName>rjw_genes_insectbreeder</defName>
-    <label>InsectBreeder</label>	
-    <description>Pawns with this gene are able to fertilize eggs with any fertile penis.</description>
-    <iconPath>World/WorldObjects/Expanding/Insects</iconPath>
-    <displayOrderInCategory>53</displayOrderInCategory>
-	  <displayCategory>rjw_genes_breeding</displayCategory>
-    <biostatCpx>1</biostatCpx>
-    <biostatMet>-1</biostatMet>
-  </GeneDef>
   
     <GeneDef>
         <defName>rjw_genes_zoophile</defName>
diff --git a/Common/Defs/GeneDefs/GeneDefs_Hive.xml b/Common/Defs/GeneDefs/GeneDefs_Hive.xml
index 897851f..e908798 100644
--- a/Common/Defs/GeneDefs/GeneDefs_Hive.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_Hive.xml
@@ -165,4 +165,28 @@
 		<biostatCpx>1</biostatCpx>
 		<biostatMet>-1</biostatMet>
 	</GeneDef>
+
+		
+	<GeneDef>
+		<defName>rjw_genes_insectincubator</defName>
+		<label>InsectIncubator</label>	
+		<description>Pawns with this gene are able to host more insect eggs, hatch them faster and fertilize any inserted egg.</description>
+		<iconPath>Genes/Icons/More_Egg_Space</iconPath>
+		<displayOrderInCategory>52</displayOrderInCategory>
+		<displayCategory>rjw_genes_hive</displayCategory>
+		<biostatCpx>1</biostatCpx>
+		<biostatMet>-1</biostatMet>
+	</GeneDef>
+
+	<GeneDef>
+		<defName>rjw_genes_insectbreeder</defName>
+		<label>InsectBreeder</label>	
+		<description>Pawns with this gene are able to fertilize eggs with any fertile penis.</description>
+		<iconPath>World/WorldObjects/Expanding/Insects</iconPath>
+		<displayOrderInCategory>53</displayOrderInCategory>
+		<displayCategory>rjw_genes_hive</displayCategory>
+		<biostatCpx>1</biostatCpx>
+		<biostatMet>-1</biostatMet>
+	</GeneDef>
+	
 </Defs>
\ No newline at end of file
diff --git a/Source/Genes/Breeding/Patch_EggFertilization.cs b/Source/Genes/Hive/Patches/Patch_InsectBreeder_EggFertilization.cs
similarity index 97%
rename from Source/Genes/Breeding/Patch_EggFertilization.cs
rename to Source/Genes/Hive/Patches/Patch_InsectBreeder_EggFertilization.cs
index d2f2dcf..6184b4a 100644
--- a/Source/Genes/Breeding/Patch_EggFertilization.cs
+++ b/Source/Genes/Hive/Patches/Patch_InsectBreeder_EggFertilization.cs
@@ -12,9 +12,10 @@ namespace RJW_Genes
     /// Patched Class is https://gitgud.io/Ed86/rjw/-/blob/master/1.4/Source/Common/Helpers/SexUtility.cs
     /// 
     /// Normal Egg-Pregnancy logic is in https://gitgud.io/Ed86/rjw/-/blob/master/1.4/Source/Modules/Pregnancy/Pregnancy_Helper.cs
+    /// Gene: rjw_genes_insectbreeder 
     /// </summary>
     [HarmonyPatch(typeof(SexUtility), "Aftersex")]
-    static class Patch_EggFertilization
+    static class Patch_InsectBreeder_EggFertilization
     {
         public static void Postfix(SexProps props)
         {
diff --git a/Source/Genes/Breeding/PatchPregnancyHelper.cs b/Source/Genes/Hive/Patches/Patch_InsectIncubator_PregnancyHelper.cs
similarity index 95%
rename from Source/Genes/Breeding/PatchPregnancyHelper.cs
rename to Source/Genes/Hive/Patches/Patch_InsectIncubator_PregnancyHelper.cs
index 81a0ad4..fc3e530 100644
--- a/Source/Genes/Breeding/PatchPregnancyHelper.cs
+++ b/Source/Genes/Hive/Patches/Patch_InsectIncubator_PregnancyHelper.cs
@@ -15,9 +15,11 @@ namespace RJW_Genes
     /// <summary>
     /// This Class patches the RJW-DoEgg to allow up to MaxEggSizeMul times the original amount of eggs.
     /// This harmony patch was kindly provided by 'shabalox' https://github.com/Shabalox/RJW_Genes_Addons/
+    /// 
+    /// For Gene: rjw_genes_insectincubator 
     /// </summary>
     [HarmonyPatch(typeof(PregnancyHelper), "DoEgg")]
-    static class PatchPregnancyHelper
+    static class Patch_InsectIncubator_PregnancyHelper
     {
         [HarmonyTranspiler]
         public static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator il)
diff --git a/Source/Rjw-Genes.csproj b/Source/Rjw-Genes.csproj
index 68a3e34..f584d19 100644
--- a/Source/Rjw-Genes.csproj
+++ b/Source/Rjw-Genes.csproj
@@ -43,7 +43,7 @@
     <Compile Include="GeneDefOf.cs" />
     <Compile Include="Genes\Breeding\Gene_MechBreeder.cs" />
     <Compile Include="Genes\Breeding\PatchMechBirth.cs" />
-    <Compile Include="Genes\Breeding\Patch_EggFertilization.cs" />
+    <Compile Include="Genes\Hive\Patches\Patch_InsectBreeder_EggFertilization.cs" />
     <Compile Include="Genes\Breeding\PatchPregnancyHelper.cs" />
     <Compile Include="Genes\Cum\CumUtility.cs" />
     <Compile Include="Genes\Cum\Gene_VeryMuchCum.cs" />