diff --git a/Defs/base.xml b/Defs/Buildings/base.xml
similarity index 100%
rename from Defs/base.xml
rename to Defs/Buildings/base.xml
diff --git a/Defs/compact.xml b/Defs/Buildings/compact.xml
similarity index 100%
rename from Defs/compact.xml
rename to Defs/Buildings/compact.xml
diff --git a/Defs/dense.xml b/Defs/Buildings/dense.xml
similarity index 100%
rename from Defs/dense.xml
rename to Defs/Buildings/dense.xml
diff --git a/Defs/Buildings/quantum.xml b/Defs/Buildings/quantum.xml
new file mode 100644
index 0000000..596279a
--- /dev/null
+++ b/Defs/Buildings/quantum.xml
@@ -0,0 +1,48 @@
+<Defs>
+    <ThingDef ParentName="HydroponicsExpanded_Base">
+        <defName>HE_Quantum_Hydroponics</defName>
+        <label>Quantum Hydroponics Bay</label>
+        <graphicData>
+            <texPath>Basins/BasinQuantum</texPath>
+            <graphicClass>Graphic_Multi</graphicClass>
+            <drawSize>(2,6)</drawSize>
+            <damageData>
+                <cornerTL>Damage/Corner</cornerTL>
+                <cornerTR>Damage/Corner</cornerTR>
+                <cornerBL>Damage/Corner</cornerBL>
+                <cornerBR>Damage/Corner</cornerBR>
+            </damageData>
+        </graphicData>
+        <size>(2,6)</size>
+        <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/ultra.xml b/Defs/Buildings/ultra.xml
similarity index 50%
rename from Defs/ultra.xml
rename to Defs/Buildings/ultra.xml
index a795d00..6c8974e 100644
--- a/Defs/ultra.xml
+++ b/Defs/Buildings/ultra.xml
@@ -44,49 +44,4 @@
             <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/Textures/Basins/BasinQuantum_east.png b/Textures/Basins/BasinQuantum_east.png
new file mode 100644
index 0000000..a965680
Binary files /dev/null and b/Textures/Basins/BasinQuantum_east.png differ
diff --git a/Textures/Basins/BasinQuantum_north.png b/Textures/Basins/BasinQuantum_north.png
new file mode 100644
index 0000000..44881e9
Binary files /dev/null and b/Textures/Basins/BasinQuantum_north.png differ