diff --git a/Defs/base.xml b/Defs/base.xml
new file mode 100644
index 0000000..d837723
--- /dev/null
+++ b/Defs/base.xml
@@ -0,0 +1,36 @@
+<Defs>
+    <ThingDef Name="HydroponicsExpanded_Base" ParentName="BuildingBase" Abstract="True">
+        <description>An artificial nutrient bath that allows very dense crop growths in growth bays underneath. The nutrient pumps must work continuously; the plants will die if power is cut. Includes its own internal light source, but the internal ventilation system is not temperature controlled.</description>
+        <thingClass>HydroponicsExpanded.BuildingDenseHydroponicsBasin</thingClass>
+        <drawerType>MapMeshAndRealTime</drawerType>
+        <minifiedDef>MinifiedThing</minifiedDef>
+        <thingCategories>
+            <li>BuildingsProduction</li>
+        </thingCategories>
+        <castEdgeShadows>true</castEdgeShadows>
+        <altitudeLayer>FloorEmplacement</altitudeLayer>
+        <defaultPlacingRot>East</defaultPlacingRot>
+        <passability>PassThroughOnly</passability>
+        <pathCost>60</pathCost>
+        <constructEffect>ConstructMetal</constructEffect>
+        <fillPercent>0.30</fillPercent>
+        <canOverlapZones>false</canOverlapZones>
+        <constructionSkillPrerequisite>4</constructionSkillPrerequisite>
+        <statBases>
+            <WorkToBuild>2800</WorkToBuild>
+            <MaxHitPoints>180</MaxHitPoints>
+            <Flammability>0.5</Flammability>
+            <Cleanliness>-3</Cleanliness>
+            <Mass>80</Mass>
+        </statBases>
+        <size>(1,4)</size>
+        <fertility>2.8</fertility>
+        <building>
+            <defaultPlantToGrow>Plant_Rice</defaultPlantToGrow>
+            <sowTag>Hydroponic</sowTag>
+        </building>
+        <tickerType>Rare</tickerType>
+        <terrainAffordanceNeeded>Heavy</terrainAffordanceNeeded>
+        <designationCategory>Production</designationCategory>
+    </ThingDef>
+</Defs>
\ No newline at end of file
diff --git a/Defs/basin.xml b/Defs/basin.xml
deleted file mode 100644
index b809ddf..0000000
--- a/Defs/basin.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<Defs>
-    <ThingDef Name="HydroponicsExpanded_Base" ParentName="BuildingBase" Abstract="True">
-        <description>An artificial nutrient bath that allows very dense crop growths in growth bays underneath. The nutrient pumps must work continuously; the plants will die if power is cut. Includes its own internal light source, but the internal ventilation system is not temperature controlled.</description>
-        <thingClass>HydroponicsExpanded.BuildingDenseHydroponicsBasin</thingClass>
-        <drawerType>MapMeshAndRealTime</drawerType>
-        <minifiedDef>MinifiedThing</minifiedDef>
-        <thingCategories>
-            <li>BuildingsProduction</li>
-        </thingCategories>
-        <castEdgeShadows>true</castEdgeShadows>
-        <altitudeLayer>FloorEmplacement</altitudeLayer>
-        <defaultPlacingRot>East</defaultPlacingRot>
-        <passability>PassThroughOnly</passability>
-        <pathCost>60</pathCost>
-        <constructEffect>ConstructMetal</constructEffect>
-        <fillPercent>0.30</fillPercent>
-        <canOverlapZones>false</canOverlapZones>
-        <constructionSkillPrerequisite>4</constructionSkillPrerequisite>
-        <statBases>
-            <WorkToBuild>2800</WorkToBuild>
-            <MaxHitPoints>180</MaxHitPoints>
-            <Flammability>0.5</Flammability>
-            <Cleanliness>-3</Cleanliness>
-            <Mass>80</Mass>
-        </statBases>
-        <size>(1,4)</size>
-        <fertility>2.8</fertility>
-        <building>
-            <defaultPlantToGrow>Plant_Rice</defaultPlantToGrow>
-            <sowTag>Hydroponic</sowTag>
-        </building>
-        <tickerType>Rare</tickerType>
-        <terrainAffordanceNeeded>Heavy</terrainAffordanceNeeded>
-        <!-- Where it appears in the construction menu. -->
-        <designationCategory>Production</designationCategory>
-    </ThingDef>
-    <ThingDef ParentName="HydroponicsExpanded_Base">
-        <defName>HE_Compact_Hydroponics</defName>
-        <label>Compact Hydroponics Bay</label>
-        <graphicData>
-            <texPath>Basins/BasinCompact</texPath>
-            <graphicClass>Graphic_Multi</graphicClass>
-            <drawSize>(1,4)</drawSize>
-            <damageData>
-                <cornerTL>Damage/Corner</cornerTL>
-                <cornerTR>Damage/Corner</cornerTR>
-                <cornerBL>Damage/Corner</cornerBL>
-                <cornerBR>Damage/Corner</cornerBR>
-            </damageData>
-        </graphicData>
-        <constructionSkillPrerequisite>6</constructionSkillPrerequisite>
-        <statBases>
-            <WorkToBuild>4200</WorkToBuild>
-            <MaxHitPoints>250</MaxHitPoints>
-            <Flammability>0.5</Flammability>
-            <Cleanliness>-3</Cleanliness>
-        </statBases>
-        <costList>
-            <Steel>280</Steel>
-            <ComponentIndustrial>3</ComponentIndustrial>
-        </costList>
-        <comps>
-            <li Class="CompProperties_Forbiddable" />
-            <li Class="CompProperties_Power">
-                <compClass>CompPowerTrader</compClass>
-                <basePowerConsumption>210</basePowerConsumption>
-            </li>
-            <li Class="CompProperties_Flickable" />
-        </comps>
-        <modExtensions>
-            <li Class="HydroponicsExpanded.ModExtension.CapacityExtension">
-                <capacity>12</capacity>
-            </li>
-        </modExtensions>
-    </ThingDef>
-    <ThingDef ParentName="HydroponicsExpanded_Base">
-        <defName>HE_Dense_Hydroponics</defName>
-        <label>Dense Hydroponics Bay</label>
-        <graphicData>
-            <texPath>Basins/BasinDense</texPath>
-            <graphicClass>Graphic_Multi</graphicClass>
-            <drawSize>(1,4)</drawSize>
-            <damageData>
-                <cornerTL>Damage/Corner</cornerTL>
-                <cornerTR>Damage/Corner</cornerTR>
-                <cornerBL>Damage/Corner</cornerBL>
-                <cornerBR>Damage/Corner</cornerBR>
-            </damageData>
-        </graphicData>
-        <fertility>3.0</fertility>
-        <constructionSkillPrerequisite>8</constructionSkillPrerequisite>
-        <statBases>
-            <WorkToBuild>5000</WorkToBuild>
-            <MaxHitPoints>250</MaxHitPoints>
-            <Flammability>0.5</Flammability>
-            <Cleanliness>-3</Cleanliness>
-        </statBases>
-        <costList>
-            <Steel>600</Steel>
-            <Plasteel>80</Plasteel>
-            <ComponentIndustrial>6</ComponentIndustrial>
-            <ComponentSpacer>1</ComponentSpacer>
-        </costList>
-        <comps>
-            <li Class="CompProperties_Forbiddable" />
-            <li Class="CompProperties_Power">
-                <compClass>CompPowerTrader</compClass>
-                <basePowerConsumption>750</basePowerConsumption>
-            </li>
-            <li Class="CompProperties_Flickable" />
-        </comps>
-        <modExtensions>
-            <li Class="HydroponicsExpanded.ModExtension.CapacityExtension">
-                <capacity>28</capacity>
-            </li>
-        </modExtensions>
-        <researchPrerequisites>
-            <li>HE_HighDensityHydroponics</li>
-        </researchPrerequisites>
-    </ThingDef>
-
-    <ThingDef ParentName="HydroponicsExpanded_Base">
-        <defName>HE_Ultra_Hydroponics</defName>
-        <label>Ultradense Hydroponics Bay</label>
-        <graphicData>
-            <texPath>Basins/BasinUltra</texPath>
-            <graphicClass>Graphic_Multi</graphicClass>
-            <drawSize>(1,4)</drawSize>
-            <damageData>
-                <cornerTL>Damage/Corner</cornerTL>
-                <cornerTR>Damage/Corner</cornerTR>
-                <cornerBL>Damage/Corner</cornerBL>
-                <cornerBR>Damage/Corner</cornerBR>
-            </damageData>
-        </graphicData>
-        <fertility>3.15</fertility>
-        <constructionSkillPrerequisite>10</constructionSkillPrerequisite>
-        <statBases>
-            <WorkToBuild>7000</WorkToBuild>
-            <MaxHitPoints>250</MaxHitPoints>
-            <Flammability>0.5</Flammability>
-            <Cleanliness>-3</Cleanliness>
-        </statBases>
-        <costList>
-            <Steel>850</Steel>
-            <Plasteel>120</Plasteel>
-            <ComponentIndustrial>8</ComponentIndustrial>
-            <ComponentSpacer>3</ComponentSpacer>
-        </costList>
-        <comps>
-            <li Class="CompProperties_Forbiddable" />
-            <li Class="CompProperties_Power">
-                <compClass>CompPowerTrader</compClass>
-                <basePowerConsumption>1500</basePowerConsumption>
-            </li>
-            <li Class="CompProperties_Flickable" />
-        </comps>
-        <modExtensions>
-            <li Class="HydroponicsExpanded.ModExtension.CapacityExtension">
-                <capacity>40</capacity>
-            </li>
-        </modExtensions>
-        <researchPrerequisites>
-            <li>HE_UltraDensityHydroponics</li>
-        </researchPrerequisites>
-    </ThingDef>
-    <ThingDef ParentName="HydroponicsExpanded_Base">
-        <defName>HE_Quantum_Hydroponics</defName>
-        <label>Quantum Hydroponics Bay</label>
-        <graphicData>
-            <texPath>Basins/BasinUltra</texPath>
-            <graphicClass>Graphic_Multi</graphicClass>
-            <drawSize>(1,4)</drawSize>
-            <damageData>
-                <cornerTL>Damage/Corner</cornerTL>
-                <cornerTR>Damage/Corner</cornerTR>
-                <cornerBL>Damage/Corner</cornerBL>
-                <cornerBR>Damage/Corner</cornerBR>
-            </damageData>
-        </graphicData>
-        <fertility>3.4</fertility>
-        <constructionSkillPrerequisite>12</constructionSkillPrerequisite>
-        <statBases>
-            <WorkToBuild>9500</WorkToBuild>
-            <MaxHitPoints>300</MaxHitPoints>
-            <Flammability>0.5</Flammability>
-            <Cleanliness>-3</Cleanliness>
-        </statBases>
-        <costList>
-            <Steel>200</Steel>
-            <Plasteel>200</Plasteel>
-            <ComponentIndustrial>12</ComponentIndustrial>
-            <ComponentSpacer>5</ComponentSpacer>
-        </costList>
-        <comps>
-            <li Class="CompProperties_Forbiddable" />
-            <li Class="CompProperties_Power">
-                <compClass>CompPowerTrader</compClass>
-                <basePowerConsumption>2200</basePowerConsumption>
-            </li>
-            <li Class="CompProperties_Flickable" />
-        </comps>
-        <modExtensions>
-            <li Class="HydroponicsExpanded.ModExtension.CapacityExtension">
-                <capacity>65</capacity>
-            </li>
-        </modExtensions>
-        <researchPrerequisites>
-            <li>HE_UltraDensityHydroponics</li>
-        </researchPrerequisites>
-    </ThingDef>
-</Defs>
\ No newline at end of file
diff --git a/Defs/compact.xml b/Defs/compact.xml
new file mode 100644
index 0000000..1e05934
--- /dev/null
+++ b/Defs/compact.xml
@@ -0,0 +1,42 @@
+<Defs>
+    <ThingDef ParentName="HydroponicsExpanded_Base">
+        <defName>HE_Compact_Hydroponics</defName>
+        <label>Compact Hydroponics Bay</label>
+        <graphicData>
+            <texPath>Basins/BasinCompact</texPath>
+            <graphicClass>Graphic_Multi</graphicClass>
+            <drawSize>(1,4)</drawSize>
+            <damageData>
+                <cornerTL>Damage/Corner</cornerTL>
+                <cornerTR>Damage/Corner</cornerTR>
+                <cornerBL>Damage/Corner</cornerBL>
+                <cornerBR>Damage/Corner</cornerBR>
+            </damageData>
+        </graphicData>
+        <constructionSkillPrerequisite>6</constructionSkillPrerequisite>
+        <statBases>
+            <WorkToBuild>4200</WorkToBuild>
+            <MaxHitPoints>250</MaxHitPoints>
+            <Flammability>0.5</Flammability>
+            <Cleanliness>-3</Cleanliness>
+        </statBases>
+        <costList>
+            <Steel>280</Steel>
+            <ComponentIndustrial>3</ComponentIndustrial>
+        </costList>
+        <comps>
+            <li Class="CompProperties_Forbiddable" />
+            <li Class="CompProperties_Power">
+                <compClass>CompPowerTrader</compClass>
+                <basePowerConsumption>480</basePowerConsumption>
+            </li>
+            <li Class="CompProperties_Flickable" />
+        </comps>
+        <modExtensions>
+            <li Class="HydroponicsExpanded.ModExtension.CapacityExtension">
+                <capacity>12</capacity>
+            </li>
+        </modExtensions>
+    </ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/Defs/dense.xml b/Defs/dense.xml
new file mode 100644
index 0000000..d25f728
--- /dev/null
+++ b/Defs/dense.xml
@@ -0,0 +1,47 @@
+<Defs>
+    <ThingDef ParentName="HydroponicsExpanded_Base">
+        <defName>HE_Dense_Hydroponics</defName>
+        <label>Dense Hydroponics Bay</label>
+        <graphicData>
+            <texPath>Basins/BasinDense</texPath>
+            <graphicClass>Graphic_Multi</graphicClass>
+            <drawSize>(1,4)</drawSize>
+            <damageData>
+                <cornerTL>Damage/Corner</cornerTL>
+                <cornerTR>Damage/Corner</cornerTR>
+                <cornerBL>Damage/Corner</cornerBL>
+                <cornerBR>Damage/Corner</cornerBR>
+            </damageData>
+        </graphicData>
+        <fertility>3.0</fertility>
+        <constructionSkillPrerequisite>8</constructionSkillPrerequisite>
+        <statBases>
+            <WorkToBuild>5000</WorkToBuild>
+            <MaxHitPoints>250</MaxHitPoints>
+            <Flammability>0.5</Flammability>
+            <Cleanliness>-3</Cleanliness>
+        </statBases>
+        <costList>
+            <Steel>600</Steel>
+            <Plasteel>80</Plasteel>
+            <ComponentIndustrial>6</ComponentIndustrial>
+            <ComponentSpacer>1</ComponentSpacer>
+        </costList>
+        <comps>
+            <li Class="CompProperties_Forbiddable" />
+            <li Class="CompProperties_Power">
+                <compClass>CompPowerTrader</compClass>
+                <basePowerConsumption>750</basePowerConsumption>
+            </li>
+            <li Class="CompProperties_Flickable" />
+        </comps>
+        <modExtensions>
+            <li Class="HydroponicsExpanded.ModExtension.CapacityExtension">
+                <capacity>28</capacity>
+            </li>
+        </modExtensions>
+        <researchPrerequisites>
+            <li>HE_HighDensityHydroponics</li>
+        </researchPrerequisites>
+    </ThingDef>
+</Defs>
\ No newline at end of file
diff --git a/Defs/ultra.xml b/Defs/ultra.xml
new file mode 100644
index 0000000..a795d00
--- /dev/null
+++ b/Defs/ultra.xml
@@ -0,0 +1,92 @@
+<Defs>
+    <ThingDef ParentName="HydroponicsExpanded_Base">
+        <defName>HE_Ultra_Hydroponics</defName>
+        <label>Ultradense Hydroponics Bay</label>
+        <graphicData>
+            <texPath>Basins/BasinUltra</texPath>
+            <graphicClass>Graphic_Multi</graphicClass>
+            <drawSize>(1,4)</drawSize>
+            <damageData>
+                <cornerTL>Damage/Corner</cornerTL>
+                <cornerTR>Damage/Corner</cornerTR>
+                <cornerBL>Damage/Corner</cornerBL>
+                <cornerBR>Damage/Corner</cornerBR>
+            </damageData>
+        </graphicData>
+        <fertility>3.15</fertility>
+        <constructionSkillPrerequisite>10</constructionSkillPrerequisite>
+        <statBases>
+            <WorkToBuild>7000</WorkToBuild>
+            <MaxHitPoints>250</MaxHitPoints>
+            <Flammability>0.5</Flammability>
+            <Cleanliness>-3</Cleanliness>
+        </statBases>
+        <costList>
+            <Steel>850</Steel>
+            <Plasteel>120</Plasteel>
+            <ComponentIndustrial>8</ComponentIndustrial>
+            <ComponentSpacer>3</ComponentSpacer>
+        </costList>
+        <comps>
+            <li Class="CompProperties_Forbiddable" />
+            <li Class="CompProperties_Power">
+                <compClass>CompPowerTrader</compClass>
+                <basePowerConsumption>1500</basePowerConsumption>
+            </li>
+            <li Class="CompProperties_Flickable" />
+        </comps>
+        <modExtensions>
+            <li Class="HydroponicsExpanded.ModExtension.CapacityExtension">
+                <capacity>40</capacity>
+            </li>
+        </modExtensions>
+        <researchPrerequisites>
+            <li>HE_UltraDensityHydroponics</li>
+        </researchPrerequisites>
+    </ThingDef>
+    <ThingDef ParentName="HydroponicsExpanded_Base">
+        <defName>HE_Quantum_Hydroponics</defName>
+        <label>Quantum Hydroponics Bay</label>
+        <graphicData>
+            <texPath>Basins/BasinUltra</texPath>
+            <graphicClass>Graphic_Multi</graphicClass>
+            <drawSize>(1,4)</drawSize>
+            <damageData>
+                <cornerTL>Damage/Corner</cornerTL>
+                <cornerTR>Damage/Corner</cornerTR>
+                <cornerBL>Damage/Corner</cornerBL>
+                <cornerBR>Damage/Corner</cornerBR>
+            </damageData>
+        </graphicData>
+        <fertility>3.4</fertility>
+        <constructionSkillPrerequisite>12</constructionSkillPrerequisite>
+        <statBases>
+            <WorkToBuild>9500</WorkToBuild>
+            <MaxHitPoints>300</MaxHitPoints>
+            <Flammability>0.5</Flammability>
+            <Cleanliness>-3</Cleanliness>
+        </statBases>
+        <costList>
+            <Steel>200</Steel>
+            <Plasteel>200</Plasteel>
+            <ComponentIndustrial>12</ComponentIndustrial>
+            <ComponentSpacer>5</ComponentSpacer>
+        </costList>
+        <comps>
+            <li Class="CompProperties_Forbiddable" />
+            <li Class="CompProperties_Power">
+                <compClass>CompPowerTrader</compClass>
+                <basePowerConsumption>2200</basePowerConsumption>
+            </li>
+            <li Class="CompProperties_Flickable" />
+        </comps>
+        <modExtensions>
+            <li Class="HydroponicsExpanded.ModExtension.CapacityExtension">
+                <capacity>65</capacity>
+            </li>
+        </modExtensions>
+        <researchPrerequisites>
+            <li>HE_UltraDensityHydroponics</li>
+        </researchPrerequisites>
+    </ThingDef>
+</Defs>
\ No newline at end of file