diff --git a/build.gradle b/build.gradle
index ee35535a0..ecaf37e7f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -107,39 +107,44 @@ minecraft {
 
 repositories {
     maven {
-        // Location of the maven that hosts JEI files (and TiC)
-        name 'Progwml6 maven'
-        url 'https://dvs1.progwml6.com/files/maven'
+        // location of the maven for Registrate and Flywheel
+        name = 'tterrag maven'
+        url = 'https://maven.tterrag.com'
+    }
+    maven {
+        // location of the maven that hosts JEI files since January 2023
+        // location of the maven for Vazkii's mods
+        name = "Jared's maven"
+        url = "https://maven.blamejared.com/"
     }
     /*maven {
-        // Location of a maven mirror for JEI files, as a fallback
-        name 'ModMaven'
-        url 'https://modmaven.k-4u.nl'
+        // location of a maven mirror for JEI files, as a fallback
+        name = "ModMaven"
+        url = "https://modmaven.dev"
     }*/
     maven {
-        // Location of the maven for vazkii's mods
-        name 'blamejared'
-        url 'https://maven.blamejared.com'
+        // location of the maven for Dynamic Trees
+        url = 'https://harleyoconnor.com/maven'
     }
     maven {
-        // Location of the maven for mixed mappings, Registrate, and Flywheel
-        name 'tterrag maven'
-        url 'https://maven.tterrag.com'
+        // location of the maven for Curios API
+        url = "https://maven.theillusivec4.top/"
     }
     maven {
-        url 'https://www.cursemaven.com'
+        // location of maven for CC: Tweaked
+        name = "squiddev"
+        url = "https://squiddev.cc/maven/"
+        content {
+            includeGroup "org.squiddev"
+        }
+    }
+
+    maven {
+        url = 'https://www.cursemaven.com'
         content {
             includeGroup "curse.maven"
         }
     }
-    maven {
-        //location of the maven for dynamic trees
-        url 'https://harleyoconnor.com/maven'
-    }
-    maven {
-        //location of the maven for curios api
-        url = "https://maven.theillusivec4.top/"
-    }
     maven {
         name = "Modrinth"
         url = "https://api.modrinth.com/maven"
@@ -147,17 +152,10 @@ repositories {
             includeGroup "maven.modrinth"
         }
     }
+
     flatDir {
         dirs 'libs'
     }
-    maven {
-        // Location of maven for CC: Tweaked
-        name = "squiddev"
-        url = "https://squiddev.cc/maven/"
-        content {
-            includeGroup "org.squiddev"
-        }
-    }
 }
 
 dependencies {
diff --git a/gradle.properties b/gradle.properties
index fe9d89591..bfd3af3a0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,7 +11,7 @@ minecraft_version = 1.19.2
 forge_version = 43.2.4
 
 # build dependency versions
-forgegradle_version = 5.1.53
+forgegradle_version = 5.1.74
 mixingradle_version = 0.7-SNAPSHOT
 mixin_version = 0.8.5
 librarian_version = 1.+
diff --git a/src/generated/resources/assets/create/blockstates/experience_block.json b/src/generated/resources/assets/create/blockstates/experience_block.json
new file mode 100644
index 000000000..96bde6400
--- /dev/null
+++ b/src/generated/resources/assets/create/blockstates/experience_block.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "create:block/experience_block"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/create/lang/en_ud.json b/src/generated/resources/assets/create/lang/en_ud.json
index b7077e918..dcce724a3 100644
--- a/src/generated/resources/assets/create/lang/en_ud.json
+++ b/src/generated/resources/assets/create/lang/en_ud.json
@@ -221,6 +221,7 @@
   "block.create.encased_chain_drive": "ǝʌıɹᗡ uıɐɥƆ pǝsɐɔuƎ",
   "block.create.encased_fan": "uɐℲ pǝsɐɔuƎ",
   "block.create.encased_fluid_pipe": "ǝdıԀ pınןℲ pǝsɐɔuƎ",
+  "block.create.experience_block": "ǝɔuǝıɹǝdxƎ ɟo ʞɔoןᗺ",
   "block.create.exposed_copper_shingle_slab": "qɐןS ǝןbuıɥS ɹǝddoƆ pǝsodxƎ",
   "block.create.exposed_copper_shingle_stairs": "sɹıɐʇS ǝןbuıɥS ɹǝddoƆ pǝsodxƎ",
   "block.create.exposed_copper_shingles": "sǝןbuıɥS ɹǝddoƆ pǝsodxƎ",
@@ -623,19 +624,19 @@
   "item.create.crafter_slot_cover": "ɹǝʌoƆ ʇoןS ɹǝʇɟɐɹƆ",
   "item.create.crafting_blueprint": "ʇuıɹdǝnןᗺ buıʇɟɐɹƆ",
   "item.create.creative_blaze_cake": "ǝʞɐƆ ǝzɐןᗺ ǝʌıʇɐǝɹƆ",
-  "item.create.crushed_aluminum_ore": "ǝɹO ɯnuıɯnןⱯ pǝɥsnɹƆ",
-  "item.create.crushed_copper_ore": "ǝɹO ɹǝddoƆ pǝɥsnɹƆ",
-  "item.create.crushed_gold_ore": "ǝɹO pןo⅁ pǝɥsnɹƆ",
-  "item.create.crushed_iron_ore": "ǝɹO uoɹI pǝɥsnɹƆ",
-  "item.create.crushed_lead_ore": "ǝɹO pɐǝꞀ pǝɥsnɹƆ",
-  "item.create.crushed_nickel_ore": "ǝɹO ןǝʞɔıN pǝɥsnɹƆ",
-  "item.create.crushed_osmium_ore": "ǝɹO ɯnıɯsO pǝɥsnɹƆ",
-  "item.create.crushed_platinum_ore": "ǝɹO ɯnuıʇɐןԀ pǝɥsnɹƆ",
-  "item.create.crushed_quicksilver_ore": "ǝɹO ɹǝʌןısʞɔınὉ pǝɥsnɹƆ",
-  "item.create.crushed_silver_ore": "ǝɹO ɹǝʌןıS pǝɥsnɹƆ",
-  "item.create.crushed_tin_ore": "ǝɹO uı⟘ pǝɥsnɹƆ",
-  "item.create.crushed_uranium_ore": "ǝɹO ɯnıuɐɹ∩ pǝɥsnɹƆ",
-  "item.create.crushed_zinc_ore": "ǝɹO ɔuıZ pǝɥsnɹƆ",
+  "item.create.crushed_raw_aluminum": "ɯnuıɯnןⱯ ʍɐᴚ pǝɥsnɹƆ",
+  "item.create.crushed_raw_copper": "ɹǝddoƆ ʍɐᴚ pǝɥsnɹƆ",
+  "item.create.crushed_raw_gold": "pןo⅁ ʍɐᴚ pǝɥsnɹƆ",
+  "item.create.crushed_raw_iron": "uoɹI ʍɐᴚ pǝɥsnɹƆ",
+  "item.create.crushed_raw_lead": "pɐǝꞀ ʍɐᴚ pǝɥsnɹƆ",
+  "item.create.crushed_raw_nickel": "ןǝʞɔıN ʍɐᴚ pǝɥsnɹƆ",
+  "item.create.crushed_raw_osmium": "ɯnıɯsO ʍɐᴚ pǝɥsnɹƆ",
+  "item.create.crushed_raw_platinum": "ɯnuıʇɐןԀ ʍɐᴚ pǝɥsnɹƆ",
+  "item.create.crushed_raw_quicksilver": "ɹǝʌןısʞɔınὉ ʍɐᴚ pǝɥsnɹƆ",
+  "item.create.crushed_raw_silver": "ɹǝʌןıS ʍɐᴚ pǝɥsnɹƆ",
+  "item.create.crushed_raw_tin": "uı⟘ ʍɐᴚ pǝɥsnɹƆ",
+  "item.create.crushed_raw_uranium": "ɯnıuɐɹ∩ ʍɐᴚ pǝɥsnɹƆ",
+  "item.create.crushed_raw_zinc": "ɔuıZ ʍɐᴚ pǝɥsnɹƆ",
   "item.create.dough": "ɥbnoᗡ",
   "item.create.electron_tube": "ǝqn⟘ uoɹʇɔǝןƎ",
   "item.create.empty_blaze_burner": "ɹǝuɹnᗺ ǝzɐןᗺ ʎʇdɯƎ",
diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json
index f620763f3..12fc617ca 100644
--- a/src/generated/resources/assets/create/lang/en_us.json
+++ b/src/generated/resources/assets/create/lang/en_us.json
@@ -224,6 +224,7 @@
 	"block.create.encased_chain_drive": "Encased Chain Drive",
 	"block.create.encased_fan": "Encased Fan",
 	"block.create.encased_fluid_pipe": "Encased Fluid Pipe",
+	"block.create.experience_block": "Block of Experience",
 	"block.create.exposed_copper_shingle_slab": "Exposed Copper Shingle Slab",
 	"block.create.exposed_copper_shingle_stairs": "Exposed Copper Shingle Stairs",
 	"block.create.exposed_copper_shingles": "Exposed Copper Shingles",
@@ -630,19 +631,19 @@
 	"item.create.crafter_slot_cover": "Crafter Slot Cover",
 	"item.create.crafting_blueprint": "Crafting Blueprint",
 	"item.create.creative_blaze_cake": "Creative Blaze Cake",
-	"item.create.crushed_aluminum_ore": "Crushed Aluminum Ore",
-	"item.create.crushed_copper_ore": "Crushed Copper Ore",
-	"item.create.crushed_gold_ore": "Crushed Gold Ore",
-	"item.create.crushed_iron_ore": "Crushed Iron Ore",
-	"item.create.crushed_lead_ore": "Crushed Lead Ore",
-	"item.create.crushed_nickel_ore": "Crushed Nickel Ore",
-	"item.create.crushed_osmium_ore": "Crushed Osmium Ore",
-	"item.create.crushed_platinum_ore": "Crushed Platinum Ore",
-	"item.create.crushed_quicksilver_ore": "Crushed Quicksilver Ore",
-	"item.create.crushed_silver_ore": "Crushed Silver Ore",
-	"item.create.crushed_tin_ore": "Crushed Tin Ore",
-	"item.create.crushed_uranium_ore": "Crushed Uranium Ore",
-	"item.create.crushed_zinc_ore": "Crushed Zinc Ore",
+	"item.create.crushed_raw_aluminum": "Crushed Raw Aluminum",
+	"item.create.crushed_raw_copper": "Crushed Raw Copper",
+	"item.create.crushed_raw_gold": "Crushed Raw Gold",
+	"item.create.crushed_raw_iron": "Crushed Raw Iron",
+	"item.create.crushed_raw_lead": "Crushed Raw Lead",
+	"item.create.crushed_raw_nickel": "Crushed Raw Nickel",
+	"item.create.crushed_raw_osmium": "Crushed Raw Osmium",
+	"item.create.crushed_raw_platinum": "Crushed Raw Platinum",
+	"item.create.crushed_raw_quicksilver": "Crushed Raw Quicksilver",
+	"item.create.crushed_raw_silver": "Crushed Raw Silver",
+	"item.create.crushed_raw_tin": "Crushed Raw Tin",
+	"item.create.crushed_raw_uranium": "Crushed Raw Uranium",
+	"item.create.crushed_raw_zinc": "Crushed Raw Zinc",
 	"item.create.dough": "Dough",
 	"item.create.electron_tube": "Electron Tube",
 	"item.create.empty_blaze_burner": "Empty Blaze Burner",
@@ -1209,7 +1210,7 @@
 	"create.schematic.mirror.leftRight": "Left-Right",
 	"create.schematic.tool.deploy": "Position",
 	"create.schematic.tool.move": "Move XZ",
-	"create.schematic.tool.movey": "Move Y",
+	"create.schematic.tool.move_y": "Move Y",
 	"create.schematic.tool.rotate": "Rotate",
 	"create.schematic.tool.print": "Print",
 	"create.schematic.tool.flip": "Mirror",
@@ -1221,10 +1222,10 @@
 	"create.schematic.tool.move.description.1": "Point at the Schematic and [CTRL]-Scroll to push it.",
 	"create.schematic.tool.move.description.2": "",
 	"create.schematic.tool.move.description.3": "",
-	"create.schematic.tool.movey.description.0": "Shifts the Schematic Vertically.",
-	"create.schematic.tool.movey.description.1": "[CTRL]-Scroll to move it up/down.",
-	"create.schematic.tool.movey.description.2": "",
-	"create.schematic.tool.movey.description.3": "",
+	"create.schematic.tool.move_y.description.0": "Shifts the Schematic Vertically.",
+	"create.schematic.tool.move_y.description.1": "[CTRL]-Scroll to move it up/down.",
+	"create.schematic.tool.move_y.description.2": "",
+	"create.schematic.tool.move_y.description.3": "",
 	"create.schematic.tool.rotate.description.0": "Rotates the Schematic around its center.",
 	"create.schematic.tool.rotate.description.1": "[CTRL]-Scroll to rotate by 90 Degrees.",
 	"create.schematic.tool.rotate.description.2": "",
@@ -2120,12 +2121,12 @@
 	"item.create.copper_diving_boots.tooltip": "COPPER DIVING BOOTS",
 	"item.create.copper_diving_boots.tooltip.summary": "A pair of _heavy_ _boots_, allowing for better traversal of the Ocean floor.",
 	"item.create.copper_diving_boots.tooltip.condition1": "When Worn",
-	"item.create.copper_diving_boots.tooltip.behaviour1": "Wielder _sinks_ _faster_ and _cannot_ _swim_. Grants the ability to _walk_ and _jump_ underwater. Wielder also is no longer affected by _Mechanical_ _Belts_.",
+	"item.create.copper_diving_boots.tooltip.behaviour1": "Wielder _descends_ more _quickly_ in liquids. Grants the ability to _walk_ and _jump_ underwater. Wielder also is no longer affected by _Mechanical_ _Belts_.",
 
 	"item.create.netherite_diving_boots.tooltip": "NETHERITE DIVING BOOTS",
 	"item.create.netherite_diving_boots.tooltip.summary": "A pair of _heavy_ _boots_, allowing for better traversal of the Ocean floor, including Oceans made of Lava.",
 	"item.create.netherite_diving_boots.tooltip.condition1": "When Worn",
-	"item.create.netherite_diving_boots.tooltip.behaviour1": "Wielder _sinks_ _faster_ and _cannot_ _swim_. Grants the ability to _walk_ and _jump_ underwater. Wielder also is no longer affected by _Mechanical_ _Belts_.",
+	"item.create.netherite_diving_boots.tooltip.behaviour1": "Wielder _descends_ more _quickly_ in liquids. Grants the ability to _walk_ and _jump_ underwater. Wielder also is no longer affected by _Mechanical_ _Belts_.",
 
 	"item.create.crafting_blueprint.tooltip": "CRAFTING BLUEPRINT",
 	"item.create.crafting_blueprint.tooltip.summary": "_Placed_ on a wall, it can be used to _specify_ _ingredient_ _arrangements_ for easier manual crafting. Each slot represents a Recipe.",
@@ -2702,7 +2703,7 @@
 	"create.ponder.mechanical_arm.header": "Setting up Mechanical Arms",
 	"create.ponder.mechanical_arm.text_1": "Mechanical Arms have to be assigned their in- and outputs before they are placed",
 	"create.ponder.mechanical_arm.text_2": "Right-Click inventories while holding the Arm to assign them as Targets",
-	"create.ponder.mechanical_arm.text_3": "Right-Click again to toggle between Input (Blue) and Output (Orange)",
+	"create.ponder.mechanical_arm.text_3": "Right-Click again to toggle between Input (Blue) and Output (Yellow)",
 	"create.ponder.mechanical_arm.text_4": "Left-Click components to remove their Selection",
 	"create.ponder.mechanical_arm.text_5": "Once placed, the Mechanical Arm will target the blocks selected previously",
 	"create.ponder.mechanical_arm.text_6": "They can have any amount of in- and outputs within their range",
diff --git a/src/generated/resources/assets/create/models/item/crushed_nickel_ore.json b/src/generated/resources/assets/create/models/item/crushed_nickel_ore.json
deleted file mode 100644
index 4a47620f7..000000000
--- a/src/generated/resources/assets/create/models/item/crushed_nickel_ore.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "create:item/crushed_nickel_ore"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/create/models/item/crushed_osmium_ore.json b/src/generated/resources/assets/create/models/item/crushed_osmium_ore.json
deleted file mode 100644
index bffaad165..000000000
--- a/src/generated/resources/assets/create/models/item/crushed_osmium_ore.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "create:item/crushed_osmium_ore"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/create/models/item/crushed_platinum_ore.json b/src/generated/resources/assets/create/models/item/crushed_platinum_ore.json
deleted file mode 100644
index 6b2d3a4a1..000000000
--- a/src/generated/resources/assets/create/models/item/crushed_platinum_ore.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "create:item/crushed_platinum_ore"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/create/models/item/crushed_quicksilver_ore.json b/src/generated/resources/assets/create/models/item/crushed_quicksilver_ore.json
deleted file mode 100644
index 755ae5489..000000000
--- a/src/generated/resources/assets/create/models/item/crushed_quicksilver_ore.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "create:item/crushed_quicksilver_ore"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/create/models/item/crushed_aluminum_ore.json b/src/generated/resources/assets/create/models/item/crushed_raw_aluminum.json
similarity index 56%
rename from src/generated/resources/assets/create/models/item/crushed_aluminum_ore.json
rename to src/generated/resources/assets/create/models/item/crushed_raw_aluminum.json
index 662060f98..f5e02b9dc 100644
--- a/src/generated/resources/assets/create/models/item/crushed_aluminum_ore.json
+++ b/src/generated/resources/assets/create/models/item/crushed_raw_aluminum.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "create:item/crushed_aluminum_ore"
+    "layer0": "create:item/crushed_raw_aluminum"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/create/models/item/crushed_copper_ore.json b/src/generated/resources/assets/create/models/item/crushed_raw_copper.json
similarity index 57%
rename from src/generated/resources/assets/create/models/item/crushed_copper_ore.json
rename to src/generated/resources/assets/create/models/item/crushed_raw_copper.json
index 500b00124..e5d40a25d 100644
--- a/src/generated/resources/assets/create/models/item/crushed_copper_ore.json
+++ b/src/generated/resources/assets/create/models/item/crushed_raw_copper.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "create:item/crushed_copper_ore"
+    "layer0": "create:item/crushed_raw_copper"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/create/models/item/crushed_lead_ore.json b/src/generated/resources/assets/create/models/item/crushed_raw_gold.json
similarity index 58%
rename from src/generated/resources/assets/create/models/item/crushed_lead_ore.json
rename to src/generated/resources/assets/create/models/item/crushed_raw_gold.json
index 1c2c6911b..fe99490a1 100644
--- a/src/generated/resources/assets/create/models/item/crushed_lead_ore.json
+++ b/src/generated/resources/assets/create/models/item/crushed_raw_gold.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "create:item/crushed_lead_ore"
+    "layer0": "create:item/crushed_raw_gold"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/create/models/item/crushed_gold_ore.json b/src/generated/resources/assets/create/models/item/crushed_raw_iron.json
similarity index 58%
rename from src/generated/resources/assets/create/models/item/crushed_gold_ore.json
rename to src/generated/resources/assets/create/models/item/crushed_raw_iron.json
index dc00a3611..a8daf7cd1 100644
--- a/src/generated/resources/assets/create/models/item/crushed_gold_ore.json
+++ b/src/generated/resources/assets/create/models/item/crushed_raw_iron.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "create:item/crushed_gold_ore"
+    "layer0": "create:item/crushed_raw_iron"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/create/models/item/crushed_iron_ore.json b/src/generated/resources/assets/create/models/item/crushed_raw_lead.json
similarity index 58%
rename from src/generated/resources/assets/create/models/item/crushed_iron_ore.json
rename to src/generated/resources/assets/create/models/item/crushed_raw_lead.json
index 9ac971ece..320d9ffe2 100644
--- a/src/generated/resources/assets/create/models/item/crushed_iron_ore.json
+++ b/src/generated/resources/assets/create/models/item/crushed_raw_lead.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "create:item/crushed_iron_ore"
+    "layer0": "create:item/crushed_raw_lead"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/create/models/item/crushed_raw_nickel.json b/src/generated/resources/assets/create/models/item/crushed_raw_nickel.json
new file mode 100644
index 000000000..ef46ce734
--- /dev/null
+++ b/src/generated/resources/assets/create/models/item/crushed_raw_nickel.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "create:item/crushed_raw_nickel"
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/create/models/item/crushed_raw_osmium.json b/src/generated/resources/assets/create/models/item/crushed_raw_osmium.json
new file mode 100644
index 000000000..e763e3794
--- /dev/null
+++ b/src/generated/resources/assets/create/models/item/crushed_raw_osmium.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "create:item/crushed_raw_osmium"
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/create/models/item/crushed_raw_platinum.json b/src/generated/resources/assets/create/models/item/crushed_raw_platinum.json
new file mode 100644
index 000000000..ce40617e9
--- /dev/null
+++ b/src/generated/resources/assets/create/models/item/crushed_raw_platinum.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "create:item/crushed_raw_platinum"
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/create/models/item/crushed_raw_quicksilver.json b/src/generated/resources/assets/create/models/item/crushed_raw_quicksilver.json
new file mode 100644
index 000000000..289805476
--- /dev/null
+++ b/src/generated/resources/assets/create/models/item/crushed_raw_quicksilver.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "create:item/crushed_raw_quicksilver"
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/create/models/item/crushed_raw_silver.json b/src/generated/resources/assets/create/models/item/crushed_raw_silver.json
new file mode 100644
index 000000000..a7e28cfbc
--- /dev/null
+++ b/src/generated/resources/assets/create/models/item/crushed_raw_silver.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "create:item/crushed_raw_silver"
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/create/models/item/crushed_tin_ore.json b/src/generated/resources/assets/create/models/item/crushed_raw_tin.json
similarity index 58%
rename from src/generated/resources/assets/create/models/item/crushed_tin_ore.json
rename to src/generated/resources/assets/create/models/item/crushed_raw_tin.json
index 6e0bb6e65..de7e79455 100644
--- a/src/generated/resources/assets/create/models/item/crushed_tin_ore.json
+++ b/src/generated/resources/assets/create/models/item/crushed_raw_tin.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "create:item/crushed_tin_ore"
+    "layer0": "create:item/crushed_raw_tin"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/create/models/item/crushed_raw_uranium.json b/src/generated/resources/assets/create/models/item/crushed_raw_uranium.json
new file mode 100644
index 000000000..d1e470743
--- /dev/null
+++ b/src/generated/resources/assets/create/models/item/crushed_raw_uranium.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "create:item/crushed_raw_uranium"
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/create/models/item/crushed_raw_zinc.json b/src/generated/resources/assets/create/models/item/crushed_raw_zinc.json
new file mode 100644
index 000000000..97a98e7e6
--- /dev/null
+++ b/src/generated/resources/assets/create/models/item/crushed_raw_zinc.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "create:item/crushed_raw_zinc"
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/create/models/item/crushed_silver_ore.json b/src/generated/resources/assets/create/models/item/crushed_silver_ore.json
deleted file mode 100644
index 98054fe18..000000000
--- a/src/generated/resources/assets/create/models/item/crushed_silver_ore.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "create:item/crushed_silver_ore"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/create/models/item/crushed_uranium_ore.json b/src/generated/resources/assets/create/models/item/crushed_uranium_ore.json
deleted file mode 100644
index b377d5915..000000000
--- a/src/generated/resources/assets/create/models/item/crushed_uranium_ore.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "create:item/crushed_uranium_ore"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/create/models/item/crushed_zinc_ore.json b/src/generated/resources/assets/create/models/item/crushed_zinc_ore.json
deleted file mode 100644
index ee85115fc..000000000
--- a/src/generated/resources/assets/create/models/item/crushed_zinc_ore.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "create:item/crushed_zinc_ore"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/create/models/item/experience_block.json b/src/generated/resources/assets/create/models/item/experience_block.json
new file mode 100644
index 000000000..450f5d371
--- /dev/null
+++ b/src/generated/resources/assets/create/models/item/experience_block.json
@@ -0,0 +1,3 @@
+{
+  "parent": "create:block/experience_block"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_aluminum_compat_immersiveengineering.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_aluminum_compat_immersiveengineering.json
index 5fe37eca2..e54fe1dd4 100644
--- a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_aluminum_compat_immersiveengineering.json
+++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_aluminum_compat_immersiveengineering.json
@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_aluminum_ore"
+              "create:crushed_raw_aluminum"
             ]
           }
         ]
diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_lead_compat_immersiveengineering.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_lead_compat_immersiveengineering.json
index 62b8f453c..bae49c78d 100644
--- a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_lead_compat_immersiveengineering.json
+++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_lead_compat_immersiveengineering.json
@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_lead_ore"
+              "create:crushed_raw_lead"
             ]
           }
         ]
diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_lead_compat_mekanism.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_lead_compat_mekanism.json
index 1f48792df..6ac8d24a4 100644
--- a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_lead_compat_mekanism.json
+++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_lead_compat_mekanism.json
@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_lead_ore"
+              "create:crushed_raw_lead"
             ]
           }
         ]
diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_nickel_compat_immersiveengineering.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_nickel_compat_immersiveengineering.json
index ef424f870..c6b9420eb 100644
--- a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_nickel_compat_immersiveengineering.json
+++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_nickel_compat_immersiveengineering.json
@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_nickel_ore"
+              "create:crushed_raw_nickel"
             ]
           }
         ]
diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_osmium_compat_mekanism.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_osmium_compat_mekanism.json
index c283cd0b9..dbb8d3c58 100644
--- a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_osmium_compat_mekanism.json
+++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_osmium_compat_mekanism.json
@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_osmium_ore"
+              "create:crushed_raw_osmium"
             ]
           }
         ]
diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_silver_compat_immersiveengineering.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_silver_compat_immersiveengineering.json
index 828401ba9..b5fea367b 100644
--- a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_silver_compat_immersiveengineering.json
+++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_silver_compat_immersiveengineering.json
@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_silver_ore"
+              "create:crushed_raw_silver"
             ]
           }
         ]
diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_tin_compat_mekanism.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_tin_compat_mekanism.json
index ba97e5bcf..cea17350c 100644
--- a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_tin_compat_mekanism.json
+++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_tin_compat_mekanism.json
@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_tin_ore"
+              "create:crushed_raw_tin"
             ]
           }
         ]
diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_uranium_compat_immersiveengineering.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_uranium_compat_immersiveengineering.json
index 68dd4ebe3..fbec5ca60 100644
--- a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_uranium_compat_immersiveengineering.json
+++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_uranium_compat_immersiveengineering.json
@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_uranium_ore"
+              "create:crushed_raw_uranium"
             ]
           }
         ]
diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_uranium_compat_mekanism.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_uranium_compat_mekanism.json
index 13a55fb5e..21f2daa29 100644
--- a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_uranium_compat_mekanism.json
+++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_uranium_compat_mekanism.json
@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_uranium_ore"
+              "create:crushed_raw_uranium"
             ]
           }
         ]
diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/lead_ingot_compat_thermal.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/lead_ingot_compat_thermal.json
index 5bbb2a61e..7ca0d1fba 100644
--- a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/lead_ingot_compat_thermal.json
+++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/lead_ingot_compat_thermal.json
@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_lead_ore"
+              "create:crushed_raw_lead"
             ]
           }
         ]
diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/nickel_ingot_compat_thermal.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/nickel_ingot_compat_thermal.json
index 95abf64c0..5779d78db 100644
--- a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/nickel_ingot_compat_thermal.json
+++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/nickel_ingot_compat_thermal.json
@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_nickel_ore"
+              "create:crushed_raw_nickel"
             ]
           }
         ]
diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/silver_ingot_compat_thermal.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/silver_ingot_compat_thermal.json
index 30387da02..326062057 100644
--- a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/silver_ingot_compat_thermal.json
+++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/silver_ingot_compat_thermal.json
@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_silver_ore"
+              "create:crushed_raw_silver"
             ]
           }
         ]
diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/tin_ingot_compat_thermal.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/tin_ingot_compat_thermal.json
index bc95145ae..36028208f 100644
--- a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/tin_ingot_compat_thermal.json
+++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/tin_ingot_compat_thermal.json
@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_tin_ore"
+              "create:crushed_raw_tin"
             ]
           }
         ]
diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_aluminum_compat_immersiveengineering.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_aluminum_compat_immersiveengineering.json
index f825bd691..17e3fbf7f 100644
--- a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_aluminum_compat_immersiveengineering.json
+++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_aluminum_compat_immersiveengineering.json
@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_aluminum_ore"
+              "create:crushed_raw_aluminum"
             ]
           }
         ]
diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_lead_compat_immersiveengineering.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_lead_compat_immersiveengineering.json
index ae0ae92a4..5aee1f149 100644
--- a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_lead_compat_immersiveengineering.json
+++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_lead_compat_immersiveengineering.json
@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_lead_ore"
+              "create:crushed_raw_lead"
             ]
           }
         ]
diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_lead_compat_mekanism.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_lead_compat_mekanism.json
index 26a60a074..7c5fcfac7 100644
--- a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_lead_compat_mekanism.json
+++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_lead_compat_mekanism.json
@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_lead_ore"
+              "create:crushed_raw_lead"
             ]
           }
         ]
diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_nickel_compat_immersiveengineering.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_nickel_compat_immersiveengineering.json
index 9369b3688..436c43fda 100644
--- a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_nickel_compat_immersiveengineering.json
+++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_nickel_compat_immersiveengineering.json
@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_nickel_ore"
+              "create:crushed_raw_nickel"
             ]
           }
         ]
diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_osmium_compat_mekanism.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_osmium_compat_mekanism.json
index 9254a4838..bd9a8862b 100644
--- a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_osmium_compat_mekanism.json
+++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_osmium_compat_mekanism.json
@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_osmium_ore"
+              "create:crushed_raw_osmium"
             ]
           }
         ]
diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_silver_compat_immersiveengineering.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_silver_compat_immersiveengineering.json
index efa5e1c8d..f248b7331 100644
--- a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_silver_compat_immersiveengineering.json
+++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_silver_compat_immersiveengineering.json
@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_silver_ore"
+              "create:crushed_raw_silver"
             ]
           }
         ]
diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_tin_compat_mekanism.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_tin_compat_mekanism.json
index 58312b58a..cbd5f6309 100644
--- a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_tin_compat_mekanism.json
+++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_tin_compat_mekanism.json
@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_tin_ore"
+              "create:crushed_raw_tin"
             ]
           }
         ]
diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_uranium_compat_immersiveengineering.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_uranium_compat_immersiveengineering.json
index 54014a9ae..3322935be 100644
--- a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_uranium_compat_immersiveengineering.json
+++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_uranium_compat_immersiveengineering.json
@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_uranium_ore"
+              "create:crushed_raw_uranium"
             ]
           }
         ]
diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_uranium_compat_mekanism.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_uranium_compat_mekanism.json
index 585d06f07..67b73862a 100644
--- a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_uranium_compat_mekanism.json
+++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_uranium_compat_mekanism.json
@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_uranium_ore"
+              "create:crushed_raw_uranium"
             ]
           }
         ]
diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/lead_ingot_compat_thermal.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/lead_ingot_compat_thermal.json
index 9513518e0..7c24b32f3 100644
--- a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/lead_ingot_compat_thermal.json
+++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/lead_ingot_compat_thermal.json
@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_lead_ore"
+              "create:crushed_raw_lead"
             ]
           }
         ]
diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/nickel_ingot_compat_thermal.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/nickel_ingot_compat_thermal.json
index d3889529e..1d442d1a2 100644
--- a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/nickel_ingot_compat_thermal.json
+++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/nickel_ingot_compat_thermal.json
@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_nickel_ore"
+              "create:crushed_raw_nickel"
             ]
           }
         ]
diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/silver_ingot_compat_thermal.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/silver_ingot_compat_thermal.json
index f9b0d9d17..77ca02140 100644
--- a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/silver_ingot_compat_thermal.json
+++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/silver_ingot_compat_thermal.json
@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_silver_ore"
+              "create:crushed_raw_silver"
             ]
           }
         ]
diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/tin_ingot_compat_thermal.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/tin_ingot_compat_thermal.json
index ebbb5d3fd..cc154d1e5 100644
--- a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/tin_ingot_compat_thermal.json
+++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/tin_ingot_compat_thermal.json
@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_tin_ore"
+              "create:crushed_raw_tin"
             ]
           }
         ]
diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/blasting/zinc_ingot_from_crushed.json b/src/generated/resources/data/create/advancements/recipes/create.base/blasting/zinc_ingot_from_crushed.json
index 75e4b604d..ed984e936 100644
--- a/src/generated/resources/data/create/advancements/recipes/create.base/blasting/zinc_ingot_from_crushed.json
+++ b/src/generated/resources/data/create/advancements/recipes/create.base/blasting/zinc_ingot_from_crushed.json
@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_zinc_ore"
+              "create:crushed_raw_zinc"
             ]
           }
         ]
diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/materials/experience_nugget_from_block.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/materials/experience_nugget_from_block.json
new file mode 100644
index 000000000..cd7cdb595
--- /dev/null
+++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/materials/experience_nugget_from_block.json
@@ -0,0 +1,34 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "create:crafting/materials/experience_nugget_from_block"
+    ]
+  },
+  "criteria": {
+    "has_item": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "create:experience_nugget"
+            ]
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "create:crafting/materials/experience_nugget_from_block"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_item",
+      "has_the_recipe"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/smelting/zinc_ingot_from_crushed.json b/src/generated/resources/data/create/advancements/recipes/create.base/smelting/zinc_ingot_from_crushed.json
index 0880d87dd..568157356 100644
--- a/src/generated/resources/data/create/advancements/recipes/create.base/smelting/zinc_ingot_from_crushed.json
+++ b/src/generated/resources/data/create/advancements/recipes/create.base/smelting/zinc_ingot_from_crushed.json
@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_zinc_ore"
+              "create:crushed_raw_zinc"
             ]
           }
         ]
diff --git a/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/materials/experience_block.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/materials/experience_block.json
new file mode 100644
index 000000000..41d286ae4
--- /dev/null
+++ b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/materials/experience_block.json
@@ -0,0 +1,34 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "create:crafting/materials/experience_block"
+    ]
+  },
+  "criteria": {
+    "has_item": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "create:experience_nugget"
+            ]
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "create:crafting/materials/experience_block"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_item",
+      "has_the_recipe"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/create/advancements/recipes/misc/blasting/copper_ingot_from_crushed.json b/src/generated/resources/data/create/advancements/recipes/misc/blasting/copper_ingot_from_crushed.json
index 356dded7a..fc70776a1 100644
--- a/src/generated/resources/data/create/advancements/recipes/misc/blasting/copper_ingot_from_crushed.json
+++ b/src/generated/resources/data/create/advancements/recipes/misc/blasting/copper_ingot_from_crushed.json
@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_copper_ore"
+              "create:crushed_raw_copper"
             ]
           }
         ]
diff --git a/src/generated/resources/data/create/advancements/recipes/misc/blasting/gold_ingot_from_crushed.json b/src/generated/resources/data/create/advancements/recipes/misc/blasting/gold_ingot_from_crushed.json
index fdefe8a46..fe72e4c9e 100644
--- a/src/generated/resources/data/create/advancements/recipes/misc/blasting/gold_ingot_from_crushed.json
+++ b/src/generated/resources/data/create/advancements/recipes/misc/blasting/gold_ingot_from_crushed.json
@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_gold_ore"
+              "create:crushed_raw_gold"
             ]
           }
         ]
diff --git a/src/generated/resources/data/create/advancements/recipes/misc/blasting/iron_ingot_from_crushed.json b/src/generated/resources/data/create/advancements/recipes/misc/blasting/iron_ingot_from_crushed.json
index 084a55110..5203b2d51 100644
--- a/src/generated/resources/data/create/advancements/recipes/misc/blasting/iron_ingot_from_crushed.json
+++ b/src/generated/resources/data/create/advancements/recipes/misc/blasting/iron_ingot_from_crushed.json
@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_iron_ore"
+              "create:crushed_raw_iron"
             ]
           }
         ]
diff --git a/src/generated/resources/data/create/advancements/recipes/misc/smelting/copper_ingot_from_crushed.json b/src/generated/resources/data/create/advancements/recipes/misc/smelting/copper_ingot_from_crushed.json
index 9590f4d98..23289d726 100644
--- a/src/generated/resources/data/create/advancements/recipes/misc/smelting/copper_ingot_from_crushed.json
+++ b/src/generated/resources/data/create/advancements/recipes/misc/smelting/copper_ingot_from_crushed.json
@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_copper_ore"
+              "create:crushed_raw_copper"
             ]
           }
         ]
diff --git a/src/generated/resources/data/create/advancements/recipes/misc/smelting/gold_ingot_from_crushed.json b/src/generated/resources/data/create/advancements/recipes/misc/smelting/gold_ingot_from_crushed.json
index 528df67cc..6540e69b3 100644
--- a/src/generated/resources/data/create/advancements/recipes/misc/smelting/gold_ingot_from_crushed.json
+++ b/src/generated/resources/data/create/advancements/recipes/misc/smelting/gold_ingot_from_crushed.json
@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_gold_ore"
+              "create:crushed_raw_gold"
             ]
           }
         ]
diff --git a/src/generated/resources/data/create/advancements/recipes/misc/smelting/iron_ingot_from_crushed.json b/src/generated/resources/data/create/advancements/recipes/misc/smelting/iron_ingot_from_crushed.json
index c5c7ac2d5..63ed3feb2 100644
--- a/src/generated/resources/data/create/advancements/recipes/misc/smelting/iron_ingot_from_crushed.json
+++ b/src/generated/resources/data/create/advancements/recipes/misc/smelting/iron_ingot_from_crushed.json
@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:crushed_iron_ore"
+              "create:crushed_raw_iron"
             ]
           }
         ]
diff --git a/src/generated/resources/data/create/loot_tables/blocks/experience_block.json b/src/generated/resources/data/create/loot_tables/blocks/experience_block.json
new file mode 100644
index 000000000..4460120de
--- /dev/null
+++ b/src/generated/resources/data/create/loot_tables/blocks/experience_block.json
@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "create:experience_block"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/create/recipes/blasting/copper_ingot_from_crushed.json b/src/generated/resources/data/create/recipes/blasting/copper_ingot_from_crushed.json
index 48412c4d5..5ff10b298 100644
--- a/src/generated/resources/data/create/recipes/blasting/copper_ingot_from_crushed.json
+++ b/src/generated/resources/data/create/recipes/blasting/copper_ingot_from_crushed.json
@@ -3,7 +3,7 @@
   "cookingtime": 100,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_copper_ore"
+    "item": "create:crushed_raw_copper"
   },
   "result": "minecraft:copper_ingot"
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/create/recipes/blasting/gold_ingot_from_crushed.json b/src/generated/resources/data/create/recipes/blasting/gold_ingot_from_crushed.json
index 31c13857f..06db0b157 100644
--- a/src/generated/resources/data/create/recipes/blasting/gold_ingot_from_crushed.json
+++ b/src/generated/resources/data/create/recipes/blasting/gold_ingot_from_crushed.json
@@ -3,7 +3,7 @@
   "cookingtime": 100,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_gold_ore"
+    "item": "create:crushed_raw_gold"
   },
   "result": "minecraft:gold_ingot"
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/create/recipes/blasting/ingot_aluminum_compat_immersiveengineering.json b/src/generated/resources/data/create/recipes/blasting/ingot_aluminum_compat_immersiveengineering.json
index 55ba71441..ef14b31fe 100644
--- a/src/generated/resources/data/create/recipes/blasting/ingot_aluminum_compat_immersiveengineering.json
+++ b/src/generated/resources/data/create/recipes/blasting/ingot_aluminum_compat_immersiveengineering.json
@@ -9,7 +9,7 @@
   "cookingtime": 100,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_aluminum_ore"
+    "item": "create:crushed_raw_aluminum"
   },
   "result": "immersiveengineering:ingot_aluminum"
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/create/recipes/blasting/ingot_lead_compat_immersiveengineering.json b/src/generated/resources/data/create/recipes/blasting/ingot_lead_compat_immersiveengineering.json
index fa12f4bed..4acac6290 100644
--- a/src/generated/resources/data/create/recipes/blasting/ingot_lead_compat_immersiveengineering.json
+++ b/src/generated/resources/data/create/recipes/blasting/ingot_lead_compat_immersiveengineering.json
@@ -9,7 +9,7 @@
   "cookingtime": 100,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_lead_ore"
+    "item": "create:crushed_raw_lead"
   },
   "result": "immersiveengineering:ingot_lead"
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/create/recipes/blasting/ingot_lead_compat_mekanism.json b/src/generated/resources/data/create/recipes/blasting/ingot_lead_compat_mekanism.json
index 3f06f6c54..c02c736f5 100644
--- a/src/generated/resources/data/create/recipes/blasting/ingot_lead_compat_mekanism.json
+++ b/src/generated/resources/data/create/recipes/blasting/ingot_lead_compat_mekanism.json
@@ -9,7 +9,7 @@
   "cookingtime": 100,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_lead_ore"
+    "item": "create:crushed_raw_lead"
   },
   "result": "mekanism:ingot_lead"
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/create/recipes/blasting/ingot_nickel_compat_immersiveengineering.json b/src/generated/resources/data/create/recipes/blasting/ingot_nickel_compat_immersiveengineering.json
index 4ca8dbdf2..69e8c7b98 100644
--- a/src/generated/resources/data/create/recipes/blasting/ingot_nickel_compat_immersiveengineering.json
+++ b/src/generated/resources/data/create/recipes/blasting/ingot_nickel_compat_immersiveengineering.json
@@ -9,7 +9,7 @@
   "cookingtime": 100,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_nickel_ore"
+    "item": "create:crushed_raw_nickel"
   },
   "result": "immersiveengineering:ingot_nickel"
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/create/recipes/blasting/ingot_osmium_compat_mekanism.json b/src/generated/resources/data/create/recipes/blasting/ingot_osmium_compat_mekanism.json
index aab62709a..32d518115 100644
--- a/src/generated/resources/data/create/recipes/blasting/ingot_osmium_compat_mekanism.json
+++ b/src/generated/resources/data/create/recipes/blasting/ingot_osmium_compat_mekanism.json
@@ -9,7 +9,7 @@
   "cookingtime": 100,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_osmium_ore"
+    "item": "create:crushed_raw_osmium"
   },
   "result": "mekanism:ingot_osmium"
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/create/recipes/blasting/ingot_silver_compat_immersiveengineering.json b/src/generated/resources/data/create/recipes/blasting/ingot_silver_compat_immersiveengineering.json
index 2f55fe717..a0d5bc392 100644
--- a/src/generated/resources/data/create/recipes/blasting/ingot_silver_compat_immersiveengineering.json
+++ b/src/generated/resources/data/create/recipes/blasting/ingot_silver_compat_immersiveengineering.json
@@ -9,7 +9,7 @@
   "cookingtime": 100,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_silver_ore"
+    "item": "create:crushed_raw_silver"
   },
   "result": "immersiveengineering:ingot_silver"
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/create/recipes/blasting/ingot_tin_compat_mekanism.json b/src/generated/resources/data/create/recipes/blasting/ingot_tin_compat_mekanism.json
index a8498adee..d8ae347e6 100644
--- a/src/generated/resources/data/create/recipes/blasting/ingot_tin_compat_mekanism.json
+++ b/src/generated/resources/data/create/recipes/blasting/ingot_tin_compat_mekanism.json
@@ -9,7 +9,7 @@
   "cookingtime": 100,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_tin_ore"
+    "item": "create:crushed_raw_tin"
   },
   "result": "mekanism:ingot_tin"
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/create/recipes/blasting/ingot_uranium_compat_immersiveengineering.json b/src/generated/resources/data/create/recipes/blasting/ingot_uranium_compat_immersiveengineering.json
index 6479e6740..ac0be044e 100644
--- a/src/generated/resources/data/create/recipes/blasting/ingot_uranium_compat_immersiveengineering.json
+++ b/src/generated/resources/data/create/recipes/blasting/ingot_uranium_compat_immersiveengineering.json
@@ -9,7 +9,7 @@
   "cookingtime": 100,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_uranium_ore"
+    "item": "create:crushed_raw_uranium"
   },
   "result": "immersiveengineering:ingot_uranium"
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/create/recipes/blasting/ingot_uranium_compat_mekanism.json b/src/generated/resources/data/create/recipes/blasting/ingot_uranium_compat_mekanism.json
index e1e27c823..271fee615 100644
--- a/src/generated/resources/data/create/recipes/blasting/ingot_uranium_compat_mekanism.json
+++ b/src/generated/resources/data/create/recipes/blasting/ingot_uranium_compat_mekanism.json
@@ -9,7 +9,7 @@
   "cookingtime": 100,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_uranium_ore"
+    "item": "create:crushed_raw_uranium"
   },
   "result": "mekanism:ingot_uranium"
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/create/recipes/blasting/iron_ingot_from_crushed.json b/src/generated/resources/data/create/recipes/blasting/iron_ingot_from_crushed.json
index 41d59b8fb..a35132239 100644
--- a/src/generated/resources/data/create/recipes/blasting/iron_ingot_from_crushed.json
+++ b/src/generated/resources/data/create/recipes/blasting/iron_ingot_from_crushed.json
@@ -3,7 +3,7 @@
   "cookingtime": 100,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_iron_ore"
+    "item": "create:crushed_raw_iron"
   },
   "result": "minecraft:iron_ingot"
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/create/recipes/blasting/lead_ingot_compat_thermal.json b/src/generated/resources/data/create/recipes/blasting/lead_ingot_compat_thermal.json
index 55d97793b..848d620dd 100644
--- a/src/generated/resources/data/create/recipes/blasting/lead_ingot_compat_thermal.json
+++ b/src/generated/resources/data/create/recipes/blasting/lead_ingot_compat_thermal.json
@@ -9,7 +9,7 @@
   "cookingtime": 100,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_lead_ore"
+    "item": "create:crushed_raw_lead"
   },
   "result": "thermal:lead_ingot"
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/create/recipes/blasting/nickel_ingot_compat_thermal.json b/src/generated/resources/data/create/recipes/blasting/nickel_ingot_compat_thermal.json
index b6c9f5e5d..a0b24c262 100644
--- a/src/generated/resources/data/create/recipes/blasting/nickel_ingot_compat_thermal.json
+++ b/src/generated/resources/data/create/recipes/blasting/nickel_ingot_compat_thermal.json
@@ -9,7 +9,7 @@
   "cookingtime": 100,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_nickel_ore"
+    "item": "create:crushed_raw_nickel"
   },
   "result": "thermal:nickel_ingot"
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/create/recipes/blasting/silver_ingot_compat_thermal.json b/src/generated/resources/data/create/recipes/blasting/silver_ingot_compat_thermal.json
index 7edd0fb1d..00fa90569 100644
--- a/src/generated/resources/data/create/recipes/blasting/silver_ingot_compat_thermal.json
+++ b/src/generated/resources/data/create/recipes/blasting/silver_ingot_compat_thermal.json
@@ -9,7 +9,7 @@
   "cookingtime": 100,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_silver_ore"
+    "item": "create:crushed_raw_silver"
   },
   "result": "thermal:silver_ingot"
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/create/recipes/blasting/tin_ingot_compat_thermal.json b/src/generated/resources/data/create/recipes/blasting/tin_ingot_compat_thermal.json
index 06be71f22..47cbf95f2 100644
--- a/src/generated/resources/data/create/recipes/blasting/tin_ingot_compat_thermal.json
+++ b/src/generated/resources/data/create/recipes/blasting/tin_ingot_compat_thermal.json
@@ -9,7 +9,7 @@
   "cookingtime": 100,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_tin_ore"
+    "item": "create:crushed_raw_tin"
   },
   "result": "thermal:tin_ingot"
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/create/recipes/blasting/zinc_ingot_from_crushed.json b/src/generated/resources/data/create/recipes/blasting/zinc_ingot_from_crushed.json
index a7afb30cb..c63560c9f 100644
--- a/src/generated/resources/data/create/recipes/blasting/zinc_ingot_from_crushed.json
+++ b/src/generated/resources/data/create/recipes/blasting/zinc_ingot_from_crushed.json
@@ -3,7 +3,7 @@
   "cookingtime": 100,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_zinc_ore"
+    "item": "create:crushed_raw_zinc"
   },
   "result": "create:zinc_ingot"
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/create/recipes/crafting/materials/experience_block.json b/src/generated/resources/data/create/recipes/crafting/materials/experience_block.json
new file mode 100644
index 000000000..be3191b6d
--- /dev/null
+++ b/src/generated/resources/data/create/recipes/crafting/materials/experience_block.json
@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "CCC",
+    "CCC",
+    "CCC"
+  ],
+  "key": {
+    "C": {
+      "item": "create:experience_nugget"
+    }
+  },
+  "result": {
+    "item": "create:experience_block"
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/create/recipes/crafting/materials/experience_nugget_from_block.json b/src/generated/resources/data/create/recipes/crafting/materials/experience_nugget_from_block.json
new file mode 100644
index 000000000..adc3f4b57
--- /dev/null
+++ b/src/generated/resources/data/create/recipes/crafting/materials/experience_nugget_from_block.json
@@ -0,0 +1,12 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "ingredients": [
+    {
+      "item": "create:experience_block"
+    }
+  ],
+  "result": {
+    "item": "create:experience_nugget",
+    "count": 9
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/create/recipes/crushing/aluminum_ore.json b/src/generated/resources/data/create/recipes/crushing/aluminum_ore.json
index 813f3744a..143c9a043 100644
--- a/src/generated/resources/data/create/recipes/crushing/aluminum_ore.json
+++ b/src/generated/resources/data/create/recipes/crushing/aluminum_ore.json
@@ -17,11 +17,11 @@
   "processingTime": 400,
   "results": [
     {
-      "item": "create:crushed_aluminum_ore"
+      "item": "create:crushed_raw_aluminum"
     },
     {
       "chance": 0.75,
-      "item": "create:crushed_aluminum_ore"
+      "item": "create:crushed_raw_aluminum"
     },
     {
       "chance": 0.75,
diff --git a/src/generated/resources/data/create/recipes/crushing/asurine.json b/src/generated/resources/data/create/recipes/crushing/asurine.json
index c25ab2297..91f334678 100644
--- a/src/generated/resources/data/create/recipes/crushing/asurine.json
+++ b/src/generated/resources/data/create/recipes/crushing/asurine.json
@@ -9,7 +9,7 @@
   "results": [
     {
       "chance": 0.3,
-      "item": "create:crushed_zinc_ore"
+      "item": "create:crushed_raw_zinc"
     },
     {
       "chance": 0.3,
diff --git a/src/generated/resources/data/create/recipes/crushing/asurine_recycling.json b/src/generated/resources/data/create/recipes/crushing/asurine_recycling.json
index 588f84c71..bbedfed29 100644
--- a/src/generated/resources/data/create/recipes/crushing/asurine_recycling.json
+++ b/src/generated/resources/data/create/recipes/crushing/asurine_recycling.json
@@ -9,7 +9,7 @@
   "results": [
     {
       "chance": 0.3,
-      "item": "create:crushed_zinc_ore"
+      "item": "create:crushed_raw_zinc"
     },
     {
       "chance": 0.3,
diff --git a/src/generated/resources/data/create/recipes/crushing/copper_ore.json b/src/generated/resources/data/create/recipes/crushing/copper_ore.json
index 9e06a17eb..2a35feaf8 100644
--- a/src/generated/resources/data/create/recipes/crushing/copper_ore.json
+++ b/src/generated/resources/data/create/recipes/crushing/copper_ore.json
@@ -9,11 +9,11 @@
   "results": [
     {
       "count": 5,
-      "item": "create:crushed_copper_ore"
+      "item": "create:crushed_raw_copper"
     },
     {
       "chance": 0.25,
-      "item": "create:crushed_copper_ore"
+      "item": "create:crushed_raw_copper"
     },
     {
       "chance": 0.75,
diff --git a/src/generated/resources/data/create/recipes/crushing/crimsite.json b/src/generated/resources/data/create/recipes/crushing/crimsite.json
index 63d5a0a2d..f725dd6b9 100644
--- a/src/generated/resources/data/create/recipes/crushing/crimsite.json
+++ b/src/generated/resources/data/create/recipes/crushing/crimsite.json
@@ -9,7 +9,7 @@
   "results": [
     {
       "chance": 0.4,
-      "item": "create:crushed_iron_ore"
+      "item": "create:crushed_raw_iron"
     },
     {
       "chance": 0.4,
diff --git a/src/generated/resources/data/create/recipes/crushing/crimsite_recycling.json b/src/generated/resources/data/create/recipes/crushing/crimsite_recycling.json
index 6d61990bd..78c3dc6e5 100644
--- a/src/generated/resources/data/create/recipes/crushing/crimsite_recycling.json
+++ b/src/generated/resources/data/create/recipes/crushing/crimsite_recycling.json
@@ -9,7 +9,7 @@
   "results": [
     {
       "chance": 0.4,
-      "item": "create:crushed_iron_ore"
+      "item": "create:crushed_raw_iron"
     },
     {
       "chance": 0.4,
diff --git a/src/generated/resources/data/create/recipes/crushing/deepslate_copper_ore.json b/src/generated/resources/data/create/recipes/crushing/deepslate_copper_ore.json
index 0b4dbfdb1..3bad3d985 100644
--- a/src/generated/resources/data/create/recipes/crushing/deepslate_copper_ore.json
+++ b/src/generated/resources/data/create/recipes/crushing/deepslate_copper_ore.json
@@ -9,11 +9,11 @@
   "results": [
     {
       "count": 7,
-      "item": "create:crushed_copper_ore"
+      "item": "create:crushed_raw_copper"
     },
     {
       "chance": 0.25,
-      "item": "create:crushed_copper_ore"
+      "item": "create:crushed_raw_copper"
     },
     {
       "chance": 0.75,
diff --git a/src/generated/resources/data/create/recipes/crushing/deepslate_gold_ore.json b/src/generated/resources/data/create/recipes/crushing/deepslate_gold_ore.json
index bf38fd5cb..1467bbbaf 100644
--- a/src/generated/resources/data/create/recipes/crushing/deepslate_gold_ore.json
+++ b/src/generated/resources/data/create/recipes/crushing/deepslate_gold_ore.json
@@ -9,11 +9,11 @@
   "results": [
     {
       "count": 2,
-      "item": "create:crushed_gold_ore"
+      "item": "create:crushed_raw_gold"
     },
     {
       "chance": 0.25,
-      "item": "create:crushed_gold_ore"
+      "item": "create:crushed_raw_gold"
     },
     {
       "chance": 0.75,
diff --git a/src/generated/resources/data/create/recipes/crushing/deepslate_iron_ore.json b/src/generated/resources/data/create/recipes/crushing/deepslate_iron_ore.json
index 7dc20a450..a12e491c1 100644
--- a/src/generated/resources/data/create/recipes/crushing/deepslate_iron_ore.json
+++ b/src/generated/resources/data/create/recipes/crushing/deepslate_iron_ore.json
@@ -9,11 +9,11 @@
   "results": [
     {
       "count": 2,
-      "item": "create:crushed_iron_ore"
+      "item": "create:crushed_raw_iron"
     },
     {
       "chance": 0.25,
-      "item": "create:crushed_iron_ore"
+      "item": "create:crushed_raw_iron"
     },
     {
       "chance": 0.75,
diff --git a/src/generated/resources/data/create/recipes/crushing/deepslate_zinc_ore.json b/src/generated/resources/data/create/recipes/crushing/deepslate_zinc_ore.json
index 75673fadc..450c786fe 100644
--- a/src/generated/resources/data/create/recipes/crushing/deepslate_zinc_ore.json
+++ b/src/generated/resources/data/create/recipes/crushing/deepslate_zinc_ore.json
@@ -9,11 +9,11 @@
   "results": [
     {
       "count": 2,
-      "item": "create:crushed_zinc_ore"
+      "item": "create:crushed_raw_zinc"
     },
     {
       "chance": 0.25,
-      "item": "create:crushed_zinc_ore"
+      "item": "create:crushed_raw_zinc"
     },
     {
       "chance": 0.75,
diff --git a/src/generated/resources/data/create/recipes/crushing/gold_ore.json b/src/generated/resources/data/create/recipes/crushing/gold_ore.json
index c22a68015..b5e49e36d 100644
--- a/src/generated/resources/data/create/recipes/crushing/gold_ore.json
+++ b/src/generated/resources/data/create/recipes/crushing/gold_ore.json
@@ -8,11 +8,11 @@
   "processingTime": 250,
   "results": [
     {
-      "item": "create:crushed_gold_ore"
+      "item": "create:crushed_raw_gold"
     },
     {
       "chance": 0.75,
-      "item": "create:crushed_gold_ore"
+      "item": "create:crushed_raw_gold"
     },
     {
       "chance": 0.75,
diff --git a/src/generated/resources/data/create/recipes/crushing/iron_ore.json b/src/generated/resources/data/create/recipes/crushing/iron_ore.json
index 25411ca07..4b08b4274 100644
--- a/src/generated/resources/data/create/recipes/crushing/iron_ore.json
+++ b/src/generated/resources/data/create/recipes/crushing/iron_ore.json
@@ -8,11 +8,11 @@
   "processingTime": 250,
   "results": [
     {
-      "item": "create:crushed_iron_ore"
+      "item": "create:crushed_raw_iron"
     },
     {
       "chance": 0.75,
-      "item": "create:crushed_iron_ore"
+      "item": "create:crushed_raw_iron"
     },
     {
       "chance": 0.75,
diff --git a/src/generated/resources/data/create/recipes/crushing/lead_ore.json b/src/generated/resources/data/create/recipes/crushing/lead_ore.json
index d431e754a..4f9d82ec5 100644
--- a/src/generated/resources/data/create/recipes/crushing/lead_ore.json
+++ b/src/generated/resources/data/create/recipes/crushing/lead_ore.json
@@ -17,11 +17,11 @@
   "processingTime": 400,
   "results": [
     {
-      "item": "create:crushed_lead_ore"
+      "item": "create:crushed_raw_lead"
     },
     {
       "chance": 0.75,
-      "item": "create:crushed_lead_ore"
+      "item": "create:crushed_raw_lead"
     },
     {
       "chance": 0.75,
diff --git a/src/generated/resources/data/create/recipes/crushing/nickel_ore.json b/src/generated/resources/data/create/recipes/crushing/nickel_ore.json
index cd85d2c1a..f815ec8a6 100644
--- a/src/generated/resources/data/create/recipes/crushing/nickel_ore.json
+++ b/src/generated/resources/data/create/recipes/crushing/nickel_ore.json
@@ -17,11 +17,11 @@
   "processingTime": 400,
   "results": [
     {
-      "item": "create:crushed_nickel_ore"
+      "item": "create:crushed_raw_nickel"
     },
     {
       "chance": 0.75,
-      "item": "create:crushed_nickel_ore"
+      "item": "create:crushed_raw_nickel"
     },
     {
       "chance": 0.75,
diff --git a/src/generated/resources/data/create/recipes/crushing/ochrum.json b/src/generated/resources/data/create/recipes/crushing/ochrum.json
index 738f1eb2e..00832373e 100644
--- a/src/generated/resources/data/create/recipes/crushing/ochrum.json
+++ b/src/generated/resources/data/create/recipes/crushing/ochrum.json
@@ -9,7 +9,7 @@
   "results": [
     {
       "chance": 0.2,
-      "item": "create:crushed_gold_ore"
+      "item": "create:crushed_raw_gold"
     },
     {
       "chance": 0.2,
diff --git a/src/generated/resources/data/create/recipes/crushing/ochrum_recycling.json b/src/generated/resources/data/create/recipes/crushing/ochrum_recycling.json
index 95510608b..283c2a889 100644
--- a/src/generated/resources/data/create/recipes/crushing/ochrum_recycling.json
+++ b/src/generated/resources/data/create/recipes/crushing/ochrum_recycling.json
@@ -9,7 +9,7 @@
   "results": [
     {
       "chance": 0.2,
-      "item": "create:crushed_gold_ore"
+      "item": "create:crushed_raw_gold"
     },
     {
       "chance": 0.2,
diff --git a/src/generated/resources/data/create/recipes/crushing/osmium_ore.json b/src/generated/resources/data/create/recipes/crushing/osmium_ore.json
index 6cba4b5d4..afc4aa5f1 100644
--- a/src/generated/resources/data/create/recipes/crushing/osmium_ore.json
+++ b/src/generated/resources/data/create/recipes/crushing/osmium_ore.json
@@ -17,11 +17,11 @@
   "processingTime": 400,
   "results": [
     {
-      "item": "create:crushed_osmium_ore"
+      "item": "create:crushed_raw_osmium"
     },
     {
       "chance": 0.75,
-      "item": "create:crushed_osmium_ore"
+      "item": "create:crushed_raw_osmium"
     },
     {
       "chance": 0.75,
diff --git a/src/generated/resources/data/create/recipes/crushing/platinum_ore.json b/src/generated/resources/data/create/recipes/crushing/platinum_ore.json
index bf126bce5..ad92ae87b 100644
--- a/src/generated/resources/data/create/recipes/crushing/platinum_ore.json
+++ b/src/generated/resources/data/create/recipes/crushing/platinum_ore.json
@@ -17,11 +17,11 @@
   "processingTime": 400,
   "results": [
     {
-      "item": "create:crushed_platinum_ore"
+      "item": "create:crushed_raw_platinum"
     },
     {
       "chance": 0.75,
-      "item": "create:crushed_platinum_ore"
+      "item": "create:crushed_raw_platinum"
     },
     {
       "chance": 0.75,
diff --git a/src/generated/resources/data/create/recipes/crushing/quicksilver_ore.json b/src/generated/resources/data/create/recipes/crushing/quicksilver_ore.json
index 9dc640550..4e60a1478 100644
--- a/src/generated/resources/data/create/recipes/crushing/quicksilver_ore.json
+++ b/src/generated/resources/data/create/recipes/crushing/quicksilver_ore.json
@@ -17,11 +17,11 @@
   "processingTime": 400,
   "results": [
     {
-      "item": "create:crushed_quicksilver_ore"
+      "item": "create:crushed_raw_quicksilver"
     },
     {
       "chance": 0.75,
-      "item": "create:crushed_quicksilver_ore"
+      "item": "create:crushed_raw_quicksilver"
     },
     {
       "chance": 0.75,
diff --git a/src/generated/resources/data/create/recipes/crushing/raw_aluminum_block.json b/src/generated/resources/data/create/recipes/crushing/raw_aluminum_block.json
index 10e11e3de..29c7765d3 100644
--- a/src/generated/resources/data/create/recipes/crushing/raw_aluminum_block.json
+++ b/src/generated/resources/data/create/recipes/crushing/raw_aluminum_block.json
@@ -18,7 +18,7 @@
   "results": [
     {
       "count": 9,
-      "item": "create:crushed_aluminum_ore"
+      "item": "create:crushed_raw_aluminum"
     },
     {
       "chance": 0.75,
diff --git a/src/generated/resources/data/create/recipes/crushing/raw_aluminum_ore.json b/src/generated/resources/data/create/recipes/crushing/raw_aluminum_ore.json
index cb20a6dfe..0dce77235 100644
--- a/src/generated/resources/data/create/recipes/crushing/raw_aluminum_ore.json
+++ b/src/generated/resources/data/create/recipes/crushing/raw_aluminum_ore.json
@@ -17,7 +17,7 @@
   "processingTime": 400,
   "results": [
     {
-      "item": "create:crushed_aluminum_ore"
+      "item": "create:crushed_raw_aluminum"
     },
     {
       "chance": 0.75,
diff --git a/src/generated/resources/data/create/recipes/crushing/raw_copper.json b/src/generated/resources/data/create/recipes/crushing/raw_copper.json
index 4a7f00571..60dd3d6fc 100644
--- a/src/generated/resources/data/create/recipes/crushing/raw_copper.json
+++ b/src/generated/resources/data/create/recipes/crushing/raw_copper.json
@@ -8,7 +8,7 @@
   "processingTime": 400,
   "results": [
     {
-      "item": "create:crushed_copper_ore"
+      "item": "create:crushed_raw_copper"
     },
     {
       "chance": 0.75,
diff --git a/src/generated/resources/data/create/recipes/crushing/raw_copper_block.json b/src/generated/resources/data/create/recipes/crushing/raw_copper_block.json
index a1f4260cd..426699923 100644
--- a/src/generated/resources/data/create/recipes/crushing/raw_copper_block.json
+++ b/src/generated/resources/data/create/recipes/crushing/raw_copper_block.json
@@ -9,7 +9,7 @@
   "results": [
     {
       "count": 9,
-      "item": "create:crushed_copper_ore"
+      "item": "create:crushed_raw_copper"
     },
     {
       "chance": 0.75,
diff --git a/src/generated/resources/data/create/recipes/crushing/raw_gold.json b/src/generated/resources/data/create/recipes/crushing/raw_gold.json
index 689edc713..3ba415681 100644
--- a/src/generated/resources/data/create/recipes/crushing/raw_gold.json
+++ b/src/generated/resources/data/create/recipes/crushing/raw_gold.json
@@ -8,7 +8,7 @@
   "processingTime": 400,
   "results": [
     {
-      "item": "create:crushed_gold_ore"
+      "item": "create:crushed_raw_gold"
     },
     {
       "chance": 0.75,
diff --git a/src/generated/resources/data/create/recipes/crushing/raw_gold_block.json b/src/generated/resources/data/create/recipes/crushing/raw_gold_block.json
index b2b77be6e..bcb1e19c6 100644
--- a/src/generated/resources/data/create/recipes/crushing/raw_gold_block.json
+++ b/src/generated/resources/data/create/recipes/crushing/raw_gold_block.json
@@ -9,7 +9,7 @@
   "results": [
     {
       "count": 9,
-      "item": "create:crushed_gold_ore"
+      "item": "create:crushed_raw_gold"
     },
     {
       "chance": 0.75,
diff --git a/src/generated/resources/data/create/recipes/crushing/raw_iron.json b/src/generated/resources/data/create/recipes/crushing/raw_iron.json
index 1e595a8f9..5177512a7 100644
--- a/src/generated/resources/data/create/recipes/crushing/raw_iron.json
+++ b/src/generated/resources/data/create/recipes/crushing/raw_iron.json
@@ -8,7 +8,7 @@
   "processingTime": 400,
   "results": [
     {
-      "item": "create:crushed_iron_ore"
+      "item": "create:crushed_raw_iron"
     },
     {
       "chance": 0.75,
diff --git a/src/generated/resources/data/create/recipes/crushing/raw_iron_block.json b/src/generated/resources/data/create/recipes/crushing/raw_iron_block.json
index 805f85b54..7a3299a0b 100644
--- a/src/generated/resources/data/create/recipes/crushing/raw_iron_block.json
+++ b/src/generated/resources/data/create/recipes/crushing/raw_iron_block.json
@@ -9,7 +9,7 @@
   "results": [
     {
       "count": 9,
-      "item": "create:crushed_iron_ore"
+      "item": "create:crushed_raw_iron"
     },
     {
       "chance": 0.75,
diff --git a/src/generated/resources/data/create/recipes/crushing/raw_lead_block.json b/src/generated/resources/data/create/recipes/crushing/raw_lead_block.json
index 99f7eb9bf..b099468b5 100644
--- a/src/generated/resources/data/create/recipes/crushing/raw_lead_block.json
+++ b/src/generated/resources/data/create/recipes/crushing/raw_lead_block.json
@@ -18,7 +18,7 @@
   "results": [
     {
       "count": 9,
-      "item": "create:crushed_lead_ore"
+      "item": "create:crushed_raw_lead"
     },
     {
       "chance": 0.75,
diff --git a/src/generated/resources/data/create/recipes/crushing/raw_lead_ore.json b/src/generated/resources/data/create/recipes/crushing/raw_lead_ore.json
index a12b4b479..30f9986b5 100644
--- a/src/generated/resources/data/create/recipes/crushing/raw_lead_ore.json
+++ b/src/generated/resources/data/create/recipes/crushing/raw_lead_ore.json
@@ -17,7 +17,7 @@
   "processingTime": 400,
   "results": [
     {
-      "item": "create:crushed_lead_ore"
+      "item": "create:crushed_raw_lead"
     },
     {
       "chance": 0.75,
diff --git a/src/generated/resources/data/create/recipes/crushing/raw_nickel_block.json b/src/generated/resources/data/create/recipes/crushing/raw_nickel_block.json
index f1b8cd54e..185a91e98 100644
--- a/src/generated/resources/data/create/recipes/crushing/raw_nickel_block.json
+++ b/src/generated/resources/data/create/recipes/crushing/raw_nickel_block.json
@@ -18,7 +18,7 @@
   "results": [
     {
       "count": 9,
-      "item": "create:crushed_nickel_ore"
+      "item": "create:crushed_raw_nickel"
     },
     {
       "chance": 0.75,
diff --git a/src/generated/resources/data/create/recipes/crushing/raw_nickel_ore.json b/src/generated/resources/data/create/recipes/crushing/raw_nickel_ore.json
index 6eac61ef9..103784704 100644
--- a/src/generated/resources/data/create/recipes/crushing/raw_nickel_ore.json
+++ b/src/generated/resources/data/create/recipes/crushing/raw_nickel_ore.json
@@ -17,7 +17,7 @@
   "processingTime": 400,
   "results": [
     {
-      "item": "create:crushed_nickel_ore"
+      "item": "create:crushed_raw_nickel"
     },
     {
       "chance": 0.75,
diff --git a/src/generated/resources/data/create/recipes/crushing/raw_osmium_block.json b/src/generated/resources/data/create/recipes/crushing/raw_osmium_block.json
index 15e2645ef..a816c41bd 100644
--- a/src/generated/resources/data/create/recipes/crushing/raw_osmium_block.json
+++ b/src/generated/resources/data/create/recipes/crushing/raw_osmium_block.json
@@ -18,7 +18,7 @@
   "results": [
     {
       "count": 9,
-      "item": "create:crushed_osmium_ore"
+      "item": "create:crushed_raw_osmium"
     },
     {
       "chance": 0.75,
diff --git a/src/generated/resources/data/create/recipes/crushing/raw_osmium_ore.json b/src/generated/resources/data/create/recipes/crushing/raw_osmium_ore.json
index 898c3a843..5a40dbc1a 100644
--- a/src/generated/resources/data/create/recipes/crushing/raw_osmium_ore.json
+++ b/src/generated/resources/data/create/recipes/crushing/raw_osmium_ore.json
@@ -17,7 +17,7 @@
   "processingTime": 400,
   "results": [
     {
-      "item": "create:crushed_osmium_ore"
+      "item": "create:crushed_raw_osmium"
     },
     {
       "chance": 0.75,
diff --git a/src/generated/resources/data/create/recipes/crushing/raw_platinum_block.json b/src/generated/resources/data/create/recipes/crushing/raw_platinum_block.json
index c0c56177b..916a9f904 100644
--- a/src/generated/resources/data/create/recipes/crushing/raw_platinum_block.json
+++ b/src/generated/resources/data/create/recipes/crushing/raw_platinum_block.json
@@ -18,7 +18,7 @@
   "results": [
     {
       "count": 9,
-      "item": "create:crushed_platinum_ore"
+      "item": "create:crushed_raw_platinum"
     },
     {
       "chance": 0.75,
diff --git a/src/generated/resources/data/create/recipes/crushing/raw_platinum_ore.json b/src/generated/resources/data/create/recipes/crushing/raw_platinum_ore.json
index da99df7cf..f3f12a188 100644
--- a/src/generated/resources/data/create/recipes/crushing/raw_platinum_ore.json
+++ b/src/generated/resources/data/create/recipes/crushing/raw_platinum_ore.json
@@ -17,7 +17,7 @@
   "processingTime": 400,
   "results": [
     {
-      "item": "create:crushed_platinum_ore"
+      "item": "create:crushed_raw_platinum"
     },
     {
       "chance": 0.75,
diff --git a/src/generated/resources/data/create/recipes/crushing/raw_quicksilver_block.json b/src/generated/resources/data/create/recipes/crushing/raw_quicksilver_block.json
index f51cf1165..b674f5dfa 100644
--- a/src/generated/resources/data/create/recipes/crushing/raw_quicksilver_block.json
+++ b/src/generated/resources/data/create/recipes/crushing/raw_quicksilver_block.json
@@ -18,7 +18,7 @@
   "results": [
     {
       "count": 9,
-      "item": "create:crushed_quicksilver_ore"
+      "item": "create:crushed_raw_quicksilver"
     },
     {
       "chance": 0.75,
diff --git a/src/generated/resources/data/create/recipes/crushing/raw_quicksilver_ore.json b/src/generated/resources/data/create/recipes/crushing/raw_quicksilver_ore.json
index 818ca0dd6..2828b5ce1 100644
--- a/src/generated/resources/data/create/recipes/crushing/raw_quicksilver_ore.json
+++ b/src/generated/resources/data/create/recipes/crushing/raw_quicksilver_ore.json
@@ -17,7 +17,7 @@
   "processingTime": 400,
   "results": [
     {
-      "item": "create:crushed_quicksilver_ore"
+      "item": "create:crushed_raw_quicksilver"
     },
     {
       "chance": 0.75,
diff --git a/src/generated/resources/data/create/recipes/crushing/raw_silver_block.json b/src/generated/resources/data/create/recipes/crushing/raw_silver_block.json
index 224a47a31..9b1e5bf50 100644
--- a/src/generated/resources/data/create/recipes/crushing/raw_silver_block.json
+++ b/src/generated/resources/data/create/recipes/crushing/raw_silver_block.json
@@ -18,7 +18,7 @@
   "results": [
     {
       "count": 9,
-      "item": "create:crushed_silver_ore"
+      "item": "create:crushed_raw_silver"
     },
     {
       "chance": 0.75,
diff --git a/src/generated/resources/data/create/recipes/crushing/raw_silver_ore.json b/src/generated/resources/data/create/recipes/crushing/raw_silver_ore.json
index ab3a0e201..9ca490108 100644
--- a/src/generated/resources/data/create/recipes/crushing/raw_silver_ore.json
+++ b/src/generated/resources/data/create/recipes/crushing/raw_silver_ore.json
@@ -17,7 +17,7 @@
   "processingTime": 400,
   "results": [
     {
-      "item": "create:crushed_silver_ore"
+      "item": "create:crushed_raw_silver"
     },
     {
       "chance": 0.75,
diff --git a/src/generated/resources/data/create/recipes/crushing/raw_tin_block.json b/src/generated/resources/data/create/recipes/crushing/raw_tin_block.json
index 2c5a37734..96354a091 100644
--- a/src/generated/resources/data/create/recipes/crushing/raw_tin_block.json
+++ b/src/generated/resources/data/create/recipes/crushing/raw_tin_block.json
@@ -18,7 +18,7 @@
   "results": [
     {
       "count": 9,
-      "item": "create:crushed_tin_ore"
+      "item": "create:crushed_raw_tin"
     },
     {
       "chance": 0.75,
diff --git a/src/generated/resources/data/create/recipes/crushing/raw_tin_ore.json b/src/generated/resources/data/create/recipes/crushing/raw_tin_ore.json
index 9a57c327a..290fede6d 100644
--- a/src/generated/resources/data/create/recipes/crushing/raw_tin_ore.json
+++ b/src/generated/resources/data/create/recipes/crushing/raw_tin_ore.json
@@ -17,7 +17,7 @@
   "processingTime": 400,
   "results": [
     {
-      "item": "create:crushed_tin_ore"
+      "item": "create:crushed_raw_tin"
     },
     {
       "chance": 0.75,
diff --git a/src/generated/resources/data/create/recipes/crushing/raw_uranium_block.json b/src/generated/resources/data/create/recipes/crushing/raw_uranium_block.json
index 6f3c1f6e8..8393f8e8b 100644
--- a/src/generated/resources/data/create/recipes/crushing/raw_uranium_block.json
+++ b/src/generated/resources/data/create/recipes/crushing/raw_uranium_block.json
@@ -18,7 +18,7 @@
   "results": [
     {
       "count": 9,
-      "item": "create:crushed_uranium_ore"
+      "item": "create:crushed_raw_uranium"
     },
     {
       "chance": 0.75,
diff --git a/src/generated/resources/data/create/recipes/crushing/raw_uranium_ore.json b/src/generated/resources/data/create/recipes/crushing/raw_uranium_ore.json
index 562198822..ee551326f 100644
--- a/src/generated/resources/data/create/recipes/crushing/raw_uranium_ore.json
+++ b/src/generated/resources/data/create/recipes/crushing/raw_uranium_ore.json
@@ -17,7 +17,7 @@
   "processingTime": 400,
   "results": [
     {
-      "item": "create:crushed_uranium_ore"
+      "item": "create:crushed_raw_uranium"
     },
     {
       "chance": 0.75,
diff --git a/src/generated/resources/data/create/recipes/crushing/raw_zinc.json b/src/generated/resources/data/create/recipes/crushing/raw_zinc.json
index 18c35d563..e0acd0ec1 100644
--- a/src/generated/resources/data/create/recipes/crushing/raw_zinc.json
+++ b/src/generated/resources/data/create/recipes/crushing/raw_zinc.json
@@ -8,7 +8,7 @@
   "processingTime": 400,
   "results": [
     {
-      "item": "create:crushed_zinc_ore"
+      "item": "create:crushed_raw_zinc"
     },
     {
       "chance": 0.75,
diff --git a/src/generated/resources/data/create/recipes/crushing/raw_zinc_block.json b/src/generated/resources/data/create/recipes/crushing/raw_zinc_block.json
index 551dd2bcb..804660ca0 100644
--- a/src/generated/resources/data/create/recipes/crushing/raw_zinc_block.json
+++ b/src/generated/resources/data/create/recipes/crushing/raw_zinc_block.json
@@ -9,7 +9,7 @@
   "results": [
     {
       "count": 9,
-      "item": "create:crushed_zinc_ore"
+      "item": "create:crushed_raw_zinc"
     },
     {
       "chance": 0.75,
diff --git a/src/generated/resources/data/create/recipes/crushing/silver_ore.json b/src/generated/resources/data/create/recipes/crushing/silver_ore.json
index e63f4ac09..2dfaa8085 100644
--- a/src/generated/resources/data/create/recipes/crushing/silver_ore.json
+++ b/src/generated/resources/data/create/recipes/crushing/silver_ore.json
@@ -17,11 +17,11 @@
   "processingTime": 400,
   "results": [
     {
-      "item": "create:crushed_silver_ore"
+      "item": "create:crushed_raw_silver"
     },
     {
       "chance": 0.75,
-      "item": "create:crushed_silver_ore"
+      "item": "create:crushed_raw_silver"
     },
     {
       "chance": 0.75,
diff --git a/src/generated/resources/data/create/recipes/crushing/tin_ore.json b/src/generated/resources/data/create/recipes/crushing/tin_ore.json
index 95ec06c1a..6544cb903 100644
--- a/src/generated/resources/data/create/recipes/crushing/tin_ore.json
+++ b/src/generated/resources/data/create/recipes/crushing/tin_ore.json
@@ -17,11 +17,11 @@
   "processingTime": 400,
   "results": [
     {
-      "item": "create:crushed_tin_ore"
+      "item": "create:crushed_raw_tin"
     },
     {
       "chance": 0.75,
-      "item": "create:crushed_tin_ore"
+      "item": "create:crushed_raw_tin"
     },
     {
       "chance": 0.75,
diff --git a/src/generated/resources/data/create/recipes/crushing/uranium_ore.json b/src/generated/resources/data/create/recipes/crushing/uranium_ore.json
index f7177af0c..34cbbfc66 100644
--- a/src/generated/resources/data/create/recipes/crushing/uranium_ore.json
+++ b/src/generated/resources/data/create/recipes/crushing/uranium_ore.json
@@ -17,11 +17,11 @@
   "processingTime": 400,
   "results": [
     {
-      "item": "create:crushed_uranium_ore"
+      "item": "create:crushed_raw_uranium"
     },
     {
       "chance": 0.75,
-      "item": "create:crushed_uranium_ore"
+      "item": "create:crushed_raw_uranium"
     },
     {
       "chance": 0.75,
diff --git a/src/generated/resources/data/create/recipes/crushing/veridium.json b/src/generated/resources/data/create/recipes/crushing/veridium.json
index 432c90515..7b1940b50 100644
--- a/src/generated/resources/data/create/recipes/crushing/veridium.json
+++ b/src/generated/resources/data/create/recipes/crushing/veridium.json
@@ -9,7 +9,7 @@
   "results": [
     {
       "chance": 0.8,
-      "item": "create:crushed_copper_ore"
+      "item": "create:crushed_raw_copper"
     },
     {
       "chance": 0.8,
diff --git a/src/generated/resources/data/create/recipes/crushing/veridium_recycling.json b/src/generated/resources/data/create/recipes/crushing/veridium_recycling.json
index 61f678183..08d1b72c7 100644
--- a/src/generated/resources/data/create/recipes/crushing/veridium_recycling.json
+++ b/src/generated/resources/data/create/recipes/crushing/veridium_recycling.json
@@ -9,7 +9,7 @@
   "results": [
     {
       "chance": 0.8,
-      "item": "create:crushed_copper_ore"
+      "item": "create:crushed_raw_copper"
     },
     {
       "chance": 0.8,
diff --git a/src/generated/resources/data/create/recipes/crushing/zinc_ore.json b/src/generated/resources/data/create/recipes/crushing/zinc_ore.json
index b21bc3c6e..86029b154 100644
--- a/src/generated/resources/data/create/recipes/crushing/zinc_ore.json
+++ b/src/generated/resources/data/create/recipes/crushing/zinc_ore.json
@@ -8,11 +8,11 @@
   "processingTime": 250,
   "results": [
     {
-      "item": "create:crushed_zinc_ore"
+      "item": "create:crushed_raw_zinc"
     },
     {
       "chance": 0.75,
-      "item": "create:crushed_zinc_ore"
+      "item": "create:crushed_raw_zinc"
     },
     {
       "chance": 0.75,
diff --git a/src/generated/resources/data/create/recipes/sequenced_assembly/precision_mechanism.json b/src/generated/resources/data/create/recipes/sequenced_assembly/precision_mechanism.json
index 7a258e05a..c288ad371 100644
--- a/src/generated/resources/data/create/recipes/sequenced_assembly/precision_mechanism.json
+++ b/src/generated/resources/data/create/recipes/sequenced_assembly/precision_mechanism.json
@@ -31,7 +31,7 @@
     },
     {
       "chance": 2.0,
-      "item": "create:crushed_gold_ore"
+      "item": "create:crushed_raw_gold"
     },
     {
       "item": "minecraft:iron_ingot"
diff --git a/src/generated/resources/data/create/recipes/smelting/copper_ingot_from_crushed.json b/src/generated/resources/data/create/recipes/smelting/copper_ingot_from_crushed.json
index 94c869050..ba49b8259 100644
--- a/src/generated/resources/data/create/recipes/smelting/copper_ingot_from_crushed.json
+++ b/src/generated/resources/data/create/recipes/smelting/copper_ingot_from_crushed.json
@@ -3,7 +3,7 @@
   "cookingtime": 200,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_copper_ore"
+    "item": "create:crushed_raw_copper"
   },
   "result": "minecraft:copper_ingot"
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/create/recipes/smelting/gold_ingot_from_crushed.json b/src/generated/resources/data/create/recipes/smelting/gold_ingot_from_crushed.json
index a676fb4a6..193151317 100644
--- a/src/generated/resources/data/create/recipes/smelting/gold_ingot_from_crushed.json
+++ b/src/generated/resources/data/create/recipes/smelting/gold_ingot_from_crushed.json
@@ -3,7 +3,7 @@
   "cookingtime": 200,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_gold_ore"
+    "item": "create:crushed_raw_gold"
   },
   "result": "minecraft:gold_ingot"
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/create/recipes/smelting/ingot_aluminum_compat_immersiveengineering.json b/src/generated/resources/data/create/recipes/smelting/ingot_aluminum_compat_immersiveengineering.json
index 7dc1e3ef9..502751101 100644
--- a/src/generated/resources/data/create/recipes/smelting/ingot_aluminum_compat_immersiveengineering.json
+++ b/src/generated/resources/data/create/recipes/smelting/ingot_aluminum_compat_immersiveengineering.json
@@ -9,7 +9,7 @@
   "cookingtime": 200,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_aluminum_ore"
+    "item": "create:crushed_raw_aluminum"
   },
   "result": "immersiveengineering:ingot_aluminum"
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/create/recipes/smelting/ingot_lead_compat_immersiveengineering.json b/src/generated/resources/data/create/recipes/smelting/ingot_lead_compat_immersiveengineering.json
index 48894e412..099a4206d 100644
--- a/src/generated/resources/data/create/recipes/smelting/ingot_lead_compat_immersiveengineering.json
+++ b/src/generated/resources/data/create/recipes/smelting/ingot_lead_compat_immersiveengineering.json
@@ -9,7 +9,7 @@
   "cookingtime": 200,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_lead_ore"
+    "item": "create:crushed_raw_lead"
   },
   "result": "immersiveengineering:ingot_lead"
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/create/recipes/smelting/ingot_lead_compat_mekanism.json b/src/generated/resources/data/create/recipes/smelting/ingot_lead_compat_mekanism.json
index 48a1c3ded..343b94476 100644
--- a/src/generated/resources/data/create/recipes/smelting/ingot_lead_compat_mekanism.json
+++ b/src/generated/resources/data/create/recipes/smelting/ingot_lead_compat_mekanism.json
@@ -9,7 +9,7 @@
   "cookingtime": 200,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_lead_ore"
+    "item": "create:crushed_raw_lead"
   },
   "result": "mekanism:ingot_lead"
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/create/recipes/smelting/ingot_nickel_compat_immersiveengineering.json b/src/generated/resources/data/create/recipes/smelting/ingot_nickel_compat_immersiveengineering.json
index dd0d42894..b52836d2e 100644
--- a/src/generated/resources/data/create/recipes/smelting/ingot_nickel_compat_immersiveengineering.json
+++ b/src/generated/resources/data/create/recipes/smelting/ingot_nickel_compat_immersiveengineering.json
@@ -9,7 +9,7 @@
   "cookingtime": 200,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_nickel_ore"
+    "item": "create:crushed_raw_nickel"
   },
   "result": "immersiveengineering:ingot_nickel"
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/create/recipes/smelting/ingot_osmium_compat_mekanism.json b/src/generated/resources/data/create/recipes/smelting/ingot_osmium_compat_mekanism.json
index 064206646..9b1b5dc37 100644
--- a/src/generated/resources/data/create/recipes/smelting/ingot_osmium_compat_mekanism.json
+++ b/src/generated/resources/data/create/recipes/smelting/ingot_osmium_compat_mekanism.json
@@ -9,7 +9,7 @@
   "cookingtime": 200,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_osmium_ore"
+    "item": "create:crushed_raw_osmium"
   },
   "result": "mekanism:ingot_osmium"
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/create/recipes/smelting/ingot_silver_compat_immersiveengineering.json b/src/generated/resources/data/create/recipes/smelting/ingot_silver_compat_immersiveengineering.json
index f9c7b868f..fcf861514 100644
--- a/src/generated/resources/data/create/recipes/smelting/ingot_silver_compat_immersiveengineering.json
+++ b/src/generated/resources/data/create/recipes/smelting/ingot_silver_compat_immersiveengineering.json
@@ -9,7 +9,7 @@
   "cookingtime": 200,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_silver_ore"
+    "item": "create:crushed_raw_silver"
   },
   "result": "immersiveengineering:ingot_silver"
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/create/recipes/smelting/ingot_tin_compat_mekanism.json b/src/generated/resources/data/create/recipes/smelting/ingot_tin_compat_mekanism.json
index aafcf268b..730e1906e 100644
--- a/src/generated/resources/data/create/recipes/smelting/ingot_tin_compat_mekanism.json
+++ b/src/generated/resources/data/create/recipes/smelting/ingot_tin_compat_mekanism.json
@@ -9,7 +9,7 @@
   "cookingtime": 200,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_tin_ore"
+    "item": "create:crushed_raw_tin"
   },
   "result": "mekanism:ingot_tin"
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/create/recipes/smelting/ingot_uranium_compat_immersiveengineering.json b/src/generated/resources/data/create/recipes/smelting/ingot_uranium_compat_immersiveengineering.json
index 7e6620ea8..716b9eb7c 100644
--- a/src/generated/resources/data/create/recipes/smelting/ingot_uranium_compat_immersiveengineering.json
+++ b/src/generated/resources/data/create/recipes/smelting/ingot_uranium_compat_immersiveengineering.json
@@ -9,7 +9,7 @@
   "cookingtime": 200,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_uranium_ore"
+    "item": "create:crushed_raw_uranium"
   },
   "result": "immersiveengineering:ingot_uranium"
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/create/recipes/smelting/ingot_uranium_compat_mekanism.json b/src/generated/resources/data/create/recipes/smelting/ingot_uranium_compat_mekanism.json
index cf57b3697..51ea32cd4 100644
--- a/src/generated/resources/data/create/recipes/smelting/ingot_uranium_compat_mekanism.json
+++ b/src/generated/resources/data/create/recipes/smelting/ingot_uranium_compat_mekanism.json
@@ -9,7 +9,7 @@
   "cookingtime": 200,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_uranium_ore"
+    "item": "create:crushed_raw_uranium"
   },
   "result": "mekanism:ingot_uranium"
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/create/recipes/smelting/iron_ingot_from_crushed.json b/src/generated/resources/data/create/recipes/smelting/iron_ingot_from_crushed.json
index 89a085a95..55b9d6b82 100644
--- a/src/generated/resources/data/create/recipes/smelting/iron_ingot_from_crushed.json
+++ b/src/generated/resources/data/create/recipes/smelting/iron_ingot_from_crushed.json
@@ -3,7 +3,7 @@
   "cookingtime": 200,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_iron_ore"
+    "item": "create:crushed_raw_iron"
   },
   "result": "minecraft:iron_ingot"
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/create/recipes/smelting/lead_ingot_compat_thermal.json b/src/generated/resources/data/create/recipes/smelting/lead_ingot_compat_thermal.json
index 078c762cc..af3ce1c18 100644
--- a/src/generated/resources/data/create/recipes/smelting/lead_ingot_compat_thermal.json
+++ b/src/generated/resources/data/create/recipes/smelting/lead_ingot_compat_thermal.json
@@ -9,7 +9,7 @@
   "cookingtime": 200,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_lead_ore"
+    "item": "create:crushed_raw_lead"
   },
   "result": "thermal:lead_ingot"
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/create/recipes/smelting/nickel_ingot_compat_thermal.json b/src/generated/resources/data/create/recipes/smelting/nickel_ingot_compat_thermal.json
index 8188c96a4..dce72d552 100644
--- a/src/generated/resources/data/create/recipes/smelting/nickel_ingot_compat_thermal.json
+++ b/src/generated/resources/data/create/recipes/smelting/nickel_ingot_compat_thermal.json
@@ -9,7 +9,7 @@
   "cookingtime": 200,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_nickel_ore"
+    "item": "create:crushed_raw_nickel"
   },
   "result": "thermal:nickel_ingot"
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/create/recipes/smelting/silver_ingot_compat_thermal.json b/src/generated/resources/data/create/recipes/smelting/silver_ingot_compat_thermal.json
index 4d1a31536..bfed6b66d 100644
--- a/src/generated/resources/data/create/recipes/smelting/silver_ingot_compat_thermal.json
+++ b/src/generated/resources/data/create/recipes/smelting/silver_ingot_compat_thermal.json
@@ -9,7 +9,7 @@
   "cookingtime": 200,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_silver_ore"
+    "item": "create:crushed_raw_silver"
   },
   "result": "thermal:silver_ingot"
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/create/recipes/smelting/tin_ingot_compat_thermal.json b/src/generated/resources/data/create/recipes/smelting/tin_ingot_compat_thermal.json
index 56a8ab354..805483d68 100644
--- a/src/generated/resources/data/create/recipes/smelting/tin_ingot_compat_thermal.json
+++ b/src/generated/resources/data/create/recipes/smelting/tin_ingot_compat_thermal.json
@@ -9,7 +9,7 @@
   "cookingtime": 200,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_tin_ore"
+    "item": "create:crushed_raw_tin"
   },
   "result": "thermal:tin_ingot"
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/create/recipes/smelting/zinc_ingot_from_crushed.json b/src/generated/resources/data/create/recipes/smelting/zinc_ingot_from_crushed.json
index 2ae833043..c899c4297 100644
--- a/src/generated/resources/data/create/recipes/smelting/zinc_ingot_from_crushed.json
+++ b/src/generated/resources/data/create/recipes/smelting/zinc_ingot_from_crushed.json
@@ -3,7 +3,7 @@
   "cookingtime": 200,
   "experience": 0.1,
   "ingredient": {
-    "item": "create:crushed_zinc_ore"
+    "item": "create:crushed_raw_zinc"
   },
   "result": "create:zinc_ingot"
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/create/recipes/splashing/crushed_copper_ore.json b/src/generated/resources/data/create/recipes/splashing/crushed_raw_copper.json
similarity index 84%
rename from src/generated/resources/data/create/recipes/splashing/crushed_copper_ore.json
rename to src/generated/resources/data/create/recipes/splashing/crushed_raw_copper.json
index 292700422..aeb0b173d 100644
--- a/src/generated/resources/data/create/recipes/splashing/crushed_copper_ore.json
+++ b/src/generated/resources/data/create/recipes/splashing/crushed_raw_copper.json
@@ -2,7 +2,7 @@
   "type": "create:splashing",
   "ingredients": [
     {
-      "item": "create:crushed_copper_ore"
+      "item": "create:crushed_raw_copper"
     }
   ],
   "results": [
diff --git a/src/generated/resources/data/create/recipes/splashing/crushed_gold_ore.json b/src/generated/resources/data/create/recipes/splashing/crushed_raw_gold.json
similarity index 84%
rename from src/generated/resources/data/create/recipes/splashing/crushed_gold_ore.json
rename to src/generated/resources/data/create/recipes/splashing/crushed_raw_gold.json
index 11cb27911..05f1f9332 100644
--- a/src/generated/resources/data/create/recipes/splashing/crushed_gold_ore.json
+++ b/src/generated/resources/data/create/recipes/splashing/crushed_raw_gold.json
@@ -2,7 +2,7 @@
   "type": "create:splashing",
   "ingredients": [
     {
-      "item": "create:crushed_gold_ore"
+      "item": "create:crushed_raw_gold"
     }
   ],
   "results": [
diff --git a/src/generated/resources/data/create/recipes/splashing/crushed_iron_ore.json b/src/generated/resources/data/create/recipes/splashing/crushed_raw_iron.json
similarity index 84%
rename from src/generated/resources/data/create/recipes/splashing/crushed_iron_ore.json
rename to src/generated/resources/data/create/recipes/splashing/crushed_raw_iron.json
index 4edd73302..c588186e1 100644
--- a/src/generated/resources/data/create/recipes/splashing/crushed_iron_ore.json
+++ b/src/generated/resources/data/create/recipes/splashing/crushed_raw_iron.json
@@ -2,7 +2,7 @@
   "type": "create:splashing",
   "ingredients": [
     {
-      "item": "create:crushed_iron_ore"
+      "item": "create:crushed_raw_iron"
     }
   ],
   "results": [
diff --git a/src/generated/resources/data/create/recipes/splashing/crushed_zinc_ore.json b/src/generated/resources/data/create/recipes/splashing/crushed_raw_zinc.json
similarity index 84%
rename from src/generated/resources/data/create/recipes/splashing/crushed_zinc_ore.json
rename to src/generated/resources/data/create/recipes/splashing/crushed_raw_zinc.json
index 500398ec1..9715918fc 100644
--- a/src/generated/resources/data/create/recipes/splashing/crushed_zinc_ore.json
+++ b/src/generated/resources/data/create/recipes/splashing/crushed_raw_zinc.json
@@ -2,7 +2,7 @@
   "type": "create:splashing",
   "ingredients": [
     {
-      "item": "create:crushed_zinc_ore"
+      "item": "create:crushed_raw_zinc"
     }
   ],
   "results": [
diff --git a/src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_aluminum_ore.json b/src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_raw_aluminum.json
similarity index 86%
rename from src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_aluminum_ore.json
rename to src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_raw_aluminum.json
index 0de64e7f2..d9a579ee3 100644
--- a/src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_aluminum_ore.json
+++ b/src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_raw_aluminum.json
@@ -8,7 +8,7 @@
   ],
   "ingredients": [
     {
-      "item": "create:crushed_aluminum_ore"
+      "item": "create:crushed_raw_aluminum"
     }
   ],
   "results": [
diff --git a/src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_lead_ore.json b/src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_raw_lead.json
similarity index 87%
rename from src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_lead_ore.json
rename to src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_raw_lead.json
index c46081a77..4dcccf7ec 100644
--- a/src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_lead_ore.json
+++ b/src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_raw_lead.json
@@ -8,7 +8,7 @@
   ],
   "ingredients": [
     {
-      "item": "create:crushed_lead_ore"
+      "item": "create:crushed_raw_lead"
     }
   ],
   "results": [
diff --git a/src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_nickel_ore.json b/src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_raw_nickel.json
similarity index 86%
rename from src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_nickel_ore.json
rename to src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_raw_nickel.json
index e6d8eb77f..c57a8a6b1 100644
--- a/src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_nickel_ore.json
+++ b/src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_raw_nickel.json
@@ -8,7 +8,7 @@
   ],
   "ingredients": [
     {
-      "item": "create:crushed_nickel_ore"
+      "item": "create:crushed_raw_nickel"
     }
   ],
   "results": [
diff --git a/src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_silver_ore.json b/src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_raw_silver.json
similarity index 86%
rename from src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_silver_ore.json
rename to src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_raw_silver.json
index 23828e45d..e8b6e2cf1 100644
--- a/src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_silver_ore.json
+++ b/src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_raw_silver.json
@@ -8,7 +8,7 @@
   ],
   "ingredients": [
     {
-      "item": "create:crushed_silver_ore"
+      "item": "create:crushed_raw_silver"
     }
   ],
   "results": [
diff --git a/src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_uranium_ore.json b/src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_raw_uranium.json
similarity index 86%
rename from src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_uranium_ore.json
rename to src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_raw_uranium.json
index 2e83536fb..73f714066 100644
--- a/src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_uranium_ore.json
+++ b/src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_raw_uranium.json
@@ -8,7 +8,7 @@
   ],
   "ingredients": [
     {
-      "item": "create:crushed_uranium_ore"
+      "item": "create:crushed_raw_uranium"
     }
   ],
   "results": [
diff --git a/src/generated/resources/data/create/recipes/splashing/mekanism/crushed_lead_ore.json b/src/generated/resources/data/create/recipes/splashing/mekanism/crushed_raw_lead.json
similarity index 86%
rename from src/generated/resources/data/create/recipes/splashing/mekanism/crushed_lead_ore.json
rename to src/generated/resources/data/create/recipes/splashing/mekanism/crushed_raw_lead.json
index a5588d8f9..c85200a8d 100644
--- a/src/generated/resources/data/create/recipes/splashing/mekanism/crushed_lead_ore.json
+++ b/src/generated/resources/data/create/recipes/splashing/mekanism/crushed_raw_lead.json
@@ -8,7 +8,7 @@
   ],
   "ingredients": [
     {
-      "item": "create:crushed_lead_ore"
+      "item": "create:crushed_raw_lead"
     }
   ],
   "results": [
diff --git a/src/generated/resources/data/create/recipes/splashing/mekanism/crushed_osmium_ore.json b/src/generated/resources/data/create/recipes/splashing/mekanism/crushed_raw_osmium.json
similarity index 85%
rename from src/generated/resources/data/create/recipes/splashing/mekanism/crushed_osmium_ore.json
rename to src/generated/resources/data/create/recipes/splashing/mekanism/crushed_raw_osmium.json
index 87dc5af82..639ef777c 100644
--- a/src/generated/resources/data/create/recipes/splashing/mekanism/crushed_osmium_ore.json
+++ b/src/generated/resources/data/create/recipes/splashing/mekanism/crushed_raw_osmium.json
@@ -8,7 +8,7 @@
   ],
   "ingredients": [
     {
-      "item": "create:crushed_osmium_ore"
+      "item": "create:crushed_raw_osmium"
     }
   ],
   "results": [
diff --git a/src/generated/resources/data/create/recipes/splashing/mekanism/crushed_tin_ore.json b/src/generated/resources/data/create/recipes/splashing/mekanism/crushed_raw_tin.json
similarity index 86%
rename from src/generated/resources/data/create/recipes/splashing/mekanism/crushed_tin_ore.json
rename to src/generated/resources/data/create/recipes/splashing/mekanism/crushed_raw_tin.json
index 4ae97cde5..56afae0a6 100644
--- a/src/generated/resources/data/create/recipes/splashing/mekanism/crushed_tin_ore.json
+++ b/src/generated/resources/data/create/recipes/splashing/mekanism/crushed_raw_tin.json
@@ -8,7 +8,7 @@
   ],
   "ingredients": [
     {
-      "item": "create:crushed_tin_ore"
+      "item": "create:crushed_raw_tin"
     }
   ],
   "results": [
diff --git a/src/generated/resources/data/create/recipes/splashing/mekanism/crushed_uranium_ore.json b/src/generated/resources/data/create/recipes/splashing/mekanism/crushed_raw_uranium.json
similarity index 85%
rename from src/generated/resources/data/create/recipes/splashing/mekanism/crushed_uranium_ore.json
rename to src/generated/resources/data/create/recipes/splashing/mekanism/crushed_raw_uranium.json
index 3659c8c10..a323e4629 100644
--- a/src/generated/resources/data/create/recipes/splashing/mekanism/crushed_uranium_ore.json
+++ b/src/generated/resources/data/create/recipes/splashing/mekanism/crushed_raw_uranium.json
@@ -8,7 +8,7 @@
   ],
   "ingredients": [
     {
-      "item": "create:crushed_uranium_ore"
+      "item": "create:crushed_raw_uranium"
     }
   ],
   "results": [
diff --git a/src/generated/resources/data/create/recipes/splashing/thermal/crushed_lead_ore.json b/src/generated/resources/data/create/recipes/splashing/thermal/crushed_raw_lead.json
similarity index 86%
rename from src/generated/resources/data/create/recipes/splashing/thermal/crushed_lead_ore.json
rename to src/generated/resources/data/create/recipes/splashing/thermal/crushed_raw_lead.json
index b08880adf..188e94c8b 100644
--- a/src/generated/resources/data/create/recipes/splashing/thermal/crushed_lead_ore.json
+++ b/src/generated/resources/data/create/recipes/splashing/thermal/crushed_raw_lead.json
@@ -8,7 +8,7 @@
   ],
   "ingredients": [
     {
-      "item": "create:crushed_lead_ore"
+      "item": "create:crushed_raw_lead"
     }
   ],
   "results": [
diff --git a/src/generated/resources/data/create/recipes/splashing/thermal/crushed_nickel_ore.json b/src/generated/resources/data/create/recipes/splashing/thermal/crushed_raw_nickel.json
similarity index 85%
rename from src/generated/resources/data/create/recipes/splashing/thermal/crushed_nickel_ore.json
rename to src/generated/resources/data/create/recipes/splashing/thermal/crushed_raw_nickel.json
index 739bac5e3..856c4a8a2 100644
--- a/src/generated/resources/data/create/recipes/splashing/thermal/crushed_nickel_ore.json
+++ b/src/generated/resources/data/create/recipes/splashing/thermal/crushed_raw_nickel.json
@@ -8,7 +8,7 @@
   ],
   "ingredients": [
     {
-      "item": "create:crushed_nickel_ore"
+      "item": "create:crushed_raw_nickel"
     }
   ],
   "results": [
diff --git a/src/generated/resources/data/create/recipes/splashing/thermal/crushed_silver_ore.json b/src/generated/resources/data/create/recipes/splashing/thermal/crushed_raw_silver.json
similarity index 85%
rename from src/generated/resources/data/create/recipes/splashing/thermal/crushed_silver_ore.json
rename to src/generated/resources/data/create/recipes/splashing/thermal/crushed_raw_silver.json
index daacf4f6f..3c429a31e 100644
--- a/src/generated/resources/data/create/recipes/splashing/thermal/crushed_silver_ore.json
+++ b/src/generated/resources/data/create/recipes/splashing/thermal/crushed_raw_silver.json
@@ -8,7 +8,7 @@
   ],
   "ingredients": [
     {
-      "item": "create:crushed_silver_ore"
+      "item": "create:crushed_raw_silver"
     }
   ],
   "results": [
diff --git a/src/generated/resources/data/create/recipes/splashing/thermal/crushed_tin_ore.json b/src/generated/resources/data/create/recipes/splashing/thermal/crushed_raw_tin.json
similarity index 86%
rename from src/generated/resources/data/create/recipes/splashing/thermal/crushed_tin_ore.json
rename to src/generated/resources/data/create/recipes/splashing/thermal/crushed_raw_tin.json
index 14dcec5c8..363b3efd0 100644
--- a/src/generated/resources/data/create/recipes/splashing/thermal/crushed_tin_ore.json
+++ b/src/generated/resources/data/create/recipes/splashing/thermal/crushed_raw_tin.json
@@ -8,7 +8,7 @@
   ],
   "ingredients": [
     {
-      "item": "create:crushed_tin_ore"
+      "item": "create:crushed_raw_tin"
     }
   ],
   "results": [
diff --git a/src/generated/resources/data/create/tags/items/crushed_ores.json b/src/generated/resources/data/create/tags/items/crushed_ores.json
deleted file mode 100644
index b3bb6f727..000000000
--- a/src/generated/resources/data/create/tags/items/crushed_ores.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "values": [
-    "create:crushed_iron_ore",
-    "create:crushed_gold_ore",
-    "create:crushed_copper_ore",
-    "create:crushed_zinc_ore",
-    "create:crushed_osmium_ore",
-    "create:crushed_platinum_ore",
-    "create:crushed_silver_ore",
-    "create:crushed_tin_ore",
-    "create:crushed_lead_ore",
-    "create:crushed_quicksilver_ore",
-    "create:crushed_aluminum_ore",
-    "create:crushed_uranium_ore",
-    "create:crushed_nickel_ore"
-  ]
-}
\ No newline at end of file
diff --git a/src/generated/resources/data/create/tags/items/crushed_raw_materials.json b/src/generated/resources/data/create/tags/items/crushed_raw_materials.json
new file mode 100644
index 000000000..c29ba6427
--- /dev/null
+++ b/src/generated/resources/data/create/tags/items/crushed_raw_materials.json
@@ -0,0 +1,18 @@
+{
+  "replace": false,
+  "values": [
+    "create:crushed_raw_iron",
+    "create:crushed_raw_gold",
+    "create:crushed_raw_copper",
+    "create:crushed_raw_zinc",
+    "create:crushed_raw_osmium",
+    "create:crushed_raw_platinum",
+    "create:crushed_raw_silver",
+    "create:crushed_raw_tin",
+    "create:crushed_raw_lead",
+    "create:crushed_raw_quicksilver",
+    "create:crushed_raw_aluminum",
+    "create:crushed_raw_uranium",
+    "create:crushed_raw_nickel"
+  ]
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks.json
index 86bcd6582..14641f451 100644
--- a/src/generated/resources/data/forge/tags/blocks/storage_blocks.json
+++ b/src/generated/resources/data/forge/tags/blocks/storage_blocks.json
@@ -3,6 +3,7 @@
     "create:raw_zinc_block",
     "create:zinc_block",
     "create:andesite_alloy_block",
-    "create:brass_block"
+    "create:brass_block",
+    "create:experience_block"
   ]
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks.json b/src/generated/resources/data/forge/tags/items/storage_blocks.json
index 86bcd6582..14641f451 100644
--- a/src/generated/resources/data/forge/tags/items/storage_blocks.json
+++ b/src/generated/resources/data/forge/tags/items/storage_blocks.json
@@ -3,6 +3,7 @@
     "create:raw_zinc_block",
     "create:zinc_block",
     "create:andesite_alloy_block",
-    "create:brass_block"
+    "create:brass_block",
+    "create:experience_block"
   ]
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/minecraft/tags/blocks/beacon_base_blocks.json b/src/generated/resources/data/minecraft/tags/blocks/beacon_base_blocks.json
index 5642e46d2..a4d31b28a 100644
--- a/src/generated/resources/data/minecraft/tags/blocks/beacon_base_blocks.json
+++ b/src/generated/resources/data/minecraft/tags/blocks/beacon_base_blocks.json
@@ -1,6 +1,7 @@
 {
   "values": [
     "create:zinc_block",
-    "create:brass_block"
+    "create:brass_block",
+    "create:experience_block"
   ]
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
index df47e2f26..196d3ef2a 100644
--- a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
+++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
@@ -182,6 +182,7 @@
     "create:andesite_alloy_block",
     "create:industrial_iron_block",
     "create:brass_block",
+    "create:experience_block",
     "create:rose_quartz_block",
     "create:rose_quartz_tiles",
     "create:small_rose_quartz_tiles",
diff --git a/src/generated/resources/data/minecraft/tags/items/piglin_loved.json b/src/generated/resources/data/minecraft/tags/items/piglin_loved.json
index 46e769ef0..5c84f1c61 100644
--- a/src/generated/resources/data/minecraft/tags/items/piglin_loved.json
+++ b/src/generated/resources/data/minecraft/tags/items/piglin_loved.json
@@ -1,6 +1,6 @@
 {
   "values": [
     "create:golden_sheet",
-    "create:crushed_gold_ore"
+    "create:crushed_raw_gold"
   ]
 }
\ No newline at end of file
diff --git a/src/main/java/com/simibubi/create/AllBlockEntityTypes.java b/src/main/java/com/simibubi/create/AllBlockEntityTypes.java
index f9fa70da7..8ff7849e6 100644
--- a/src/main/java/com/simibubi/create/AllBlockEntityTypes.java
+++ b/src/main/java/com/simibubi/create/AllBlockEntityTypes.java
@@ -1,218 +1,218 @@
 package com.simibubi.create;
 
 import static com.simibubi.create.Create.REGISTRATE;
-import static com.simibubi.create.content.logistics.block.display.AllDisplayBehaviours.assignDataBehaviourBE;
+import static com.simibubi.create.content.redstone.displayLink.AllDisplayBehaviours.assignDataBehaviourBE;
 
-import com.simibubi.create.content.contraptions.base.CutoutRotatingInstance;
-import com.simibubi.create.content.contraptions.base.HalfShaftInstance;
-import com.simibubi.create.content.contraptions.base.HorizontalHalfShaftInstance;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityRenderer;
-import com.simibubi.create.content.contraptions.base.SingleRotatingInstance;
-import com.simibubi.create.content.contraptions.components.actors.DrillBlockEntity;
-import com.simibubi.create.content.contraptions.components.actors.DrillInstance;
-import com.simibubi.create.content.contraptions.components.actors.DrillRenderer;
-import com.simibubi.create.content.contraptions.components.actors.HarvesterBlockEntity;
-import com.simibubi.create.content.contraptions.components.actors.HarvesterRenderer;
-import com.simibubi.create.content.contraptions.components.actors.PSIInstance;
-import com.simibubi.create.content.contraptions.components.actors.PortableFluidInterfaceBlockEntity;
-import com.simibubi.create.content.contraptions.components.actors.PortableItemInterfaceBlockEntity;
-import com.simibubi.create.content.contraptions.components.actors.PortableStorageInterfaceRenderer;
-import com.simibubi.create.content.contraptions.components.actors.RollerBlockEntity;
-import com.simibubi.create.content.contraptions.components.actors.RollerRenderer;
-import com.simibubi.create.content.contraptions.components.actors.controls.ContraptionControlsBlockEntity;
-import com.simibubi.create.content.contraptions.components.actors.controls.ContraptionControlsRenderer;
-import com.simibubi.create.content.contraptions.components.clock.CuckooClockBlockEntity;
-import com.simibubi.create.content.contraptions.components.clock.CuckooClockRenderer;
-import com.simibubi.create.content.contraptions.components.crafter.MechanicalCrafterBlockEntity;
-import com.simibubi.create.content.contraptions.components.crafter.MechanicalCrafterRenderer;
-import com.simibubi.create.content.contraptions.components.crafter.ShaftlessCogwheelInstance;
-import com.simibubi.create.content.contraptions.components.crank.HandCrankBlockEntity;
-import com.simibubi.create.content.contraptions.components.crank.HandCrankInstance;
-import com.simibubi.create.content.contraptions.components.crank.HandCrankRenderer;
-import com.simibubi.create.content.contraptions.components.crank.ValveHandleBlockEntity;
-import com.simibubi.create.content.contraptions.components.crusher.CrushingWheelBlockEntity;
-import com.simibubi.create.content.contraptions.components.crusher.CrushingWheelControllerBlockEntity;
-import com.simibubi.create.content.contraptions.components.deployer.DeployerBlockEntity;
-import com.simibubi.create.content.contraptions.components.deployer.DeployerInstance;
-import com.simibubi.create.content.contraptions.components.deployer.DeployerRenderer;
-import com.simibubi.create.content.contraptions.components.fan.EncasedFanBlockEntity;
-import com.simibubi.create.content.contraptions.components.fan.EncasedFanRenderer;
-import com.simibubi.create.content.contraptions.components.fan.FanInstance;
-import com.simibubi.create.content.contraptions.components.fan.NozzleBlockEntity;
-import com.simibubi.create.content.contraptions.components.flywheel.FlywheelBlockEntity;
-import com.simibubi.create.content.contraptions.components.flywheel.FlywheelInstance;
-import com.simibubi.create.content.contraptions.components.flywheel.FlywheelRenderer;
-import com.simibubi.create.content.contraptions.components.millstone.MillstoneBlockEntity;
-import com.simibubi.create.content.contraptions.components.millstone.MillstoneCogInstance;
-import com.simibubi.create.content.contraptions.components.millstone.MillstoneRenderer;
-import com.simibubi.create.content.contraptions.components.mixer.MechanicalMixerBlockEntity;
-import com.simibubi.create.content.contraptions.components.mixer.MechanicalMixerRenderer;
-import com.simibubi.create.content.contraptions.components.mixer.MixerInstance;
-import com.simibubi.create.content.contraptions.components.motor.CreativeMotorBlockEntity;
-import com.simibubi.create.content.contraptions.components.motor.CreativeMotorRenderer;
-import com.simibubi.create.content.contraptions.components.press.MechanicalPressBlockEntity;
-import com.simibubi.create.content.contraptions.components.press.MechanicalPressRenderer;
-import com.simibubi.create.content.contraptions.components.press.PressInstance;
-import com.simibubi.create.content.contraptions.components.saw.SawBlockEntity;
-import com.simibubi.create.content.contraptions.components.saw.SawInstance;
-import com.simibubi.create.content.contraptions.components.saw.SawRenderer;
-import com.simibubi.create.content.contraptions.components.steam.PoweredShaftBlockEntity;
-import com.simibubi.create.content.contraptions.components.steam.SteamEngineBlockEntity;
-import com.simibubi.create.content.contraptions.components.steam.SteamEngineInstance;
-import com.simibubi.create.content.contraptions.components.steam.SteamEngineRenderer;
-import com.simibubi.create.content.contraptions.components.steam.whistle.WhistleBlockEntity;
-import com.simibubi.create.content.contraptions.components.steam.whistle.WhistleRenderer;
-import com.simibubi.create.content.contraptions.components.structureMovement.bearing.BearingInstance;
-import com.simibubi.create.content.contraptions.components.structureMovement.bearing.BearingRenderer;
-import com.simibubi.create.content.contraptions.components.structureMovement.bearing.ClockworkBearingBlockEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.bearing.MechanicalBearingBlockEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.bearing.WindmillBearingBlockEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.chassis.ChassisBlockEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.chassis.StickerBlockEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.chassis.StickerInstance;
-import com.simibubi.create.content.contraptions.components.structureMovement.chassis.StickerRenderer;
-import com.simibubi.create.content.contraptions.components.structureMovement.elevator.ElevatorContactBlockEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.elevator.ElevatorPulleyBlockEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.elevator.ElevatorPulleyRenderer;
-import com.simibubi.create.content.contraptions.components.structureMovement.gantry.GantryCarriageBlockEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.gantry.GantryCarriageInstance;
-import com.simibubi.create.content.contraptions.components.structureMovement.gantry.GantryCarriageRenderer;
-import com.simibubi.create.content.contraptions.components.structureMovement.mounted.CartAssemblerBlockEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlockEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonRenderer;
-import com.simibubi.create.content.contraptions.components.structureMovement.pulley.HosePulleyInstance;
-import com.simibubi.create.content.contraptions.components.structureMovement.pulley.PulleyBlockEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.pulley.PulleyRenderer;
-import com.simibubi.create.content.contraptions.components.structureMovement.pulley.RopePulleyInstance;
-import com.simibubi.create.content.contraptions.components.turntable.TurntableBlockEntity;
-import com.simibubi.create.content.contraptions.components.waterwheel.LargeWaterWheelBlockEntity;
-import com.simibubi.create.content.contraptions.components.waterwheel.WaterWheelBlockEntity;
-import com.simibubi.create.content.contraptions.components.waterwheel.WaterWheelInstance;
-import com.simibubi.create.content.contraptions.components.waterwheel.WaterWheelRenderer;
-import com.simibubi.create.content.contraptions.fluids.PumpBlockEntity;
-import com.simibubi.create.content.contraptions.fluids.PumpCogInstance;
-import com.simibubi.create.content.contraptions.fluids.PumpRenderer;
-import com.simibubi.create.content.contraptions.fluids.actors.HosePulleyBlockEntity;
-import com.simibubi.create.content.contraptions.fluids.actors.HosePulleyRenderer;
-import com.simibubi.create.content.contraptions.fluids.actors.ItemDrainBlockEntity;
-import com.simibubi.create.content.contraptions.fluids.actors.ItemDrainRenderer;
-import com.simibubi.create.content.contraptions.fluids.actors.SpoutBlockEntity;
-import com.simibubi.create.content.contraptions.fluids.actors.SpoutRenderer;
-import com.simibubi.create.content.contraptions.fluids.pipes.FluidPipeBlockEntity;
-import com.simibubi.create.content.contraptions.fluids.pipes.FluidValveBlockEntity;
-import com.simibubi.create.content.contraptions.fluids.pipes.FluidValveInstance;
-import com.simibubi.create.content.contraptions.fluids.pipes.FluidValveRenderer;
-import com.simibubi.create.content.contraptions.fluids.pipes.SmartFluidPipeBlockEntity;
-import com.simibubi.create.content.contraptions.fluids.pipes.StraightPipeBlockEntity;
-import com.simibubi.create.content.contraptions.fluids.pipes.TransparentStraightPipeRenderer;
-import com.simibubi.create.content.contraptions.fluids.tank.CreativeFluidTankBlockEntity;
-import com.simibubi.create.content.contraptions.fluids.tank.FluidTankBlockEntity;
-import com.simibubi.create.content.contraptions.fluids.tank.FluidTankRenderer;
-import com.simibubi.create.content.contraptions.processing.BasinBlockEntity;
-import com.simibubi.create.content.contraptions.processing.BasinRenderer;
-import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlockEntity;
-import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerRenderer;
-import com.simibubi.create.content.contraptions.relays.advanced.GantryShaftBlockEntity;
-import com.simibubi.create.content.contraptions.relays.advanced.SpeedControllerBlockEntity;
-import com.simibubi.create.content.contraptions.relays.advanced.SpeedControllerRenderer;
-import com.simibubi.create.content.contraptions.relays.advanced.sequencer.SequencedGearshiftBlockEntity;
-import com.simibubi.create.content.contraptions.relays.belt.BeltBlockEntity;
-import com.simibubi.create.content.contraptions.relays.belt.BeltInstance;
-import com.simibubi.create.content.contraptions.relays.belt.BeltRenderer;
-import com.simibubi.create.content.contraptions.relays.elementary.BracketedKineticBlockEntity;
-import com.simibubi.create.content.contraptions.relays.elementary.BracketedKineticBlockEntityInstance;
-import com.simibubi.create.content.contraptions.relays.elementary.BracketedKineticBlockEntityRenderer;
-import com.simibubi.create.content.contraptions.relays.elementary.SimpleKineticBlockEntity;
-import com.simibubi.create.content.contraptions.relays.encased.AdjustablePulleyBlockEntity;
-import com.simibubi.create.content.contraptions.relays.encased.ClutchBlockEntity;
-import com.simibubi.create.content.contraptions.relays.encased.EncasedCogInstance;
-import com.simibubi.create.content.contraptions.relays.encased.EncasedCogRenderer;
-import com.simibubi.create.content.contraptions.relays.encased.ShaftInstance;
-import com.simibubi.create.content.contraptions.relays.encased.ShaftRenderer;
-import com.simibubi.create.content.contraptions.relays.encased.SplitShaftInstance;
-import com.simibubi.create.content.contraptions.relays.encased.SplitShaftRenderer;
-import com.simibubi.create.content.contraptions.relays.gauge.GaugeInstance;
-import com.simibubi.create.content.contraptions.relays.gauge.GaugeRenderer;
-import com.simibubi.create.content.contraptions.relays.gauge.SpeedGaugeBlockEntity;
-import com.simibubi.create.content.contraptions.relays.gauge.StressGaugeBlockEntity;
-import com.simibubi.create.content.contraptions.relays.gearbox.GearboxBlockEntity;
-import com.simibubi.create.content.contraptions.relays.gearbox.GearboxInstance;
-import com.simibubi.create.content.contraptions.relays.gearbox.GearboxRenderer;
-import com.simibubi.create.content.contraptions.relays.gearbox.GearshiftBlockEntity;
-import com.simibubi.create.content.curiosities.armor.BacktankBlockEntity;
-import com.simibubi.create.content.curiosities.armor.BacktankInstance;
-import com.simibubi.create.content.curiosities.armor.BacktankRenderer;
-import com.simibubi.create.content.curiosities.bell.BellRenderer;
-import com.simibubi.create.content.curiosities.bell.HauntedBellBlockEntity;
-import com.simibubi.create.content.curiosities.bell.PeculiarBellBlockEntity;
-import com.simibubi.create.content.curiosities.clipboard.ClipboardBlockEntity;
-import com.simibubi.create.content.curiosities.deco.PlacardBlockEntity;
-import com.simibubi.create.content.curiosities.deco.PlacardRenderer;
-import com.simibubi.create.content.curiosities.deco.SlidingDoorBlockEntity;
-import com.simibubi.create.content.curiosities.deco.SlidingDoorRenderer;
-import com.simibubi.create.content.curiosities.frames.CopycatBlockEntity;
-import com.simibubi.create.content.curiosities.toolbox.ToolBoxInstance;
-import com.simibubi.create.content.curiosities.toolbox.ToolboxBlockEntity;
-import com.simibubi.create.content.curiosities.toolbox.ToolboxRenderer;
-import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelBlockEntity;
-import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelInstance;
-import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelRenderer;
-import com.simibubi.create.content.logistics.block.belts.tunnel.BrassTunnelBlockEntity;
-import com.simibubi.create.content.logistics.block.chute.ChuteBlockEntity;
-import com.simibubi.create.content.logistics.block.chute.ChuteRenderer;
-import com.simibubi.create.content.logistics.block.chute.SmartChuteBlockEntity;
-import com.simibubi.create.content.logistics.block.chute.SmartChuteRenderer;
-import com.simibubi.create.content.logistics.block.depot.DepotBlockEntity;
-import com.simibubi.create.content.logistics.block.depot.DepotRenderer;
-import com.simibubi.create.content.logistics.block.depot.EjectorBlockEntity;
-import com.simibubi.create.content.logistics.block.depot.EjectorInstance;
-import com.simibubi.create.content.logistics.block.depot.EjectorRenderer;
-import com.simibubi.create.content.logistics.block.diodes.BrassDiodeInstance;
-import com.simibubi.create.content.logistics.block.diodes.BrassDiodeRenderer;
-import com.simibubi.create.content.logistics.block.diodes.PulseExtenderBlockEntity;
-import com.simibubi.create.content.logistics.block.diodes.PulseRepeaterBlockEntity;
-import com.simibubi.create.content.logistics.block.display.DisplayLinkBlockEntity;
-import com.simibubi.create.content.logistics.block.display.DisplayLinkRenderer;
-import com.simibubi.create.content.logistics.block.display.source.NixieTubeDisplaySource;
-import com.simibubi.create.content.logistics.block.display.target.NixieTubeDisplayTarget;
-import com.simibubi.create.content.logistics.block.funnel.FunnelBlockEntity;
-import com.simibubi.create.content.logistics.block.funnel.FunnelInstance;
-import com.simibubi.create.content.logistics.block.funnel.FunnelRenderer;
-import com.simibubi.create.content.logistics.block.inventories.CreativeCrateBlockEntity;
-import com.simibubi.create.content.logistics.block.mechanicalArm.ArmBlockEntity;
-import com.simibubi.create.content.logistics.block.mechanicalArm.ArmInstance;
-import com.simibubi.create.content.logistics.block.mechanicalArm.ArmRenderer;
-import com.simibubi.create.content.logistics.block.redstone.AnalogLeverBlockEntity;
-import com.simibubi.create.content.logistics.block.redstone.AnalogLeverInstance;
-import com.simibubi.create.content.logistics.block.redstone.AnalogLeverRenderer;
-import com.simibubi.create.content.logistics.block.redstone.NixieTubeBlockEntity;
-import com.simibubi.create.content.logistics.block.redstone.NixieTubeRenderer;
-import com.simibubi.create.content.logistics.block.redstone.RedstoneLinkBlockEntity;
-import com.simibubi.create.content.logistics.block.redstone.SmartObserverBlockEntity;
-import com.simibubi.create.content.logistics.block.redstone.ThresholdSwitchBlockEntity;
-import com.simibubi.create.content.logistics.block.vault.ItemVaultBlockEntity;
-import com.simibubi.create.content.logistics.item.LecternControllerBlockEntity;
-import com.simibubi.create.content.logistics.item.LecternControllerRenderer;
-import com.simibubi.create.content.logistics.trains.BogeyBlockEntityRenderer;
-import com.simibubi.create.content.logistics.trains.TrackMaterial;
-import com.simibubi.create.content.logistics.trains.management.display.FlapDisplayBlockEntity;
-import com.simibubi.create.content.logistics.trains.management.display.FlapDisplayRenderer;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.observer.TrackObserverBlockEntity;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.observer.TrackObserverRenderer;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.SignalBlockEntity;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.SignalRenderer;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.station.StationBlockEntity;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.station.StationRenderer;
-import com.simibubi.create.content.logistics.trains.track.FakeTrackBlockEntity;
-import com.simibubi.create.content.logistics.trains.track.StandardBogeyBlockEntity;
-import com.simibubi.create.content.logistics.trains.track.TrackBlockEntity;
-import com.simibubi.create.content.logistics.trains.track.TrackInstance;
-import com.simibubi.create.content.logistics.trains.track.TrackRenderer;
-import com.simibubi.create.content.schematics.block.SchematicTableBlockEntity;
-import com.simibubi.create.content.schematics.block.SchematicannonBlockEntity;
-import com.simibubi.create.content.schematics.block.SchematicannonInstance;
-import com.simibubi.create.content.schematics.block.SchematicannonRenderer;
+import com.simibubi.create.content.contraptions.actors.contraptionControls.ContraptionControlsBlockEntity;
+import com.simibubi.create.content.contraptions.actors.contraptionControls.ContraptionControlsRenderer;
+import com.simibubi.create.content.contraptions.actors.harvester.HarvesterBlockEntity;
+import com.simibubi.create.content.contraptions.actors.harvester.HarvesterRenderer;
+import com.simibubi.create.content.contraptions.actors.psi.PSIInstance;
+import com.simibubi.create.content.contraptions.actors.psi.PortableFluidInterfaceBlockEntity;
+import com.simibubi.create.content.contraptions.actors.psi.PortableItemInterfaceBlockEntity;
+import com.simibubi.create.content.contraptions.actors.psi.PortableStorageInterfaceRenderer;
+import com.simibubi.create.content.contraptions.actors.roller.RollerBlockEntity;
+import com.simibubi.create.content.contraptions.actors.roller.RollerRenderer;
+import com.simibubi.create.content.contraptions.bearing.BearingInstance;
+import com.simibubi.create.content.contraptions.bearing.BearingRenderer;
+import com.simibubi.create.content.contraptions.bearing.ClockworkBearingBlockEntity;
+import com.simibubi.create.content.contraptions.bearing.MechanicalBearingBlockEntity;
+import com.simibubi.create.content.contraptions.bearing.WindmillBearingBlockEntity;
+import com.simibubi.create.content.contraptions.chassis.ChassisBlockEntity;
+import com.simibubi.create.content.contraptions.chassis.StickerBlockEntity;
+import com.simibubi.create.content.contraptions.chassis.StickerInstance;
+import com.simibubi.create.content.contraptions.chassis.StickerRenderer;
+import com.simibubi.create.content.contraptions.elevator.ElevatorContactBlockEntity;
+import com.simibubi.create.content.contraptions.elevator.ElevatorPulleyBlockEntity;
+import com.simibubi.create.content.contraptions.elevator.ElevatorPulleyRenderer;
+import com.simibubi.create.content.contraptions.gantry.GantryCarriageBlockEntity;
+import com.simibubi.create.content.contraptions.gantry.GantryCarriageInstance;
+import com.simibubi.create.content.contraptions.gantry.GantryCarriageRenderer;
+import com.simibubi.create.content.contraptions.mounted.CartAssemblerBlockEntity;
+import com.simibubi.create.content.contraptions.piston.MechanicalPistonBlockEntity;
+import com.simibubi.create.content.contraptions.piston.MechanicalPistonRenderer;
+import com.simibubi.create.content.contraptions.pulley.HosePulleyInstance;
+import com.simibubi.create.content.contraptions.pulley.PulleyBlockEntity;
+import com.simibubi.create.content.contraptions.pulley.PulleyRenderer;
+import com.simibubi.create.content.contraptions.pulley.RopePulleyInstance;
+import com.simibubi.create.content.decoration.copycat.CopycatBlockEntity;
+import com.simibubi.create.content.decoration.placard.PlacardBlockEntity;
+import com.simibubi.create.content.decoration.placard.PlacardRenderer;
+import com.simibubi.create.content.decoration.slidingDoor.SlidingDoorBlockEntity;
+import com.simibubi.create.content.decoration.slidingDoor.SlidingDoorRenderer;
+import com.simibubi.create.content.decoration.steamWhistle.WhistleBlockEntity;
+import com.simibubi.create.content.decoration.steamWhistle.WhistleRenderer;
+import com.simibubi.create.content.equipment.armor.BacktankBlockEntity;
+import com.simibubi.create.content.equipment.armor.BacktankInstance;
+import com.simibubi.create.content.equipment.armor.BacktankRenderer;
+import com.simibubi.create.content.equipment.bell.BellRenderer;
+import com.simibubi.create.content.equipment.bell.HauntedBellBlockEntity;
+import com.simibubi.create.content.equipment.bell.PeculiarBellBlockEntity;
+import com.simibubi.create.content.equipment.clipboard.ClipboardBlockEntity;
+import com.simibubi.create.content.equipment.toolbox.ToolBoxInstance;
+import com.simibubi.create.content.equipment.toolbox.ToolboxBlockEntity;
+import com.simibubi.create.content.equipment.toolbox.ToolboxRenderer;
+import com.simibubi.create.content.fluids.drain.ItemDrainBlockEntity;
+import com.simibubi.create.content.fluids.drain.ItemDrainRenderer;
+import com.simibubi.create.content.fluids.hosePulley.HosePulleyBlockEntity;
+import com.simibubi.create.content.fluids.hosePulley.HosePulleyRenderer;
+import com.simibubi.create.content.fluids.pipes.FluidPipeBlockEntity;
+import com.simibubi.create.content.fluids.pipes.SmartFluidPipeBlockEntity;
+import com.simibubi.create.content.fluids.pipes.StraightPipeBlockEntity;
+import com.simibubi.create.content.fluids.pipes.TransparentStraightPipeRenderer;
+import com.simibubi.create.content.fluids.pipes.valve.FluidValveBlockEntity;
+import com.simibubi.create.content.fluids.pipes.valve.FluidValveInstance;
+import com.simibubi.create.content.fluids.pipes.valve.FluidValveRenderer;
+import com.simibubi.create.content.fluids.pump.PumpBlockEntity;
+import com.simibubi.create.content.fluids.pump.PumpCogInstance;
+import com.simibubi.create.content.fluids.pump.PumpRenderer;
+import com.simibubi.create.content.fluids.spout.SpoutBlockEntity;
+import com.simibubi.create.content.fluids.spout.SpoutRenderer;
+import com.simibubi.create.content.fluids.tank.CreativeFluidTankBlockEntity;
+import com.simibubi.create.content.fluids.tank.FluidTankBlockEntity;
+import com.simibubi.create.content.fluids.tank.FluidTankRenderer;
+import com.simibubi.create.content.kinetics.base.CutoutRotatingInstance;
+import com.simibubi.create.content.kinetics.base.HalfShaftInstance;
+import com.simibubi.create.content.kinetics.base.HorizontalHalfShaftInstance;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
+import com.simibubi.create.content.kinetics.base.ShaftInstance;
+import com.simibubi.create.content.kinetics.base.ShaftRenderer;
+import com.simibubi.create.content.kinetics.base.SingleRotatingInstance;
+import com.simibubi.create.content.kinetics.belt.BeltBlockEntity;
+import com.simibubi.create.content.kinetics.belt.BeltInstance;
+import com.simibubi.create.content.kinetics.belt.BeltRenderer;
+import com.simibubi.create.content.kinetics.chainDrive.ChainGearshiftBlockEntity;
+import com.simibubi.create.content.kinetics.clock.CuckooClockBlockEntity;
+import com.simibubi.create.content.kinetics.clock.CuckooClockRenderer;
+import com.simibubi.create.content.kinetics.crafter.MechanicalCrafterBlockEntity;
+import com.simibubi.create.content.kinetics.crafter.MechanicalCrafterRenderer;
+import com.simibubi.create.content.kinetics.crafter.ShaftlessCogwheelInstance;
+import com.simibubi.create.content.kinetics.crank.HandCrankBlockEntity;
+import com.simibubi.create.content.kinetics.crank.HandCrankInstance;
+import com.simibubi.create.content.kinetics.crank.HandCrankRenderer;
+import com.simibubi.create.content.kinetics.crank.ValveHandleBlockEntity;
+import com.simibubi.create.content.kinetics.crusher.CrushingWheelBlockEntity;
+import com.simibubi.create.content.kinetics.crusher.CrushingWheelControllerBlockEntity;
+import com.simibubi.create.content.kinetics.deployer.DeployerBlockEntity;
+import com.simibubi.create.content.kinetics.deployer.DeployerInstance;
+import com.simibubi.create.content.kinetics.deployer.DeployerRenderer;
+import com.simibubi.create.content.kinetics.drill.DrillBlockEntity;
+import com.simibubi.create.content.kinetics.drill.DrillInstance;
+import com.simibubi.create.content.kinetics.drill.DrillRenderer;
+import com.simibubi.create.content.kinetics.fan.EncasedFanBlockEntity;
+import com.simibubi.create.content.kinetics.fan.EncasedFanRenderer;
+import com.simibubi.create.content.kinetics.fan.FanInstance;
+import com.simibubi.create.content.kinetics.fan.NozzleBlockEntity;
+import com.simibubi.create.content.kinetics.flywheel.FlywheelBlockEntity;
+import com.simibubi.create.content.kinetics.flywheel.FlywheelInstance;
+import com.simibubi.create.content.kinetics.flywheel.FlywheelRenderer;
+import com.simibubi.create.content.kinetics.gantry.GantryShaftBlockEntity;
+import com.simibubi.create.content.kinetics.gauge.GaugeInstance;
+import com.simibubi.create.content.kinetics.gauge.GaugeRenderer;
+import com.simibubi.create.content.kinetics.gauge.SpeedGaugeBlockEntity;
+import com.simibubi.create.content.kinetics.gauge.StressGaugeBlockEntity;
+import com.simibubi.create.content.kinetics.gearbox.GearboxBlockEntity;
+import com.simibubi.create.content.kinetics.gearbox.GearboxInstance;
+import com.simibubi.create.content.kinetics.gearbox.GearboxRenderer;
+import com.simibubi.create.content.kinetics.mechanicalArm.ArmBlockEntity;
+import com.simibubi.create.content.kinetics.mechanicalArm.ArmInstance;
+import com.simibubi.create.content.kinetics.mechanicalArm.ArmRenderer;
+import com.simibubi.create.content.kinetics.millstone.MillstoneBlockEntity;
+import com.simibubi.create.content.kinetics.millstone.MillstoneCogInstance;
+import com.simibubi.create.content.kinetics.millstone.MillstoneRenderer;
+import com.simibubi.create.content.kinetics.mixer.MechanicalMixerBlockEntity;
+import com.simibubi.create.content.kinetics.mixer.MechanicalMixerRenderer;
+import com.simibubi.create.content.kinetics.mixer.MixerInstance;
+import com.simibubi.create.content.kinetics.motor.CreativeMotorBlockEntity;
+import com.simibubi.create.content.kinetics.motor.CreativeMotorRenderer;
+import com.simibubi.create.content.kinetics.press.MechanicalPressBlockEntity;
+import com.simibubi.create.content.kinetics.press.MechanicalPressRenderer;
+import com.simibubi.create.content.kinetics.press.PressInstance;
+import com.simibubi.create.content.kinetics.saw.SawBlockEntity;
+import com.simibubi.create.content.kinetics.saw.SawInstance;
+import com.simibubi.create.content.kinetics.saw.SawRenderer;
+import com.simibubi.create.content.kinetics.simpleRelays.BracketedKineticBlockEntity;
+import com.simibubi.create.content.kinetics.simpleRelays.BracketedKineticBlockEntityInstance;
+import com.simibubi.create.content.kinetics.simpleRelays.BracketedKineticBlockEntityRenderer;
+import com.simibubi.create.content.kinetics.simpleRelays.SimpleKineticBlockEntity;
+import com.simibubi.create.content.kinetics.simpleRelays.encased.EncasedCogInstance;
+import com.simibubi.create.content.kinetics.simpleRelays.encased.EncasedCogRenderer;
+import com.simibubi.create.content.kinetics.speedController.SpeedControllerBlockEntity;
+import com.simibubi.create.content.kinetics.speedController.SpeedControllerRenderer;
+import com.simibubi.create.content.kinetics.steamEngine.PoweredShaftBlockEntity;
+import com.simibubi.create.content.kinetics.steamEngine.SteamEngineBlockEntity;
+import com.simibubi.create.content.kinetics.steamEngine.SteamEngineInstance;
+import com.simibubi.create.content.kinetics.steamEngine.SteamEngineRenderer;
+import com.simibubi.create.content.kinetics.transmission.ClutchBlockEntity;
+import com.simibubi.create.content.kinetics.transmission.GearshiftBlockEntity;
+import com.simibubi.create.content.kinetics.transmission.SplitShaftInstance;
+import com.simibubi.create.content.kinetics.transmission.SplitShaftRenderer;
+import com.simibubi.create.content.kinetics.transmission.sequencer.SequencedGearshiftBlockEntity;
+import com.simibubi.create.content.kinetics.turntable.TurntableBlockEntity;
+import com.simibubi.create.content.kinetics.waterwheel.LargeWaterWheelBlockEntity;
+import com.simibubi.create.content.kinetics.waterwheel.WaterWheelBlockEntity;
+import com.simibubi.create.content.kinetics.waterwheel.WaterWheelInstance;
+import com.simibubi.create.content.kinetics.waterwheel.WaterWheelRenderer;
+import com.simibubi.create.content.logistics.chute.ChuteBlockEntity;
+import com.simibubi.create.content.logistics.chute.ChuteRenderer;
+import com.simibubi.create.content.logistics.chute.SmartChuteBlockEntity;
+import com.simibubi.create.content.logistics.chute.SmartChuteRenderer;
+import com.simibubi.create.content.logistics.crate.CreativeCrateBlockEntity;
+import com.simibubi.create.content.logistics.depot.DepotBlockEntity;
+import com.simibubi.create.content.logistics.depot.DepotRenderer;
+import com.simibubi.create.content.logistics.depot.EjectorBlockEntity;
+import com.simibubi.create.content.logistics.depot.EjectorInstance;
+import com.simibubi.create.content.logistics.depot.EjectorRenderer;
+import com.simibubi.create.content.logistics.funnel.FunnelBlockEntity;
+import com.simibubi.create.content.logistics.funnel.FunnelInstance;
+import com.simibubi.create.content.logistics.funnel.FunnelRenderer;
+import com.simibubi.create.content.logistics.tunnel.BeltTunnelBlockEntity;
+import com.simibubi.create.content.logistics.tunnel.BeltTunnelInstance;
+import com.simibubi.create.content.logistics.tunnel.BeltTunnelRenderer;
+import com.simibubi.create.content.logistics.tunnel.BrassTunnelBlockEntity;
+import com.simibubi.create.content.logistics.vault.ItemVaultBlockEntity;
+import com.simibubi.create.content.processing.basin.BasinBlockEntity;
+import com.simibubi.create.content.processing.basin.BasinRenderer;
+import com.simibubi.create.content.processing.burner.BlazeBurnerBlockEntity;
+import com.simibubi.create.content.processing.burner.BlazeBurnerRenderer;
+import com.simibubi.create.content.redstone.analogLever.AnalogLeverBlockEntity;
+import com.simibubi.create.content.redstone.analogLever.AnalogLeverInstance;
+import com.simibubi.create.content.redstone.analogLever.AnalogLeverRenderer;
+import com.simibubi.create.content.redstone.diodes.BrassDiodeInstance;
+import com.simibubi.create.content.redstone.diodes.BrassDiodeRenderer;
+import com.simibubi.create.content.redstone.diodes.PulseExtenderBlockEntity;
+import com.simibubi.create.content.redstone.diodes.PulseRepeaterBlockEntity;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkBlockEntity;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkRenderer;
+import com.simibubi.create.content.redstone.displayLink.source.NixieTubeDisplaySource;
+import com.simibubi.create.content.redstone.displayLink.target.NixieTubeDisplayTarget;
+import com.simibubi.create.content.redstone.link.RedstoneLinkBlockEntity;
+import com.simibubi.create.content.redstone.link.controller.LecternControllerBlockEntity;
+import com.simibubi.create.content.redstone.link.controller.LecternControllerRenderer;
+import com.simibubi.create.content.redstone.nixieTube.NixieTubeBlockEntity;
+import com.simibubi.create.content.redstone.nixieTube.NixieTubeRenderer;
+import com.simibubi.create.content.redstone.smartObserver.SmartObserverBlockEntity;
+import com.simibubi.create.content.redstone.thresholdSwitch.ThresholdSwitchBlockEntity;
+import com.simibubi.create.content.schematics.cannon.SchematicannonBlockEntity;
+import com.simibubi.create.content.schematics.cannon.SchematicannonInstance;
+import com.simibubi.create.content.schematics.cannon.SchematicannonRenderer;
+import com.simibubi.create.content.schematics.table.SchematicTableBlockEntity;
+import com.simibubi.create.content.trains.bogey.BogeyBlockEntityRenderer;
+import com.simibubi.create.content.trains.bogey.StandardBogeyBlockEntity;
+import com.simibubi.create.content.trains.display.FlapDisplayBlockEntity;
+import com.simibubi.create.content.trains.display.FlapDisplayRenderer;
+import com.simibubi.create.content.trains.observer.TrackObserverBlockEntity;
+import com.simibubi.create.content.trains.observer.TrackObserverRenderer;
+import com.simibubi.create.content.trains.signal.SignalBlockEntity;
+import com.simibubi.create.content.trains.signal.SignalRenderer;
+import com.simibubi.create.content.trains.station.StationBlockEntity;
+import com.simibubi.create.content.trains.station.StationRenderer;
+import com.simibubi.create.content.trains.track.FakeTrackBlockEntity;
+import com.simibubi.create.content.trains.track.TrackBlockEntity;
+import com.simibubi.create.content.trains.track.TrackInstance;
+import com.simibubi.create.content.trains.track.TrackMaterial;
+import com.simibubi.create.content.trains.track.TrackRenderer;
 import com.simibubi.create.foundation.blockEntity.renderer.SmartBlockEntityRenderer;
 import com.tterrag.registrate.util.entry.BlockEntityEntry;
 
@@ -275,8 +275,8 @@ public class AllBlockEntityTypes {
 		.renderer(() -> EncasedCogRenderer::large)
 		.register();
 
-	public static final BlockEntityEntry<AdjustablePulleyBlockEntity> ADJUSTABLE_PULLEY = REGISTRATE
-		.blockEntity("adjustable_pulley", AdjustablePulleyBlockEntity::new)
+	public static final BlockEntityEntry<ChainGearshiftBlockEntity> ADJUSTABLE_CHAIN_GEARSHIFT = REGISTRATE
+		.blockEntity("adjustable_chain_gearshift", ChainGearshiftBlockEntity::new)
 		.instance(() -> ShaftInstance::new, false)
 		.validBlocks(AllBlocks.ADJUSTABLE_CHAIN_GEARSHIFT)
 		.renderer(() -> ShaftRenderer::new)
diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java
index 72fec17d1..aaa020f40 100644
--- a/src/main/java/com/simibubi/create/AllBlocks.java
+++ b/src/main/java/com/simibubi/create/AllBlocks.java
@@ -3,7 +3,7 @@ package com.simibubi.create;
 import static com.simibubi.create.AllInteractionBehaviours.interactionBehaviour;
 import static com.simibubi.create.AllMovementBehaviours.movementBehaviour;
 import static com.simibubi.create.Create.REGISTRATE;
-import static com.simibubi.create.content.logistics.block.display.AllDisplayBehaviours.assignDataBehaviour;
+import static com.simibubi.create.content.redstone.displayLink.AllDisplayBehaviours.assignDataBehaviour;
 import static com.simibubi.create.foundation.data.BlockStateGen.axisBlock;
 import static com.simibubi.create.foundation.data.BlockStateGen.simpleCubeAll;
 import static com.simibubi.create.foundation.data.CreateRegistrate.connectedTextures;
@@ -15,238 +15,239 @@ import static com.simibubi.create.foundation.data.TagGen.tagBlockAndItem;
 
 import com.simibubi.create.AllTags.AllBlockTags;
 import com.simibubi.create.AllTags.AllItemTags;
-import com.simibubi.create.content.contraptions.base.CasingBlock;
-import com.simibubi.create.content.contraptions.components.AssemblyOperatorBlockItem;
-import com.simibubi.create.content.contraptions.components.actors.BellMovementBehaviour;
-import com.simibubi.create.content.contraptions.components.actors.DrillBlock;
-import com.simibubi.create.content.contraptions.components.actors.DrillMovementBehaviour;
-import com.simibubi.create.content.contraptions.components.actors.HarvesterBlock;
-import com.simibubi.create.content.contraptions.components.actors.HarvesterMovementBehaviour;
-import com.simibubi.create.content.contraptions.components.actors.PloughBlock;
-import com.simibubi.create.content.contraptions.components.actors.PloughMovementBehaviour;
-import com.simibubi.create.content.contraptions.components.actors.PortableStorageInterfaceBlock;
-import com.simibubi.create.content.contraptions.components.actors.PortableStorageInterfaceMovement;
-import com.simibubi.create.content.contraptions.components.actors.RollerBlock;
-import com.simibubi.create.content.contraptions.components.actors.RollerBlockItem;
-import com.simibubi.create.content.contraptions.components.actors.RollerMovementBehaviour;
-import com.simibubi.create.content.contraptions.components.actors.SawMovementBehaviour;
-import com.simibubi.create.content.contraptions.components.actors.SeatBlock;
-import com.simibubi.create.content.contraptions.components.actors.SeatInteractionBehaviour;
-import com.simibubi.create.content.contraptions.components.actors.SeatMovementBehaviour;
-import com.simibubi.create.content.contraptions.components.actors.controls.ContraptionControlsBlock;
-import com.simibubi.create.content.contraptions.components.actors.controls.ContraptionControlsMovement;
-import com.simibubi.create.content.contraptions.components.actors.controls.ContraptionControlsMovingInteraction;
-import com.simibubi.create.content.contraptions.components.clock.CuckooClockBlock;
-import com.simibubi.create.content.contraptions.components.crafter.CrafterCTBehaviour;
-import com.simibubi.create.content.contraptions.components.crafter.MechanicalCrafterBlock;
-import com.simibubi.create.content.contraptions.components.crank.HandCrankBlock;
-import com.simibubi.create.content.contraptions.components.crank.ValveHandleBlock;
-import com.simibubi.create.content.contraptions.components.crusher.CrushingWheelBlock;
-import com.simibubi.create.content.contraptions.components.crusher.CrushingWheelControllerBlock;
-import com.simibubi.create.content.contraptions.components.deployer.DeployerBlock;
-import com.simibubi.create.content.contraptions.components.deployer.DeployerMovementBehaviour;
-import com.simibubi.create.content.contraptions.components.deployer.DeployerMovingInteraction;
-import com.simibubi.create.content.contraptions.components.fan.EncasedFanBlock;
-import com.simibubi.create.content.contraptions.components.fan.NozzleBlock;
-import com.simibubi.create.content.contraptions.components.flywheel.FlywheelBlock;
-import com.simibubi.create.content.contraptions.components.millstone.MillstoneBlock;
-import com.simibubi.create.content.contraptions.components.mixer.MechanicalMixerBlock;
-import com.simibubi.create.content.contraptions.components.motor.CreativeMotorBlock;
-import com.simibubi.create.content.contraptions.components.motor.CreativeMotorGenerator;
-import com.simibubi.create.content.contraptions.components.press.MechanicalPressBlock;
-import com.simibubi.create.content.contraptions.components.saw.SawBlock;
-import com.simibubi.create.content.contraptions.components.saw.SawGenerator;
-import com.simibubi.create.content.contraptions.components.steam.PoweredShaftBlock;
-import com.simibubi.create.content.contraptions.components.steam.SteamEngineBlock;
-import com.simibubi.create.content.contraptions.components.steam.whistle.WhistleBlock;
-import com.simibubi.create.content.contraptions.components.steam.whistle.WhistleExtenderBlock;
-import com.simibubi.create.content.contraptions.components.steam.whistle.WhistleGenerator;
-import com.simibubi.create.content.contraptions.components.structureMovement.bearing.BlankSailBlockItem;
-import com.simibubi.create.content.contraptions.components.structureMovement.bearing.ClockworkBearingBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.bearing.MechanicalBearingBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.bearing.SailBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.bearing.StabilizedBearingMovementBehaviour;
-import com.simibubi.create.content.contraptions.components.structureMovement.bearing.WindmillBearingBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.chassis.LinearChassisBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.chassis.LinearChassisBlock.ChassisCTBehaviour;
-import com.simibubi.create.content.contraptions.components.structureMovement.chassis.RadialChassisBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.chassis.StickerBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.elevator.ElevatorContactBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.elevator.ElevatorPulleyBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.gantry.GantryCarriageBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.interaction.controls.ControlsBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.interaction.controls.ControlsInteractionBehaviour;
-import com.simibubi.create.content.contraptions.components.structureMovement.interaction.controls.ControlsMovementBehaviour;
-import com.simibubi.create.content.contraptions.components.structureMovement.mounted.CartAssemblerBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.mounted.CartAssemblerBlock.MinecartAnchorBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.mounted.CartAssemblerBlockItem;
-import com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonHeadBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.piston.PistonExtensionPoleBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.pulley.PulleyBlock;
-import com.simibubi.create.content.contraptions.components.tracks.ControllerRailBlock;
-import com.simibubi.create.content.contraptions.components.tracks.ControllerRailGenerator;
-import com.simibubi.create.content.contraptions.components.turntable.TurntableBlock;
-import com.simibubi.create.content.contraptions.components.waterwheel.LargeWaterWheelBlock;
-import com.simibubi.create.content.contraptions.components.waterwheel.LargeWaterWheelBlockItem;
-import com.simibubi.create.content.contraptions.components.waterwheel.WaterWheelBlock;
-import com.simibubi.create.content.contraptions.components.waterwheel.WaterWheelStructuralBlock;
-import com.simibubi.create.content.contraptions.fluids.PipeAttachmentModel;
-import com.simibubi.create.content.contraptions.fluids.PumpBlock;
-import com.simibubi.create.content.contraptions.fluids.actors.HosePulleyBlock;
-import com.simibubi.create.content.contraptions.fluids.actors.ItemDrainBlock;
-import com.simibubi.create.content.contraptions.fluids.actors.SpoutBlock;
-import com.simibubi.create.content.contraptions.fluids.pipes.BracketBlock;
-import com.simibubi.create.content.contraptions.fluids.pipes.BracketBlockItem;
-import com.simibubi.create.content.contraptions.fluids.pipes.BracketGenerator;
-import com.simibubi.create.content.contraptions.fluids.pipes.EncasedPipeBlock;
-import com.simibubi.create.content.contraptions.fluids.pipes.FluidPipeBlock;
-import com.simibubi.create.content.contraptions.fluids.pipes.FluidValveBlock;
-import com.simibubi.create.content.contraptions.fluids.pipes.GlassFluidPipeBlock;
-import com.simibubi.create.content.contraptions.fluids.pipes.SmartFluidPipeBlock;
-import com.simibubi.create.content.contraptions.fluids.pipes.SmartFluidPipeGenerator;
-import com.simibubi.create.content.contraptions.fluids.tank.FluidTankBlock;
-import com.simibubi.create.content.contraptions.fluids.tank.FluidTankGenerator;
-import com.simibubi.create.content.contraptions.fluids.tank.FluidTankItem;
-import com.simibubi.create.content.contraptions.fluids.tank.FluidTankModel;
-import com.simibubi.create.content.contraptions.processing.BasinBlock;
-import com.simibubi.create.content.contraptions.processing.BasinGenerator;
-import com.simibubi.create.content.contraptions.processing.BasinMovementBehaviour;
-import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock;
-import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlockItem;
-import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerInteractionBehaviour;
-import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerMovementBehaviour;
-import com.simibubi.create.content.contraptions.processing.burner.LitBlazeBurnerBlock;
-import com.simibubi.create.content.contraptions.relays.advanced.GantryShaftBlock;
-import com.simibubi.create.content.contraptions.relays.advanced.SpeedControllerBlock;
-import com.simibubi.create.content.contraptions.relays.advanced.sequencer.SequencedGearshiftBlock;
-import com.simibubi.create.content.contraptions.relays.advanced.sequencer.SequencedGearshiftGenerator;
-import com.simibubi.create.content.contraptions.relays.belt.BeltBlock;
-import com.simibubi.create.content.contraptions.relays.belt.BeltGenerator;
-import com.simibubi.create.content.contraptions.relays.belt.BeltModel;
-import com.simibubi.create.content.contraptions.relays.elementary.BracketedKineticBlockModel;
-import com.simibubi.create.content.contraptions.relays.elementary.CogWheelBlock;
-import com.simibubi.create.content.contraptions.relays.elementary.CogwheelBlockItem;
-import com.simibubi.create.content.contraptions.relays.elementary.EncasingRegistry;
-import com.simibubi.create.content.contraptions.relays.elementary.ShaftBlock;
-import com.simibubi.create.content.contraptions.relays.encased.AdjustablePulleyBlock;
-import com.simibubi.create.content.contraptions.relays.encased.ClutchBlock;
-import com.simibubi.create.content.contraptions.relays.encased.EncasedBeltBlock;
-import com.simibubi.create.content.contraptions.relays.encased.EncasedBeltGenerator;
-import com.simibubi.create.content.contraptions.relays.encased.EncasedCTBehaviour;
-import com.simibubi.create.content.contraptions.relays.encased.EncasedCogCTBehaviour;
-import com.simibubi.create.content.contraptions.relays.encased.EncasedCogwheelBlock;
-import com.simibubi.create.content.contraptions.relays.encased.EncasedShaftBlock;
-import com.simibubi.create.content.contraptions.relays.encased.GearshiftBlock;
-import com.simibubi.create.content.contraptions.relays.gauge.GaugeBlock;
-import com.simibubi.create.content.contraptions.relays.gauge.GaugeGenerator;
-import com.simibubi.create.content.contraptions.relays.gearbox.GearboxBlock;
-import com.simibubi.create.content.curiosities.armor.BacktankBlock;
-import com.simibubi.create.content.curiosities.bell.HauntedBellBlock;
-import com.simibubi.create.content.curiosities.bell.HauntedBellMovementBehaviour;
-import com.simibubi.create.content.curiosities.bell.PeculiarBellBlock;
-import com.simibubi.create.content.curiosities.clipboard.ClipboardBlock;
-import com.simibubi.create.content.curiosities.clipboard.ClipboardBlockItem;
-import com.simibubi.create.content.curiosities.clipboard.ClipboardOverrides;
-import com.simibubi.create.content.curiosities.deco.MetalLadderBlock;
-import com.simibubi.create.content.curiosities.deco.MetalScaffoldingBlock;
-import com.simibubi.create.content.curiosities.deco.PlacardBlock;
-import com.simibubi.create.content.curiosities.deco.SlidingDoorBlock;
-import com.simibubi.create.content.curiosities.deco.TrainTrapdoorBlock;
-import com.simibubi.create.content.curiosities.deco.TrapdoorCTBehaviour;
-import com.simibubi.create.content.curiosities.frames.CopycatBarsModel;
-import com.simibubi.create.content.curiosities.frames.CopycatPanelBlock;
-import com.simibubi.create.content.curiosities.frames.CopycatPanelModel;
-import com.simibubi.create.content.curiosities.frames.CopycatStepBlock;
-import com.simibubi.create.content.curiosities.frames.CopycatStepModel;
-import com.simibubi.create.content.curiosities.frames.SpecialCopycatPanelBlockState;
-import com.simibubi.create.content.curiosities.girder.ConnectedGirderModel;
-import com.simibubi.create.content.curiosities.girder.GirderBlock;
-import com.simibubi.create.content.curiosities.girder.GirderBlockStateGenerator;
-import com.simibubi.create.content.curiosities.girder.GirderEncasedShaftBlock;
-import com.simibubi.create.content.curiosities.toolbox.ToolboxBlock;
-import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelBlock;
-import com.simibubi.create.content.logistics.block.belts.tunnel.BrassTunnelBlock;
-import com.simibubi.create.content.logistics.block.belts.tunnel.BrassTunnelCTBehaviour;
-import com.simibubi.create.content.logistics.block.chute.ChuteBlock;
-import com.simibubi.create.content.logistics.block.chute.ChuteGenerator;
-import com.simibubi.create.content.logistics.block.chute.ChuteItem;
-import com.simibubi.create.content.logistics.block.chute.SmartChuteBlock;
-import com.simibubi.create.content.logistics.block.depot.DepotBlock;
-import com.simibubi.create.content.logistics.block.depot.EjectorBlock;
-import com.simibubi.create.content.logistics.block.depot.EjectorItem;
-import com.simibubi.create.content.logistics.block.diodes.AbstractDiodeGenerator;
-import com.simibubi.create.content.logistics.block.diodes.BrassDiodeBlock;
-import com.simibubi.create.content.logistics.block.diodes.BrassDiodeGenerator;
-import com.simibubi.create.content.logistics.block.diodes.PoweredLatchBlock;
-import com.simibubi.create.content.logistics.block.diodes.PoweredLatchGenerator;
-import com.simibubi.create.content.logistics.block.diodes.ToggleLatchBlock;
-import com.simibubi.create.content.logistics.block.diodes.ToggleLatchGenerator;
-import com.simibubi.create.content.logistics.block.display.DisplayLinkBlock;
-import com.simibubi.create.content.logistics.block.display.DisplayLinkBlockItem;
-import com.simibubi.create.content.logistics.block.display.source.AccumulatedItemCountDisplaySource;
-import com.simibubi.create.content.logistics.block.display.source.BoilerDisplaySource;
-import com.simibubi.create.content.logistics.block.display.source.CurrentFloorDisplaySource;
-import com.simibubi.create.content.logistics.block.display.source.EntityNameDisplaySource;
-import com.simibubi.create.content.logistics.block.display.source.FillLevelDisplaySource;
-import com.simibubi.create.content.logistics.block.display.source.FluidAmountDisplaySource;
-import com.simibubi.create.content.logistics.block.display.source.FluidListDisplaySource;
-import com.simibubi.create.content.logistics.block.display.source.ItemCountDisplaySource;
-import com.simibubi.create.content.logistics.block.display.source.ItemListDisplaySource;
-import com.simibubi.create.content.logistics.block.display.source.ItemNameDisplaySource;
-import com.simibubi.create.content.logistics.block.display.source.ItemThroughputDisplaySource;
-import com.simibubi.create.content.logistics.block.display.source.KineticSpeedDisplaySource;
-import com.simibubi.create.content.logistics.block.display.source.KineticStressDisplaySource;
-import com.simibubi.create.content.logistics.block.display.source.ObservedTrainNameSource;
-import com.simibubi.create.content.logistics.block.display.source.StationSummaryDisplaySource;
-import com.simibubi.create.content.logistics.block.display.source.StopWatchDisplaySource;
-import com.simibubi.create.content.logistics.block.display.source.TimeOfDayDisplaySource;
-import com.simibubi.create.content.logistics.block.display.source.TrainStatusDisplaySource;
-import com.simibubi.create.content.logistics.block.display.target.DisplayBoardTarget;
-import com.simibubi.create.content.logistics.block.funnel.AndesiteFunnelBlock;
-import com.simibubi.create.content.logistics.block.funnel.BeltFunnelBlock;
-import com.simibubi.create.content.logistics.block.funnel.BeltFunnelGenerator;
-import com.simibubi.create.content.logistics.block.funnel.BrassFunnelBlock;
-import com.simibubi.create.content.logistics.block.funnel.FunnelGenerator;
-import com.simibubi.create.content.logistics.block.funnel.FunnelItem;
-import com.simibubi.create.content.logistics.block.funnel.FunnelMovementBehaviour;
-import com.simibubi.create.content.logistics.block.inventories.CreativeCrateBlock;
-import com.simibubi.create.content.logistics.block.mechanicalArm.ArmBlock;
-import com.simibubi.create.content.logistics.block.mechanicalArm.ArmItem;
-import com.simibubi.create.content.logistics.block.redstone.AnalogLeverBlock;
-import com.simibubi.create.content.logistics.block.redstone.ContactMovementBehaviour;
-import com.simibubi.create.content.logistics.block.redstone.NixieTubeBlock;
-import com.simibubi.create.content.logistics.block.redstone.NixieTubeGenerator;
-import com.simibubi.create.content.logistics.block.redstone.RedstoneContactBlock;
-import com.simibubi.create.content.logistics.block.redstone.RedstoneContactItem;
-import com.simibubi.create.content.logistics.block.redstone.RedstoneLinkBlock;
-import com.simibubi.create.content.logistics.block.redstone.RedstoneLinkGenerator;
-import com.simibubi.create.content.logistics.block.redstone.RoseQuartzLampBlock;
-import com.simibubi.create.content.logistics.block.redstone.SmartObserverBlock;
-import com.simibubi.create.content.logistics.block.redstone.SmartObserverGenerator;
-import com.simibubi.create.content.logistics.block.redstone.ThresholdSwitchBlock;
-import com.simibubi.create.content.logistics.block.redstone.ThresholdSwitchGenerator;
-import com.simibubi.create.content.logistics.block.vault.ItemVaultBlock;
-import com.simibubi.create.content.logistics.block.vault.ItemVaultCTBehaviour;
-import com.simibubi.create.content.logistics.block.vault.ItemVaultItem;
-import com.simibubi.create.content.logistics.item.LecternControllerBlock;
-import com.simibubi.create.content.logistics.trains.BogeySizes;
-import com.simibubi.create.content.logistics.trains.TrackMaterial;
-import com.simibubi.create.content.logistics.trains.management.display.FlapDisplayBlock;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.EdgePointType;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.TrackTargetingBlockItem;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.observer.TrackObserverBlock;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.SignalBlock;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.station.StationBlock;
-import com.simibubi.create.content.logistics.trains.track.FakeTrackBlock;
-import com.simibubi.create.content.logistics.trains.track.StandardBogeyBlock;
-import com.simibubi.create.content.logistics.trains.track.TrackBlock;
-import com.simibubi.create.content.logistics.trains.track.TrackBlockItem;
-import com.simibubi.create.content.logistics.trains.track.TrackBlockStateGenerator;
-import com.simibubi.create.content.logistics.trains.track.TrackModel;
-import com.simibubi.create.content.schematics.block.SchematicTableBlock;
-import com.simibubi.create.content.schematics.block.SchematicannonBlock;
-import com.simibubi.create.foundation.block.BlockStressDefaults;
+import com.simibubi.create.content.contraptions.actors.contraptionControls.ContraptionControlsBlock;
+import com.simibubi.create.content.contraptions.actors.contraptionControls.ContraptionControlsMovement;
+import com.simibubi.create.content.contraptions.actors.contraptionControls.ContraptionControlsMovingInteraction;
+import com.simibubi.create.content.contraptions.actors.harvester.HarvesterBlock;
+import com.simibubi.create.content.contraptions.actors.harvester.HarvesterMovementBehaviour;
+import com.simibubi.create.content.contraptions.actors.plough.PloughBlock;
+import com.simibubi.create.content.contraptions.actors.plough.PloughMovementBehaviour;
+import com.simibubi.create.content.contraptions.actors.psi.PortableStorageInterfaceBlock;
+import com.simibubi.create.content.contraptions.actors.psi.PortableStorageInterfaceMovement;
+import com.simibubi.create.content.contraptions.actors.roller.RollerBlock;
+import com.simibubi.create.content.contraptions.actors.roller.RollerBlockItem;
+import com.simibubi.create.content.contraptions.actors.roller.RollerMovementBehaviour;
+import com.simibubi.create.content.contraptions.actors.seat.SeatBlock;
+import com.simibubi.create.content.contraptions.actors.seat.SeatInteractionBehaviour;
+import com.simibubi.create.content.contraptions.actors.seat.SeatMovementBehaviour;
+import com.simibubi.create.content.contraptions.actors.trainControls.ControlsBlock;
+import com.simibubi.create.content.contraptions.actors.trainControls.ControlsInteractionBehaviour;
+import com.simibubi.create.content.contraptions.actors.trainControls.ControlsMovementBehaviour;
+import com.simibubi.create.content.contraptions.bearing.BlankSailBlockItem;
+import com.simibubi.create.content.contraptions.bearing.ClockworkBearingBlock;
+import com.simibubi.create.content.contraptions.bearing.MechanicalBearingBlock;
+import com.simibubi.create.content.contraptions.bearing.SailBlock;
+import com.simibubi.create.content.contraptions.bearing.StabilizedBearingMovementBehaviour;
+import com.simibubi.create.content.contraptions.bearing.WindmillBearingBlock;
+import com.simibubi.create.content.contraptions.behaviour.BellMovementBehaviour;
+import com.simibubi.create.content.contraptions.chassis.LinearChassisBlock;
+import com.simibubi.create.content.contraptions.chassis.LinearChassisBlock.ChassisCTBehaviour;
+import com.simibubi.create.content.contraptions.chassis.RadialChassisBlock;
+import com.simibubi.create.content.contraptions.chassis.StickerBlock;
+import com.simibubi.create.content.contraptions.elevator.ElevatorContactBlock;
+import com.simibubi.create.content.contraptions.elevator.ElevatorPulleyBlock;
+import com.simibubi.create.content.contraptions.gantry.GantryCarriageBlock;
+import com.simibubi.create.content.contraptions.mounted.CartAssemblerBlock;
+import com.simibubi.create.content.contraptions.mounted.CartAssemblerBlock.MinecartAnchorBlock;
+import com.simibubi.create.content.contraptions.mounted.CartAssemblerBlockItem;
+import com.simibubi.create.content.contraptions.piston.MechanicalPistonBlock;
+import com.simibubi.create.content.contraptions.piston.MechanicalPistonHeadBlock;
+import com.simibubi.create.content.contraptions.piston.PistonExtensionPoleBlock;
+import com.simibubi.create.content.contraptions.pulley.PulleyBlock;
+import com.simibubi.create.content.decoration.MetalLadderBlock;
+import com.simibubi.create.content.decoration.MetalScaffoldingBlock;
+import com.simibubi.create.content.decoration.TrainTrapdoorBlock;
+import com.simibubi.create.content.decoration.TrapdoorCTBehaviour;
+import com.simibubi.create.content.decoration.bracket.BracketBlock;
+import com.simibubi.create.content.decoration.bracket.BracketBlockItem;
+import com.simibubi.create.content.decoration.bracket.BracketGenerator;
+import com.simibubi.create.content.decoration.copycat.CopycatBarsModel;
+import com.simibubi.create.content.decoration.copycat.CopycatPanelBlock;
+import com.simibubi.create.content.decoration.copycat.CopycatPanelModel;
+import com.simibubi.create.content.decoration.copycat.CopycatStepBlock;
+import com.simibubi.create.content.decoration.copycat.CopycatStepModel;
+import com.simibubi.create.content.decoration.copycat.SpecialCopycatPanelBlockState;
+import com.simibubi.create.content.decoration.encasing.CasingBlock;
+import com.simibubi.create.content.decoration.encasing.EncasedCTBehaviour;
+import com.simibubi.create.content.decoration.encasing.EncasingRegistry;
+import com.simibubi.create.content.decoration.girder.ConnectedGirderModel;
+import com.simibubi.create.content.decoration.girder.GirderBlock;
+import com.simibubi.create.content.decoration.girder.GirderBlockStateGenerator;
+import com.simibubi.create.content.decoration.girder.GirderEncasedShaftBlock;
+import com.simibubi.create.content.decoration.placard.PlacardBlock;
+import com.simibubi.create.content.decoration.slidingDoor.SlidingDoorBlock;
+import com.simibubi.create.content.decoration.steamWhistle.WhistleBlock;
+import com.simibubi.create.content.decoration.steamWhistle.WhistleExtenderBlock;
+import com.simibubi.create.content.decoration.steamWhistle.WhistleGenerator;
+import com.simibubi.create.content.equipment.armor.BacktankBlock;
+import com.simibubi.create.content.equipment.bell.HauntedBellBlock;
+import com.simibubi.create.content.equipment.bell.HauntedBellMovementBehaviour;
+import com.simibubi.create.content.equipment.bell.PeculiarBellBlock;
+import com.simibubi.create.content.equipment.clipboard.ClipboardBlock;
+import com.simibubi.create.content.equipment.clipboard.ClipboardBlockItem;
+import com.simibubi.create.content.equipment.clipboard.ClipboardOverrides;
+import com.simibubi.create.content.equipment.toolbox.ToolboxBlock;
+import com.simibubi.create.content.fluids.PipeAttachmentModel;
+import com.simibubi.create.content.fluids.drain.ItemDrainBlock;
+import com.simibubi.create.content.fluids.hosePulley.HosePulleyBlock;
+import com.simibubi.create.content.fluids.pipes.EncasedPipeBlock;
+import com.simibubi.create.content.fluids.pipes.FluidPipeBlock;
+import com.simibubi.create.content.fluids.pipes.GlassFluidPipeBlock;
+import com.simibubi.create.content.fluids.pipes.SmartFluidPipeBlock;
+import com.simibubi.create.content.fluids.pipes.SmartFluidPipeGenerator;
+import com.simibubi.create.content.fluids.pipes.valve.FluidValveBlock;
+import com.simibubi.create.content.fluids.pump.PumpBlock;
+import com.simibubi.create.content.fluids.spout.SpoutBlock;
+import com.simibubi.create.content.fluids.tank.FluidTankBlock;
+import com.simibubi.create.content.fluids.tank.FluidTankGenerator;
+import com.simibubi.create.content.fluids.tank.FluidTankItem;
+import com.simibubi.create.content.fluids.tank.FluidTankModel;
+import com.simibubi.create.content.kinetics.BlockStressDefaults;
+import com.simibubi.create.content.kinetics.belt.BeltBlock;
+import com.simibubi.create.content.kinetics.belt.BeltGenerator;
+import com.simibubi.create.content.kinetics.belt.BeltModel;
+import com.simibubi.create.content.kinetics.chainDrive.ChainDriveBlock;
+import com.simibubi.create.content.kinetics.chainDrive.ChainDriveGenerator;
+import com.simibubi.create.content.kinetics.chainDrive.ChainGearshiftBlock;
+import com.simibubi.create.content.kinetics.clock.CuckooClockBlock;
+import com.simibubi.create.content.kinetics.crafter.CrafterCTBehaviour;
+import com.simibubi.create.content.kinetics.crafter.MechanicalCrafterBlock;
+import com.simibubi.create.content.kinetics.crank.HandCrankBlock;
+import com.simibubi.create.content.kinetics.crank.ValveHandleBlock;
+import com.simibubi.create.content.kinetics.crusher.CrushingWheelBlock;
+import com.simibubi.create.content.kinetics.crusher.CrushingWheelControllerBlock;
+import com.simibubi.create.content.kinetics.deployer.DeployerBlock;
+import com.simibubi.create.content.kinetics.deployer.DeployerMovementBehaviour;
+import com.simibubi.create.content.kinetics.deployer.DeployerMovingInteraction;
+import com.simibubi.create.content.kinetics.drill.DrillBlock;
+import com.simibubi.create.content.kinetics.drill.DrillMovementBehaviour;
+import com.simibubi.create.content.kinetics.fan.EncasedFanBlock;
+import com.simibubi.create.content.kinetics.fan.NozzleBlock;
+import com.simibubi.create.content.kinetics.flywheel.FlywheelBlock;
+import com.simibubi.create.content.kinetics.gantry.GantryShaftBlock;
+import com.simibubi.create.content.kinetics.gauge.GaugeBlock;
+import com.simibubi.create.content.kinetics.gauge.GaugeGenerator;
+import com.simibubi.create.content.kinetics.gearbox.GearboxBlock;
+import com.simibubi.create.content.kinetics.mechanicalArm.ArmBlock;
+import com.simibubi.create.content.kinetics.mechanicalArm.ArmItem;
+import com.simibubi.create.content.kinetics.millstone.MillstoneBlock;
+import com.simibubi.create.content.kinetics.mixer.MechanicalMixerBlock;
+import com.simibubi.create.content.kinetics.motor.CreativeMotorBlock;
+import com.simibubi.create.content.kinetics.motor.CreativeMotorGenerator;
+import com.simibubi.create.content.kinetics.press.MechanicalPressBlock;
+import com.simibubi.create.content.kinetics.saw.SawBlock;
+import com.simibubi.create.content.kinetics.saw.SawGenerator;
+import com.simibubi.create.content.kinetics.saw.SawMovementBehaviour;
+import com.simibubi.create.content.kinetics.simpleRelays.BracketedKineticBlockModel;
+import com.simibubi.create.content.kinetics.simpleRelays.CogWheelBlock;
+import com.simibubi.create.content.kinetics.simpleRelays.CogwheelBlockItem;
+import com.simibubi.create.content.kinetics.simpleRelays.ShaftBlock;
+import com.simibubi.create.content.kinetics.simpleRelays.encased.EncasedCogCTBehaviour;
+import com.simibubi.create.content.kinetics.simpleRelays.encased.EncasedCogwheelBlock;
+import com.simibubi.create.content.kinetics.simpleRelays.encased.EncasedShaftBlock;
+import com.simibubi.create.content.kinetics.speedController.SpeedControllerBlock;
+import com.simibubi.create.content.kinetics.steamEngine.PoweredShaftBlock;
+import com.simibubi.create.content.kinetics.steamEngine.SteamEngineBlock;
+import com.simibubi.create.content.kinetics.transmission.ClutchBlock;
+import com.simibubi.create.content.kinetics.transmission.GearshiftBlock;
+import com.simibubi.create.content.kinetics.transmission.sequencer.SequencedGearshiftBlock;
+import com.simibubi.create.content.kinetics.transmission.sequencer.SequencedGearshiftGenerator;
+import com.simibubi.create.content.kinetics.turntable.TurntableBlock;
+import com.simibubi.create.content.kinetics.waterwheel.LargeWaterWheelBlock;
+import com.simibubi.create.content.kinetics.waterwheel.LargeWaterWheelBlockItem;
+import com.simibubi.create.content.kinetics.waterwheel.WaterWheelBlock;
+import com.simibubi.create.content.kinetics.waterwheel.WaterWheelStructuralBlock;
+import com.simibubi.create.content.logistics.chute.ChuteBlock;
+import com.simibubi.create.content.logistics.chute.ChuteGenerator;
+import com.simibubi.create.content.logistics.chute.ChuteItem;
+import com.simibubi.create.content.logistics.chute.SmartChuteBlock;
+import com.simibubi.create.content.logistics.crate.CreativeCrateBlock;
+import com.simibubi.create.content.logistics.depot.DepotBlock;
+import com.simibubi.create.content.logistics.depot.EjectorBlock;
+import com.simibubi.create.content.logistics.depot.EjectorItem;
+import com.simibubi.create.content.logistics.funnel.AndesiteFunnelBlock;
+import com.simibubi.create.content.logistics.funnel.BeltFunnelBlock;
+import com.simibubi.create.content.logistics.funnel.BeltFunnelGenerator;
+import com.simibubi.create.content.logistics.funnel.BrassFunnelBlock;
+import com.simibubi.create.content.logistics.funnel.FunnelGenerator;
+import com.simibubi.create.content.logistics.funnel.FunnelItem;
+import com.simibubi.create.content.logistics.funnel.FunnelMovementBehaviour;
+import com.simibubi.create.content.logistics.tunnel.BeltTunnelBlock;
+import com.simibubi.create.content.logistics.tunnel.BrassTunnelBlock;
+import com.simibubi.create.content.logistics.tunnel.BrassTunnelCTBehaviour;
+import com.simibubi.create.content.logistics.vault.ItemVaultBlock;
+import com.simibubi.create.content.logistics.vault.ItemVaultCTBehaviour;
+import com.simibubi.create.content.logistics.vault.ItemVaultItem;
+import com.simibubi.create.content.materials.ExperienceBlock;
+import com.simibubi.create.content.processing.AssemblyOperatorBlockItem;
+import com.simibubi.create.content.processing.basin.BasinBlock;
+import com.simibubi.create.content.processing.basin.BasinGenerator;
+import com.simibubi.create.content.processing.basin.BasinMovementBehaviour;
+import com.simibubi.create.content.processing.burner.BlazeBurnerBlock;
+import com.simibubi.create.content.processing.burner.BlazeBurnerBlockItem;
+import com.simibubi.create.content.processing.burner.BlazeBurnerInteractionBehaviour;
+import com.simibubi.create.content.processing.burner.BlazeBurnerMovementBehaviour;
+import com.simibubi.create.content.processing.burner.LitBlazeBurnerBlock;
+import com.simibubi.create.content.redstone.RoseQuartzLampBlock;
+import com.simibubi.create.content.redstone.analogLever.AnalogLeverBlock;
+import com.simibubi.create.content.redstone.contact.ContactMovementBehaviour;
+import com.simibubi.create.content.redstone.contact.RedstoneContactBlock;
+import com.simibubi.create.content.redstone.contact.RedstoneContactItem;
+import com.simibubi.create.content.redstone.diodes.AbstractDiodeGenerator;
+import com.simibubi.create.content.redstone.diodes.BrassDiodeBlock;
+import com.simibubi.create.content.redstone.diodes.BrassDiodeGenerator;
+import com.simibubi.create.content.redstone.diodes.PoweredLatchBlock;
+import com.simibubi.create.content.redstone.diodes.PoweredLatchGenerator;
+import com.simibubi.create.content.redstone.diodes.ToggleLatchBlock;
+import com.simibubi.create.content.redstone.diodes.ToggleLatchGenerator;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkBlock;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkBlockItem;
+import com.simibubi.create.content.redstone.displayLink.source.AccumulatedItemCountDisplaySource;
+import com.simibubi.create.content.redstone.displayLink.source.BoilerDisplaySource;
+import com.simibubi.create.content.redstone.displayLink.source.CurrentFloorDisplaySource;
+import com.simibubi.create.content.redstone.displayLink.source.EntityNameDisplaySource;
+import com.simibubi.create.content.redstone.displayLink.source.FillLevelDisplaySource;
+import com.simibubi.create.content.redstone.displayLink.source.FluidAmountDisplaySource;
+import com.simibubi.create.content.redstone.displayLink.source.FluidListDisplaySource;
+import com.simibubi.create.content.redstone.displayLink.source.ItemCountDisplaySource;
+import com.simibubi.create.content.redstone.displayLink.source.ItemListDisplaySource;
+import com.simibubi.create.content.redstone.displayLink.source.ItemNameDisplaySource;
+import com.simibubi.create.content.redstone.displayLink.source.ItemThroughputDisplaySource;
+import com.simibubi.create.content.redstone.displayLink.source.KineticSpeedDisplaySource;
+import com.simibubi.create.content.redstone.displayLink.source.KineticStressDisplaySource;
+import com.simibubi.create.content.redstone.displayLink.source.ObservedTrainNameSource;
+import com.simibubi.create.content.redstone.displayLink.source.StationSummaryDisplaySource;
+import com.simibubi.create.content.redstone.displayLink.source.StopWatchDisplaySource;
+import com.simibubi.create.content.redstone.displayLink.source.TimeOfDayDisplaySource;
+import com.simibubi.create.content.redstone.displayLink.source.TrainStatusDisplaySource;
+import com.simibubi.create.content.redstone.displayLink.target.DisplayBoardTarget;
+import com.simibubi.create.content.redstone.link.RedstoneLinkBlock;
+import com.simibubi.create.content.redstone.link.RedstoneLinkGenerator;
+import com.simibubi.create.content.redstone.link.controller.LecternControllerBlock;
+import com.simibubi.create.content.redstone.nixieTube.NixieTubeBlock;
+import com.simibubi.create.content.redstone.nixieTube.NixieTubeGenerator;
+import com.simibubi.create.content.redstone.rail.ControllerRailBlock;
+import com.simibubi.create.content.redstone.rail.ControllerRailGenerator;
+import com.simibubi.create.content.redstone.smartObserver.SmartObserverBlock;
+import com.simibubi.create.content.redstone.smartObserver.SmartObserverGenerator;
+import com.simibubi.create.content.redstone.thresholdSwitch.ThresholdSwitchBlock;
+import com.simibubi.create.content.redstone.thresholdSwitch.ThresholdSwitchGenerator;
+import com.simibubi.create.content.schematics.cannon.SchematicannonBlock;
+import com.simibubi.create.content.schematics.table.SchematicTableBlock;
+import com.simibubi.create.content.trains.bogey.BogeySizes;
+import com.simibubi.create.content.trains.bogey.StandardBogeyBlock;
+import com.simibubi.create.content.trains.display.FlapDisplayBlock;
+import com.simibubi.create.content.trains.graph.EdgePointType;
+import com.simibubi.create.content.trains.observer.TrackObserverBlock;
+import com.simibubi.create.content.trains.signal.SignalBlock;
+import com.simibubi.create.content.trains.station.StationBlock;
+import com.simibubi.create.content.trains.track.FakeTrackBlock;
+import com.simibubi.create.content.trains.track.TrackBlock;
+import com.simibubi.create.content.trains.track.TrackBlockItem;
+import com.simibubi.create.content.trains.track.TrackBlockStateGenerator;
+import com.simibubi.create.content.trains.track.TrackMaterial;
+import com.simibubi.create.content.trains.track.TrackModel;
+import com.simibubi.create.content.trains.track.TrackTargetingBlockItem;
 import com.simibubi.create.foundation.block.CopperBlockSet;
 import com.simibubi.create.foundation.block.DyedBlockList;
 import com.simibubi.create.foundation.block.ItemUseOverrides;
@@ -275,6 +276,7 @@ import net.minecraft.core.Registry;
 import net.minecraft.data.loot.BlockLoot;
 import net.minecraft.data.recipes.ShapelessRecipeBuilder;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.sounds.SoundEvents;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.tags.ItemTags;
 import net.minecraft.world.item.DyeColor;
@@ -304,6 +306,7 @@ import net.minecraft.world.level.storage.loot.providers.number.ConstantValue;
 import net.minecraftforge.client.model.generators.ConfiguredModel;
 import net.minecraftforge.client.model.generators.ModelFile;
 import net.minecraftforge.common.Tags;
+import net.minecraftforge.common.util.ForgeSoundType;
 
 public class AllBlocks {
 
@@ -474,28 +477,28 @@ public class AllBlocks {
 		.transform(customItemModel())
 		.register();
 
-	public static final BlockEntry<EncasedBeltBlock> ENCASED_CHAIN_DRIVE =
-		REGISTRATE.block("encased_chain_drive", EncasedBeltBlock::new)
+	public static final BlockEntry<ChainDriveBlock> ENCASED_CHAIN_DRIVE =
+		REGISTRATE.block("encased_chain_drive", ChainDriveBlock::new)
 			.initialProperties(SharedProperties::stone)
 			.properties(BlockBehaviour.Properties::noOcclusion)
 			.properties(p -> p.color(MaterialColor.PODZOL))
 			.transform(BlockStressDefaults.setNoImpact())
 			.transform(axeOrPickaxe())
-			.blockstate((c, p) -> new EncasedBeltGenerator((state, suffix) -> p.models()
+			.blockstate((c, p) -> new ChainDriveGenerator((state, suffix) -> p.models()
 				.getExistingFile(p.modLoc("block/" + c.getName() + "/" + suffix))).generate(c, p))
 			.item()
 			.transform(customItemModel())
 			.register();
 
-	public static final BlockEntry<AdjustablePulleyBlock> ADJUSTABLE_CHAIN_GEARSHIFT =
-		REGISTRATE.block("adjustable_chain_gearshift", AdjustablePulleyBlock::new)
+	public static final BlockEntry<ChainGearshiftBlock> ADJUSTABLE_CHAIN_GEARSHIFT =
+		REGISTRATE.block("adjustable_chain_gearshift", ChainGearshiftBlock::new)
 			.initialProperties(SharedProperties::stone)
 			.properties(BlockBehaviour.Properties::noOcclusion)
 			.properties(p -> p.color(MaterialColor.NETHER))
 			.transform(BlockStressDefaults.setNoImpact())
 			.transform(axeOrPickaxe())
-			.blockstate((c, p) -> new EncasedBeltGenerator((state, suffix) -> {
-				String powered = state.getValue(AdjustablePulleyBlock.POWERED) ? "_powered" : "";
+			.blockstate((c, p) -> new ChainDriveGenerator((state, suffix) -> {
+				String powered = state.getValue(ChainGearshiftBlock.POWERED) ? "_powered" : "";
 				return p.models()
 					.withExistingParent(c.getName() + "_" + suffix + powered,
 						p.modLoc("block/encased_chain_drive/" + suffix))
@@ -2245,7 +2248,7 @@ public class AllBlocks {
 		.build()
 		.register();
 
-	public static final BlockEntry<Block> ZINC_BLOCK = REGISTRATE.block("zinc_block", p -> new Block(p))
+	public static final BlockEntry<Block> ZINC_BLOCK = REGISTRATE.block("zinc_block", Block::new)
 		.initialProperties(() -> Blocks.IRON_BLOCK)
 		.properties(p -> p.color(MaterialColor.GLOW_LICHEN))
 		.properties(p -> p.requiresCorrectToolForDrops())
@@ -2302,6 +2305,26 @@ public class AllBlocks {
 		.lang("Block of Brass")
 		.register();
 
+	public static final BlockEntry<ExperienceBlock> EXPERIENCE_BLOCK =
+		REGISTRATE.block("experience_block", ExperienceBlock::new)
+			.initialProperties(SharedProperties::softMetal)
+			.properties(p -> p.color(MaterialColor.PLANT))
+			.properties(p -> p.sound(new ForgeSoundType(1, .5f, () -> SoundEvents.AMETHYST_BLOCK_BREAK,
+				() -> SoundEvents.AMETHYST_BLOCK_STEP, () -> SoundEvents.AMETHYST_BLOCK_PLACE,
+				() -> SoundEvents.AMETHYST_BLOCK_HIT, () -> SoundEvents.AMETHYST_BLOCK_FALL)))
+			.properties(p -> p.requiresCorrectToolForDrops())
+			.properties(p -> p.lightLevel(s -> 15))
+			.blockstate((c, p) -> p.simpleBlock(c.get(), AssetLookup.standardModel(c, p)))
+			.transform(pickaxeOnly())
+			.lang("Block of Experience")
+			.tag(Tags.Blocks.STORAGE_BLOCKS)
+			.tag(BlockTags.BEACON_BASE_BLOCKS)
+			.item()
+			.properties(p -> p.rarity(Rarity.UNCOMMON))
+			.tag(Tags.Items.STORAGE_BLOCKS)
+			.build()
+			.register();
+
 	public static final BlockEntry<RotatedPillarBlock> ROSE_QUARTZ_BLOCK =
 		REGISTRATE.block("rose_quartz_block", RotatedPillarBlock::new)
 			.initialProperties(() -> Blocks.AMETHYST_BLOCK)
diff --git a/src/main/java/com/simibubi/create/AllBogeyStyles.java b/src/main/java/com/simibubi/create/AllBogeyStyles.java
index d9487f089..ae72c36b8 100644
--- a/src/main/java/com/simibubi/create/AllBogeyStyles.java
+++ b/src/main/java/com/simibubi/create/AllBogeyStyles.java
@@ -6,14 +6,14 @@ import java.util.Optional;
 import java.util.function.Supplier;
 
 import com.google.common.collect.ImmutableMap;
-import com.simibubi.create.content.logistics.trains.AbstractBogeyBlock;
-import com.simibubi.create.content.logistics.trains.BogeyRenderer;
-import com.simibubi.create.content.logistics.trains.BogeyRenderer.CommonRenderer;
-import com.simibubi.create.content.logistics.trains.BogeySizes;
-import com.simibubi.create.content.logistics.trains.StandardBogeyRenderer.CommonStandardBogeyRenderer;
-import com.simibubi.create.content.logistics.trains.StandardBogeyRenderer.LargeStandardBogeyRenderer;
-import com.simibubi.create.content.logistics.trains.StandardBogeyRenderer.SmallStandardBogeyRenderer;
-import com.simibubi.create.content.logistics.trains.entity.BogeyStyle;
+import com.simibubi.create.content.trains.bogey.AbstractBogeyBlock;
+import com.simibubi.create.content.trains.bogey.BogeyRenderer;
+import com.simibubi.create.content.trains.bogey.BogeyRenderer.CommonRenderer;
+import com.simibubi.create.content.trains.bogey.BogeySizes;
+import com.simibubi.create.content.trains.bogey.BogeyStyle;
+import com.simibubi.create.content.trains.bogey.StandardBogeyRenderer.CommonStandardBogeyRenderer;
+import com.simibubi.create.content.trains.bogey.StandardBogeyRenderer.LargeStandardBogeyRenderer;
+import com.simibubi.create.content.trains.bogey.StandardBogeyRenderer.SmallStandardBogeyRenderer;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Lang;
 import com.tterrag.registrate.util.entry.BlockEntry;
diff --git a/src/main/java/com/simibubi/create/AllCreativeModeTabs.java b/src/main/java/com/simibubi/create/AllCreativeModeTabs.java
index 1d056623a..14b3edeac 100644
--- a/src/main/java/com/simibubi/create/AllCreativeModeTabs.java
+++ b/src/main/java/com/simibubi/create/AllCreativeModeTabs.java
@@ -1,7 +1,7 @@
 package com.simibubi.create;
 
-import com.simibubi.create.content.palettes.PalettesCreativeModeTab;
-import com.simibubi.create.foundation.item.BaseCreativeModeTab;
+import com.simibubi.create.content.decoration.palettes.PalettesCreativeModeTab;
+import com.simibubi.create.infrastructure.item.BaseCreativeModeTab;
 
 import net.minecraft.world.item.CreativeModeTab;
 
diff --git a/src/main/java/com/simibubi/create/AllEnchantments.java b/src/main/java/com/simibubi/create/AllEnchantments.java
index 135933ab8..3f0a3f863 100644
--- a/src/main/java/com/simibubi/create/AllEnchantments.java
+++ b/src/main/java/com/simibubi/create/AllEnchantments.java
@@ -2,8 +2,8 @@ package com.simibubi.create;
 
 import static com.simibubi.create.Create.REGISTRATE;
 
-import com.simibubi.create.content.curiosities.armor.CapacityEnchantment;
-import com.simibubi.create.content.curiosities.weapons.PotatoRecoveryEnchantment;
+import com.simibubi.create.content.equipment.armor.CapacityEnchantment;
+import com.simibubi.create.content.equipment.potatoCannon.PotatoRecoveryEnchantment;
 import com.tterrag.registrate.util.entry.RegistryEntry;
 
 import net.minecraft.world.entity.EquipmentSlot;
diff --git a/src/main/java/com/simibubi/create/AllEntityDataSerializers.java b/src/main/java/com/simibubi/create/AllEntityDataSerializers.java
index 6227bea7d..ad3932e90 100644
--- a/src/main/java/com/simibubi/create/AllEntityDataSerializers.java
+++ b/src/main/java/com/simibubi/create/AllEntityDataSerializers.java
@@ -1,6 +1,6 @@
 package com.simibubi.create;
 
-import com.simibubi.create.content.logistics.trains.entity.CarriageSyncDataSerializer;
+import com.simibubi.create.content.trains.entity.CarriageSyncDataSerializer;
 
 import net.minecraft.network.syncher.EntityDataSerializer;
 import net.minecraftforge.eventbus.api.IEventBus;
diff --git a/src/main/java/com/simibubi/create/AllEntityTypes.java b/src/main/java/com/simibubi/create/AllEntityTypes.java
index 2b4161e76..5d6b70220 100644
--- a/src/main/java/com/simibubi/create/AllEntityTypes.java
+++ b/src/main/java/com/simibubi/create/AllEntityTypes.java
@@ -1,21 +1,21 @@
 package com.simibubi.create;
 
-import com.simibubi.create.content.contraptions.components.actors.SeatEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.ControlledContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.OrientedContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.OrientedContraptionEntityRenderer;
-import com.simibubi.create.content.contraptions.components.structureMovement.gantry.GantryContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.glue.SuperGlueEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.glue.SuperGlueRenderer;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionEntityRenderer;
-import com.simibubi.create.content.curiosities.tools.BlueprintEntity;
-import com.simibubi.create.content.curiosities.tools.BlueprintRenderer;
-import com.simibubi.create.content.curiosities.weapons.PotatoProjectileEntity;
-import com.simibubi.create.content.curiosities.weapons.PotatoProjectileRenderer;
-import com.simibubi.create.content.logistics.trains.entity.CarriageContraptionEntity;
-import com.simibubi.create.content.logistics.trains.entity.CarriageContraptionEntityRenderer;
-import com.simibubi.create.content.logistics.trains.entity.CarriageContraptionInstance;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.ControlledContraptionEntity;
+import com.simibubi.create.content.contraptions.OrientedContraptionEntity;
+import com.simibubi.create.content.contraptions.actors.seat.SeatEntity;
+import com.simibubi.create.content.contraptions.gantry.GantryContraptionEntity;
+import com.simibubi.create.content.contraptions.glue.SuperGlueEntity;
+import com.simibubi.create.content.contraptions.glue.SuperGlueRenderer;
+import com.simibubi.create.content.contraptions.render.ContraptionEntityRenderer;
+import com.simibubi.create.content.contraptions.render.OrientedContraptionEntityRenderer;
+import com.simibubi.create.content.equipment.blueprint.BlueprintEntity;
+import com.simibubi.create.content.equipment.blueprint.BlueprintRenderer;
+import com.simibubi.create.content.equipment.potatoCannon.PotatoProjectileEntity;
+import com.simibubi.create.content.equipment.potatoCannon.PotatoProjectileRenderer;
+import com.simibubi.create.content.trains.entity.CarriageContraptionEntity;
+import com.simibubi.create.content.trains.entity.CarriageContraptionEntityRenderer;
+import com.simibubi.create.content.trains.entity.CarriageContraptionInstance;
 import com.simibubi.create.foundation.data.CreateEntityBuilder;
 import com.simibubi.create.foundation.utility.Lang;
 import com.tterrag.registrate.util.entry.EntityEntry;
diff --git a/src/main/java/com/simibubi/create/AllFluids.java b/src/main/java/com/simibubi/create/AllFluids.java
index e3ec85004..3a5765df5 100644
--- a/src/main/java/com/simibubi/create/AllFluids.java
+++ b/src/main/java/com/simibubi/create/AllFluids.java
@@ -7,10 +7,10 @@ import java.util.function.Consumer;
 import javax.annotation.Nullable;
 
 import com.simibubi.create.AllTags.AllFluidTags;
-import com.simibubi.create.content.contraptions.fluids.VirtualFluid;
-import com.simibubi.create.content.contraptions.fluids.potion.PotionFluid;
-import com.simibubi.create.content.contraptions.fluids.potion.PotionFluid.PotionFluidType;
-import com.simibubi.create.content.palettes.AllPaletteStoneTypes;
+import com.simibubi.create.content.decoration.palettes.AllPaletteStoneTypes;
+import com.simibubi.create.content.fluids.VirtualFluid;
+import com.simibubi.create.content.fluids.potion.PotionFluid;
+import com.simibubi.create.content.fluids.potion.PotionFluid.PotionFluidType;
 import com.tterrag.registrate.util.entry.FluidEntry;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/AllInteractionBehaviours.java b/src/main/java/com/simibubi/create/AllInteractionBehaviours.java
index 20c9d58e6..31c518c5f 100644
--- a/src/main/java/com/simibubi/create/AllInteractionBehaviours.java
+++ b/src/main/java/com/simibubi/create/AllInteractionBehaviours.java
@@ -5,10 +5,10 @@ import java.util.List;
 
 import org.jetbrains.annotations.Nullable;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.MovingInteractionBehaviour;
-import com.simibubi.create.content.contraptions.components.structureMovement.interaction.DoorMovingInteraction;
-import com.simibubi.create.content.contraptions.components.structureMovement.interaction.LeverMovingInteraction;
-import com.simibubi.create.content.contraptions.components.structureMovement.interaction.TrapdoorMovingInteraction;
+import com.simibubi.create.content.contraptions.behaviour.DoorMovingInteraction;
+import com.simibubi.create.content.contraptions.behaviour.LeverMovingInteraction;
+import com.simibubi.create.content.contraptions.behaviour.MovingInteractionBehaviour;
+import com.simibubi.create.content.contraptions.behaviour.TrapdoorMovingInteraction;
 import com.simibubi.create.foundation.utility.AttachedRegistry;
 import com.tterrag.registrate.util.nullness.NonNullConsumer;
 
diff --git a/src/main/java/com/simibubi/create/AllItems.java b/src/main/java/com/simibubi/create/AllItems.java
index 831586dda..4e9371d32 100644
--- a/src/main/java/com/simibubi/create/AllItems.java
+++ b/src/main/java/com/simibubi/create/AllItems.java
@@ -2,7 +2,7 @@ package com.simibubi.create;
 
 import static com.simibubi.create.AllTags.forgeItemTag;
 import static com.simibubi.create.AllTags.AllItemTags.CREATE_INGOTS;
-import static com.simibubi.create.AllTags.AllItemTags.CRUSHED_ORES;
+import static com.simibubi.create.AllTags.AllItemTags.CRUSHED_RAW_MATERIALS;
 import static com.simibubi.create.AllTags.AllItemTags.PLATES;
 import static com.simibubi.create.Create.REGISTRATE;
 import static com.simibubi.create.foundation.data.recipe.CompatMetals.ALUMINUM;
@@ -16,43 +16,43 @@ import static com.simibubi.create.foundation.data.recipe.CompatMetals.TIN;
 import static com.simibubi.create.foundation.data.recipe.CompatMetals.URANIUM;
 
 import com.simibubi.create.AllTags.AllItemTags;
-import com.simibubi.create.content.contraptions.components.structureMovement.glue.SuperGlueItem;
-import com.simibubi.create.content.contraptions.components.structureMovement.mounted.MinecartContraptionItem;
-import com.simibubi.create.content.contraptions.components.structureMovement.train.MinecartCouplingItem;
-import com.simibubi.create.content.contraptions.goggles.GogglesItem;
-import com.simibubi.create.content.contraptions.goggles.GogglesModel;
-import com.simibubi.create.content.contraptions.itemAssembly.SequencedAssemblyItem;
-import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlockItem;
-import com.simibubi.create.content.contraptions.relays.belt.item.BeltConnectorItem;
-import com.simibubi.create.content.contraptions.relays.gearbox.VerticalGearboxItem;
-import com.simibubi.create.content.contraptions.wrench.WrenchItem;
-import com.simibubi.create.content.curiosities.BuildersTeaItem;
-import com.simibubi.create.content.curiosities.ChromaticCompoundColor;
-import com.simibubi.create.content.curiosities.ChromaticCompoundItem;
-import com.simibubi.create.content.curiosities.CombustibleItem;
-import com.simibubi.create.content.curiosities.ExperienceNuggetItem;
-import com.simibubi.create.content.curiosities.RefinedRadianceItem;
-import com.simibubi.create.content.curiosities.ShadowSteelItem;
-import com.simibubi.create.content.curiosities.TreeFertilizerItem;
-import com.simibubi.create.content.curiosities.armor.AllArmorMaterials;
-import com.simibubi.create.content.curiosities.armor.BacktankItem;
-import com.simibubi.create.content.curiosities.armor.BacktankItem.BacktankBlockItem;
-import com.simibubi.create.content.curiosities.armor.DivingBootsItem;
-import com.simibubi.create.content.curiosities.armor.DivingHelmetItem;
-import com.simibubi.create.content.curiosities.symmetry.SymmetryWandItem;
-import com.simibubi.create.content.curiosities.tools.BlueprintItem;
-import com.simibubi.create.content.curiosities.tools.ExtendoGripItem;
-import com.simibubi.create.content.curiosities.tools.SandPaperItem;
-import com.simibubi.create.content.curiosities.weapons.PotatoCannonItem;
-import com.simibubi.create.content.curiosities.zapper.terrainzapper.WorldshaperItem;
-import com.simibubi.create.content.logistics.item.LinkedControllerItem;
-import com.simibubi.create.content.logistics.item.filter.FilterItem;
-import com.simibubi.create.content.logistics.trains.management.schedule.ScheduleItem;
-import com.simibubi.create.content.schematics.item.SchematicAndQuillItem;
-import com.simibubi.create.content.schematics.item.SchematicItem;
+import com.simibubi.create.content.contraptions.glue.SuperGlueItem;
+import com.simibubi.create.content.contraptions.minecart.MinecartCouplingItem;
+import com.simibubi.create.content.contraptions.mounted.MinecartContraptionItem;
+import com.simibubi.create.content.equipment.BuildersTeaItem;
+import com.simibubi.create.content.equipment.TreeFertilizerItem;
+import com.simibubi.create.content.equipment.armor.AllArmorMaterials;
+import com.simibubi.create.content.equipment.armor.BacktankItem;
+import com.simibubi.create.content.equipment.armor.BacktankItem.BacktankBlockItem;
+import com.simibubi.create.content.equipment.armor.DivingBootsItem;
+import com.simibubi.create.content.equipment.armor.DivingHelmetItem;
+import com.simibubi.create.content.equipment.blueprint.BlueprintItem;
+import com.simibubi.create.content.equipment.extendoGrip.ExtendoGripItem;
+import com.simibubi.create.content.equipment.goggles.GogglesItem;
+import com.simibubi.create.content.equipment.goggles.GogglesModel;
+import com.simibubi.create.content.equipment.potatoCannon.PotatoCannonItem;
+import com.simibubi.create.content.equipment.sandPaper.SandPaperItem;
+import com.simibubi.create.content.equipment.symmetryWand.SymmetryWandItem;
+import com.simibubi.create.content.equipment.wrench.WrenchItem;
+import com.simibubi.create.content.equipment.zapper.terrainzapper.WorldshaperItem;
+import com.simibubi.create.content.kinetics.belt.item.BeltConnectorItem;
+import com.simibubi.create.content.kinetics.gearbox.VerticalGearboxItem;
+import com.simibubi.create.content.legacy.ChromaticCompoundColor;
+import com.simibubi.create.content.legacy.ChromaticCompoundItem;
+import com.simibubi.create.content.legacy.RefinedRadianceItem;
+import com.simibubi.create.content.legacy.ShadowSteelItem;
+import com.simibubi.create.content.logistics.filter.FilterItem;
+import com.simibubi.create.content.materials.ExperienceNuggetItem;
+import com.simibubi.create.content.processing.burner.BlazeBurnerBlockItem;
+import com.simibubi.create.content.processing.sequenced.SequencedAssemblyItem;
+import com.simibubi.create.content.redstone.link.controller.LinkedControllerItem;
+import com.simibubi.create.content.schematics.SchematicAndQuillItem;
+import com.simibubi.create.content.schematics.SchematicItem;
+import com.simibubi.create.content.trains.schedule.ScheduleItem;
 import com.simibubi.create.foundation.data.AssetLookup;
 import com.simibubi.create.foundation.data.CreateRegistrate;
 import com.simibubi.create.foundation.data.recipe.CompatMetals;
+import com.simibubi.create.foundation.item.CombustibleItem;
 import com.simibubi.create.foundation.item.HiddenIngredientItem;
 import com.simibubi.create.foundation.item.ItemDescription;
 import com.simibubi.create.foundation.item.TagDependentIngredientItem;
@@ -178,10 +178,10 @@ public class AllItems {
 		IRON_SHEET = taggedIngredient("iron_sheet", forgeItemTag("plates/iron"), PLATES.tag),
 		GOLDEN_SHEET = taggedIngredient("golden_sheet", forgeItemTag("plates/gold"), PLATES.tag, ItemTags.PIGLIN_LOVED),
 
-		CRUSHED_IRON = taggedIngredient("crushed_iron_ore", CRUSHED_ORES.tag),
-		CRUSHED_GOLD = taggedIngredient("crushed_gold_ore", CRUSHED_ORES.tag, ItemTags.PIGLIN_LOVED),
-		CRUSHED_COPPER = taggedIngredient("crushed_copper_ore", CRUSHED_ORES.tag),
-		CRUSHED_ZINC = taggedIngredient("crushed_zinc_ore", CRUSHED_ORES.tag);
+		CRUSHED_IRON = taggedIngredient("crushed_raw_iron", CRUSHED_RAW_MATERIALS.tag),
+		CRUSHED_GOLD = taggedIngredient("crushed_raw_gold", CRUSHED_RAW_MATERIALS.tag, ItemTags.PIGLIN_LOVED),
+		CRUSHED_COPPER = taggedIngredient("crushed_raw_copper", CRUSHED_RAW_MATERIALS.tag),
+		CRUSHED_ZINC = taggedIngredient("crushed_raw_zinc", CRUSHED_RAW_MATERIALS.tag);
 
 	public static final ItemEntry<TagDependentIngredientItem> CRUSHED_OSMIUM = compatCrushedOre(OSMIUM),
 		CRUSHED_PLATINUM = compatCrushedOre(PLATINUM), CRUSHED_SILVER = compatCrushedOre(SILVER),
@@ -412,9 +412,9 @@ public class AllItems {
 	private static ItemEntry<TagDependentIngredientItem> compatCrushedOre(CompatMetals metal) {
 		String metalName = metal.getName();
 		return REGISTRATE
-			.item("crushed_" + metalName + "_ore",
+			.item("crushed_raw_" + metalName,
 				props -> new TagDependentIngredientItem(props, AllTags.forgeItemTag("ores/" + metalName)))
-			.tag(CRUSHED_ORES.tag)
+			.tag(CRUSHED_RAW_MATERIALS.tag)
 			.register();
 	}
 
diff --git a/src/main/java/com/simibubi/create/AllMenuTypes.java b/src/main/java/com/simibubi/create/AllMenuTypes.java
index bbd3278f4..853a9e647 100644
--- a/src/main/java/com/simibubi/create/AllMenuTypes.java
+++ b/src/main/java/com/simibubi/create/AllMenuTypes.java
@@ -1,21 +1,21 @@
 package com.simibubi.create;
 
-import com.simibubi.create.content.curiosities.toolbox.ToolboxMenu;
-import com.simibubi.create.content.curiosities.toolbox.ToolboxScreen;
-import com.simibubi.create.content.curiosities.tools.BlueprintMenu;
-import com.simibubi.create.content.curiosities.tools.BlueprintScreen;
-import com.simibubi.create.content.logistics.item.LinkedControllerMenu;
-import com.simibubi.create.content.logistics.item.LinkedControllerScreen;
-import com.simibubi.create.content.logistics.item.filter.AttributeFilterMenu;
-import com.simibubi.create.content.logistics.item.filter.AttributeFilterScreen;
-import com.simibubi.create.content.logistics.item.filter.FilterMenu;
-import com.simibubi.create.content.logistics.item.filter.FilterScreen;
-import com.simibubi.create.content.logistics.trains.management.schedule.ScheduleMenu;
-import com.simibubi.create.content.logistics.trains.management.schedule.ScheduleScreen;
-import com.simibubi.create.content.schematics.block.SchematicTableMenu;
-import com.simibubi.create.content.schematics.block.SchematicTableScreen;
-import com.simibubi.create.content.schematics.block.SchematicannonMenu;
-import com.simibubi.create.content.schematics.block.SchematicannonScreen;
+import com.simibubi.create.content.equipment.blueprint.BlueprintMenu;
+import com.simibubi.create.content.equipment.blueprint.BlueprintScreen;
+import com.simibubi.create.content.equipment.toolbox.ToolboxMenu;
+import com.simibubi.create.content.equipment.toolbox.ToolboxScreen;
+import com.simibubi.create.content.logistics.filter.AttributeFilterMenu;
+import com.simibubi.create.content.logistics.filter.AttributeFilterScreen;
+import com.simibubi.create.content.logistics.filter.FilterMenu;
+import com.simibubi.create.content.logistics.filter.FilterScreen;
+import com.simibubi.create.content.redstone.link.controller.LinkedControllerMenu;
+import com.simibubi.create.content.redstone.link.controller.LinkedControllerScreen;
+import com.simibubi.create.content.schematics.cannon.SchematicannonMenu;
+import com.simibubi.create.content.schematics.cannon.SchematicannonScreen;
+import com.simibubi.create.content.schematics.table.SchematicTableMenu;
+import com.simibubi.create.content.schematics.table.SchematicTableScreen;
+import com.simibubi.create.content.trains.schedule.ScheduleMenu;
+import com.simibubi.create.content.trains.schedule.ScheduleScreen;
 import com.tterrag.registrate.builders.MenuBuilder.ForgeMenuFactory;
 import com.tterrag.registrate.builders.MenuBuilder.ScreenFactory;
 import com.tterrag.registrate.util.entry.MenuEntry;
diff --git a/src/main/java/com/simibubi/create/AllMovementBehaviours.java b/src/main/java/com/simibubi/create/AllMovementBehaviours.java
index f04306853..6dde48640 100644
--- a/src/main/java/com/simibubi/create/AllMovementBehaviours.java
+++ b/src/main/java/com/simibubi/create/AllMovementBehaviours.java
@@ -5,11 +5,11 @@ import java.util.List;
 
 import javax.annotation.Nullable;
 
-import com.simibubi.create.content.contraptions.components.actors.BellMovementBehaviour;
-import com.simibubi.create.content.contraptions.components.actors.CampfireMovementBehaviour;
-import com.simibubi.create.content.contraptions.components.actors.dispenser.DispenserMovementBehaviour;
-import com.simibubi.create.content.contraptions.components.actors.dispenser.DropperMovementBehaviour;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour;
+import com.simibubi.create.content.contraptions.behaviour.BellMovementBehaviour;
+import com.simibubi.create.content.contraptions.behaviour.CampfireMovementBehaviour;
+import com.simibubi.create.content.contraptions.behaviour.MovementBehaviour;
+import com.simibubi.create.content.contraptions.behaviour.dispenser.DispenserMovementBehaviour;
+import com.simibubi.create.content.contraptions.behaviour.dispenser.DropperMovementBehaviour;
 import com.simibubi.create.foundation.utility.AttachedRegistry;
 import com.tterrag.registrate.util.nullness.NonNullConsumer;
 
diff --git a/src/main/java/com/simibubi/create/foundation/networking/AllPackets.java b/src/main/java/com/simibubi/create/AllPackets.java
similarity index 64%
rename from src/main/java/com/simibubi/create/foundation/networking/AllPackets.java
rename to src/main/java/com/simibubi/create/AllPackets.java
index 52ff9d039..00d5b3b0a 100644
--- a/src/main/java/com/simibubi/create/foundation/networking/AllPackets.java
+++ b/src/main/java/com/simibubi/create/AllPackets.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.networking;
+package com.simibubi.create;
 
 import static net.minecraftforge.network.NetworkDirection.PLAY_TO_CLIENT;
 import static net.minecraftforge.network.NetworkDirection.PLAY_TO_SERVER;
@@ -7,89 +7,91 @@ import java.util.function.BiConsumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-import com.simibubi.create.Create;
 import com.simibubi.create.compat.computercraft.AttachedComputerPacket;
-import com.simibubi.create.content.contraptions.components.actors.controls.ContraptionDisableActorPacket;
-import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionBlockChangedPacket;
-import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionColliderLockPacket;
-import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionColliderLockPacket.ContraptionColliderLockPacketRequest;
-import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionDisassemblyPacket;
-import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionRelocationPacket;
-import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionStallPacket;
-import com.simibubi.create.content.contraptions.components.structureMovement.TrainCollisionPacket;
-import com.simibubi.create.content.contraptions.components.structureMovement.elevator.ElevatorContactEditPacket;
-import com.simibubi.create.content.contraptions.components.structureMovement.elevator.ElevatorFloorListPacket;
-import com.simibubi.create.content.contraptions.components.structureMovement.elevator.ElevatorTargetFloorPacket;
-import com.simibubi.create.content.contraptions.components.structureMovement.gantry.GantryContraptionUpdatePacket;
-import com.simibubi.create.content.contraptions.components.structureMovement.glue.GlueEffectPacket;
-import com.simibubi.create.content.contraptions.components.structureMovement.glue.SuperGlueRemovalPacket;
-import com.simibubi.create.content.contraptions.components.structureMovement.glue.SuperGlueSelectionPacket;
-import com.simibubi.create.content.contraptions.components.structureMovement.interaction.controls.ControlsInputPacket;
-import com.simibubi.create.content.contraptions.components.structureMovement.interaction.controls.ControlsStopControllingPacket;
-import com.simibubi.create.content.contraptions.components.structureMovement.interaction.controls.HonkPacket;
-import com.simibubi.create.content.contraptions.components.structureMovement.interaction.controls.TrainHUDUpdatePacket;
-import com.simibubi.create.content.contraptions.components.structureMovement.sync.ClientMotionPacket;
-import com.simibubi.create.content.contraptions.components.structureMovement.sync.ContraptionFluidPacket;
-import com.simibubi.create.content.contraptions.components.structureMovement.sync.ContraptionInteractionPacket;
-import com.simibubi.create.content.contraptions.components.structureMovement.sync.ContraptionSeatMappingPacket;
-import com.simibubi.create.content.contraptions.components.structureMovement.sync.LimbSwingUpdatePacket;
-import com.simibubi.create.content.contraptions.components.structureMovement.train.CouplingCreationPacket;
-import com.simibubi.create.content.contraptions.components.structureMovement.train.capability.MinecartControllerUpdatePacket;
-import com.simibubi.create.content.contraptions.fluids.actors.FluidSplashPacket;
-import com.simibubi.create.content.contraptions.relays.advanced.sequencer.ConfigureSequencedGearshiftPacket;
-import com.simibubi.create.content.contraptions.relays.gauge.GaugeObservedPacket;
-import com.simibubi.create.content.curiosities.bell.SoulPulseEffectPacket;
-import com.simibubi.create.content.curiosities.clipboard.ClipboardEditPacket;
-import com.simibubi.create.content.curiosities.symmetry.ConfigureSymmetryWandPacket;
-import com.simibubi.create.content.curiosities.symmetry.SymmetryEffectPacket;
-import com.simibubi.create.content.curiosities.toolbox.ToolboxDisposeAllPacket;
-import com.simibubi.create.content.curiosities.toolbox.ToolboxEquipPacket;
-import com.simibubi.create.content.curiosities.tools.BlueprintAssignCompleteRecipePacket;
-import com.simibubi.create.content.curiosities.tools.ExtendoGripInteractionPacket;
-import com.simibubi.create.content.curiosities.weapons.PotatoCannonPacket;
-import com.simibubi.create.content.curiosities.weapons.PotatoProjectileTypeManager;
-import com.simibubi.create.content.curiosities.zapper.ZapperBeamPacket;
-import com.simibubi.create.content.curiosities.zapper.terrainzapper.ConfigureWorldshaperPacket;
-import com.simibubi.create.content.logistics.block.depot.EjectorAwardPacket;
-import com.simibubi.create.content.logistics.block.depot.EjectorElytraPacket;
-import com.simibubi.create.content.logistics.block.depot.EjectorPlacementPacket;
-import com.simibubi.create.content.logistics.block.depot.EjectorTriggerPacket;
-import com.simibubi.create.content.logistics.block.display.DisplayLinkConfigurationPacket;
-import com.simibubi.create.content.logistics.block.mechanicalArm.ArmPlacementPacket;
-import com.simibubi.create.content.logistics.item.LinkedControllerBindPacket;
-import com.simibubi.create.content.logistics.item.LinkedControllerInputPacket;
-import com.simibubi.create.content.logistics.item.LinkedControllerStopLecternPacket;
-import com.simibubi.create.content.logistics.item.filter.FilterScreenPacket;
-import com.simibubi.create.content.logistics.packet.ConfigureStockswitchPacket;
-import com.simibubi.create.content.logistics.packet.FunnelFlapPacket;
-import com.simibubi.create.content.logistics.packet.TunnelFlapPacket;
-import com.simibubi.create.content.logistics.trains.TrackGraphRequestPacket;
-import com.simibubi.create.content.logistics.trains.TrackGraphRollCallPacket;
-import com.simibubi.create.content.logistics.trains.TrackGraphSyncPacket;
-import com.simibubi.create.content.logistics.trains.entity.TrainPacket;
-import com.simibubi.create.content.logistics.trains.entity.TrainPromptPacket;
-import com.simibubi.create.content.logistics.trains.entity.TrainRelocationPacket;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.CurvedTrackSelectionPacket;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.SignalEdgeGroupPacket;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.station.StationEditPacket;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.station.TrainEditPacket;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.station.TrainEditPacket.TrainEditReturnPacket;
-import com.simibubi.create.content.logistics.trains.management.schedule.ScheduleEditPacket;
-import com.simibubi.create.content.logistics.trains.track.CurvedTrackDestroyPacket;
-import com.simibubi.create.content.logistics.trains.track.PlaceExtendedCurvePacket;
-import com.simibubi.create.content.schematics.packet.ConfigureSchematicannonPacket;
+import com.simibubi.create.content.contraptions.ContraptionBlockChangedPacket;
+import com.simibubi.create.content.contraptions.ContraptionColliderLockPacket;
+import com.simibubi.create.content.contraptions.ContraptionColliderLockPacket.ContraptionColliderLockPacketRequest;
+import com.simibubi.create.content.contraptions.ContraptionDisassemblyPacket;
+import com.simibubi.create.content.contraptions.ContraptionRelocationPacket;
+import com.simibubi.create.content.contraptions.ContraptionStallPacket;
+import com.simibubi.create.content.contraptions.TrainCollisionPacket;
+import com.simibubi.create.content.contraptions.actors.contraptionControls.ContraptionDisableActorPacket;
+import com.simibubi.create.content.contraptions.actors.trainControls.ControlsInputPacket;
+import com.simibubi.create.content.contraptions.actors.trainControls.ControlsStopControllingPacket;
+import com.simibubi.create.content.contraptions.elevator.ElevatorContactEditPacket;
+import com.simibubi.create.content.contraptions.elevator.ElevatorFloorListPacket;
+import com.simibubi.create.content.contraptions.elevator.ElevatorTargetFloorPacket;
+import com.simibubi.create.content.contraptions.gantry.GantryContraptionUpdatePacket;
+import com.simibubi.create.content.contraptions.glue.GlueEffectPacket;
+import com.simibubi.create.content.contraptions.glue.SuperGlueRemovalPacket;
+import com.simibubi.create.content.contraptions.glue.SuperGlueSelectionPacket;
+import com.simibubi.create.content.contraptions.minecart.CouplingCreationPacket;
+import com.simibubi.create.content.contraptions.minecart.capability.MinecartControllerUpdatePacket;
+import com.simibubi.create.content.contraptions.sync.ClientMotionPacket;
+import com.simibubi.create.content.contraptions.sync.ContraptionFluidPacket;
+import com.simibubi.create.content.contraptions.sync.ContraptionInteractionPacket;
+import com.simibubi.create.content.contraptions.sync.ContraptionSeatMappingPacket;
+import com.simibubi.create.content.contraptions.sync.LimbSwingUpdatePacket;
+import com.simibubi.create.content.equipment.bell.SoulPulseEffectPacket;
+import com.simibubi.create.content.equipment.blueprint.BlueprintAssignCompleteRecipePacket;
+import com.simibubi.create.content.equipment.clipboard.ClipboardEditPacket;
+import com.simibubi.create.content.equipment.extendoGrip.ExtendoGripInteractionPacket;
+import com.simibubi.create.content.equipment.potatoCannon.PotatoCannonPacket;
+import com.simibubi.create.content.equipment.potatoCannon.PotatoProjectileTypeManager;
+import com.simibubi.create.content.equipment.symmetryWand.ConfigureSymmetryWandPacket;
+import com.simibubi.create.content.equipment.symmetryWand.SymmetryEffectPacket;
+import com.simibubi.create.content.equipment.toolbox.ToolboxDisposeAllPacket;
+import com.simibubi.create.content.equipment.toolbox.ToolboxEquipPacket;
+import com.simibubi.create.content.equipment.zapper.ZapperBeamPacket;
+import com.simibubi.create.content.equipment.zapper.terrainzapper.ConfigureWorldshaperPacket;
+import com.simibubi.create.content.fluids.transfer.FluidSplashPacket;
+import com.simibubi.create.content.kinetics.gauge.GaugeObservedPacket;
+import com.simibubi.create.content.kinetics.mechanicalArm.ArmPlacementPacket;
+import com.simibubi.create.content.kinetics.transmission.sequencer.ConfigureSequencedGearshiftPacket;
+import com.simibubi.create.content.logistics.depot.EjectorAwardPacket;
+import com.simibubi.create.content.logistics.depot.EjectorElytraPacket;
+import com.simibubi.create.content.logistics.depot.EjectorPlacementPacket;
+import com.simibubi.create.content.logistics.depot.EjectorTriggerPacket;
+import com.simibubi.create.content.logistics.filter.FilterScreenPacket;
+import com.simibubi.create.content.logistics.funnel.FunnelFlapPacket;
+import com.simibubi.create.content.logistics.tunnel.TunnelFlapPacket;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkConfigurationPacket;
+import com.simibubi.create.content.redstone.link.controller.LinkedControllerBindPacket;
+import com.simibubi.create.content.redstone.link.controller.LinkedControllerInputPacket;
+import com.simibubi.create.content.redstone.link.controller.LinkedControllerStopLecternPacket;
+import com.simibubi.create.content.redstone.thresholdSwitch.ConfigureThresholdSwitchPacket;
+import com.simibubi.create.content.schematics.cannon.ConfigureSchematicannonPacket;
 import com.simibubi.create.content.schematics.packet.InstantSchematicPacket;
 import com.simibubi.create.content.schematics.packet.SchematicPlacePacket;
 import com.simibubi.create.content.schematics.packet.SchematicSyncPacket;
 import com.simibubi.create.content.schematics.packet.SchematicUploadPacket;
+import com.simibubi.create.content.trains.HonkPacket;
+import com.simibubi.create.content.trains.TrainHUDUpdatePacket;
+import com.simibubi.create.content.trains.entity.TrainPacket;
+import com.simibubi.create.content.trains.entity.TrainPromptPacket;
+import com.simibubi.create.content.trains.entity.TrainRelocationPacket;
+import com.simibubi.create.content.trains.graph.TrackGraphRequestPacket;
+import com.simibubi.create.content.trains.graph.TrackGraphRollCallPacket;
+import com.simibubi.create.content.trains.graph.TrackGraphSyncPacket;
+import com.simibubi.create.content.trains.schedule.ScheduleEditPacket;
+import com.simibubi.create.content.trains.signal.SignalEdgeGroupPacket;
+import com.simibubi.create.content.trains.station.StationEditPacket;
+import com.simibubi.create.content.trains.station.TrainEditPacket;
+import com.simibubi.create.content.trains.station.TrainEditPacket.TrainEditReturnPacket;
+import com.simibubi.create.content.trains.track.CurvedTrackDestroyPacket;
+import com.simibubi.create.content.trains.track.CurvedTrackSelectionPacket;
+import com.simibubi.create.content.trains.track.PlaceExtendedCurvePacket;
 import com.simibubi.create.foundation.blockEntity.RemoveBlockEntityPacket;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsPacket;
-import com.simibubi.create.foundation.command.HighlightPacket;
-import com.simibubi.create.foundation.command.SConfigureConfigPacket;
 import com.simibubi.create.foundation.config.ui.CConfigureConfigPacket;
 import com.simibubi.create.foundation.gui.menu.ClearMenuPacket;
 import com.simibubi.create.foundation.gui.menu.GhostItemSubmitPacket;
+import com.simibubi.create.foundation.networking.ISyncPersistentData;
+import com.simibubi.create.foundation.networking.LeftClickPacket;
+import com.simibubi.create.foundation.networking.SimplePacketBase;
 import com.simibubi.create.foundation.utility.ServerSpeedProvider;
+import com.simibubi.create.infrastructure.command.HighlightPacket;
+import com.simibubi.create.infrastructure.command.SConfigureConfigPacket;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.FriendlyByteBuf;
@@ -106,7 +108,7 @@ public enum AllPackets {
 
 	// Client to Server
 	CONFIGURE_SCHEMATICANNON(ConfigureSchematicannonPacket.class, ConfigureSchematicannonPacket::new, PLAY_TO_SERVER),
-	CONFIGURE_STOCKSWITCH(ConfigureStockswitchPacket.class, ConfigureStockswitchPacket::new, PLAY_TO_SERVER),
+	CONFIGURE_STOCKSWITCH(ConfigureThresholdSwitchPacket.class, ConfigureThresholdSwitchPacket::new, PLAY_TO_SERVER),
 	CONFIGURE_SEQUENCER(ConfigureSequencedGearshiftPacket.class, ConfigureSequencedGearshiftPacket::new,
 		PLAY_TO_SERVER),
 	PLACE_SCHEMATIC(SchematicPlacePacket.class, SchematicPlacePacket::new, PLAY_TO_SERVER),
diff --git a/src/main/java/com/simibubi/create/AllPartialModels.java b/src/main/java/com/simibubi/create/AllPartialModels.java
index a0ca1a4fe..8fde35136 100644
--- a/src/main/java/com/simibubi/create/AllPartialModels.java
+++ b/src/main/java/com/simibubi/create/AllPartialModels.java
@@ -7,7 +7,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.jozufozu.flywheel.core.PartialModel;
-import com.simibubi.create.content.contraptions.fluids.FluidTransportBehaviour;
+import com.simibubi.create.content.fluids.FluidTransportBehaviour;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.Lang;
diff --git a/src/main/java/com/simibubi/create/AllParticleTypes.java b/src/main/java/com/simibubi/create/AllParticleTypes.java
index eb1d938bc..31759c4a3 100644
--- a/src/main/java/com/simibubi/create/AllParticleTypes.java
+++ b/src/main/java/com/simibubi/create/AllParticleTypes.java
@@ -2,16 +2,15 @@ package com.simibubi.create;
 
 import java.util.function.Supplier;
 
-import com.simibubi.create.content.contraptions.components.steam.SteamJetParticleData;
-import com.simibubi.create.content.contraptions.fluids.particle.FluidParticleData;
-import com.simibubi.create.content.contraptions.particle.AirFlowParticleData;
-import com.simibubi.create.content.contraptions.particle.AirParticleData;
-import com.simibubi.create.content.contraptions.particle.CubeParticleData;
-import com.simibubi.create.content.contraptions.particle.HeaterParticleData;
-import com.simibubi.create.content.contraptions.particle.ICustomParticleData;
-import com.simibubi.create.content.contraptions.particle.RotationIndicatorParticleData;
-import com.simibubi.create.content.curiosities.bell.SoulBaseParticle;
-import com.simibubi.create.content.curiosities.bell.SoulParticle;
+import com.simibubi.create.content.equipment.bell.SoulBaseParticle;
+import com.simibubi.create.content.equipment.bell.SoulParticle;
+import com.simibubi.create.content.fluids.particle.FluidParticleData;
+import com.simibubi.create.content.kinetics.base.RotationIndicatorParticleData;
+import com.simibubi.create.content.kinetics.fan.AirFlowParticleData;
+import com.simibubi.create.content.kinetics.steamEngine.SteamJetParticleData;
+import com.simibubi.create.content.trains.CubeParticleData;
+import com.simibubi.create.foundation.particle.AirParticleData;
+import com.simibubi.create.foundation.particle.ICustomParticleData;
 import com.simibubi.create.foundation.utility.Lang;
 
 import net.minecraft.core.particles.ParticleOptions;
@@ -30,7 +29,6 @@ public enum AllParticleTypes {
 	AIR_FLOW(AirFlowParticleData::new),
 	AIR(AirParticleData::new),
 	STEAM_JET(SteamJetParticleData::new),
-	HEATER_PARTICLE(HeaterParticleData::new),
 	CUBE(CubeParticleData::new),
 	FLUID_PARTICLE(FluidParticleData::new),
 	BASIN_FLUID(FluidParticleData::new),
diff --git a/src/main/java/com/simibubi/create/AllRecipeTypes.java b/src/main/java/com/simibubi/create/AllRecipeTypes.java
index 08e8ffffe..c9bd643bb 100644
--- a/src/main/java/com/simibubi/create/AllRecipeTypes.java
+++ b/src/main/java/com/simibubi/create/AllRecipeTypes.java
@@ -8,28 +8,28 @@ import org.jetbrains.annotations.Nullable;
 
 import com.google.common.collect.ImmutableSet;
 import com.simibubi.create.compat.jei.ConversionRecipe;
-import com.simibubi.create.content.contraptions.components.crafter.MechanicalCraftingRecipe;
-import com.simibubi.create.content.contraptions.components.crusher.CrushingRecipe;
-import com.simibubi.create.content.contraptions.components.deployer.DeployerApplicationRecipe;
-import com.simibubi.create.content.contraptions.components.deployer.ManualApplicationRecipe;
-import com.simibubi.create.content.contraptions.components.fan.HauntingRecipe;
-import com.simibubi.create.content.contraptions.components.fan.SplashingRecipe;
-import com.simibubi.create.content.contraptions.components.millstone.MillingRecipe;
-import com.simibubi.create.content.contraptions.components.mixer.CompactingRecipe;
-import com.simibubi.create.content.contraptions.components.mixer.MixingRecipe;
-import com.simibubi.create.content.contraptions.components.press.PressingRecipe;
-import com.simibubi.create.content.contraptions.components.saw.CuttingRecipe;
-import com.simibubi.create.content.contraptions.fluids.actors.FillingRecipe;
-import com.simibubi.create.content.contraptions.itemAssembly.SequencedAssemblyRecipeSerializer;
-import com.simibubi.create.content.contraptions.processing.BasinRecipe;
-import com.simibubi.create.content.contraptions.processing.EmptyingRecipe;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipeBuilder.ProcessingRecipeFactory;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipeSerializer;
-import com.simibubi.create.content.curiosities.toolbox.ToolboxDyeingRecipe;
-import com.simibubi.create.content.curiosities.tools.SandPaperPolishingRecipe;
+import com.simibubi.create.content.equipment.sandPaper.SandPaperPolishingRecipe;
+import com.simibubi.create.content.equipment.toolbox.ToolboxDyeingRecipe;
+import com.simibubi.create.content.fluids.transfer.EmptyingRecipe;
+import com.simibubi.create.content.fluids.transfer.FillingRecipe;
+import com.simibubi.create.content.kinetics.crafter.MechanicalCraftingRecipe;
+import com.simibubi.create.content.kinetics.crusher.CrushingRecipe;
+import com.simibubi.create.content.kinetics.deployer.DeployerApplicationRecipe;
+import com.simibubi.create.content.kinetics.deployer.ManualApplicationRecipe;
+import com.simibubi.create.content.kinetics.fan.HauntingRecipe;
+import com.simibubi.create.content.kinetics.fan.SplashingRecipe;
+import com.simibubi.create.content.kinetics.millstone.MillingRecipe;
+import com.simibubi.create.content.kinetics.mixer.CompactingRecipe;
+import com.simibubi.create.content.kinetics.mixer.MixingRecipe;
+import com.simibubi.create.content.kinetics.press.PressingRecipe;
+import com.simibubi.create.content.kinetics.saw.CuttingRecipe;
+import com.simibubi.create.content.processing.basin.BasinRecipe;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder.ProcessingRecipeFactory;
+import com.simibubi.create.content.processing.sequenced.SequencedAssemblyRecipeSerializer;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipeSerializer;
+import com.simibubi.create.foundation.recipe.IRecipeTypeInfo;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.RegisteredObjects;
-import com.simibubi.create.foundation.utility.recipe.IRecipeTypeInfo;
 
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
diff --git a/src/main/java/com/simibubi/create/AllShapes.java b/src/main/java/com/simibubi/create/AllShapes.java
index 2a24670af..8f3e06568 100644
--- a/src/main/java/com/simibubi/create/AllShapes.java
+++ b/src/main/java/com/simibubi/create/AllShapes.java
@@ -7,8 +7,8 @@ import static net.minecraft.core.Direction.UP;
 
 import java.util.function.BiFunction;
 
-import com.simibubi.create.content.logistics.block.chute.ChuteShapes;
-import com.simibubi.create.content.logistics.trains.track.TrackVoxelShapes;
+import com.simibubi.create.content.logistics.chute.ChuteShapes;
+import com.simibubi.create.content.trains.track.TrackVoxelShapes;
 import com.simibubi.create.foundation.utility.VoxelShaper;
 
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/AllTags.java b/src/main/java/com/simibubi/create/AllTags.java
index 500d022b9..7dbac12e8 100644
--- a/src/main/java/com/simibubi/create/AllTags.java
+++ b/src/main/java/com/simibubi/create/AllTags.java
@@ -151,7 +151,7 @@ public class AllTags {
 		BLAZE_BURNER_FUEL_SPECIAL(MOD, "blaze_burner_fuel/special"),
 		CASING,
 		CREATE_INGOTS,
-		CRUSHED_ORES,
+		CRUSHED_RAW_MATERIALS,
 		MODDED_STRIPPED_LOGS,
 		MODDED_STRIPPED_WOOD,
 		PRESSURIZED_AIR_SOURCES,
diff --git a/src/main/java/com/simibubi/create/Create.java b/src/main/java/com/simibubi/create/Create.java
index 079412481..423d979e2 100644
--- a/src/main/java/com/simibubi/create/Create.java
+++ b/src/main/java/com/simibubi/create/Create.java
@@ -2,8 +2,6 @@ package com.simibubi.create;
 
 import java.util.Random;
 
-import com.simibubi.create.content.logistics.trains.BogeySizes;
-
 import org.slf4j.Logger;
 
 import com.google.gson.Gson;
@@ -13,22 +11,21 @@ import com.simibubi.create.api.behaviour.BlockSpoutingBehaviour;
 import com.simibubi.create.compat.Mods;
 import com.simibubi.create.compat.computercraft.ComputerCraftProxy;
 import com.simibubi.create.compat.curios.Curios;
-import com.simibubi.create.content.contraptions.TorquePropagator;
-import com.simibubi.create.content.contraptions.fluids.tank.BoilerHeaters;
-import com.simibubi.create.content.curiosities.weapons.BuiltinPotatoProjectileTypes;
-import com.simibubi.create.content.logistics.RedstoneLinkNetworkHandler;
-import com.simibubi.create.content.logistics.block.display.AllDisplayBehaviours;
-import com.simibubi.create.content.logistics.block.mechanicalArm.AllArmInteractionPointTypes;
-import com.simibubi.create.content.logistics.trains.GlobalRailwayManager;
-import com.simibubi.create.content.palettes.AllPaletteBlocks;
+import com.simibubi.create.content.contraptions.ContraptionMovementSetting;
+import com.simibubi.create.content.decoration.palettes.AllPaletteBlocks;
+import com.simibubi.create.content.equipment.potatoCannon.BuiltinPotatoProjectileTypes;
+import com.simibubi.create.content.fluids.tank.BoilerHeaters;
+import com.simibubi.create.content.kinetics.TorquePropagator;
+import com.simibubi.create.content.kinetics.mechanicalArm.AllArmInteractionPointTypes;
+import com.simibubi.create.content.redstone.displayLink.AllDisplayBehaviours;
+import com.simibubi.create.content.redstone.link.RedstoneLinkNetworkHandler;
+import com.simibubi.create.content.schematics.SchematicInstances;
 import com.simibubi.create.content.schematics.ServerSchematicLoader;
-import com.simibubi.create.content.schematics.filtering.SchematicInstances;
+import com.simibubi.create.content.trains.GlobalRailwayManager;
+import com.simibubi.create.content.trains.bogey.BogeySizes;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
 import com.simibubi.create.foundation.advancement.AllTriggers;
 import com.simibubi.create.foundation.block.CopperRegistries;
-import com.simibubi.create.foundation.command.ServerLagger;
-import com.simibubi.create.foundation.config.AllConfigs;
-import com.simibubi.create.foundation.config.ContraptionMovementSetting;
 import com.simibubi.create.foundation.data.AllLangPartials;
 import com.simibubi.create.foundation.data.CreateRegistrate;
 import com.simibubi.create.foundation.data.LangMerger;
@@ -41,12 +38,13 @@ import com.simibubi.create.foundation.item.ItemDescription;
 import com.simibubi.create.foundation.item.KineticStats;
 import com.simibubi.create.foundation.item.TooltipHelper.Palette;
 import com.simibubi.create.foundation.item.TooltipModifier;
-import com.simibubi.create.foundation.networking.AllPackets;
 import com.simibubi.create.foundation.utility.AttachedRegistry;
-import com.simibubi.create.foundation.worldgen.AllFeatures;
-import com.simibubi.create.foundation.worldgen.AllOreFeatureConfigEntries;
-import com.simibubi.create.foundation.worldgen.AllPlacementModifiers;
-import com.simibubi.create.foundation.worldgen.BuiltinRegistration;
+import com.simibubi.create.infrastructure.command.ServerLagger;
+import com.simibubi.create.infrastructure.config.AllConfigs;
+import com.simibubi.create.infrastructure.worldgen.AllFeatures;
+import com.simibubi.create.infrastructure.worldgen.AllOreFeatureConfigEntries;
+import com.simibubi.create.infrastructure.worldgen.AllPlacementModifiers;
+import com.simibubi.create.infrastructure.worldgen.BuiltinRegistration;
 
 import net.minecraft.data.DataGenerator;
 import net.minecraft.resources.ResourceLocation;
diff --git a/src/main/java/com/simibubi/create/CreateClient.java b/src/main/java/com/simibubi/create/CreateClient.java
index db345b43f..0b2fe21be 100644
--- a/src/main/java/com/simibubi/create/CreateClient.java
+++ b/src/main/java/com/simibubi/create/CreateClient.java
@@ -1,23 +1,22 @@
 package com.simibubi.create;
 
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityRenderer;
-import com.simibubi.create.content.contraptions.components.structureMovement.glue.SuperGlueSelectionHandler;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionRenderDispatcher;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.SBBContraptionManager;
-import com.simibubi.create.content.contraptions.components.waterwheel.WaterWheelRenderer;
-import com.simibubi.create.content.contraptions.relays.encased.CasingConnectivity;
-import com.simibubi.create.content.curiosities.bell.SoulPulseEffectHandler;
-import com.simibubi.create.content.curiosities.weapons.PotatoCannonRenderHandler;
-import com.simibubi.create.content.curiosities.zapper.ZapperRenderHandler;
-import com.simibubi.create.content.logistics.trains.GlobalRailwayManager;
-import com.simibubi.create.content.schematics.ClientSchematicLoader;
+import com.simibubi.create.content.contraptions.glue.SuperGlueSelectionHandler;
+import com.simibubi.create.content.contraptions.render.ContraptionRenderDispatcher;
+import com.simibubi.create.content.contraptions.render.SBBContraptionManager;
+import com.simibubi.create.content.decoration.encasing.CasingConnectivity;
+import com.simibubi.create.content.equipment.bell.SoulPulseEffectHandler;
+import com.simibubi.create.content.equipment.potatoCannon.PotatoCannonRenderHandler;
+import com.simibubi.create.content.equipment.zapper.ZapperRenderHandler;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
+import com.simibubi.create.content.kinetics.waterwheel.WaterWheelRenderer;
+import com.simibubi.create.content.schematics.client.ClientSchematicLoader;
 import com.simibubi.create.content.schematics.client.SchematicAndQuillHandler;
 import com.simibubi.create.content.schematics.client.SchematicHandler;
+import com.simibubi.create.content.trains.GlobalRailwayManager;
 import com.simibubi.create.foundation.ClientResourceReloadListener;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsClient;
-import com.simibubi.create.foundation.config.AllConfigs;
 import com.simibubi.create.foundation.gui.UIRenderHelper;
-import com.simibubi.create.foundation.ponder.content.PonderIndex;
+import com.simibubi.create.foundation.outliner.Outliner;
 import com.simibubi.create.foundation.ponder.element.WorldSectionElement;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.CreateContexts;
@@ -25,7 +24,9 @@ import com.simibubi.create.foundation.render.SuperByteBufferCache;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.ModelSwapper;
 import com.simibubi.create.foundation.utility.ghost.GhostBlocks;
-import com.simibubi.create.foundation.utility.outliner.Outliner;
+import com.simibubi.create.infrastructure.config.AllConfigs;
+import com.simibubi.create.infrastructure.ponder.AllPonderTags;
+import com.simibubi.create.infrastructure.ponder.PonderIndex;
 
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.GraphicsStatus;
@@ -81,8 +82,8 @@ public class CreateClient {
 
 		AllPartialModels.init();
 
+		AllPonderTags.register();
 		PonderIndex.register();
-		PonderIndex.registerTags();
 
 		UIRenderHelper.init();
 	}
diff --git a/src/main/java/com/simibubi/create/api/behaviour/BlockSpoutingBehaviour.java b/src/main/java/com/simibubi/create/api/behaviour/BlockSpoutingBehaviour.java
index c2f33942b..9bdcf69d4 100644
--- a/src/main/java/com/simibubi/create/api/behaviour/BlockSpoutingBehaviour.java
+++ b/src/main/java/com/simibubi/create/api/behaviour/BlockSpoutingBehaviour.java
@@ -6,7 +6,7 @@ import java.util.function.Consumer;
 
 import com.simibubi.create.Create;
 import com.simibubi.create.compat.tconstruct.SpoutCasting;
-import com.simibubi.create.content.contraptions.fluids.actors.SpoutBlockEntity;
+import com.simibubi.create.content.fluids.spout.SpoutBlockEntity;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.resources.ResourceLocation;
diff --git a/src/main/java/com/simibubi/create/api/connectivity/ConnectivityHandler.java b/src/main/java/com/simibubi/create/api/connectivity/ConnectivityHandler.java
index f355cccf5..f367df848 100644
--- a/src/main/java/com/simibubi/create/api/connectivity/ConnectivityHandler.java
+++ b/src/main/java/com/simibubi/create/api/connectivity/ConnectivityHandler.java
@@ -13,7 +13,7 @@ import javax.annotation.Nullable;
 
 import org.apache.commons.lang3.tuple.Pair;
 
-import com.simibubi.create.content.contraptions.fluids.tank.CreativeFluidTankBlockEntity;
+import com.simibubi.create.content.fluids.tank.CreativeFluidTankBlockEntity;
 import com.simibubi.create.foundation.blockEntity.IMultiBlockEntityContainer;
 import com.simibubi.create.foundation.utility.Iterate;
 
diff --git a/src/main/java/com/simibubi/create/api/event/BlockEntityBehaviourEvent.java b/src/main/java/com/simibubi/create/api/event/BlockEntityBehaviourEvent.java
index 146d5ad1b..398783d74 100644
--- a/src/main/java/com/simibubi/create/api/event/BlockEntityBehaviourEvent.java
+++ b/src/main/java/com/simibubi/create/api/event/BlockEntityBehaviourEvent.java
@@ -3,9 +3,9 @@ package com.simibubi.create.api.event;
 import java.lang.reflect.Type;
 import java.util.Map;
 
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
 import com.simibubi.create.foundation.blockEntity.behaviour.BehaviourType;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraftforge.eventbus.api.GenericEvent;
diff --git a/src/main/java/com/simibubi/create/api/event/TrackGraphMergeEvent.java b/src/main/java/com/simibubi/create/api/event/TrackGraphMergeEvent.java
index af58070d2..d48e2a3a7 100644
--- a/src/main/java/com/simibubi/create/api/event/TrackGraphMergeEvent.java
+++ b/src/main/java/com/simibubi/create/api/event/TrackGraphMergeEvent.java
@@ -1,6 +1,6 @@
 package com.simibubi.create.api.event;
 
-import com.simibubi.create.content.logistics.trains.TrackGraph;
+import com.simibubi.create.content.trains.graph.TrackGraph;
 
 import net.minecraftforge.eventbus.api.Event;
 
diff --git a/src/main/java/com/simibubi/create/compat/computercraft/AbstractComputerBehaviour.java b/src/main/java/com/simibubi/create/compat/computercraft/AbstractComputerBehaviour.java
index ef2777d1a..956aad0b6 100644
--- a/src/main/java/com/simibubi/create/compat/computercraft/AbstractComputerBehaviour.java
+++ b/src/main/java/com/simibubi/create/compat/computercraft/AbstractComputerBehaviour.java
@@ -1,8 +1,8 @@
 package com.simibubi.create.compat.computercraft;
 
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
 import com.simibubi.create.foundation.blockEntity.behaviour.BehaviourType;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 
 import net.minecraft.nbt.CompoundTag;
 import net.minecraftforge.common.capabilities.Capability;
diff --git a/src/main/java/com/simibubi/create/compat/computercraft/implementation/ComputerBehaviour.java b/src/main/java/com/simibubi/create/compat/computercraft/implementation/ComputerBehaviour.java
index 4005f591d..3ade80faf 100644
--- a/src/main/java/com/simibubi/create/compat/computercraft/implementation/ComputerBehaviour.java
+++ b/src/main/java/com/simibubi/create/compat/computercraft/implementation/ComputerBehaviour.java
@@ -7,12 +7,12 @@ import com.simibubi.create.compat.computercraft.implementation.peripherals.Speed
 import com.simibubi.create.compat.computercraft.implementation.peripherals.SpeedGaugePeripheral;
 import com.simibubi.create.compat.computercraft.implementation.peripherals.StationPeripheral;
 import com.simibubi.create.compat.computercraft.implementation.peripherals.StressGaugePeripheral;
-import com.simibubi.create.content.contraptions.relays.advanced.SpeedControllerBlockEntity;
-import com.simibubi.create.content.contraptions.relays.advanced.sequencer.SequencedGearshiftBlockEntity;
-import com.simibubi.create.content.contraptions.relays.gauge.SpeedGaugeBlockEntity;
-import com.simibubi.create.content.contraptions.relays.gauge.StressGaugeBlockEntity;
-import com.simibubi.create.content.logistics.block.display.DisplayLinkBlockEntity;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.station.StationBlockEntity;
+import com.simibubi.create.content.kinetics.gauge.SpeedGaugeBlockEntity;
+import com.simibubi.create.content.kinetics.gauge.StressGaugeBlockEntity;
+import com.simibubi.create.content.kinetics.speedController.SpeedControllerBlockEntity;
+import com.simibubi.create.content.kinetics.transmission.sequencer.SequencedGearshiftBlockEntity;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkBlockEntity;
+import com.simibubi.create.content.trains.station.StationBlockEntity;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
 
 import dan200.computercraft.api.peripheral.IPeripheral;
diff --git a/src/main/java/com/simibubi/create/compat/computercraft/implementation/peripherals/DisplayLinkPeripheral.java b/src/main/java/com/simibubi/create/compat/computercraft/implementation/peripherals/DisplayLinkPeripheral.java
index cff49977e..0a65701ca 100644
--- a/src/main/java/com/simibubi/create/compat/computercraft/implementation/peripherals/DisplayLinkPeripheral.java
+++ b/src/main/java/com/simibubi/create/compat/computercraft/implementation/peripherals/DisplayLinkPeripheral.java
@@ -4,9 +4,9 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import org.jetbrains.annotations.NotNull;
 
-import com.simibubi.create.content.logistics.block.display.DisplayLinkBlockEntity;
-import com.simibubi.create.content.logistics.block.display.DisplayLinkContext;
-import com.simibubi.create.content.logistics.block.display.target.DisplayTargetStats;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkBlockEntity;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext;
+import com.simibubi.create.content.redstone.displayLink.target.DisplayTargetStats;
 
 import dan200.computercraft.api.lua.LuaFunction;
 import net.minecraft.nbt.ListTag;
diff --git a/src/main/java/com/simibubi/create/compat/computercraft/implementation/peripherals/SequencedGearshiftPeripheral.java b/src/main/java/com/simibubi/create/compat/computercraft/implementation/peripherals/SequencedGearshiftPeripheral.java
index 26574bd7f..35bd35cc9 100644
--- a/src/main/java/com/simibubi/create/compat/computercraft/implementation/peripherals/SequencedGearshiftPeripheral.java
+++ b/src/main/java/com/simibubi/create/compat/computercraft/implementation/peripherals/SequencedGearshiftPeripheral.java
@@ -2,10 +2,10 @@ package com.simibubi.create.compat.computercraft.implementation.peripherals;
 
 import org.jetbrains.annotations.NotNull;
 
-import com.simibubi.create.content.contraptions.relays.advanced.sequencer.Instruction;
-import com.simibubi.create.content.contraptions.relays.advanced.sequencer.InstructionSpeedModifiers;
-import com.simibubi.create.content.contraptions.relays.advanced.sequencer.SequencedGearshiftBlockEntity;
-import com.simibubi.create.content.contraptions.relays.advanced.sequencer.SequencerInstructions;
+import com.simibubi.create.content.kinetics.transmission.sequencer.Instruction;
+import com.simibubi.create.content.kinetics.transmission.sequencer.InstructionSpeedModifiers;
+import com.simibubi.create.content.kinetics.transmission.sequencer.SequencedGearshiftBlockEntity;
+import com.simibubi.create.content.kinetics.transmission.sequencer.SequencerInstructions;
 
 import dan200.computercraft.api.lua.IArguments;
 import dan200.computercraft.api.lua.LuaException;
diff --git a/src/main/java/com/simibubi/create/compat/computercraft/implementation/peripherals/SpeedControllerPeripheral.java b/src/main/java/com/simibubi/create/compat/computercraft/implementation/peripherals/SpeedControllerPeripheral.java
index a10f594f7..4b4f90741 100644
--- a/src/main/java/com/simibubi/create/compat/computercraft/implementation/peripherals/SpeedControllerPeripheral.java
+++ b/src/main/java/com/simibubi/create/compat/computercraft/implementation/peripherals/SpeedControllerPeripheral.java
@@ -2,8 +2,8 @@ package com.simibubi.create.compat.computercraft.implementation.peripherals;
 
 import org.jetbrains.annotations.NotNull;
 
-import com.simibubi.create.content.contraptions.relays.advanced.SpeedControllerBlockEntity;
-import com.simibubi.create.foundation.blockEntity.behaviour.scrollvalue.ScrollValueBehaviour;
+import com.simibubi.create.content.kinetics.speedController.SpeedControllerBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollValueBehaviour;
 
 import dan200.computercraft.api.lua.LuaFunction;
 
diff --git a/src/main/java/com/simibubi/create/compat/computercraft/implementation/peripherals/SpeedGaugePeripheral.java b/src/main/java/com/simibubi/create/compat/computercraft/implementation/peripherals/SpeedGaugePeripheral.java
index a2ff521c5..c1955c8b9 100644
--- a/src/main/java/com/simibubi/create/compat/computercraft/implementation/peripherals/SpeedGaugePeripheral.java
+++ b/src/main/java/com/simibubi/create/compat/computercraft/implementation/peripherals/SpeedGaugePeripheral.java
@@ -2,7 +2,7 @@ package com.simibubi.create.compat.computercraft.implementation.peripherals;
 
 import org.jetbrains.annotations.NotNull;
 
-import com.simibubi.create.content.contraptions.relays.gauge.SpeedGaugeBlockEntity;
+import com.simibubi.create.content.kinetics.gauge.SpeedGaugeBlockEntity;
 
 import dan200.computercraft.api.lua.LuaFunction;
 
diff --git a/src/main/java/com/simibubi/create/compat/computercraft/implementation/peripherals/StationPeripheral.java b/src/main/java/com/simibubi/create/compat/computercraft/implementation/peripherals/StationPeripheral.java
index 552304fb8..a676e60f9 100644
--- a/src/main/java/com/simibubi/create/compat/computercraft/implementation/peripherals/StationPeripheral.java
+++ b/src/main/java/com/simibubi/create/compat/computercraft/implementation/peripherals/StationPeripheral.java
@@ -6,13 +6,13 @@ import javax.annotation.Nullable;
 
 import org.jetbrains.annotations.NotNull;
 
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.compat.computercraft.implementation.CreateLuaTable;
-import com.simibubi.create.content.logistics.trains.entity.Train;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.station.GlobalStation;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.station.StationBlockEntity;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.station.TrainEditPacket;
-import com.simibubi.create.content.logistics.trains.management.schedule.Schedule;
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.content.trains.entity.Train;
+import com.simibubi.create.content.trains.schedule.Schedule;
+import com.simibubi.create.content.trains.station.GlobalStation;
+import com.simibubi.create.content.trains.station.StationBlockEntity;
+import com.simibubi.create.content.trains.station.TrainEditPacket;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.StringHelper;
 
diff --git a/src/main/java/com/simibubi/create/compat/computercraft/implementation/peripherals/StressGaugePeripheral.java b/src/main/java/com/simibubi/create/compat/computercraft/implementation/peripherals/StressGaugePeripheral.java
index 480ad12ab..d35a4de66 100644
--- a/src/main/java/com/simibubi/create/compat/computercraft/implementation/peripherals/StressGaugePeripheral.java
+++ b/src/main/java/com/simibubi/create/compat/computercraft/implementation/peripherals/StressGaugePeripheral.java
@@ -2,7 +2,7 @@ package com.simibubi.create.compat.computercraft.implementation.peripherals;
 
 import org.jetbrains.annotations.NotNull;
 
-import com.simibubi.create.content.contraptions.relays.gauge.StressGaugeBlockEntity;
+import com.simibubi.create.content.kinetics.gauge.StressGaugeBlockEntity;
 
 import dan200.computercraft.api.lua.LuaFunction;
 
diff --git a/src/main/java/com/simibubi/create/compat/computercraft/implementation/peripherals/SyncedPeripheral.java b/src/main/java/com/simibubi/create/compat/computercraft/implementation/peripherals/SyncedPeripheral.java
index 59b378619..404260074 100644
--- a/src/main/java/com/simibubi/create/compat/computercraft/implementation/peripherals/SyncedPeripheral.java
+++ b/src/main/java/com/simibubi/create/compat/computercraft/implementation/peripherals/SyncedPeripheral.java
@@ -5,10 +5,10 @@ import java.util.concurrent.atomic.AtomicInteger;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.compat.computercraft.AttachedComputerPacket;
 import com.simibubi.create.compat.computercraft.implementation.ComputerBehaviour;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
-import com.simibubi.create.foundation.networking.AllPackets;
 
 import dan200.computercraft.api.peripheral.IComputerAccess;
 import dan200.computercraft.api.peripheral.IPeripheral;
diff --git a/src/main/java/com/simibubi/create/compat/curios/Curios.java b/src/main/java/com/simibubi/create/compat/curios/Curios.java
index 1b85d2f26..9545dcc2d 100644
--- a/src/main/java/com/simibubi/create/compat/curios/Curios.java
+++ b/src/main/java/com/simibubi/create/compat/curios/Curios.java
@@ -1,7 +1,7 @@
 package com.simibubi.create.compat.curios;
 
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.contraptions.goggles.GogglesItem;
+import com.simibubi.create.content.equipment.goggles.GogglesItem;
 
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.eventbus.api.IEventBus;
diff --git a/src/main/java/com/simibubi/create/compat/jei/BlueprintTransferHandler.java b/src/main/java/com/simibubi/create/compat/jei/BlueprintTransferHandler.java
index ce306c3b9..7356a422f 100644
--- a/src/main/java/com/simibubi/create/compat/jei/BlueprintTransferHandler.java
+++ b/src/main/java/com/simibubi/create/compat/jei/BlueprintTransferHandler.java
@@ -6,9 +6,9 @@ import javax.annotation.ParametersAreNonnullByDefault;
 
 import org.jetbrains.annotations.Nullable;
 
-import com.simibubi.create.content.curiosities.tools.BlueprintAssignCompleteRecipePacket;
-import com.simibubi.create.content.curiosities.tools.BlueprintMenu;
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.AllPackets;
+import com.simibubi.create.content.equipment.blueprint.BlueprintAssignCompleteRecipePacket;
+import com.simibubi.create.content.equipment.blueprint.BlueprintMenu;
 
 import mezz.jei.api.constants.RecipeTypes;
 import mezz.jei.api.gui.ingredient.IRecipeSlotsView;
diff --git a/src/main/java/com/simibubi/create/compat/jei/ConversionRecipe.java b/src/main/java/com/simibubi/create/compat/jei/ConversionRecipe.java
index 373d3c99e..cc41e9a90 100644
--- a/src/main/java/com/simibubi/create/compat/jei/ConversionRecipe.java
+++ b/src/main/java/com/simibubi/create/compat/jei/ConversionRecipe.java
@@ -4,9 +4,9 @@ import javax.annotation.ParametersAreNonnullByDefault;
 
 import com.simibubi.create.AllRecipeTypes;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipe;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipeBuilder;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipeBuilder.ProcessingRecipeParams;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipe;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder.ProcessingRecipeParams;
 
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
diff --git a/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java b/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java
index 893b3d655..d03851fe7 100644
--- a/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java
+++ b/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java
@@ -40,35 +40,35 @@ import com.simibubi.create.compat.jei.category.ProcessingViaFanCategory;
 import com.simibubi.create.compat.jei.category.SawingCategory;
 import com.simibubi.create.compat.jei.category.SequencedAssemblyCategory;
 import com.simibubi.create.compat.jei.category.SpoutCategory;
-import com.simibubi.create.content.contraptions.components.crafter.MechanicalCraftingRecipe;
-import com.simibubi.create.content.contraptions.components.crusher.AbstractCrushingRecipe;
-import com.simibubi.create.content.contraptions.components.deployer.DeployerApplicationRecipe;
-import com.simibubi.create.content.contraptions.components.deployer.ManualApplicationRecipe;
-import com.simibubi.create.content.contraptions.components.fan.HauntingRecipe;
-import com.simibubi.create.content.contraptions.components.fan.SplashingRecipe;
-import com.simibubi.create.content.contraptions.components.press.MechanicalPressBlockEntity;
-import com.simibubi.create.content.contraptions.components.press.PressingRecipe;
-import com.simibubi.create.content.contraptions.components.saw.CuttingRecipe;
-import com.simibubi.create.content.contraptions.components.saw.SawBlockEntity;
-import com.simibubi.create.content.contraptions.fluids.actors.FillingRecipe;
-import com.simibubi.create.content.contraptions.fluids.potion.PotionFluid;
-import com.simibubi.create.content.contraptions.fluids.recipe.PotionMixingRecipes;
-import com.simibubi.create.content.contraptions.itemAssembly.SequencedAssemblyRecipe;
-import com.simibubi.create.content.contraptions.processing.BasinRecipe;
-import com.simibubi.create.content.contraptions.processing.EmptyingRecipe;
-import com.simibubi.create.content.contraptions.processing.ItemApplicationRecipe;
-import com.simibubi.create.content.curiosities.tools.BlueprintScreen;
-import com.simibubi.create.content.curiosities.tools.SandPaperPolishingRecipe;
-import com.simibubi.create.content.logistics.item.LinkedControllerScreen;
-import com.simibubi.create.content.logistics.item.filter.AbstractFilterScreen;
-import com.simibubi.create.content.logistics.trains.management.schedule.ScheduleScreen;
-import com.simibubi.create.foundation.config.AllConfigs;
-import com.simibubi.create.foundation.config.CRecipes;
+import com.simibubi.create.content.equipment.blueprint.BlueprintScreen;
+import com.simibubi.create.content.equipment.sandPaper.SandPaperPolishingRecipe;
+import com.simibubi.create.content.fluids.potion.PotionFluid;
+import com.simibubi.create.content.fluids.potion.PotionMixingRecipes;
+import com.simibubi.create.content.fluids.transfer.EmptyingRecipe;
+import com.simibubi.create.content.fluids.transfer.FillingRecipe;
+import com.simibubi.create.content.kinetics.crafter.MechanicalCraftingRecipe;
+import com.simibubi.create.content.kinetics.crusher.AbstractCrushingRecipe;
+import com.simibubi.create.content.kinetics.deployer.DeployerApplicationRecipe;
+import com.simibubi.create.content.kinetics.deployer.ItemApplicationRecipe;
+import com.simibubi.create.content.kinetics.deployer.ManualApplicationRecipe;
+import com.simibubi.create.content.kinetics.fan.HauntingRecipe;
+import com.simibubi.create.content.kinetics.fan.SplashingRecipe;
+import com.simibubi.create.content.kinetics.press.MechanicalPressBlockEntity;
+import com.simibubi.create.content.kinetics.press.PressingRecipe;
+import com.simibubi.create.content.kinetics.saw.CuttingRecipe;
+import com.simibubi.create.content.kinetics.saw.SawBlockEntity;
+import com.simibubi.create.content.logistics.filter.AbstractFilterScreen;
+import com.simibubi.create.content.processing.basin.BasinRecipe;
+import com.simibubi.create.content.processing.sequenced.SequencedAssemblyRecipe;
+import com.simibubi.create.content.redstone.link.controller.LinkedControllerScreen;
+import com.simibubi.create.content.trains.schedule.ScheduleScreen;
 import com.simibubi.create.foundation.config.ConfigBase.ConfigBool;
 import com.simibubi.create.foundation.data.recipe.LogStrippingFakeRecipes;
 import com.simibubi.create.foundation.gui.menu.AbstractSimiContainerScreen;
+import com.simibubi.create.foundation.recipe.IRecipeTypeInfo;
 import com.simibubi.create.foundation.utility.Lang;
-import com.simibubi.create.foundation.utility.recipe.IRecipeTypeInfo;
+import com.simibubi.create.infrastructure.config.AllConfigs;
+import com.simibubi.create.infrastructure.config.CRecipes;
 
 import mezz.jei.api.IModPlugin;
 import mezz.jei.api.JeiPlugin;
diff --git a/src/main/java/com/simibubi/create/compat/jei/GhostIngredientHandler.java b/src/main/java/com/simibubi/create/compat/jei/GhostIngredientHandler.java
index 798a7fca2..9f3db72c9 100644
--- a/src/main/java/com/simibubi/create/compat/jei/GhostIngredientHandler.java
+++ b/src/main/java/com/simibubi/create/compat/jei/GhostIngredientHandler.java
@@ -5,11 +5,11 @@ import java.util.List;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
-import com.simibubi.create.content.logistics.item.filter.AttributeFilterScreen;
+import com.simibubi.create.AllPackets;
+import com.simibubi.create.content.logistics.filter.AttributeFilterScreen;
 import com.simibubi.create.foundation.gui.menu.AbstractSimiContainerScreen;
 import com.simibubi.create.foundation.gui.menu.GhostItemMenu;
 import com.simibubi.create.foundation.gui.menu.GhostItemSubmitPacket;
-import com.simibubi.create.foundation.networking.AllPackets;
 
 import mezz.jei.api.gui.handlers.IGhostIngredientHandler;
 import net.minecraft.MethodsReturnNonnullByDefault;
diff --git a/src/main/java/com/simibubi/create/compat/jei/PotionFluidSubtypeInterpreter.java b/src/main/java/com/simibubi/create/compat/jei/PotionFluidSubtypeInterpreter.java
index ee5d05a6c..68b6d6151 100644
--- a/src/main/java/com/simibubi/create/compat/jei/PotionFluidSubtypeInterpreter.java
+++ b/src/main/java/com/simibubi/create/compat/jei/PotionFluidSubtypeInterpreter.java
@@ -2,7 +2,7 @@ package com.simibubi.create.compat.jei;
 
 import java.util.List;
 
-import com.simibubi.create.content.contraptions.fluids.potion.PotionFluid.BottleType;
+import com.simibubi.create.content.fluids.potion.PotionFluid.BottleType;
 import com.simibubi.create.foundation.utility.NBTHelper;
 
 import mezz.jei.api.ingredients.subtypes.IIngredientSubtypeInterpreter;
diff --git a/src/main/java/com/simibubi/create/compat/jei/category/BasinCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/BasinCategory.java
index 737a1101b..294dac022 100644
--- a/src/main/java/com/simibubi/create/compat/jei/category/BasinCategory.java
+++ b/src/main/java/com/simibubi/create/compat/jei/category/BasinCategory.java
@@ -10,10 +10,10 @@ import org.apache.commons.lang3.mutable.MutableInt;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.contraptions.processing.BasinRecipe;
-import com.simibubi.create.content.contraptions.processing.HeatCondition;
-import com.simibubi.create.content.contraptions.processing.ProcessingOutput;
-import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock.HeatLevel;
+import com.simibubi.create.content.processing.basin.BasinRecipe;
+import com.simibubi.create.content.processing.burner.BlazeBurnerBlock.HeatLevel;
+import com.simibubi.create.content.processing.recipe.HeatCondition;
+import com.simibubi.create.content.processing.recipe.ProcessingOutput;
 import com.simibubi.create.foundation.fluid.FluidIngredient;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
 import com.simibubi.create.foundation.item.ItemHelper;
diff --git a/src/main/java/com/simibubi/create/compat/jei/category/CreateRecipeCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/CreateRecipeCategory.java
index 480fc3e70..b626810db 100644
--- a/src/main/java/com/simibubi/create/compat/jei/category/CreateRecipeCategory.java
+++ b/src/main/java/com/simibubi/create/compat/jei/category/CreateRecipeCategory.java
@@ -12,8 +12,8 @@ import org.jetbrains.annotations.NotNull;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllFluids;
-import com.simibubi.create.content.contraptions.fluids.potion.PotionFluidHandler;
-import com.simibubi.create.content.contraptions.processing.ProcessingOutput;
+import com.simibubi.create.content.fluids.potion.PotionFluidHandler;
+import com.simibubi.create.content.processing.recipe.ProcessingOutput;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Lang;
diff --git a/src/main/java/com/simibubi/create/compat/jei/category/CrushingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/CrushingCategory.java
index 6d5f3b3eb..fb891a99b 100644
--- a/src/main/java/com/simibubi/create/compat/jei/category/CrushingCategory.java
+++ b/src/main/java/com/simibubi/create/compat/jei/category/CrushingCategory.java
@@ -7,9 +7,9 @@ import javax.annotation.ParametersAreNonnullByDefault;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.compat.jei.category.animations.AnimatedCrushingWheels;
-import com.simibubi.create.content.contraptions.components.crusher.AbstractCrushingRecipe;
-import com.simibubi.create.content.contraptions.processing.ProcessingOutput;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipe;
+import com.simibubi.create.content.kinetics.crusher.AbstractCrushingRecipe;
+import com.simibubi.create.content.processing.recipe.ProcessingOutput;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipe;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
 import com.simibubi.create.foundation.ponder.ui.LayoutHelper;
 
diff --git a/src/main/java/com/simibubi/create/compat/jei/category/DeployingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/DeployingCategory.java
index 9631e36b6..8e8465be5 100644
--- a/src/main/java/com/simibubi/create/compat/jei/category/DeployingCategory.java
+++ b/src/main/java/com/simibubi/create/compat/jei/category/DeployingCategory.java
@@ -6,8 +6,8 @@ import javax.annotation.ParametersAreNonnullByDefault;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.compat.jei.category.animations.AnimatedDeployer;
-import com.simibubi.create.content.contraptions.components.deployer.DeployerApplicationRecipe;
-import com.simibubi.create.content.contraptions.processing.ProcessingOutput;
+import com.simibubi.create.content.kinetics.deployer.DeployerApplicationRecipe;
+import com.simibubi.create.content.processing.recipe.ProcessingOutput;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
 import com.simibubi.create.foundation.utility.Lang;
 
diff --git a/src/main/java/com/simibubi/create/compat/jei/category/FanHauntingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/FanHauntingCategory.java
index b76ac4982..c574a5922 100644
--- a/src/main/java/com/simibubi/create/compat/jei/category/FanHauntingCategory.java
+++ b/src/main/java/com/simibubi/create/compat/jei/category/FanHauntingCategory.java
@@ -4,7 +4,7 @@ import org.jetbrains.annotations.NotNull;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.compat.jei.category.animations.AnimatedKinetics;
-import com.simibubi.create.content.contraptions.components.fan.HauntingRecipe;
+import com.simibubi.create.content.kinetics.fan.HauntingRecipe;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
 import com.simibubi.create.foundation.gui.element.GuiGameElement;
 
diff --git a/src/main/java/com/simibubi/create/compat/jei/category/FanWashingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/FanWashingCategory.java
index d0064ed4d..aa41ec84f 100644
--- a/src/main/java/com/simibubi/create/compat/jei/category/FanWashingCategory.java
+++ b/src/main/java/com/simibubi/create/compat/jei/category/FanWashingCategory.java
@@ -4,7 +4,7 @@ import org.jetbrains.annotations.NotNull;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.compat.jei.category.animations.AnimatedKinetics;
-import com.simibubi.create.content.contraptions.components.fan.SplashingRecipe;
+import com.simibubi.create.content.kinetics.fan.SplashingRecipe;
 import com.simibubi.create.foundation.gui.element.GuiGameElement;
 
 import net.minecraft.world.level.material.Fluids;
diff --git a/src/main/java/com/simibubi/create/compat/jei/category/ItemApplicationCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/ItemApplicationCategory.java
index a24f3e258..048dfc366 100644
--- a/src/main/java/com/simibubi/create/compat/jei/category/ItemApplicationCategory.java
+++ b/src/main/java/com/simibubi/create/compat/jei/category/ItemApplicationCategory.java
@@ -8,8 +8,8 @@ import javax.annotation.ParametersAreNonnullByDefault;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Vector3f;
 import com.simibubi.create.compat.jei.category.animations.AnimatedKinetics;
-import com.simibubi.create.content.contraptions.processing.ItemApplicationRecipe;
-import com.simibubi.create.content.contraptions.processing.ProcessingOutput;
+import com.simibubi.create.content.kinetics.deployer.ItemApplicationRecipe;
+import com.simibubi.create.content.processing.recipe.ProcessingOutput;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
 import com.simibubi.create.foundation.gui.element.GuiGameElement;
 import com.simibubi.create.foundation.utility.Lang;
diff --git a/src/main/java/com/simibubi/create/compat/jei/category/ItemDrainCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/ItemDrainCategory.java
index 63f1779c0..b40b8beb3 100644
--- a/src/main/java/com/simibubi/create/compat/jei/category/ItemDrainCategory.java
+++ b/src/main/java/com/simibubi/create/compat/jei/category/ItemDrainCategory.java
@@ -7,9 +7,9 @@ import javax.annotation.ParametersAreNonnullByDefault;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.Create;
 import com.simibubi.create.compat.jei.category.animations.AnimatedItemDrain;
-import com.simibubi.create.content.contraptions.fluids.potion.PotionFluidHandler;
-import com.simibubi.create.content.contraptions.processing.EmptyingRecipe;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipeBuilder;
+import com.simibubi.create.content.fluids.potion.PotionFluidHandler;
+import com.simibubi.create.content.fluids.transfer.EmptyingRecipe;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
 import com.simibubi.create.foundation.utility.RegisteredObjects;
 
diff --git a/src/main/java/com/simibubi/create/compat/jei/category/MillingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/MillingCategory.java
index 9fc0945fe..f9943a976 100644
--- a/src/main/java/com/simibubi/create/compat/jei/category/MillingCategory.java
+++ b/src/main/java/com/simibubi/create/compat/jei/category/MillingCategory.java
@@ -6,8 +6,8 @@ import javax.annotation.ParametersAreNonnullByDefault;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.compat.jei.category.animations.AnimatedMillstone;
-import com.simibubi.create.content.contraptions.components.crusher.AbstractCrushingRecipe;
-import com.simibubi.create.content.contraptions.processing.ProcessingOutput;
+import com.simibubi.create.content.kinetics.crusher.AbstractCrushingRecipe;
+import com.simibubi.create.content.processing.recipe.ProcessingOutput;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
 
 import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
diff --git a/src/main/java/com/simibubi/create/compat/jei/category/MixingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/MixingCategory.java
index ad0bade4d..4cd7c7015 100644
--- a/src/main/java/com/simibubi/create/compat/jei/category/MixingCategory.java
+++ b/src/main/java/com/simibubi/create/compat/jei/category/MixingCategory.java
@@ -5,8 +5,8 @@ import javax.annotation.ParametersAreNonnullByDefault;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.compat.jei.category.animations.AnimatedBlazeBurner;
 import com.simibubi.create.compat.jei.category.animations.AnimatedMixer;
-import com.simibubi.create.content.contraptions.processing.BasinRecipe;
-import com.simibubi.create.content.contraptions.processing.HeatCondition;
+import com.simibubi.create.content.processing.basin.BasinRecipe;
+import com.simibubi.create.content.processing.recipe.HeatCondition;
 
 import mezz.jei.api.gui.ingredient.IRecipeSlotsView;
 
diff --git a/src/main/java/com/simibubi/create/compat/jei/category/PackingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/PackingCategory.java
index 7cb7773d9..c7618096c 100644
--- a/src/main/java/com/simibubi/create/compat/jei/category/PackingCategory.java
+++ b/src/main/java/com/simibubi/create/compat/jei/category/PackingCategory.java
@@ -5,8 +5,8 @@ import javax.annotation.ParametersAreNonnullByDefault;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.compat.jei.category.animations.AnimatedBlazeBurner;
 import com.simibubi.create.compat.jei.category.animations.AnimatedPress;
-import com.simibubi.create.content.contraptions.processing.BasinRecipe;
-import com.simibubi.create.content.contraptions.processing.HeatCondition;
+import com.simibubi.create.content.processing.basin.BasinRecipe;
+import com.simibubi.create.content.processing.recipe.HeatCondition;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
 
 import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
diff --git a/src/main/java/com/simibubi/create/compat/jei/category/PolishingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/PolishingCategory.java
index 00fe2378e..eeae17b3f 100644
--- a/src/main/java/com/simibubi/create/compat/jei/category/PolishingCategory.java
+++ b/src/main/java/com/simibubi/create/compat/jei/category/PolishingCategory.java
@@ -4,8 +4,8 @@ import javax.annotation.ParametersAreNonnullByDefault;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.contraptions.processing.ProcessingOutput;
-import com.simibubi.create.content.curiosities.tools.SandPaperPolishingRecipe;
+import com.simibubi.create.content.equipment.sandPaper.SandPaperPolishingRecipe;
+import com.simibubi.create.content.processing.recipe.ProcessingOutput;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
 import com.simibubi.create.foundation.gui.element.GuiGameElement;
 
diff --git a/src/main/java/com/simibubi/create/compat/jei/category/PressingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/PressingCategory.java
index b0bffa08c..ba3084c88 100644
--- a/src/main/java/com/simibubi/create/compat/jei/category/PressingCategory.java
+++ b/src/main/java/com/simibubi/create/compat/jei/category/PressingCategory.java
@@ -6,8 +6,8 @@ import javax.annotation.ParametersAreNonnullByDefault;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.compat.jei.category.animations.AnimatedPress;
-import com.simibubi.create.content.contraptions.components.press.PressingRecipe;
-import com.simibubi.create.content.contraptions.processing.ProcessingOutput;
+import com.simibubi.create.content.kinetics.press.PressingRecipe;
+import com.simibubi.create.content.processing.recipe.ProcessingOutput;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
 
 import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
diff --git a/src/main/java/com/simibubi/create/compat/jei/category/ProcessingViaFanCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/ProcessingViaFanCategory.java
index 0a72b92fb..e1cf433cf 100644
--- a/src/main/java/com/simibubi/create/compat/jei/category/ProcessingViaFanCategory.java
+++ b/src/main/java/com/simibubi/create/compat/jei/category/ProcessingViaFanCategory.java
@@ -10,8 +10,8 @@ import com.mojang.math.Vector3f;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllPartialModels;
 import com.simibubi.create.compat.jei.category.animations.AnimatedKinetics;
-import com.simibubi.create.content.contraptions.processing.ProcessingOutput;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipe;
+import com.simibubi.create.content.processing.recipe.ProcessingOutput;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipe;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
 import com.simibubi.create.foundation.utility.Lang;
 
diff --git a/src/main/java/com/simibubi/create/compat/jei/category/SawingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/SawingCategory.java
index 4db6a713d..b852d7e9c 100644
--- a/src/main/java/com/simibubi/create/compat/jei/category/SawingCategory.java
+++ b/src/main/java/com/simibubi/create/compat/jei/category/SawingCategory.java
@@ -6,8 +6,8 @@ import javax.annotation.ParametersAreNonnullByDefault;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.compat.jei.category.animations.AnimatedSaw;
-import com.simibubi.create.content.contraptions.components.saw.CuttingRecipe;
-import com.simibubi.create.content.contraptions.processing.ProcessingOutput;
+import com.simibubi.create.content.kinetics.saw.CuttingRecipe;
+import com.simibubi.create.content.processing.recipe.ProcessingOutput;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
 
 import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
diff --git a/src/main/java/com/simibubi/create/compat/jei/category/SequencedAssemblyCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/SequencedAssemblyCategory.java
index 1dbcd15ad..4a89ea1af 100644
--- a/src/main/java/com/simibubi/create/compat/jei/category/SequencedAssemblyCategory.java
+++ b/src/main/java/com/simibubi/create/compat/jei/category/SequencedAssemblyCategory.java
@@ -11,8 +11,8 @@ import org.jetbrains.annotations.NotNull;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.compat.jei.category.sequencedAssembly.SequencedAssemblySubCategory;
-import com.simibubi.create.content.contraptions.itemAssembly.SequencedAssemblyRecipe;
-import com.simibubi.create.content.contraptions.itemAssembly.SequencedRecipe;
+import com.simibubi.create.content.processing.sequenced.SequencedAssemblyRecipe;
+import com.simibubi.create.content.processing.sequenced.SequencedRecipe;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
 import com.simibubi.create.foundation.gui.AllIcons;
 import com.simibubi.create.foundation.utility.Components;
diff --git a/src/main/java/com/simibubi/create/compat/jei/category/SpoutCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/SpoutCategory.java
index 5f4f43160..58940cb79 100644
--- a/src/main/java/com/simibubi/create/compat/jei/category/SpoutCategory.java
+++ b/src/main/java/com/simibubi/create/compat/jei/category/SpoutCategory.java
@@ -8,10 +8,10 @@ import javax.annotation.ParametersAreNonnullByDefault;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.Create;
 import com.simibubi.create.compat.jei.category.animations.AnimatedSpout;
-import com.simibubi.create.content.contraptions.fluids.actors.FillingRecipe;
-import com.simibubi.create.content.contraptions.fluids.actors.GenericItemFilling;
-import com.simibubi.create.content.contraptions.fluids.potion.PotionFluidHandler;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipeBuilder;
+import com.simibubi.create.content.fluids.potion.PotionFluidHandler;
+import com.simibubi.create.content.fluids.transfer.FillingRecipe;
+import com.simibubi.create.content.fluids.transfer.GenericItemFilling;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder;
 import com.simibubi.create.foundation.fluid.FluidIngredient;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
 import com.simibubi.create.foundation.utility.RegisteredObjects;
diff --git a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedBlazeBurner.java b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedBlazeBurner.java
index ca8b6b6ca..735f55c7f 100644
--- a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedBlazeBurner.java
+++ b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedBlazeBurner.java
@@ -7,7 +7,7 @@ import com.mojang.math.Vector3f;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllPartialModels;
 import com.simibubi.create.AllSpriteShifts;
-import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock.HeatLevel;
+import com.simibubi.create.content.processing.burner.BlazeBurnerBlock.HeatLevel;
 import com.simibubi.create.foundation.block.render.SpriteShiftEntry;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
diff --git a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedDeployer.java b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedDeployer.java
index 95e7e7018..1d604b6a7 100644
--- a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedDeployer.java
+++ b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedDeployer.java
@@ -4,7 +4,7 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Vector3f;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.components.deployer.DeployerBlock;
+import com.simibubi.create.content.kinetics.deployer.DeployerBlock;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedSaw.java b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedSaw.java
index 675501061..5e5018914 100644
--- a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedSaw.java
+++ b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedSaw.java
@@ -4,7 +4,7 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Vector3f;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.components.saw.SawBlock;
+import com.simibubi.create.content.kinetics.saw.SawBlock;
 
 import net.minecraft.core.Direction;
 import net.minecraft.core.Direction.Axis;
diff --git a/src/main/java/com/simibubi/create/compat/jei/category/sequencedAssembly/SequencedAssemblySubCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/sequencedAssembly/SequencedAssemblySubCategory.java
index 26d76a540..b7682ce65 100644
--- a/src/main/java/com/simibubi/create/compat/jei/category/sequencedAssembly/SequencedAssemblySubCategory.java
+++ b/src/main/java/com/simibubi/create/compat/jei/category/sequencedAssembly/SequencedAssemblySubCategory.java
@@ -6,8 +6,8 @@ import com.simibubi.create.compat.jei.category.animations.AnimatedDeployer;
 import com.simibubi.create.compat.jei.category.animations.AnimatedPress;
 import com.simibubi.create.compat.jei.category.animations.AnimatedSaw;
 import com.simibubi.create.compat.jei.category.animations.AnimatedSpout;
-import com.simibubi.create.content.contraptions.components.deployer.DeployerApplicationRecipe;
-import com.simibubi.create.content.contraptions.itemAssembly.SequencedRecipe;
+import com.simibubi.create.content.kinetics.deployer.DeployerApplicationRecipe;
+import com.simibubi.create.content.processing.sequenced.SequencedRecipe;
 import com.simibubi.create.foundation.fluid.FluidIngredient;
 import com.simibubi.create.foundation.utility.Lang;
 
diff --git a/src/main/java/com/simibubi/create/compat/tconstruct/SpoutCasting.java b/src/main/java/com/simibubi/create/compat/tconstruct/SpoutCasting.java
index c2dae5c8f..65e26042f 100644
--- a/src/main/java/com/simibubi/create/compat/tconstruct/SpoutCasting.java
+++ b/src/main/java/com/simibubi/create/compat/tconstruct/SpoutCasting.java
@@ -2,10 +2,10 @@ package com.simibubi.create.compat.tconstruct;
 
 import com.simibubi.create.api.behaviour.BlockSpoutingBehaviour;
 import com.simibubi.create.compat.Mods;
-import com.simibubi.create.content.contraptions.fluids.actors.SpoutBlockEntity;
-import com.simibubi.create.foundation.config.AllConfigs;
+import com.simibubi.create.content.fluids.spout.SpoutBlockEntity;
 import com.simibubi.create.foundation.fluid.FluidHelper;
 import com.simibubi.create.foundation.utility.RegisteredObjects;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AbstractContraptionEntity.java b/src/main/java/com/simibubi/create/content/contraptions/AbstractContraptionEntity.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AbstractContraptionEntity.java
rename to src/main/java/com/simibubi/create/content/contraptions/AbstractContraptionEntity.java
index 077d21987..a91cf3b70 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AbstractContraptionEntity.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/AbstractContraptionEntity.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement;
+package com.simibubi.create.content.contraptions;
 
 import java.util.Collection;
 import java.util.IdentityHashMap;
@@ -16,27 +16,28 @@ import org.apache.commons.lang3.tuple.MutablePair;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllItems;
 import com.simibubi.create.AllMovementBehaviours;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.AllSoundEvents;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.contraptions.components.actors.PortableStorageInterfaceMovement;
-import com.simibubi.create.content.contraptions.components.actors.SeatBlock;
-import com.simibubi.create.content.contraptions.components.actors.SeatEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.elevator.ElevatorContraption;
-import com.simibubi.create.content.contraptions.components.structureMovement.glue.SuperGlueEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.interaction.controls.ControlsStopControllingPacket;
-import com.simibubi.create.content.contraptions.components.structureMovement.mounted.MountedContraption;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionRenderDispatcher;
-import com.simibubi.create.content.contraptions.components.structureMovement.sync.ContraptionSeatMappingPacket;
-import com.simibubi.create.content.curiosities.deco.SlidingDoorBlock;
-import com.simibubi.create.content.logistics.trains.entity.CarriageContraption;
-import com.simibubi.create.content.logistics.trains.entity.CarriageContraptionEntity;
-import com.simibubi.create.content.logistics.trains.entity.Train;
+import com.simibubi.create.content.contraptions.actors.psi.PortableStorageInterfaceMovement;
+import com.simibubi.create.content.contraptions.actors.seat.SeatBlock;
+import com.simibubi.create.content.contraptions.actors.seat.SeatEntity;
+import com.simibubi.create.content.contraptions.actors.trainControls.ControlsStopControllingPacket;
+import com.simibubi.create.content.contraptions.behaviour.MovementBehaviour;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
+import com.simibubi.create.content.contraptions.elevator.ElevatorContraption;
+import com.simibubi.create.content.contraptions.glue.SuperGlueEntity;
+import com.simibubi.create.content.contraptions.mounted.MountedContraption;
+import com.simibubi.create.content.contraptions.render.ContraptionRenderDispatcher;
+import com.simibubi.create.content.contraptions.sync.ContraptionSeatMappingPacket;
+import com.simibubi.create.content.decoration.slidingDoor.SlidingDoorBlock;
+import com.simibubi.create.content.trains.entity.CarriageContraption;
+import com.simibubi.create.content.trains.entity.CarriageContraptionEntity;
+import com.simibubi.create.content.trains.entity.Train;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
 import com.simibubi.create.foundation.collision.Matrix3d;
 import com.simibubi.create.foundation.mixin.accessor.ServerLevelAccessor;
-import com.simibubi.create.foundation.networking.AllPackets;
 import com.simibubi.create.foundation.utility.AngleHelper;
-import com.simibubi.create.foundation.utility.ContraptionData;
 import com.simibubi.create.foundation.utility.VecHelper;
 
 import net.minecraft.client.Minecraft;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AssemblyException.java b/src/main/java/com/simibubi/create/content/contraptions/AssemblyException.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AssemblyException.java
rename to src/main/java/com/simibubi/create/content/contraptions/AssemblyException.java
index 0938b4e8b..8bb1675d4 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AssemblyException.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/AssemblyException.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.content.contraptions.components.structureMovement;
+package com.simibubi.create.content.contraptions;
 
-import com.simibubi.create.foundation.config.AllConfigs;
 import com.simibubi.create.foundation.utility.Lang;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/BlockMovementChecks.java b/src/main/java/com/simibubi/create/content/contraptions/BlockMovementChecks.java
similarity index 85%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/BlockMovementChecks.java
rename to src/main/java/com/simibubi/create/content/contraptions/BlockMovementChecks.java
index e305af2aa..0a223944d 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/BlockMovementChecks.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/BlockMovementChecks.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement;
+package com.simibubi.create.content.contraptions;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -6,33 +6,32 @@ import java.util.List;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllTags.AllBlockTags;
 import com.simibubi.create.api.connectivity.ConnectivityHandler;
-import com.simibubi.create.content.contraptions.components.actors.AttachedActorBlock;
-import com.simibubi.create.content.contraptions.components.actors.HarvesterBlock;
-import com.simibubi.create.content.contraptions.components.actors.PortableStorageInterfaceBlock;
-import com.simibubi.create.content.contraptions.components.crank.HandCrankBlock;
-import com.simibubi.create.content.contraptions.components.fan.NozzleBlock;
-import com.simibubi.create.content.contraptions.components.steam.whistle.WhistleBlock;
-import com.simibubi.create.content.contraptions.components.steam.whistle.WhistleExtenderBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.bearing.ClockworkBearingBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.bearing.ClockworkBearingBlockEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.bearing.MechanicalBearingBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.bearing.MechanicalBearingBlockEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.bearing.SailBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.chassis.AbstractChassisBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.chassis.StickerBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.mounted.CartAssemblerBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock.PistonState;
-import com.simibubi.create.content.contraptions.components.structureMovement.pulley.PulleyBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.pulley.PulleyBlockEntity;
-import com.simibubi.create.content.contraptions.fluids.tank.FluidTankBlock;
-import com.simibubi.create.content.curiosities.deco.SlidingDoorBlock;
-import com.simibubi.create.content.logistics.block.redstone.RedstoneLinkBlock;
-import com.simibubi.create.content.logistics.block.vault.ItemVaultBlock;
-import com.simibubi.create.content.logistics.trains.AbstractBogeyBlock;
-import com.simibubi.create.content.logistics.trains.ITrackBlock;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.station.StationBlock;
-import com.simibubi.create.foundation.config.ContraptionMovementSetting;
+import com.simibubi.create.content.contraptions.actors.AttachedActorBlock;
+import com.simibubi.create.content.contraptions.actors.harvester.HarvesterBlock;
+import com.simibubi.create.content.contraptions.actors.psi.PortableStorageInterfaceBlock;
+import com.simibubi.create.content.contraptions.bearing.ClockworkBearingBlock;
+import com.simibubi.create.content.contraptions.bearing.ClockworkBearingBlockEntity;
+import com.simibubi.create.content.contraptions.bearing.MechanicalBearingBlock;
+import com.simibubi.create.content.contraptions.bearing.MechanicalBearingBlockEntity;
+import com.simibubi.create.content.contraptions.bearing.SailBlock;
+import com.simibubi.create.content.contraptions.chassis.AbstractChassisBlock;
+import com.simibubi.create.content.contraptions.chassis.StickerBlock;
+import com.simibubi.create.content.contraptions.mounted.CartAssemblerBlock;
+import com.simibubi.create.content.contraptions.piston.MechanicalPistonBlock;
+import com.simibubi.create.content.contraptions.piston.MechanicalPistonBlock.PistonState;
+import com.simibubi.create.content.contraptions.pulley.PulleyBlock;
+import com.simibubi.create.content.contraptions.pulley.PulleyBlockEntity;
+import com.simibubi.create.content.decoration.slidingDoor.SlidingDoorBlock;
+import com.simibubi.create.content.decoration.steamWhistle.WhistleBlock;
+import com.simibubi.create.content.decoration.steamWhistle.WhistleExtenderBlock;
+import com.simibubi.create.content.fluids.tank.FluidTankBlock;
+import com.simibubi.create.content.kinetics.crank.HandCrankBlock;
+import com.simibubi.create.content.kinetics.fan.NozzleBlock;
+import com.simibubi.create.content.logistics.vault.ItemVaultBlock;
+import com.simibubi.create.content.redstone.link.RedstoneLinkBlock;
+import com.simibubi.create.content.trains.bogey.AbstractBogeyBlock;
+import com.simibubi.create.content.trains.station.StationBlock;
+import com.simibubi.create.content.trains.track.ITrackBlock;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java b/src/main/java/com/simibubi/create/content/contraptions/Contraption.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java
rename to src/main/java/com/simibubi/create/content/contraptions/Contraption.java
index f0a8875b3..1433e557a 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/Contraption.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.content.contraptions.components.structureMovement;
+package com.simibubi.create.content.contraptions;
 
-import static com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock.isExtensionPole;
-import static com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock.isPistonHead;
+import static com.simibubi.create.content.contraptions.piston.MechanicalPistonBlock.isExtensionPole;
+import static com.simibubi.create.content.contraptions.piston.MechanicalPistonBlock.isPistonHead;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -28,46 +28,48 @@ import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllInteractionBehaviours;
 import com.simibubi.create.AllMovementBehaviours;
-import com.simibubi.create.content.contraptions.base.IRotate;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.components.actors.BlockBreakingMovementBehaviour;
-import com.simibubi.create.content.contraptions.components.actors.HarvesterMovementBehaviour;
-import com.simibubi.create.content.contraptions.components.actors.SeatBlock;
-import com.simibubi.create.content.contraptions.components.actors.SeatEntity;
-import com.simibubi.create.content.contraptions.components.actors.controls.ContraptionControlsMovement;
-import com.simibubi.create.content.contraptions.components.steam.PoweredShaftBlockEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.bearing.MechanicalBearingBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.bearing.StabilizedContraption;
-import com.simibubi.create.content.contraptions.components.structureMovement.bearing.WindmillBearingBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.bearing.WindmillBearingBlockEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.chassis.AbstractChassisBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.chassis.ChassisBlockEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.chassis.StickerBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.gantry.GantryCarriageBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.glue.SuperGlueEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.interaction.controls.ControlsBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock.PistonState;
-import com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonHeadBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.piston.PistonExtensionPoleBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.pulley.PulleyBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.pulley.PulleyBlock.MagnetBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.pulley.PulleyBlock.RopeBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.pulley.PulleyBlockEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionLighter;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.EmptyLighter;
-import com.simibubi.create.content.contraptions.fluids.tank.FluidTankBlockEntity;
-import com.simibubi.create.content.contraptions.relays.advanced.GantryShaftBlock;
-import com.simibubi.create.content.contraptions.relays.belt.BeltBlock;
-import com.simibubi.create.content.contraptions.relays.elementary.ShaftBlock;
-import com.simibubi.create.content.curiosities.deco.SlidingDoorBlock;
-import com.simibubi.create.content.logistics.block.inventories.CreativeCrateBlockEntity;
-import com.simibubi.create.content.logistics.block.redstone.RedstoneContactBlock;
-import com.simibubi.create.content.logistics.block.vault.ItemVaultBlockEntity;
-import com.simibubi.create.content.logistics.trains.AbstractBogeyBlock;
+import com.simibubi.create.content.contraptions.actors.contraptionControls.ContraptionControlsMovement;
+import com.simibubi.create.content.contraptions.actors.harvester.HarvesterMovementBehaviour;
+import com.simibubi.create.content.contraptions.actors.seat.SeatBlock;
+import com.simibubi.create.content.contraptions.actors.seat.SeatEntity;
+import com.simibubi.create.content.contraptions.actors.trainControls.ControlsBlock;
+import com.simibubi.create.content.contraptions.bearing.MechanicalBearingBlock;
+import com.simibubi.create.content.contraptions.bearing.StabilizedContraption;
+import com.simibubi.create.content.contraptions.bearing.WindmillBearingBlock;
+import com.simibubi.create.content.contraptions.bearing.WindmillBearingBlockEntity;
+import com.simibubi.create.content.contraptions.behaviour.MovementBehaviour;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
+import com.simibubi.create.content.contraptions.behaviour.MovingInteractionBehaviour;
+import com.simibubi.create.content.contraptions.chassis.AbstractChassisBlock;
+import com.simibubi.create.content.contraptions.chassis.ChassisBlockEntity;
+import com.simibubi.create.content.contraptions.chassis.StickerBlock;
+import com.simibubi.create.content.contraptions.gantry.GantryCarriageBlock;
+import com.simibubi.create.content.contraptions.glue.SuperGlueEntity;
+import com.simibubi.create.content.contraptions.piston.MechanicalPistonBlock;
+import com.simibubi.create.content.contraptions.piston.MechanicalPistonBlock.PistonState;
+import com.simibubi.create.content.contraptions.piston.MechanicalPistonHeadBlock;
+import com.simibubi.create.content.contraptions.piston.PistonExtensionPoleBlock;
+import com.simibubi.create.content.contraptions.pulley.PulleyBlock;
+import com.simibubi.create.content.contraptions.pulley.PulleyBlock.MagnetBlock;
+import com.simibubi.create.content.contraptions.pulley.PulleyBlock.RopeBlock;
+import com.simibubi.create.content.contraptions.pulley.PulleyBlockEntity;
+import com.simibubi.create.content.contraptions.render.ContraptionLighter;
+import com.simibubi.create.content.contraptions.render.EmptyLighter;
+import com.simibubi.create.content.decoration.slidingDoor.SlidingDoorBlock;
+import com.simibubi.create.content.fluids.tank.FluidTankBlockEntity;
+import com.simibubi.create.content.kinetics.base.BlockBreakingMovementBehaviour;
+import com.simibubi.create.content.kinetics.base.IRotate;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.belt.BeltBlock;
+import com.simibubi.create.content.kinetics.gantry.GantryShaftBlock;
+import com.simibubi.create.content.kinetics.simpleRelays.ShaftBlock;
+import com.simibubi.create.content.kinetics.steamEngine.PoweredShaftBlockEntity;
+import com.simibubi.create.content.logistics.crate.CreativeCrateBlockEntity;
+import com.simibubi.create.content.logistics.vault.ItemVaultBlockEntity;
+import com.simibubi.create.content.redstone.contact.RedstoneContactBlock;
+import com.simibubi.create.content.trains.bogey.AbstractBogeyBlock;
 import com.simibubi.create.foundation.blockEntity.IMultiBlockEntityContainer;
 import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour;
-import com.simibubi.create.foundation.config.AllConfigs;
 import com.simibubi.create.foundation.utility.BBHelper;
 import com.simibubi.create.foundation.utility.BlockFace;
 import com.simibubi.create.foundation.utility.BlockHelper;
@@ -76,6 +78,7 @@ import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.NBTHelper;
 import com.simibubi.create.foundation.utility.NBTProcessors;
 import com.simibubi.create.foundation.utility.UniqueLinkedList;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -192,7 +195,7 @@ public abstract class Contraption {
 
 	public abstract boolean canBeStabilized(Direction facing, BlockPos localPos);
 
-	protected abstract ContraptionType getType();
+	public abstract ContraptionType getType();
 
 	protected boolean customBlockPlacement(LevelAccessor world, BlockPos pos, BlockState state) {
 		return false;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionBlockChangedPacket.java b/src/main/java/com/simibubi/create/content/contraptions/ContraptionBlockChangedPacket.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionBlockChangedPacket.java
rename to src/main/java/com/simibubi/create/content/contraptions/ContraptionBlockChangedPacket.java
index b26436386..bd082b9ba 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionBlockChangedPacket.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/ContraptionBlockChangedPacket.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement;
+package com.simibubi.create.content.contraptions;
 
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionCollider.java b/src/main/java/com/simibubi/create/content/contraptions/ContraptionCollider.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionCollider.java
rename to src/main/java/com/simibubi/create/content/contraptions/ContraptionCollider.java
index d992b4219..245107612 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionCollider.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/ContraptionCollider.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement;
+package com.simibubi.create.content.contraptions;
 
 import static net.minecraft.world.entity.Entity.collideBoundingBox;
 
@@ -17,21 +17,23 @@ import org.apache.commons.lang3.tuple.MutablePair;
 import com.google.common.base.Predicates;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllMovementBehaviours;
-import com.simibubi.create.content.contraptions.components.actors.BlockBreakingMovementBehaviour;
-import com.simibubi.create.content.contraptions.components.actors.HarvesterMovementBehaviour;
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity.ContraptionRotationState;
-import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionColliderLockPacket.ContraptionColliderLockPacketRequest;
-import com.simibubi.create.content.contraptions.components.structureMovement.sync.ClientMotionPacket;
-import com.simibubi.create.content.logistics.trains.entity.CarriageContraptionEntity;
+import com.simibubi.create.AllPackets;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity.ContraptionRotationState;
+import com.simibubi.create.content.contraptions.ContraptionColliderLockPacket.ContraptionColliderLockPacketRequest;
+import com.simibubi.create.content.contraptions.actors.harvester.HarvesterMovementBehaviour;
+import com.simibubi.create.content.contraptions.behaviour.MovementBehaviour;
+import com.simibubi.create.content.contraptions.behaviour.MovingInteractionBehaviour;
+import com.simibubi.create.content.contraptions.sync.ClientMotionPacket;
+import com.simibubi.create.content.kinetics.base.BlockBreakingMovementBehaviour;
+import com.simibubi.create.content.trains.entity.CarriageContraptionEntity;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
 import com.simibubi.create.foundation.collision.ContinuousOBBCollider.ContinuousSeparationManifold;
 import com.simibubi.create.foundation.collision.Matrix3d;
 import com.simibubi.create.foundation.collision.OrientedBB;
-import com.simibubi.create.foundation.config.AllConfigs;
-import com.simibubi.create.foundation.networking.AllPackets;
 import com.simibubi.create.foundation.utility.BlockHelper;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.VecHelper;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ClientLevel;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionColliderLockPacket.java b/src/main/java/com/simibubi/create/content/contraptions/ContraptionColliderLockPacket.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionColliderLockPacket.java
rename to src/main/java/com/simibubi/create/content/contraptions/ContraptionColliderLockPacket.java
index f2c399768..edcc173cb 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionColliderLockPacket.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/ContraptionColliderLockPacket.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.contraptions.components.structureMovement;
+package com.simibubi.create.content.contraptions;
 
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 
 import net.minecraft.network.FriendlyByteBuf;
diff --git a/src/main/java/com/simibubi/create/foundation/utility/ContraptionData.java b/src/main/java/com/simibubi/create/content/contraptions/ContraptionData.java
similarity index 94%
rename from src/main/java/com/simibubi/create/foundation/utility/ContraptionData.java
rename to src/main/java/com/simibubi/create/content/contraptions/ContraptionData.java
index dd63e44de..c204d4edf 100644
--- a/src/main/java/com/simibubi/create/foundation/utility/ContraptionData.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/ContraptionData.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.foundation.utility;
+package com.simibubi.create.content.contraptions;
 
 import com.simibubi.create.compat.Mods;
-import com.simibubi.create.foundation.config.AllConfigs;
 import com.simibubi.create.foundation.mixin.accessor.NbtAccounterAccessor;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import io.netty.buffer.Unpooled;
 import net.minecraft.nbt.CompoundTag;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionDisassemblyPacket.java b/src/main/java/com/simibubi/create/content/contraptions/ContraptionDisassemblyPacket.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionDisassemblyPacket.java
rename to src/main/java/com/simibubi/create/content/contraptions/ContraptionDisassemblyPacket.java
index 96d2e9da0..44d56748c 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionDisassemblyPacket.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/ContraptionDisassemblyPacket.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement;
+package com.simibubi.create.content.contraptions;
 
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionHandler.java b/src/main/java/com/simibubi/create/content/contraptions/ContraptionHandler.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionHandler.java
rename to src/main/java/com/simibubi/create/content/contraptions/ContraptionHandler.java
index 298e9d596..a55884112 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionHandler.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/ContraptionHandler.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement;
+package com.simibubi.create.content.contraptions;
 
 import java.lang.ref.WeakReference;
 import java.util.Collection;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionHandlerClient.java b/src/main/java/com/simibubi/create/content/contraptions/ContraptionHandlerClient.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionHandlerClient.java
rename to src/main/java/com/simibubi/create/content/contraptions/ContraptionHandlerClient.java
index 161ba201b..a80369809 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionHandlerClient.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/ContraptionHandlerClient.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement;
+package com.simibubi.create.content.contraptions;
 
 import java.lang.ref.WeakReference;
 import java.util.Collection;
@@ -8,10 +8,10 @@ import javax.annotation.Nullable;
 import org.apache.commons.lang3.mutable.MutableObject;
 
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.contraptions.components.structureMovement.sync.ContraptionInteractionPacket;
-import com.simibubi.create.content.logistics.trains.entity.CarriageContraptionEntity;
-import com.simibubi.create.content.logistics.trains.entity.TrainRelocator;
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.AllPackets;
+import com.simibubi.create.content.contraptions.sync.ContraptionInteractionPacket;
+import com.simibubi.create.content.trains.entity.CarriageContraptionEntity;
+import com.simibubi.create.content.trains.entity.TrainRelocator;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.RaycastHelper;
diff --git a/src/main/java/com/simibubi/create/foundation/config/ContraptionMovementSetting.java b/src/main/java/com/simibubi/create/content/contraptions/ContraptionMovementSetting.java
similarity index 95%
rename from src/main/java/com/simibubi/create/foundation/config/ContraptionMovementSetting.java
rename to src/main/java/com/simibubi/create/content/contraptions/ContraptionMovementSetting.java
index e71893740..e8fc89990 100644
--- a/src/main/java/com/simibubi/create/foundation/config/ContraptionMovementSetting.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/ContraptionMovementSetting.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.config;
+package com.simibubi.create.content.contraptions;
 
 import java.util.Collection;
 import java.util.function.Supplier;
@@ -6,6 +6,7 @@ import java.util.function.Supplier;
 import javax.annotation.Nullable;
 
 import com.simibubi.create.foundation.utility.AttachedRegistry;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.Block;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionRelocationPacket.java b/src/main/java/com/simibubi/create/content/contraptions/ContraptionRelocationPacket.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionRelocationPacket.java
rename to src/main/java/com/simibubi/create/content/contraptions/ContraptionRelocationPacket.java
index 580d6eed2..8513de073 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionRelocationPacket.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/ContraptionRelocationPacket.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement;
+package com.simibubi.create.content.contraptions;
 
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionStallPacket.java b/src/main/java/com/simibubi/create/content/contraptions/ContraptionStallPacket.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionStallPacket.java
rename to src/main/java/com/simibubi/create/content/contraptions/ContraptionStallPacket.java
index baf0b211f..0cb3ff2a1 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionStallPacket.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/ContraptionStallPacket.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement;
+package com.simibubi.create.content.contraptions;
 
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionType.java b/src/main/java/com/simibubi/create/content/contraptions/ContraptionType.java
similarity index 50%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionType.java
rename to src/main/java/com/simibubi/create/content/contraptions/ContraptionType.java
index aa3d98e5f..1b85efc41 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionType.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/ContraptionType.java
@@ -1,24 +1,24 @@
-package com.simibubi.create.content.contraptions.components.structureMovement;
+package com.simibubi.create.content.contraptions;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.function.Supplier;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.bearing.BearingContraption;
-import com.simibubi.create.content.contraptions.components.structureMovement.bearing.ClockworkContraption;
-import com.simibubi.create.content.contraptions.components.structureMovement.bearing.StabilizedContraption;
-import com.simibubi.create.content.contraptions.components.structureMovement.elevator.ElevatorContraption;
-import com.simibubi.create.content.contraptions.components.structureMovement.gantry.GantryContraption;
-import com.simibubi.create.content.contraptions.components.structureMovement.mounted.MountedContraption;
-import com.simibubi.create.content.contraptions.components.structureMovement.piston.PistonContraption;
-import com.simibubi.create.content.contraptions.components.structureMovement.pulley.PulleyContraption;
-import com.simibubi.create.content.logistics.trains.entity.CarriageContraption;
+import com.simibubi.create.content.contraptions.bearing.BearingContraption;
+import com.simibubi.create.content.contraptions.bearing.ClockworkContraption;
+import com.simibubi.create.content.contraptions.bearing.StabilizedContraption;
+import com.simibubi.create.content.contraptions.elevator.ElevatorContraption;
+import com.simibubi.create.content.contraptions.gantry.GantryContraption;
+import com.simibubi.create.content.contraptions.mounted.MountedContraption;
+import com.simibubi.create.content.contraptions.piston.PistonContraption;
+import com.simibubi.create.content.contraptions.pulley.PulleyContraption;
+import com.simibubi.create.content.trains.entity.CarriageContraption;
 
 public class ContraptionType {
 
-	public static Map<String, ContraptionType> entries = new HashMap<>();
-	public static ContraptionType
+	public static final Map<String, ContraptionType> ENTRIES = new HashMap<>();
+	public static final ContraptionType
 		PISTON = register("piston", PistonContraption::new), 
 		BEARING = register("bearing", BearingContraption::new),
 		PULLEY = register("pulley", PulleyContraption::new),
@@ -34,7 +34,7 @@ public class ContraptionType {
 
 	public static ContraptionType register(String id, Supplier<? extends Contraption> factory) {
 		ContraptionType value = new ContraptionType(id, factory);
-		entries.put(id, value);
+		ENTRIES.put(id, value);
 		return value;
 	}
 
@@ -44,7 +44,7 @@ public class ContraptionType {
 	}
 
 	public static Contraption fromType(String type) {
-		for (Entry<String, ContraptionType> allContraptionTypes : entries.entrySet())
+		for (Entry<String, ContraptionType> allContraptionTypes : ENTRIES.entrySet())
 			if (type.equals(allContraptionTypes.getKey()))
 				return allContraptionTypes.getValue().factory.get();
 		return null;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionWorld.java b/src/main/java/com/simibubi/create/content/contraptions/ContraptionWorld.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionWorld.java
rename to src/main/java/com/simibubi/create/content/contraptions/ContraptionWorld.java
index 5824028fe..171b9e17f 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionWorld.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/ContraptionWorld.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement;
+package com.simibubi.create.content.contraptions;
 
 import com.simibubi.create.foundation.utility.worldWrappers.WrappedWorld;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ControlledContraptionEntity.java b/src/main/java/com/simibubi/create/content/contraptions/ControlledContraptionEntity.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ControlledContraptionEntity.java
rename to src/main/java/com/simibubi/create/content/contraptions/ControlledContraptionEntity.java
index 872700b1e..a343b6c87 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ControlledContraptionEntity.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/ControlledContraptionEntity.java
@@ -1,11 +1,13 @@
-package com.simibubi.create.content.contraptions.components.structureMovement;
+package com.simibubi.create.content.contraptions;
 
 import static com.simibubi.create.foundation.utility.AngleHelper.angleLerp;
 
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllEntityTypes;
-import com.simibubi.create.content.contraptions.components.structureMovement.bearing.BearingContraption;
+import com.simibubi.create.content.contraptions.bearing.BearingContraption;
+import com.simibubi.create.content.contraptions.behaviour.MovementBehaviour;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
 import com.simibubi.create.foundation.utility.NBTHelper;
 import com.simibubi.create.foundation.utility.VecHelper;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/DirectionalExtenderScrollOptionSlot.java b/src/main/java/com/simibubi/create/content/contraptions/DirectionalExtenderScrollOptionSlot.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/DirectionalExtenderScrollOptionSlot.java
rename to src/main/java/com/simibubi/create/content/contraptions/DirectionalExtenderScrollOptionSlot.java
index a7edffe6c..27b58da19 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/DirectionalExtenderScrollOptionSlot.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/DirectionalExtenderScrollOptionSlot.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement;
+package com.simibubi.create.content.contraptions;
 
 import java.util.function.BiPredicate;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/IControlContraption.java b/src/main/java/com/simibubi/create/content/contraptions/IControlContraption.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/IControlContraption.java
rename to src/main/java/com/simibubi/create/content/contraptions/IControlContraption.java
index 14c88530d..9453fea9f 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/IControlContraption.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/IControlContraption.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.contraptions.components.structureMovement;
+package com.simibubi.create.content.contraptions;
 
-import com.simibubi.create.foundation.blockEntity.behaviour.scrollvalue.INamedIconOptions;
+import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.INamedIconOptions;
 import com.simibubi.create.foundation.gui.AllIcons;
 import com.simibubi.create.foundation.utility.Lang;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/IDisplayAssemblyExceptions.java b/src/main/java/com/simibubi/create/content/contraptions/IDisplayAssemblyExceptions.java
similarity index 87%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/IDisplayAssemblyExceptions.java
rename to src/main/java/com/simibubi/create/content/contraptions/IDisplayAssemblyExceptions.java
index b1ef2f21c..c99054f41 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/IDisplayAssemblyExceptions.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/IDisplayAssemblyExceptions.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.contraptions.components.structureMovement;
+package com.simibubi.create.content.contraptions;
 
 import java.util.Arrays;
 import java.util.List;
 
-import com.simibubi.create.content.contraptions.goggles.IHaveGoggleInformation;
+import com.simibubi.create.content.equipment.goggles.IHaveGoggleInformation;
 import com.simibubi.create.foundation.item.TooltipHelper;
 import com.simibubi.create.foundation.item.TooltipHelper.Palette;
 import com.simibubi.create.foundation.utility.Components;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ITransformableBlock.java b/src/main/java/com/simibubi/create/content/contraptions/ITransformableBlock.java
similarity index 68%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ITransformableBlock.java
rename to src/main/java/com/simibubi/create/content/contraptions/ITransformableBlock.java
index 3e5fc78eb..61c4cb0aa 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ITransformableBlock.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/ITransformableBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement;
+package com.simibubi.create.content.contraptions;
 
 import net.minecraft.world.level.block.state.BlockState;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ITransformableBlockEntity.java b/src/main/java/com/simibubi/create/content/contraptions/ITransformableBlockEntity.java
similarity index 55%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ITransformableBlockEntity.java
rename to src/main/java/com/simibubi/create/content/contraptions/ITransformableBlockEntity.java
index 49fb7d38e..cadd35946 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ITransformableBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/ITransformableBlockEntity.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement;
+package com.simibubi.create.content.contraptions;
 
 public interface ITransformableBlockEntity {
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MountedFluidStorage.java b/src/main/java/com/simibubi/create/content/contraptions/MountedFluidStorage.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MountedFluidStorage.java
rename to src/main/java/com/simibubi/create/content/contraptions/MountedFluidStorage.java
index 7a6497cff..648995587 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MountedFluidStorage.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/MountedFluidStorage.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.contraptions.components.structureMovement;
+package com.simibubi.create.content.contraptions;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.sync.ContraptionFluidPacket;
-import com.simibubi.create.content.contraptions.fluids.tank.CreativeFluidTankBlockEntity;
-import com.simibubi.create.content.contraptions.fluids.tank.CreativeFluidTankBlockEntity.CreativeSmartFluidTank;
-import com.simibubi.create.content.contraptions.fluids.tank.FluidTankBlockEntity;
+import com.simibubi.create.AllPackets;
+import com.simibubi.create.content.contraptions.sync.ContraptionFluidPacket;
+import com.simibubi.create.content.fluids.tank.CreativeFluidTankBlockEntity;
+import com.simibubi.create.content.fluids.tank.CreativeFluidTankBlockEntity.CreativeSmartFluidTank;
+import com.simibubi.create.content.fluids.tank.FluidTankBlockEntity;
 import com.simibubi.create.foundation.fluid.SmartFluidTank;
-import com.simibubi.create.foundation.networking.AllPackets;
 import com.simibubi.create.foundation.utility.NBTHelper;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat.Chaser;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MountedStorage.java b/src/main/java/com/simibubi/create/content/contraptions/MountedStorage.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MountedStorage.java
rename to src/main/java/com/simibubi/create/content/contraptions/MountedStorage.java
index ba1cd8215..1275b1e90 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MountedStorage.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/MountedStorage.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.contraptions.components.structureMovement;
+package com.simibubi.create.content.contraptions;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllTags.AllBlockTags;
-import com.simibubi.create.content.contraptions.components.crafter.MechanicalCrafterBlockEntity;
-import com.simibubi.create.content.contraptions.processing.ProcessingInventory;
-import com.simibubi.create.content.logistics.block.inventories.BottomlessItemHandler;
-import com.simibubi.create.content.logistics.block.vault.ItemVaultBlockEntity;
+import com.simibubi.create.content.kinetics.crafter.MechanicalCrafterBlockEntity;
+import com.simibubi.create.content.logistics.crate.BottomlessItemHandler;
+import com.simibubi.create.content.logistics.vault.ItemVaultBlockEntity;
+import com.simibubi.create.content.processing.recipe.ProcessingInventory;
 import com.simibubi.create.foundation.utility.NBTHelper;
 
 import net.minecraft.core.NonNullList;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MountedStorageInteraction.java b/src/main/java/com/simibubi/create/content/contraptions/MountedStorageInteraction.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MountedStorageInteraction.java
rename to src/main/java/com/simibubi/create/content/contraptions/MountedStorageInteraction.java
index c9bd3a7ab..da84498db 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MountedStorageInteraction.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/MountedStorageInteraction.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement;
+package com.simibubi.create.content.contraptions;
 
 import java.util.List;
 import java.util.function.Supplier;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MountedStorageManager.java b/src/main/java/com/simibubi/create/content/contraptions/MountedStorageManager.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MountedStorageManager.java
rename to src/main/java/com/simibubi/create/content/contraptions/MountedStorageManager.java
index c7c416e38..240f74575 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MountedStorageManager.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/MountedStorageManager.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement;
+package com.simibubi.create.content.contraptions;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -9,8 +9,8 @@ import java.util.Map;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.Contraption.ContraptionInvWrapper;
-import com.simibubi.create.content.contraptions.fluids.tank.FluidTankBlockEntity;
+import com.simibubi.create.content.contraptions.Contraption.ContraptionInvWrapper;
+import com.simibubi.create.content.fluids.tank.FluidTankBlockEntity;
 import com.simibubi.create.foundation.fluid.CombinedTankWrapper;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.NBTHelper;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/OrientedContraptionEntity.java b/src/main/java/com/simibubi/create/content/contraptions/OrientedContraptionEntity.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/OrientedContraptionEntity.java
rename to src/main/java/com/simibubi/create/content/contraptions/OrientedContraptionEntity.java
index 7911fe0ab..41879519b 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/OrientedContraptionEntity.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/OrientedContraptionEntity.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement;
+package com.simibubi.create.content.contraptions;
 
 import static com.simibubi.create.foundation.utility.AngleHelper.angleLerp;
 
@@ -10,12 +10,12 @@ import javax.annotation.Nullable;
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllEntityTypes;
-import com.simibubi.create.content.contraptions.components.structureMovement.bearing.StabilizedContraption;
-import com.simibubi.create.content.contraptions.components.structureMovement.mounted.CartAssemblerBlockEntity.CartMovementMode;
-import com.simibubi.create.content.contraptions.components.structureMovement.mounted.MountedContraption;
-import com.simibubi.create.content.contraptions.components.structureMovement.train.MinecartSim2020;
-import com.simibubi.create.content.contraptions.components.structureMovement.train.capability.CapabilityMinecartController;
-import com.simibubi.create.content.contraptions.components.structureMovement.train.capability.MinecartController;
+import com.simibubi.create.content.contraptions.bearing.StabilizedContraption;
+import com.simibubi.create.content.contraptions.minecart.MinecartSim2020;
+import com.simibubi.create.content.contraptions.minecart.capability.CapabilityMinecartController;
+import com.simibubi.create.content.contraptions.minecart.capability.MinecartController;
+import com.simibubi.create.content.contraptions.mounted.CartAssemblerBlockEntity.CartMovementMode;
+import com.simibubi.create.content.contraptions.mounted.MountedContraption;
 import com.simibubi.create.foundation.item.ItemHelper;
 import com.simibubi.create.foundation.utility.AngleHelper;
 import com.simibubi.create.foundation.utility.Couple;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/StructureTransform.java b/src/main/java/com/simibubi/create/content/contraptions/StructureTransform.java
similarity index 99%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/StructureTransform.java
rename to src/main/java/com/simibubi/create/content/contraptions/StructureTransform.java
index b97f35eca..0a36efe85 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/StructureTransform.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/StructureTransform.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement;
+package com.simibubi.create.content.contraptions;
 
 import static net.minecraft.world.level.block.state.properties.BlockStateProperties.AXIS;
 import static net.minecraft.world.level.block.state.properties.BlockStateProperties.FACING;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/TrainCollisionPacket.java b/src/main/java/com/simibubi/create/content/contraptions/TrainCollisionPacket.java
similarity index 89%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/TrainCollisionPacket.java
rename to src/main/java/com/simibubi/create/content/contraptions/TrainCollisionPacket.java
index e152aa504..926e89433 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/TrainCollisionPacket.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/TrainCollisionPacket.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.contraptions.components.structureMovement;
+package com.simibubi.create.content.contraptions;
 
-import com.simibubi.create.content.logistics.trains.entity.CarriageContraptionEntity;
+import com.simibubi.create.content.trains.entity.CarriageContraptionEntity;
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 
 import net.minecraft.network.FriendlyByteBuf;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/TranslatingContraption.java b/src/main/java/com/simibubi/create/content/contraptions/TranslatingContraption.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/TranslatingContraption.java
rename to src/main/java/com/simibubi/create/content/contraptions/TranslatingContraption.java
index 5b6ba8e3e..e547f49f7 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/TranslatingContraption.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/TranslatingContraption.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement;
+package com.simibubi.create.content.contraptions;
 
 import java.util.Collections;
 import java.util.HashSet;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/AttachedActorBlock.java b/src/main/java/com/simibubi/create/content/contraptions/actors/AttachedActorBlock.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/AttachedActorBlock.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/AttachedActorBlock.java
index 90cf20d64..7ffb86954 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/AttachedActorBlock.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/AttachedActorBlock.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.contraptions.components.actors;
+package com.simibubi.create.content.contraptions.actors;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
 import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
 import com.simibubi.create.foundation.utility.BlockHelper;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/controls/ContraptionControlsBlock.java b/src/main/java/com/simibubi/create/content/contraptions/actors/contraptionControls/ContraptionControlsBlock.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/controls/ContraptionControlsBlock.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/contraptionControls/ContraptionControlsBlock.java
index f28206e1c..9898d1549 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/controls/ContraptionControlsBlock.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/contraptionControls/ContraptionControlsBlock.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.contraptions.components.actors.controls;
+package com.simibubi.create.content.contraptions.actors.contraptionControls;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllShapes;
 import com.simibubi.create.AllSoundEvents;
-import com.simibubi.create.content.contraptions.components.structureMovement.interaction.controls.ControlsBlock;
+import com.simibubi.create.content.contraptions.actors.trainControls.ControlsBlock;
 import com.simibubi.create.foundation.block.IBE;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/controls/ContraptionControlsBlockEntity.java b/src/main/java/com/simibubi/create/content/contraptions/actors/contraptionControls/ContraptionControlsBlockEntity.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/controls/ContraptionControlsBlockEntity.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/contraptionControls/ContraptionControlsBlockEntity.java
index 33300530f..bcfca357b 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/controls/ContraptionControlsBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/contraptionControls/ContraptionControlsBlockEntity.java
@@ -1,13 +1,13 @@
-package com.simibubi.create.content.contraptions.components.actors.controls;
+package com.simibubi.create.content.contraptions.actors.contraptionControls;
 
 import java.util.List;
 
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllTags.AllItemTags;
-import com.simibubi.create.content.contraptions.components.structureMovement.interaction.controls.ControlsBlock;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.contraptions.actors.trainControls.ControlsBlock;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform;
 import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour;
 import com.simibubi.create.foundation.utility.AngleHelper;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/controls/ContraptionControlsMovement.java b/src/main/java/com/simibubi/create/content/contraptions/actors/contraptionControls/ContraptionControlsMovement.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/controls/ContraptionControlsMovement.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/contraptionControls/ContraptionControlsMovement.java
index 106d22613..b3e9536ec 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/controls/ContraptionControlsMovement.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/contraptionControls/ContraptionControlsMovement.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.contraptions.components.actors.controls;
+package com.simibubi.create.content.contraptions.actors.contraptionControls;
 
 import com.jozufozu.flywheel.core.virtual.VirtualRenderWorld;
-import com.simibubi.create.content.contraptions.components.structureMovement.Contraption;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
-import com.simibubi.create.content.contraptions.components.structureMovement.elevator.ElevatorContraption;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionMatrices;
+import com.simibubi.create.content.contraptions.Contraption;
+import com.simibubi.create.content.contraptions.behaviour.MovementBehaviour;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
+import com.simibubi.create.content.contraptions.elevator.ElevatorContraption;
+import com.simibubi.create.content.contraptions.render.ContraptionMatrices;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.IntAttached;
 import com.simibubi.create.foundation.utility.Lang;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/controls/ContraptionControlsMovingInteraction.java b/src/main/java/com/simibubi/create/content/contraptions/actors/contraptionControls/ContraptionControlsMovingInteraction.java
similarity index 81%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/controls/ContraptionControlsMovingInteraction.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/contraptionControls/ContraptionControlsMovingInteraction.java
index 94e325647..f979d87b0 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/controls/ContraptionControlsMovingInteraction.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/contraptionControls/ContraptionControlsMovingInteraction.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.actors.controls;
+package com.simibubi.create.content.contraptions.actors.contraptionControls;
 
 import java.util.Iterator;
 import java.util.List;
@@ -6,16 +6,16 @@ import java.util.List;
 import org.apache.commons.lang3.tuple.MutablePair;
 
 import com.simibubi.create.AllMovementBehaviours;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.AllSoundEvents;
-import com.simibubi.create.content.contraptions.components.actors.controls.ContraptionControlsMovement.ElevatorFloorSelection;
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.Contraption;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovingInteractionBehaviour;
-import com.simibubi.create.content.contraptions.components.structureMovement.elevator.ElevatorContraption;
-import com.simibubi.create.content.contraptions.components.structureMovement.elevator.ElevatorTargetFloorPacket;
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.Contraption;
+import com.simibubi.create.content.contraptions.actors.contraptionControls.ContraptionControlsMovement.ElevatorFloorSelection;
+import com.simibubi.create.content.contraptions.behaviour.MovementBehaviour;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
+import com.simibubi.create.content.contraptions.behaviour.MovingInteractionBehaviour;
+import com.simibubi.create.content.contraptions.elevator.ElevatorContraption;
+import com.simibubi.create.content.contraptions.elevator.ElevatorTargetFloorPacket;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.InteractionHand;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/controls/ContraptionControlsRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/actors/contraptionControls/ContraptionControlsRenderer.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/controls/ContraptionControlsRenderer.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/contraptionControls/ContraptionControlsRenderer.java
index 4ec9dae3f..6eae07487 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/controls/ContraptionControlsRenderer.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/contraptionControls/ContraptionControlsRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.actors.controls;
+package com.simibubi.create.content.contraptions.actors.contraptionControls;
 
 import java.util.Random;
 
@@ -8,10 +8,10 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.components.actors.controls.ContraptionControlsMovement.ElevatorFloorSelection;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionMatrices;
-import com.simibubi.create.content.logistics.block.redstone.NixieTubeRenderer;
+import com.simibubi.create.content.contraptions.actors.contraptionControls.ContraptionControlsMovement.ElevatorFloorSelection;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
+import com.simibubi.create.content.contraptions.render.ContraptionMatrices;
+import com.simibubi.create.content.redstone.nixieTube.NixieTubeRenderer;
 import com.simibubi.create.foundation.blockEntity.renderer.SmartBlockEntityRenderer;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.utility.AngleHelper;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/controls/ContraptionDisableActorPacket.java b/src/main/java/com/simibubi/create/content/contraptions/actors/contraptionControls/ContraptionDisableActorPacket.java
similarity index 87%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/controls/ContraptionDisableActorPacket.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/contraptionControls/ContraptionDisableActorPacket.java
index 57d421e72..6122b53d0 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/controls/ContraptionDisableActorPacket.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/contraptionControls/ContraptionDisableActorPacket.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.contraptions.components.actors.controls;
+package com.simibubi.create.content.contraptions.actors.contraptionControls;
 
 import java.util.Iterator;
 import java.util.List;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.Contraption;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.Contraption;
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 
 import net.minecraft.client.Minecraft;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/flwdata/ActorData.java b/src/main/java/com/simibubi/create/content/contraptions/actors/flwdata/ActorData.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/flwdata/ActorData.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/flwdata/ActorData.java
index 8432de748..32d04c846 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/flwdata/ActorData.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/flwdata/ActorData.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.actors.flwdata;
+package com.simibubi.create.content.contraptions.actors.flwdata;
 
 import com.jozufozu.flywheel.api.InstanceData;
 import com.mojang.math.Quaternion;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/flwdata/ActorType.java b/src/main/java/com/simibubi/create/content/contraptions/actors/flwdata/ActorType.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/flwdata/ActorType.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/flwdata/ActorType.java
index edcb0d54d..90dfffb87 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/flwdata/ActorType.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/flwdata/ActorType.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.actors.flwdata;
+package com.simibubi.create.content.contraptions.actors.flwdata;
 
 import com.jozufozu.flywheel.api.struct.Batched;
 import com.jozufozu.flywheel.api.struct.Instanced;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/flwdata/UnsafeActorWriter.java b/src/main/java/com/simibubi/create/content/contraptions/actors/flwdata/UnsafeActorWriter.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/flwdata/UnsafeActorWriter.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/flwdata/UnsafeActorWriter.java
index 4479e800d..c54b11db1 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/flwdata/UnsafeActorWriter.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/flwdata/UnsafeActorWriter.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.actors.flwdata;
+package com.simibubi.create.content.contraptions.actors.flwdata;
 
 import org.lwjgl.system.MemoryUtil;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/flwdata/package-info.java b/src/main/java/com/simibubi/create/content/contraptions/actors/flwdata/package-info.java
similarity index 69%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/flwdata/package-info.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/flwdata/package-info.java
index 125403077..0498b1729 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/flwdata/package-info.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/flwdata/package-info.java
@@ -1,5 +1,5 @@
 @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault
-package com.simibubi.create.content.contraptions.components.actors.flwdata;
+package com.simibubi.create.content.contraptions.actors.flwdata;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterActorInstance.java b/src/main/java/com/simibubi/create/content/contraptions/actors/harvester/HarvesterActorInstance.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterActorInstance.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/harvester/HarvesterActorInstance.java
index 6f0a0122f..a9baf2f65 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterActorInstance.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/harvester/HarvesterActorInstance.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.actors;
+package com.simibubi.create.content.contraptions.actors.harvester;
 
 import com.jozufozu.flywheel.api.Material;
 import com.jozufozu.flywheel.api.MaterialManager;
@@ -7,8 +7,8 @@ import com.jozufozu.flywheel.core.PartialModel;
 import com.jozufozu.flywheel.core.materials.model.ModelData;
 import com.jozufozu.flywheel.core.virtual.VirtualRenderWorld;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ActorInstance;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
+import com.simibubi.create.content.contraptions.render.ActorInstance;
 import com.simibubi.create.foundation.utility.AngleHelper;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 import com.simibubi.create.foundation.utility.VecHelper;
@@ -22,7 +22,7 @@ public class HarvesterActorInstance extends ActorInstance {
     static float originOffset = 1 / 16f;
     static Vec3 rotOffset = new Vec3(0.5f, -2 * originOffset + 0.5f, originOffset + 0.5f);
 
-    ModelData harvester;
+    protected ModelData harvester;
     private Direction facing;
 
     protected float horizontalAngle;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterBlock.java b/src/main/java/com/simibubi/create/content/contraptions/actors/harvester/HarvesterBlock.java
similarity index 80%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterBlock.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/harvester/HarvesterBlock.java
index 928da6280..31e8da723 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterBlock.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/harvester/HarvesterBlock.java
@@ -1,6 +1,7 @@
-package com.simibubi.create.content.contraptions.components.actors;
+package com.simibubi.create.content.contraptions.actors.harvester;
 
 import com.simibubi.create.AllBlockEntityTypes;
+import com.simibubi.create.content.contraptions.actors.AttachedActorBlock;
 import com.simibubi.create.foundation.block.IBE;
 
 import net.minecraft.world.level.block.entity.BlockEntityType;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterBlockEntity.java b/src/main/java/com/simibubi/create/content/contraptions/actors/harvester/HarvesterBlockEntity.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterBlockEntity.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/harvester/HarvesterBlockEntity.java
index 5569ae9c5..b87ac1b5e 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/harvester/HarvesterBlockEntity.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.actors;
+package com.simibubi.create.content.contraptions.actors.harvester;
 
 import com.simibubi.create.foundation.blockEntity.CachedRenderBBBlockEntity;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterMovementBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/actors/harvester/HarvesterMovementBehaviour.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterMovementBehaviour.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/harvester/HarvesterMovementBehaviour.java
index 686a2c9ca..fff0f5601 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterMovementBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/harvester/HarvesterMovementBehaviour.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.actors;
+package com.simibubi.create.content.contraptions.actors.harvester;
 
 import javax.annotation.Nullable;
 
@@ -6,14 +6,14 @@ import org.apache.commons.lang3.mutable.MutableBoolean;
 
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.jozufozu.flywheel.core.virtual.VirtualRenderWorld;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ActorInstance;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionMatrices;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionRenderDispatcher;
-import com.simibubi.create.foundation.config.AllConfigs;
+import com.simibubi.create.content.contraptions.behaviour.MovementBehaviour;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
+import com.simibubi.create.content.contraptions.render.ActorInstance;
+import com.simibubi.create.content.contraptions.render.ContraptionMatrices;
+import com.simibubi.create.content.contraptions.render.ContraptionRenderDispatcher;
 import com.simibubi.create.foundation.utility.BlockHelper;
 import com.simibubi.create.foundation.utility.VecHelper;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/actors/harvester/HarvesterRenderer.java
similarity index 89%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterRenderer.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/harvester/HarvesterRenderer.java
index 94fd350b0..9b99a16eb 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterRenderer.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/harvester/HarvesterRenderer.java
@@ -1,13 +1,13 @@
-package com.simibubi.create.content.contraptions.components.actors;
+package com.simibubi.create.content.contraptions.actors.harvester;
 
 import static net.minecraft.world.level.block.state.properties.BlockStateProperties.HORIZONTAL_FACING;
 
 import com.jozufozu.flywheel.core.virtual.VirtualRenderWorld;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionMatrices;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionRenderDispatcher;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
+import com.simibubi.create.content.contraptions.render.ContraptionMatrices;
+import com.simibubi.create.content.contraptions.render.ContraptionRenderDispatcher;
 import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/PloughBlock.java b/src/main/java/com/simibubi/create/content/contraptions/actors/plough/PloughBlock.java
similarity index 82%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/PloughBlock.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/plough/PloughBlock.java
index ef9372851..ed70dfd0f 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/PloughBlock.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/plough/PloughBlock.java
@@ -1,8 +1,9 @@
-package com.simibubi.create.content.contraptions.components.actors;
+package com.simibubi.create.content.contraptions.actors.plough;
 
 import java.util.UUID;
 
 import com.mojang.authlib.GameProfile;
+import com.simibubi.create.content.contraptions.actors.AttachedActorBlock;
 
 import net.minecraft.server.level.ServerLevel;
 import net.minecraftforge.common.util.FakePlayer;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/PloughMovementBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/actors/plough/PloughMovementBehaviour.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/PloughMovementBehaviour.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/plough/PloughMovementBehaviour.java
index a7bab0a2c..b6bc2d6b9 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/PloughMovementBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/plough/PloughMovementBehaviour.java
@@ -1,9 +1,10 @@
-package com.simibubi.create.content.contraptions.components.actors;
+package com.simibubi.create.content.contraptions.actors.plough;
 
-import com.simibubi.create.content.contraptions.components.actors.PloughBlock.PloughFakePlayer;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
-import com.simibubi.create.content.logistics.trains.ITrackBlock;
-import com.simibubi.create.content.logistics.trains.track.FakeTrackBlock;
+import com.simibubi.create.content.contraptions.actors.plough.PloughBlock.PloughFakePlayer;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
+import com.simibubi.create.content.kinetics.base.BlockBreakingMovementBehaviour;
+import com.simibubi.create.content.trains.track.FakeTrackBlock;
+import com.simibubi.create.content.trains.track.ITrackBlock;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
 import com.simibubi.create.foundation.utility.VecHelper;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/PIInstance.java b/src/main/java/com/simibubi/create/content/contraptions/actors/psi/PIInstance.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/PIInstance.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/psi/PIInstance.java
index ec28142a6..087c79b0c 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/PIInstance.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/psi/PIInstance.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.actors;
+package com.simibubi.create.content.contraptions.actors.psi;
 
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.jozufozu.flywheel.core.Materials;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/PSIActorInstance.java b/src/main/java/com/simibubi/create/content/contraptions/actors/psi/PSIActorInstance.java
similarity index 78%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/PSIActorInstance.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/psi/PSIActorInstance.java
index 8dad7184b..9cee93e99 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/PSIActorInstance.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/psi/PSIActorInstance.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.contraptions.components.actors;
+package com.simibubi.create.content.contraptions.actors.psi;
 
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.jozufozu.flywheel.core.virtual.VirtualRenderWorld;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ActorInstance;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
+import com.simibubi.create.content.contraptions.render.ActorInstance;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/PSIInstance.java b/src/main/java/com/simibubi/create/content/contraptions/actors/psi/PSIInstance.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/PSIInstance.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/psi/PSIInstance.java
index 2ff5b1d4d..4fa102041 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/PSIInstance.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/psi/PSIInstance.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.actors;
+package com.simibubi.create.content.contraptions.actors.psi;
 
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.jozufozu.flywheel.api.instance.DynamicInstance;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableFluidInterfaceBlockEntity.java b/src/main/java/com/simibubi/create/content/contraptions/actors/psi/PortableFluidInterfaceBlockEntity.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableFluidInterfaceBlockEntity.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/psi/PortableFluidInterfaceBlockEntity.java
index ce034dfd8..99b310634 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableFluidInterfaceBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/psi/PortableFluidInterfaceBlockEntity.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.contraptions.components.actors;
+package com.simibubi.create.content.contraptions.actors.psi;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.Contraption;
+import com.simibubi.create.content.contraptions.Contraption;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableItemInterfaceBlockEntity.java b/src/main/java/com/simibubi/create/content/contraptions/actors/psi/PortableItemInterfaceBlockEntity.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableItemInterfaceBlockEntity.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/psi/PortableItemInterfaceBlockEntity.java
index 82c8ba256..fd72d5627 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableItemInterfaceBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/psi/PortableItemInterfaceBlockEntity.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.contraptions.components.actors;
+package com.simibubi.create.content.contraptions.actors.psi;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.Contraption;
+import com.simibubi.create.content.contraptions.Contraption;
 import com.simibubi.create.foundation.item.ItemHandlerWrapper;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableStorageInterfaceBlock.java b/src/main/java/com/simibubi/create/content/contraptions/actors/psi/PortableStorageInterfaceBlock.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableStorageInterfaceBlock.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/psi/PortableStorageInterfaceBlock.java
index 0d572f5ca..9faee84b6 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableStorageInterfaceBlock.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/psi/PortableStorageInterfaceBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.actors;
+package com.simibubi.create.content.contraptions.actors.psi;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableStorageInterfaceBlockEntity.java b/src/main/java/com/simibubi/create/content/contraptions/actors/psi/PortableStorageInterfaceBlockEntity.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableStorageInterfaceBlockEntity.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/psi/PortableStorageInterfaceBlockEntity.java
index 9a054b101..18d13c84b 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableStorageInterfaceBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/psi/PortableStorageInterfaceBlockEntity.java
@@ -1,14 +1,14 @@
-package com.simibubi.create.content.contraptions.components.actors;
+package com.simibubi.create.content.contraptions.actors.psi;
 
 import java.util.List;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.Contraption;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.Contraption;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
-import com.simibubi.create.foundation.config.AllConfigs;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableStorageInterfaceMovement.java b/src/main/java/com/simibubi/create/content/contraptions/actors/psi/PortableStorageInterfaceMovement.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableStorageInterfaceMovement.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/psi/PortableStorageInterfaceMovement.java
index a56765ade..32639dd0d 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableStorageInterfaceMovement.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/psi/PortableStorageInterfaceMovement.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.actors;
+package com.simibubi.create.content.contraptions.actors.psi;
 
 import java.util.Optional;
 
@@ -6,12 +6,12 @@ import org.jetbrains.annotations.Nullable;
 
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.jozufozu.flywheel.core.virtual.VirtualRenderWorld;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ActorInstance;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionMatrices;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionRenderDispatcher;
-import com.simibubi.create.content.logistics.trains.entity.CarriageContraption;
+import com.simibubi.create.content.contraptions.behaviour.MovementBehaviour;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
+import com.simibubi.create.content.contraptions.render.ActorInstance;
+import com.simibubi.create.content.contraptions.render.ContraptionMatrices;
+import com.simibubi.create.content.contraptions.render.ContraptionRenderDispatcher;
+import com.simibubi.create.content.trains.entity.CarriageContraption;
 import com.simibubi.create.foundation.utility.VecHelper;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat.Chaser;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableStorageInterfaceRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/actors/psi/PortableStorageInterfaceRenderer.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableStorageInterfaceRenderer.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/psi/PortableStorageInterfaceRenderer.java
index 2d35399d4..6ceffab7d 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableStorageInterfaceRenderer.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/psi/PortableStorageInterfaceRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.actors;
+package com.simibubi.create.content.contraptions.actors.psi;
 
 import java.util.function.Consumer;
 
@@ -9,9 +9,9 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionMatrices;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionRenderDispatcher;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
+import com.simibubi.create.content.contraptions.render.ContraptionMatrices;
+import com.simibubi.create.content.contraptions.render.ContraptionRenderDispatcher;
 import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/trackPaver/PaveTask.java b/src/main/java/com/simibubi/create/content/contraptions/actors/roller/PaveTask.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/trackPaver/PaveTask.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/roller/PaveTask.java
index 9fc49e47f..abefe49a6 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/trackPaver/PaveTask.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/roller/PaveTask.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.actors.trackPaver;
+package com.simibubi.create.content.contraptions.actors.roller;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/RollerActorInstance.java b/src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerActorInstance.java
similarity index 86%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/RollerActorInstance.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerActorInstance.java
index caafd4936..1e76217e7 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/RollerActorInstance.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerActorInstance.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.actors;
+package com.simibubi.create.content.contraptions.actors.roller;
 
 import com.jozufozu.flywheel.api.Material;
 import com.jozufozu.flywheel.api.MaterialManager;
@@ -7,7 +7,8 @@ import com.jozufozu.flywheel.core.PartialModel;
 import com.jozufozu.flywheel.core.materials.model.ModelData;
 import com.jozufozu.flywheel.core.virtual.VirtualRenderWorld;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
+import com.simibubi.create.content.contraptions.actors.harvester.HarvesterActorInstance;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
 
 import net.minecraft.world.phys.Vec3;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/RollerBlock.java b/src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerBlock.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/RollerBlock.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerBlock.java
index 9c1426b64..99166cd46 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/RollerBlock.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerBlock.java
@@ -1,13 +1,14 @@
-package com.simibubi.create.content.contraptions.components.actors;
+package com.simibubi.create.content.contraptions.actors.roller;
 
 import java.util.function.Predicate;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
+import com.simibubi.create.content.contraptions.actors.AttachedActorBlock;
 import com.simibubi.create.foundation.block.IBE;
-import com.simibubi.create.foundation.utility.placement.IPlacementHelper;
-import com.simibubi.create.foundation.utility.placement.PlacementHelpers;
-import com.simibubi.create.foundation.utility.placement.util.PoleHelper;
+import com.simibubi.create.foundation.placement.IPlacementHelper;
+import com.simibubi.create.foundation.placement.PlacementHelpers;
+import com.simibubi.create.foundation.placement.PoleHelper;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/RollerBlockEntity.java b/src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerBlockEntity.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/RollerBlockEntity.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerBlockEntity.java
index 09ad60007..17a3cb1b9 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/RollerBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerBlockEntity.java
@@ -1,15 +1,15 @@
-package com.simibubi.create.content.contraptions.components.actors;
+package com.simibubi.create.content.contraptions.actors.roller;
 
 import java.util.List;
 
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform;
 import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.scrollvalue.INamedIconOptions;
-import com.simibubi.create.foundation.blockEntity.behaviour.scrollvalue.ScrollOptionBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.INamedIconOptions;
+import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollOptionBehaviour;
 import com.simibubi.create.foundation.gui.AllIcons;
 import com.simibubi.create.foundation.utility.AngleHelper;
 import com.simibubi.create.foundation.utility.Iterate;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/RollerBlockItem.java b/src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerBlockItem.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/RollerBlockItem.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerBlockItem.java
index 36d101a3d..3bf7c6070 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/RollerBlockItem.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerBlockItem.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.actors;
+package com.simibubi.create.content.contraptions.actors.roller;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/RollerMovementBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerMovementBehaviour.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/RollerMovementBehaviour.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerMovementBehaviour.java
index 33907aefc..a0bf842c2 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/RollerMovementBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerMovementBehaviour.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.actors;
+package com.simibubi.create.content.contraptions.actors.roller;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -12,31 +12,30 @@ import javax.annotation.Nullable;
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.jozufozu.flywheel.core.virtual.VirtualRenderWorld;
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.components.actors.RollerBlockEntity.RollingMode;
-import com.simibubi.create.content.contraptions.components.actors.trackPaver.PaveTask;
-import com.simibubi.create.content.contraptions.components.actors.trackPaver.TrackPaverV2;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
-import com.simibubi.create.content.contraptions.components.structureMovement.pulley.PulleyContraption;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ActorInstance;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionMatrices;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionRenderDispatcher;
-import com.simibubi.create.content.logistics.item.filter.FilterItem;
-import com.simibubi.create.content.logistics.trains.TrackEdge;
-import com.simibubi.create.content.logistics.trains.TrackGraph;
-import com.simibubi.create.content.logistics.trains.entity.Carriage;
-import com.simibubi.create.content.logistics.trains.entity.CarriageBogey;
-import com.simibubi.create.content.logistics.trains.entity.CarriageContraptionEntity;
-import com.simibubi.create.content.logistics.trains.entity.Train;
-import com.simibubi.create.content.logistics.trains.entity.TravellingPoint;
-import com.simibubi.create.content.logistics.trains.entity.TravellingPoint.ITrackSelector;
-import com.simibubi.create.content.logistics.trains.entity.TravellingPoint.SteerDirection;
-import com.simibubi.create.content.logistics.trains.track.StandardBogeyBlock;
-import com.simibubi.create.foundation.config.AllConfigs;
+import com.simibubi.create.content.contraptions.actors.roller.RollerBlockEntity.RollingMode;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
+import com.simibubi.create.content.contraptions.pulley.PulleyContraption;
+import com.simibubi.create.content.contraptions.render.ActorInstance;
+import com.simibubi.create.content.contraptions.render.ContraptionMatrices;
+import com.simibubi.create.content.contraptions.render.ContraptionRenderDispatcher;
+import com.simibubi.create.content.kinetics.base.BlockBreakingMovementBehaviour;
+import com.simibubi.create.content.logistics.filter.FilterItem;
+import com.simibubi.create.content.trains.bogey.StandardBogeyBlock;
+import com.simibubi.create.content.trains.entity.Carriage;
+import com.simibubi.create.content.trains.entity.CarriageBogey;
+import com.simibubi.create.content.trains.entity.CarriageContraptionEntity;
+import com.simibubi.create.content.trains.entity.Train;
+import com.simibubi.create.content.trains.entity.TravellingPoint;
+import com.simibubi.create.content.trains.entity.TravellingPoint.ITrackSelector;
+import com.simibubi.create.content.trains.entity.TravellingPoint.SteerDirection;
+import com.simibubi.create.content.trains.graph.TrackEdge;
+import com.simibubi.create.content.trains.graph.TrackGraph;
 import com.simibubi.create.foundation.item.ItemHelper;
 import com.simibubi.create.foundation.utility.BlockHelper;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.Pair;
 import com.simibubi.create.foundation.utility.VecHelper;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/RollerRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerRenderer.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/RollerRenderer.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerRenderer.java
index 3d051214c..ec3cab40e 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/RollerRenderer.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerRenderer.java
@@ -1,13 +1,14 @@
-package com.simibubi.create.content.contraptions.components.actors;
+package com.simibubi.create.content.contraptions.actors.roller;
 
 import static net.minecraft.world.level.block.state.properties.BlockStateProperties.HORIZONTAL_FACING;
 
 import com.jozufozu.flywheel.core.virtual.VirtualRenderWorld;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionMatrices;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionRenderDispatcher;
+import com.simibubi.create.content.contraptions.actors.harvester.HarvesterRenderer;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
+import com.simibubi.create.content.contraptions.render.ContraptionMatrices;
+import com.simibubi.create.content.contraptions.render.ContraptionRenderDispatcher;
 import com.simibubi.create.foundation.blockEntity.renderer.SmartBlockEntityRenderer;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/trackPaver/TrackPaverV2.java b/src/main/java/com/simibubi/create/content/contraptions/actors/roller/TrackPaverV2.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/trackPaver/TrackPaverV2.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/roller/TrackPaverV2.java
index 4b8a3888c..0782288bc 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/trackPaver/TrackPaverV2.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/roller/TrackPaverV2.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.actors.trackPaver;
+package com.simibubi.create.content.contraptions.actors.roller;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -6,9 +6,9 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import com.simibubi.create.content.logistics.trains.BezierConnection;
-import com.simibubi.create.content.logistics.trains.TrackEdge;
-import com.simibubi.create.content.logistics.trains.TrackGraph;
+import com.simibubi.create.content.trains.graph.TrackEdge;
+import com.simibubi.create.content.trains.graph.TrackGraph;
+import com.simibubi.create.content.trains.track.BezierConnection;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.Pair;
 import com.simibubi.create.foundation.utility.VecHelper;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/SeatBlock.java b/src/main/java/com/simibubi/create/content/contraptions/actors/seat/SeatBlock.java
similarity index 99%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/SeatBlock.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/seat/SeatBlock.java
index cd028a068..6bbd68f71 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/SeatBlock.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/seat/SeatBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.actors;
+package com.simibubi.create.content.contraptions.actors.seat;
 
 import java.util.List;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/SeatEntity.java b/src/main/java/com/simibubi/create/content/contraptions/actors/seat/SeatEntity.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/SeatEntity.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/seat/SeatEntity.java
index 428de3790..97d26ab52 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/SeatEntity.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/seat/SeatEntity.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.actors;
+package com.simibubi.create.content.contraptions.actors.seat;
 
 import com.simibubi.create.AllEntityTypes;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/SeatInteractionBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/actors/seat/SeatInteractionBehaviour.java
similarity index 69%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/SeatInteractionBehaviour.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/seat/SeatInteractionBehaviour.java
index 47e9beb0c..522d0a9b2 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/SeatInteractionBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/seat/SeatInteractionBehaviour.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.contraptions.components.actors;
+package com.simibubi.create.content.contraptions.actors.seat;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.Contraption;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovingInteractionBehaviour;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.Contraption;
+import com.simibubi.create.content.contraptions.behaviour.MovingInteractionBehaviour;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.InteractionHand;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/SeatMovementBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/actors/seat/SeatMovementBehaviour.java
similarity index 84%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/SeatMovementBehaviour.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/seat/SeatMovementBehaviour.java
index 5c5082874..f1a26404b 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/SeatMovementBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/seat/SeatMovementBehaviour.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.contraptions.components.actors;
+package com.simibubi.create.content.contraptions.actors.seat;
 
 import java.util.Map;
 import java.util.UUID;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.behaviour.MovementBehaviour;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
 import com.simibubi.create.foundation.utility.VecHelper;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/controls/ControlsBlock.java b/src/main/java/com/simibubi/create/content/contraptions/actors/trainControls/ControlsBlock.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/controls/ControlsBlock.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/trainControls/ControlsBlock.java
index 9eae0dba5..e299b3616 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/controls/ControlsBlock.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/trainControls/ControlsBlock.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.interaction.controls;
+package com.simibubi.create.content.contraptions.actors.trainControls;
 
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionWorld;
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
+import com.simibubi.create.content.contraptions.ContraptionWorld;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
 import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/controls/ControlsHandler.java b/src/main/java/com/simibubi/create/content/contraptions/actors/trainControls/ControlsHandler.java
similarity index 86%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/controls/ControlsHandler.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/trainControls/ControlsHandler.java
index 25b8a09a6..d3a1b1919 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/controls/ControlsHandler.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/trainControls/ControlsHandler.java
@@ -1,15 +1,16 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.interaction.controls;
+package com.simibubi.create.content.contraptions.actors.trainControls;
 
 import java.lang.ref.WeakReference;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Vector;
 
+import org.jetbrains.annotations.Nullable;
 import org.lwjgl.glfw.GLFW;
 
 import com.mojang.blaze3d.platform.InputConstants;
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.AllPackets;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
 import com.simibubi.create.foundation.utility.ControlsUtil;
 import com.simibubi.create.foundation.utility.Lang;
 
@@ -23,10 +24,10 @@ public class ControlsHandler {
 	public static Collection<Integer> currentlyPressed = new HashSet<>();
 
 	public static int PACKET_RATE = 5;
-	static int packetCooldown;
+	private static int packetCooldown;
 
-	static WeakReference<AbstractContraptionEntity> entityRef = new WeakReference<>(null);
-	static BlockPos controlsPos;
+	private static WeakReference<AbstractContraptionEntity> entityRef = new WeakReference<>(null);
+	private static BlockPos controlsPos;
 
 	public static void levelUnloaded(LevelAccessor level) {
 		packetCooldown = 0;
@@ -117,4 +118,14 @@ public class ControlsHandler {
 		controls.forEach(kb -> kb.setDown(false));
 	}
 
+	@Nullable
+	public static AbstractContraptionEntity getContraption() {
+		return entityRef.get();
+	}
+
+	@Nullable
+	public static BlockPos getControlsPos() {
+		return controlsPos;
+	}
+
 }
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/controls/ControlsInputPacket.java b/src/main/java/com/simibubi/create/content/contraptions/actors/trainControls/ControlsInputPacket.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/controls/ControlsInputPacket.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/trainControls/ControlsInputPacket.java
index 9e97d98aa..485360536 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/controls/ControlsInputPacket.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/trainControls/ControlsInputPacket.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.interaction.controls;
+package com.simibubi.create.content.contraptions.actors.trainControls;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.UUID;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/controls/ControlsInteractionBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/actors/trainControls/ControlsInteractionBehaviour.java
similarity index 79%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/controls/ControlsInteractionBehaviour.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/trainControls/ControlsInteractionBehaviour.java
index d64f24d1a..726eb424a 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/controls/ControlsInteractionBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/trainControls/ControlsInteractionBehaviour.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.interaction.controls;
+package com.simibubi.create.content.contraptions.actors.trainControls;
 
 import java.util.UUID;
 
 import com.google.common.base.Objects;
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovingInteractionBehaviour;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.behaviour.MovingInteractionBehaviour;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.InteractionHand;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/controls/ControlsMovementBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/actors/trainControls/ControlsMovementBehaviour.java
similarity index 81%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/controls/ControlsMovementBehaviour.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/trainControls/ControlsMovementBehaviour.java
index b17932720..895a6979c 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/controls/ControlsMovementBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/trainControls/ControlsMovementBehaviour.java
@@ -1,13 +1,13 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.interaction.controls;
+package com.simibubi.create.content.contraptions.actors.trainControls;
 
 import java.util.Collection;
 
 import com.jozufozu.flywheel.core.virtual.VirtualRenderWorld;
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionMatrices;
-import com.simibubi.create.content.logistics.trains.entity.CarriageContraptionEntity;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.behaviour.MovementBehaviour;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
+import com.simibubi.create.content.contraptions.render.ContraptionMatrices;
+import com.simibubi.create.content.trains.entity.CarriageContraptionEntity;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat.Chaser;
@@ -72,8 +72,8 @@ public class ControlsMovementBehaviour implements MovementBehaviour {
 			inverted = !info.state.getValue(ControlsBlock.FACING)
 				.equals(initialOrientation);
 
-		if (ControlsHandler.entityRef.get() == entity && ControlsHandler.controlsPos != null
-			&& ControlsHandler.controlsPos.equals(context.localPos)) {
+		if (ControlsHandler.getContraption() == entity && ControlsHandler.getControlsPos() != null
+			&& ControlsHandler.getControlsPos().equals(context.localPos)) {
 			Collection<Integer> pressed = ControlsHandler.currentlyPressed;
 			angles.equipAnimation.chase(1, .2f, Chaser.EXP);
 			angles.steering.chase((pressed.contains(3) ? 1 : 0) + (pressed.contains(2) ? -1 : 0), 0.2f, Chaser.EXP);
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/controls/ControlsRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/actors/trainControls/ControlsRenderer.java
similarity index 84%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/controls/ControlsRenderer.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/trainControls/ControlsRenderer.java
index 6432727bf..b4c71c2de 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/controls/ControlsRenderer.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/trainControls/ControlsRenderer.java
@@ -1,12 +1,12 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.interaction.controls;
+package com.simibubi.create.content.contraptions.actors.trainControls;
 
 import com.jozufozu.flywheel.core.virtual.VirtualRenderWorld;
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionMatrices;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionRenderDispatcher;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
+import com.simibubi.create.content.contraptions.render.ContraptionMatrices;
+import com.simibubi.create.content.contraptions.render.ContraptionRenderDispatcher;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.utility.AngleHelper;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/controls/ControlsServerHandler.java b/src/main/java/com/simibubi/create/content/contraptions/actors/trainControls/ControlsServerHandler.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/controls/ControlsServerHandler.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/trainControls/ControlsServerHandler.java
index f3d78b7c2..f3ef536d5 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/controls/ControlsServerHandler.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/trainControls/ControlsServerHandler.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.interaction.controls;
+package com.simibubi.create.content.contraptions.actors.trainControls;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -8,7 +8,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.UUID;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
 import com.simibubi.create.foundation.utility.IntAttached;
 import com.simibubi.create.foundation.utility.WorldAttached;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/controls/ControlsStopControllingPacket.java b/src/main/java/com/simibubi/create/content/contraptions/actors/trainControls/ControlsStopControllingPacket.java
similarity index 84%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/controls/ControlsStopControllingPacket.java
rename to src/main/java/com/simibubi/create/content/contraptions/actors/trainControls/ControlsStopControllingPacket.java
index 172f28aa7..243407149 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/controls/ControlsStopControllingPacket.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/actors/trainControls/ControlsStopControllingPacket.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.interaction.controls;
+package com.simibubi.create.content.contraptions.actors.trainControls;
 
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/AnchoredLighter.java b/src/main/java/com/simibubi/create/content/contraptions/bearing/AnchoredLighter.java
similarity index 59%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/AnchoredLighter.java
rename to src/main/java/com/simibubi/create/content/contraptions/bearing/AnchoredLighter.java
index e195ae9b3..43788e223 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/AnchoredLighter.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/bearing/AnchoredLighter.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.bearing;
+package com.simibubi.create.content.contraptions.bearing;
 
 import com.jozufozu.flywheel.util.box.GridAlignedBB;
-import com.simibubi.create.content.contraptions.components.structureMovement.Contraption;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionLighter;
+import com.simibubi.create.content.contraptions.Contraption;
+import com.simibubi.create.content.contraptions.render.ContraptionLighter;
 
 public class AnchoredLighter extends ContraptionLighter<Contraption> {
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingBlock.java b/src/main/java/com/simibubi/create/content/contraptions/bearing/BearingBlock.java
similarity index 88%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingBlock.java
rename to src/main/java/com/simibubi/create/content/contraptions/bearing/BearingBlock.java
index e67ed606e..8f52312b7 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingBlock.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/bearing/BearingBlock.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.bearing;
+package com.simibubi.create.content.contraptions.bearing;
 
-import com.simibubi.create.content.contraptions.base.DirectionalKineticBlock;
+import com.simibubi.create.content.kinetics.base.DirectionalKineticBlock;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingContraption.java b/src/main/java/com/simibubi/create/content/contraptions/bearing/BearingContraption.java
similarity index 82%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingContraption.java
rename to src/main/java/com/simibubi/create/content/contraptions/bearing/BearingContraption.java
index d69812e73..5aacdc73c 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingContraption.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/bearing/BearingContraption.java
@@ -1,15 +1,15 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.bearing;
+package com.simibubi.create.content.contraptions.bearing;
 
 import org.apache.commons.lang3.tuple.Pair;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllTags.AllBlockTags;
-import com.simibubi.create.content.contraptions.components.structureMovement.AssemblyException;
-import com.simibubi.create.content.contraptions.components.structureMovement.Contraption;
-import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionType;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionLighter;
-import com.simibubi.create.content.curiosities.frames.CopycatBlockEntity;
-import com.simibubi.create.foundation.config.AllConfigs;
+import com.simibubi.create.content.contraptions.AssemblyException;
+import com.simibubi.create.content.contraptions.Contraption;
+import com.simibubi.create.content.contraptions.ContraptionType;
+import com.simibubi.create.content.contraptions.render.ContraptionLighter;
+import com.simibubi.create.content.decoration.copycat.CopycatBlockEntity;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -50,7 +50,7 @@ public class BearingContraption extends Contraption {
 	}
 
 	@Override
-	protected ContraptionType getType() {
+	public ContraptionType getType() {
 		return ContraptionType.BEARING;
 	}
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingInstance.java b/src/main/java/com/simibubi/create/content/contraptions/bearing/BearingInstance.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingInstance.java
rename to src/main/java/com/simibubi/create/content/contraptions/bearing/BearingInstance.java
index f8088f215..41bab40d7 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingInstance.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/bearing/BearingInstance.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.bearing;
+package com.simibubi.create.content.contraptions.bearing;
 
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.jozufozu.flywheel.api.instance.DynamicInstance;
@@ -7,8 +7,8 @@ import com.jozufozu.flywheel.core.materials.oriented.OrientedData;
 import com.mojang.math.Quaternion;
 import com.mojang.math.Vector3f;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.base.BackHalfShaftInstance;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.base.BackHalfShaftInstance;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
 import com.simibubi.create.foundation.utility.AngleHelper;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/bearing/BearingRenderer.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingRenderer.java
rename to src/main/java/com/simibubi/create/content/contraptions/bearing/BearingRenderer.java
index 5f351fdf1..c7a4921c2 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingRenderer.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/bearing/BearingRenderer.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.bearing;
+package com.simibubi.create.content.contraptions.bearing;
 
 import com.jozufozu.flywheel.backend.Backend;
 import com.jozufozu.flywheel.core.PartialModel;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityRenderer;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.utility.AngleHelper;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BlankSailBlockItem.java b/src/main/java/com/simibubi/create/content/contraptions/bearing/BlankSailBlockItem.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BlankSailBlockItem.java
rename to src/main/java/com/simibubi/create/content/contraptions/bearing/BlankSailBlockItem.java
index 49f8ad8e7..b8ef959e9 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BlankSailBlockItem.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/bearing/BlankSailBlockItem.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.bearing;
+package com.simibubi.create.content.contraptions.bearing;
 
 import java.util.Map;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/ClockworkBearingBlock.java b/src/main/java/com/simibubi/create/content/contraptions/bearing/ClockworkBearingBlock.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/ClockworkBearingBlock.java
rename to src/main/java/com/simibubi/create/content/contraptions/bearing/ClockworkBearingBlock.java
index 435249155..f04c93965 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/ClockworkBearingBlock.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/bearing/ClockworkBearingBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.bearing;
+package com.simibubi.create.content.contraptions.bearing;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.foundation.block.IBE;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/ClockworkBearingBlockEntity.java b/src/main/java/com/simibubi/create/content/contraptions/bearing/ClockworkBearingBlockEntity.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/ClockworkBearingBlockEntity.java
rename to src/main/java/com/simibubi/create/content/contraptions/bearing/ClockworkBearingBlockEntity.java
index 219e7d487..9a4786793 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/ClockworkBearingBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/bearing/ClockworkBearingBlockEntity.java
@@ -1,19 +1,19 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.bearing;
+package com.simibubi.create.content.contraptions.bearing;
 
 import java.util.List;
 
 import org.apache.commons.lang3.tuple.Pair;
 
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.AssemblyException;
-import com.simibubi.create.content.contraptions.components.structureMovement.ControlledContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.IDisplayAssemblyExceptions;
-import com.simibubi.create.content.contraptions.components.structureMovement.bearing.ClockworkContraption.HandType;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.AssemblyException;
+import com.simibubi.create.content.contraptions.ControlledContraptionEntity;
+import com.simibubi.create.content.contraptions.IDisplayAssemblyExceptions;
+import com.simibubi.create.content.contraptions.bearing.ClockworkContraption.HandType;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.scrollvalue.INamedIconOptions;
-import com.simibubi.create.foundation.blockEntity.behaviour.scrollvalue.ScrollOptionBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.INamedIconOptions;
+import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollOptionBehaviour;
 import com.simibubi.create.foundation.gui.AllIcons;
 import com.simibubi.create.foundation.utility.AngleHelper;
 import com.simibubi.create.foundation.utility.Lang;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/ClockworkContraption.java b/src/main/java/com/simibubi/create/content/contraptions/bearing/ClockworkContraption.java
similarity index 88%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/ClockworkContraption.java
rename to src/main/java/com/simibubi/create/content/contraptions/bearing/ClockworkContraption.java
index 5027c0bea..1ab8f97af 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/ClockworkContraption.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/bearing/ClockworkContraption.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.bearing;
+package com.simibubi.create.content.contraptions.bearing;
 
 import java.util.HashSet;
 import java.util.Queue;
@@ -6,10 +6,10 @@ import java.util.Set;
 
 import org.apache.commons.lang3.tuple.Pair;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.AssemblyException;
-import com.simibubi.create.content.contraptions.components.structureMovement.Contraption;
-import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionType;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionLighter;
+import com.simibubi.create.content.contraptions.AssemblyException;
+import com.simibubi.create.content.contraptions.Contraption;
+import com.simibubi.create.content.contraptions.ContraptionType;
+import com.simibubi.create.content.contraptions.render.ContraptionLighter;
 import com.simibubi.create.foundation.utility.NBTHelper;
 
 import net.minecraft.core.BlockPos;
@@ -27,7 +27,7 @@ public class ClockworkContraption extends Contraption {
 	private Set<BlockPos> ignoreBlocks = new HashSet<>();
 
 	@Override
-	protected ContraptionType getType() {
+	public ContraptionType getType() {
 		return ContraptionType.CLOCKWORK;
 	}
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/IBearingBlockEntity.java b/src/main/java/com/simibubi/create/content/contraptions/bearing/IBearingBlockEntity.java
similarity index 65%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/IBearingBlockEntity.java
rename to src/main/java/com/simibubi/create/content/contraptions/bearing/IBearingBlockEntity.java
index 4d370d008..31031de2c 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/IBearingBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/bearing/IBearingBlockEntity.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.bearing;
+package com.simibubi.create.content.contraptions.bearing;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.DirectionalExtenderScrollOptionSlot;
-import com.simibubi.create.content.contraptions.components.structureMovement.IControlContraption;
+import com.simibubi.create.content.contraptions.DirectionalExtenderScrollOptionSlot;
+import com.simibubi.create.content.contraptions.IControlContraption;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform;
 
 import net.minecraft.core.Direction.Axis;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/MechanicalBearingBlock.java b/src/main/java/com/simibubi/create/content/contraptions/bearing/MechanicalBearingBlock.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/MechanicalBearingBlock.java
rename to src/main/java/com/simibubi/create/content/contraptions/bearing/MechanicalBearingBlock.java
index b269f2e25..5e19fd434 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/MechanicalBearingBlock.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/bearing/MechanicalBearingBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.bearing;
+package com.simibubi.create.content.contraptions.bearing;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.foundation.block.IBE;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/MechanicalBearingBlockEntity.java b/src/main/java/com/simibubi/create/content/contraptions/bearing/MechanicalBearingBlockEntity.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/MechanicalBearingBlockEntity.java
rename to src/main/java/com/simibubi/create/content/contraptions/bearing/MechanicalBearingBlockEntity.java
index e5c4df939..98d1fc40b 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/MechanicalBearingBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/bearing/MechanicalBearingBlockEntity.java
@@ -1,17 +1,17 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.bearing;
+package com.simibubi.create.content.contraptions.bearing;
 
 import java.util.List;
 
 import com.simibubi.create.AllSoundEvents;
-import com.simibubi.create.content.contraptions.base.GeneratingKineticBlockEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.AssemblyException;
-import com.simibubi.create.content.contraptions.components.structureMovement.ControlledContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.IDisplayAssemblyExceptions;
-import com.simibubi.create.content.contraptions.relays.advanced.sequencer.SequencerInstructions;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.AssemblyException;
+import com.simibubi.create.content.contraptions.ControlledContraptionEntity;
+import com.simibubi.create.content.contraptions.IDisplayAssemblyExceptions;
+import com.simibubi.create.content.kinetics.base.GeneratingKineticBlockEntity;
+import com.simibubi.create.content.kinetics.transmission.sequencer.SequencerInstructions;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.scrollvalue.ScrollOptionBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollOptionBehaviour;
 import com.simibubi.create.foundation.item.TooltipHelper;
 import com.simibubi.create.foundation.utility.AngleHelper;
 import com.simibubi.create.foundation.utility.Lang;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/SailBlock.java b/src/main/java/com/simibubi/create/content/contraptions/bearing/SailBlock.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/SailBlock.java
rename to src/main/java/com/simibubi/create/content/contraptions/bearing/SailBlock.java
index 7ea70fe0d..e26d5798d 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/SailBlock.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/bearing/SailBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.bearing;
+package com.simibubi.create.content.contraptions.bearing;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -11,11 +11,11 @@ import javax.annotation.Nullable;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllShapes;
 import com.simibubi.create.foundation.block.WrenchableDirectionalBlock;
+import com.simibubi.create.foundation.placement.IPlacementHelper;
+import com.simibubi.create.foundation.placement.PlacementHelpers;
+import com.simibubi.create.foundation.placement.PlacementOffset;
 import com.simibubi.create.foundation.utility.BlockHelper;
 import com.simibubi.create.foundation.utility.Iterate;
-import com.simibubi.create.foundation.utility.placement.IPlacementHelper;
-import com.simibubi.create.foundation.utility.placement.PlacementHelpers;
-import com.simibubi.create.foundation.utility.placement.PlacementOffset;
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/StabilizedBearingInstance.java b/src/main/java/com/simibubi/create/content/contraptions/bearing/StabilizedBearingInstance.java
similarity index 86%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/StabilizedBearingInstance.java
rename to src/main/java/com/simibubi/create/content/contraptions/bearing/StabilizedBearingInstance.java
index 23c5c8d88..04d89d4c5 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/StabilizedBearingInstance.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/bearing/StabilizedBearingInstance.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.bearing;
+package com.simibubi.create.content.contraptions.bearing;
 
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.jozufozu.flywheel.core.Materials;
@@ -7,9 +7,9 @@ import com.jozufozu.flywheel.core.virtual.VirtualRenderWorld;
 import com.mojang.math.Quaternion;
 import com.mojang.math.Vector3f;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.base.flwdata.RotatingData;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ActorInstance;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
+import com.simibubi.create.content.contraptions.render.ActorInstance;
+import com.simibubi.create.content.kinetics.base.flwdata.RotatingData;
 import com.simibubi.create.foundation.render.AllMaterialSpecs;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/StabilizedBearingMovementBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/bearing/StabilizedBearingMovementBehaviour.java
similarity index 79%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/StabilizedBearingMovementBehaviour.java
rename to src/main/java/com/simibubi/create/content/contraptions/bearing/StabilizedBearingMovementBehaviour.java
index 53084c90e..a92ea5beb 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/StabilizedBearingMovementBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/bearing/StabilizedBearingMovementBehaviour.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.bearing;
+package com.simibubi.create.content.contraptions.bearing;
 
 import javax.annotation.Nullable;
 
@@ -7,14 +7,14 @@ import com.jozufozu.flywheel.core.PartialModel;
 import com.jozufozu.flywheel.core.virtual.VirtualRenderWorld;
 import com.mojang.math.Quaternion;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.ControlledContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
-import com.simibubi.create.content.contraptions.components.structureMovement.OrientedContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ActorInstance;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionMatrices;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionRenderDispatcher;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.ControlledContraptionEntity;
+import com.simibubi.create.content.contraptions.OrientedContraptionEntity;
+import com.simibubi.create.content.contraptions.behaviour.MovementBehaviour;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
+import com.simibubi.create.content.contraptions.render.ActorInstance;
+import com.simibubi.create.content.contraptions.render.ContraptionMatrices;
+import com.simibubi.create.content.contraptions.render.ContraptionRenderDispatcher;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/StabilizedContraption.java b/src/main/java/com/simibubi/create/content/contraptions/bearing/StabilizedContraption.java
similarity index 71%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/StabilizedContraption.java
rename to src/main/java/com/simibubi/create/content/contraptions/bearing/StabilizedContraption.java
index ca4526b8d..c4ef7cf30 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/StabilizedContraption.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/bearing/StabilizedContraption.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.bearing;
+package com.simibubi.create.content.contraptions.bearing;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.AssemblyException;
-import com.simibubi.create.content.contraptions.components.structureMovement.Contraption;
-import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionType;
-import com.simibubi.create.content.contraptions.components.structureMovement.NonStationaryLighter;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionLighter;
+import com.simibubi.create.content.contraptions.AssemblyException;
+import com.simibubi.create.content.contraptions.Contraption;
+import com.simibubi.create.content.contraptions.ContraptionType;
+import com.simibubi.create.content.contraptions.render.ContraptionLighter;
+import com.simibubi.create.content.contraptions.render.NonStationaryLighter;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -40,7 +40,7 @@ public class StabilizedContraption extends Contraption {
 	}
 
 	@Override
-	protected ContraptionType getType() {
+	public ContraptionType getType() {
 		return ContraptionType.STABILIZED;
 	}
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/WindmillBearingBlock.java b/src/main/java/com/simibubi/create/content/contraptions/bearing/WindmillBearingBlock.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/WindmillBearingBlock.java
rename to src/main/java/com/simibubi/create/content/contraptions/bearing/WindmillBearingBlock.java
index 10212e425..29416b982 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/WindmillBearingBlock.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/bearing/WindmillBearingBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.bearing;
+package com.simibubi.create.content.contraptions.bearing;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.foundation.block.IBE;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/WindmillBearingBlockEntity.java b/src/main/java/com/simibubi/create/content/contraptions/bearing/WindmillBearingBlockEntity.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/WindmillBearingBlockEntity.java
rename to src/main/java/com/simibubi/create/content/contraptions/bearing/WindmillBearingBlockEntity.java
index fbb13044e..d78dc5251 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/WindmillBearingBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/bearing/WindmillBearingBlockEntity.java
@@ -1,14 +1,14 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.bearing;
+package com.simibubi.create.content.contraptions.bearing;
 
 import java.util.List;
 
 import com.simibubi.create.foundation.advancement.AllAdvancements;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.scrollvalue.INamedIconOptions;
-import com.simibubi.create.foundation.blockEntity.behaviour.scrollvalue.ScrollOptionBehaviour;
-import com.simibubi.create.foundation.config.AllConfigs;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.INamedIconOptions;
+import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollOptionBehaviour;
 import com.simibubi.create.foundation.gui.AllIcons;
 import com.simibubi.create.foundation.utility.Lang;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/BellMovementBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/behaviour/BellMovementBehaviour.java
similarity index 77%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/BellMovementBehaviour.java
rename to src/main/java/com/simibubi/create/content/contraptions/behaviour/BellMovementBehaviour.java
index ef99b83ed..367d06ffc 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/BellMovementBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/behaviour/BellMovementBehaviour.java
@@ -1,9 +1,7 @@
-package com.simibubi.create.content.contraptions.components.actors;
+package com.simibubi.create.content.contraptions.behaviour;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
-import com.simibubi.create.content.curiosities.bell.AbstractBellBlock;
-import com.simibubi.create.content.logistics.trains.entity.CarriageContraption;
+import com.simibubi.create.content.equipment.bell.AbstractBellBlock;
+import com.simibubi.create.content.trains.entity.CarriageContraption;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.sounds.SoundEvents;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/CampfireMovementBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/behaviour/CampfireMovementBehaviour.java
similarity index 82%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/CampfireMovementBehaviour.java
rename to src/main/java/com/simibubi/create/content/contraptions/behaviour/CampfireMovementBehaviour.java
index 305813a7c..a6be9bf45 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/CampfireMovementBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/behaviour/CampfireMovementBehaviour.java
@@ -1,7 +1,4 @@
-package com.simibubi.create.content.contraptions.components.actors;
-
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
+package com.simibubi.create.content.contraptions.behaviour;
 
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.util.RandomSource;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/DoorMovingInteraction.java b/src/main/java/com/simibubi/create/content/contraptions/behaviour/DoorMovingInteraction.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/DoorMovingInteraction.java
rename to src/main/java/com/simibubi/create/content/contraptions/behaviour/DoorMovingInteraction.java
index 0c5b7a22d..d58c0d129 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/DoorMovingInteraction.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/behaviour/DoorMovingInteraction.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.interaction;
+package com.simibubi.create.content.contraptions.behaviour;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.Contraption;
-import com.simibubi.create.content.curiosities.deco.SlidingDoorBlock;
+import com.simibubi.create.content.contraptions.Contraption;
+import com.simibubi.create.content.decoration.slidingDoor.SlidingDoorBlock;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/LeverMovingInteraction.java b/src/main/java/com/simibubi/create/content/contraptions/behaviour/LeverMovingInteraction.java
similarity index 76%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/LeverMovingInteraction.java
rename to src/main/java/com/simibubi/create/content/contraptions/behaviour/LeverMovingInteraction.java
index 021ecf75d..19472df5d 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/LeverMovingInteraction.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/behaviour/LeverMovingInteraction.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.interaction;
+package com.simibubi.create.content.contraptions.behaviour;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.Contraption;
+import com.simibubi.create.content.contraptions.Contraption;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.sounds.SoundEvents;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MovementBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/behaviour/MovementBehaviour.java
similarity index 88%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MovementBehaviour.java
rename to src/main/java/com/simibubi/create/content/contraptions/behaviour/MovementBehaviour.java
index dd339ae4d..3c3a2432b 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MovementBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/behaviour/MovementBehaviour.java
@@ -1,12 +1,12 @@
-package com.simibubi.create.content.contraptions.components.structureMovement;
+package com.simibubi.create.content.contraptions.behaviour;
 
 import javax.annotation.Nullable;
 
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.jozufozu.flywheel.core.virtual.VirtualRenderWorld;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ActorInstance;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionMatrices;
-import com.simibubi.create.foundation.config.AllConfigs;
+import com.simibubi.create.content.contraptions.render.ActorInstance;
+import com.simibubi.create.content.contraptions.render.ContraptionMatrices;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MovementContext.java b/src/main/java/com/simibubi/create/content/contraptions/behaviour/MovementContext.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MovementContext.java
rename to src/main/java/com/simibubi/create/content/contraptions/behaviour/MovementContext.java
index 1f483afee..b5ff9ee76 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MovementContext.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/behaviour/MovementContext.java
@@ -1,7 +1,8 @@
-package com.simibubi.create.content.contraptions.components.structureMovement;
+package com.simibubi.create.content.contraptions.behaviour;
 
 import java.util.function.UnaryOperator;
 
+import com.simibubi.create.content.contraptions.Contraption;
 import com.simibubi.create.foundation.utility.VecHelper;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MovingInteractionBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/behaviour/MovingInteractionBehaviour.java
similarity index 75%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MovingInteractionBehaviour.java
rename to src/main/java/com/simibubi/create/content/contraptions/behaviour/MovingInteractionBehaviour.java
index cd8285595..b6b2d698c 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MovingInteractionBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/behaviour/MovingInteractionBehaviour.java
@@ -1,7 +1,9 @@
-package com.simibubi.create.content.contraptions.components.structureMovement;
+package com.simibubi.create.content.contraptions.behaviour;
 
 import org.apache.commons.lang3.tuple.MutablePair;
 
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.Entity;
@@ -12,10 +14,10 @@ public abstract class MovingInteractionBehaviour {
 
 	protected void setContraptionActorData(AbstractContraptionEntity contraptionEntity, int index,
 		StructureBlockInfo info, MovementContext ctx) {
-		contraptionEntity.contraption.actors.remove(index);
-		contraptionEntity.contraption.actors.add(index, MutablePair.of(info, ctx));
+		contraptionEntity.getContraption().getActors().remove(index);
+		contraptionEntity.getContraption().getActors().add(index, MutablePair.of(info, ctx));
 		if (contraptionEntity.level.isClientSide)
-			contraptionEntity.contraption.deferInvalidate = true;
+			contraptionEntity.getContraption().deferInvalidate = true;
 	}
 
 	protected void setContraptionBlockData(AbstractContraptionEntity contraptionEntity, BlockPos pos,
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/SimpleBlockMovingInteraction.java b/src/main/java/com/simibubi/create/content/contraptions/behaviour/SimpleBlockMovingInteraction.java
similarity index 78%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/SimpleBlockMovingInteraction.java
rename to src/main/java/com/simibubi/create/content/contraptions/behaviour/SimpleBlockMovingInteraction.java
index eceb3c0c2..69de088b2 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/SimpleBlockMovingInteraction.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/behaviour/SimpleBlockMovingInteraction.java
@@ -1,8 +1,7 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.interaction;
+package com.simibubi.create.content.contraptions.behaviour;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.Contraption;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovingInteractionBehaviour;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.Contraption;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.sounds.SoundEvent;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/TrapdoorMovingInteraction.java b/src/main/java/com/simibubi/create/content/contraptions/behaviour/TrapdoorMovingInteraction.java
similarity index 82%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/TrapdoorMovingInteraction.java
rename to src/main/java/com/simibubi/create/content/contraptions/behaviour/TrapdoorMovingInteraction.java
index 18aed3faf..226dcfa2e 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/TrapdoorMovingInteraction.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/behaviour/TrapdoorMovingInteraction.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.interaction;
+package com.simibubi.create.content.contraptions.behaviour;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.Contraption;
+import com.simibubi.create.content.contraptions.Contraption;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.sounds.SoundEvent;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/ContraptionBlockSource.java b/src/main/java/com/simibubi/create/content/contraptions/behaviour/dispenser/ContraptionBlockSource.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/ContraptionBlockSource.java
rename to src/main/java/com/simibubi/create/content/contraptions/behaviour/dispenser/ContraptionBlockSource.java
index d64758b33..870da5cdb 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/ContraptionBlockSource.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/behaviour/dispenser/ContraptionBlockSource.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.contraptions.components.actors.dispenser;
+package com.simibubi.create.content.contraptions.behaviour.dispenser;
 
 import javax.annotation.Nullable;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/DispenseItemLocation.java b/src/main/java/com/simibubi/create/content/contraptions/behaviour/dispenser/DispenseItemLocation.java
similarity index 85%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/DispenseItemLocation.java
rename to src/main/java/com/simibubi/create/content/contraptions/behaviour/dispenser/DispenseItemLocation.java
index 2b0b23916..c9134e0b3 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/DispenseItemLocation.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/behaviour/dispenser/DispenseItemLocation.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.actors.dispenser;
+package com.simibubi.create.content.contraptions.behaviour.dispenser;
 
 public class DispenseItemLocation {
 	private final boolean internal;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/DispenserMovementBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/behaviour/dispenser/DispenserMovementBehaviour.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/DispenserMovementBehaviour.java
rename to src/main/java/com/simibubi/create/content/contraptions/behaviour/dispenser/DispenserMovementBehaviour.java
index f20069f0e..1018e9887 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/DispenserMovementBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/behaviour/dispenser/DispenserMovementBehaviour.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.contraptions.components.actors.dispenser;
+package com.simibubi.create.content.contraptions.behaviour.dispenser;
 
 import java.util.HashMap;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
 import com.simibubi.create.foundation.mixin.accessor.DispenserBlockAccessor;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/DropperMovementBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/behaviour/dispenser/DropperMovementBehaviour.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/DropperMovementBehaviour.java
rename to src/main/java/com/simibubi/create/content/contraptions/behaviour/dispenser/DropperMovementBehaviour.java
index 28fa2b3f6..3f854219e 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/DropperMovementBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/behaviour/dispenser/DropperMovementBehaviour.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.contraptions.components.actors.dispenser;
+package com.simibubi.create.content.contraptions.behaviour.dispenser;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
+import com.simibubi.create.content.contraptions.behaviour.MovementBehaviour;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
 import com.simibubi.create.foundation.item.ItemHelper;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/IMovedDispenseItemBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/behaviour/dispenser/IMovedDispenseItemBehaviour.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/IMovedDispenseItemBehaviour.java
rename to src/main/java/com/simibubi/create/content/contraptions/behaviour/dispenser/IMovedDispenseItemBehaviour.java
index a9a35e3cd..899398435 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/IMovedDispenseItemBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/behaviour/dispenser/IMovedDispenseItemBehaviour.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.contraptions.components.actors.dispenser;
+package com.simibubi.create.content.contraptions.behaviour.dispenser;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
 
 import net.minecraft.Util;
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/MovedDefaultDispenseItemBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/behaviour/dispenser/MovedDefaultDispenseItemBehaviour.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/MovedDefaultDispenseItemBehaviour.java
rename to src/main/java/com/simibubi/create/content/contraptions/behaviour/dispenser/MovedDefaultDispenseItemBehaviour.java
index 954a7046f..1ad03f1bc 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/MovedDefaultDispenseItemBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/behaviour/dispenser/MovedDefaultDispenseItemBehaviour.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.contraptions.components.actors.dispenser;
+package com.simibubi.create.content.contraptions.behaviour.dispenser;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/MovedOptionalDispenseBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/behaviour/dispenser/MovedOptionalDispenseBehaviour.java
similarity index 82%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/MovedOptionalDispenseBehaviour.java
rename to src/main/java/com/simibubi/create/content/contraptions/behaviour/dispenser/MovedOptionalDispenseBehaviour.java
index b1af00626..3e9e77ed1 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/MovedOptionalDispenseBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/behaviour/dispenser/MovedOptionalDispenseBehaviour.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.actors.dispenser;
+package com.simibubi.create.content.contraptions.behaviour.dispenser;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.LevelAccessor;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/MovedProjectileDispenserBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/behaviour/dispenser/MovedProjectileDispenserBehaviour.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/MovedProjectileDispenserBehaviour.java
rename to src/main/java/com/simibubi/create/content/contraptions/behaviour/dispenser/MovedProjectileDispenserBehaviour.java
index eb11f3c7f..2d99d3617 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/MovedProjectileDispenserBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/behaviour/dispenser/MovedProjectileDispenserBehaviour.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.contraptions.components.actors.dispenser;
+package com.simibubi.create.content.contraptions.behaviour.dispenser;
 
 import javax.annotation.Nullable;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
 import com.simibubi.create.foundation.mixin.accessor.AbstractProjectileDispenseBehaviorAccessor;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/SimplePos.java b/src/main/java/com/simibubi/create/content/contraptions/behaviour/dispenser/SimplePos.java
similarity index 83%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/SimplePos.java
rename to src/main/java/com/simibubi/create/content/contraptions/behaviour/dispenser/SimplePos.java
index 3d62bd8c7..9b8c22acc 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/SimplePos.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/behaviour/dispenser/SimplePos.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.actors.dispenser;
+package com.simibubi.create.content.contraptions.behaviour.dispenser;
 
 import net.minecraft.core.Position;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/AbstractChassisBlock.java b/src/main/java/com/simibubi/create/content/contraptions/chassis/AbstractChassisBlock.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/AbstractChassisBlock.java
rename to src/main/java/com/simibubi/create/content/contraptions/chassis/AbstractChassisBlock.java
index e1c003b1b..d406b5d13 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/AbstractChassisBlock.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/chassis/AbstractChassisBlock.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.chassis;
+package com.simibubi.create.content.contraptions.chassis;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllItems;
 import com.simibubi.create.AllSoundEvents;
-import com.simibubi.create.content.contraptions.components.structureMovement.ITransformableBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.StructureTransform;
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
+import com.simibubi.create.content.contraptions.ITransformableBlock;
+import com.simibubi.create.content.contraptions.StructureTransform;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
 import com.simibubi.create.foundation.block.IBE;
 import com.simibubi.create.foundation.utility.Iterate;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/ChassisBlockEntity.java b/src/main/java/com/simibubi/create/content/contraptions/chassis/ChassisBlockEntity.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/ChassisBlockEntity.java
rename to src/main/java/com/simibubi/create/content/contraptions/chassis/ChassisBlockEntity.java
index 9d3bd4118..702f9148a 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/ChassisBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/chassis/ChassisBlockEntity.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.chassis;
+package com.simibubi.create.content.contraptions.chassis;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -12,18 +12,18 @@ import java.util.function.Function;
 import com.google.common.collect.ImmutableList;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllKeys;
-import com.simibubi.create.content.contraptions.components.structureMovement.BlockMovementChecks;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.contraptions.BlockMovementChecks;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.CenteredSideValueBoxTransform;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsBoard;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsFormatter;
-import com.simibubi.create.foundation.blockEntity.behaviour.scrollvalue.BulkScrollValueBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.scrollvalue.ScrollValueBehaviour;
-import com.simibubi.create.foundation.config.AllConfigs;
+import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.BulkScrollValueBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollValueBehaviour;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.Lang;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/ChassisRangeDisplay.java b/src/main/java/com/simibubi/create/content/contraptions/chassis/ChassisRangeDisplay.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/ChassisRangeDisplay.java
rename to src/main/java/com/simibubi/create/content/contraptions/chassis/ChassisRangeDisplay.java
index a5c00b835..b55a138aa 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/ChassisRangeDisplay.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/chassis/ChassisRangeDisplay.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.chassis;
+package com.simibubi.create.content.contraptions.chassis;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/LinearChassisBlock.java b/src/main/java/com/simibubi/create/content/contraptions/chassis/LinearChassisBlock.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/LinearChassisBlock.java
rename to src/main/java/com/simibubi/create/content/contraptions/chassis/LinearChassisBlock.java
index 6545e64ec..63c400bce 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/LinearChassisBlock.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/chassis/LinearChassisBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.chassis;
+package com.simibubi.create.content.contraptions.chassis;
 
 import org.jetbrains.annotations.Nullable;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/RadialChassisBlock.java b/src/main/java/com/simibubi/create/content/contraptions/chassis/RadialChassisBlock.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/RadialChassisBlock.java
rename to src/main/java/com/simibubi/create/content/contraptions/chassis/RadialChassisBlock.java
index 1c0888855..f0f297c32 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/RadialChassisBlock.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/chassis/RadialChassisBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.chassis;
+package com.simibubi.create.content.contraptions.chassis;
 
 import net.minecraft.core.Direction;
 import net.minecraft.core.Direction.Axis;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerBlock.java b/src/main/java/com/simibubi/create/content/contraptions/chassis/StickerBlock.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerBlock.java
rename to src/main/java/com/simibubi/create/content/contraptions/chassis/StickerBlock.java
index 32814f7dd..d2f71a28b 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerBlock.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/chassis/StickerBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.chassis;
+package com.simibubi.create.content.contraptions.chassis;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerBlockEntity.java b/src/main/java/com/simibubi/create/content/contraptions/chassis/StickerBlockEntity.java
similarity index 89%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerBlockEntity.java
rename to src/main/java/com/simibubi/create/content/contraptions/chassis/StickerBlockEntity.java
index 8b62f7884..8b4454bea 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/chassis/StickerBlockEntity.java
@@ -1,14 +1,14 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.chassis;
+package com.simibubi.create.content.contraptions.chassis;
 
 import java.util.List;
 
 import com.jozufozu.flywheel.backend.instancing.InstancedRenderDispatcher;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllSoundEvents;
-import com.simibubi.create.content.contraptions.components.structureMovement.glue.SuperGlueEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.glue.SuperGlueItem;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.contraptions.glue.SuperGlueEntity;
+import com.simibubi.create.content.contraptions.glue.SuperGlueItem;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat.Chaser;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerInstance.java b/src/main/java/com/simibubi/create/content/contraptions/chassis/StickerInstance.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerInstance.java
rename to src/main/java/com/simibubi/create/content/contraptions/chassis/StickerInstance.java
index 790de505b..4b4c4a262 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerInstance.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/chassis/StickerInstance.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.chassis;
+package com.simibubi.create.content.contraptions.chassis;
 
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.jozufozu.flywheel.api.instance.DynamicInstance;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/chassis/StickerRenderer.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerRenderer.java
rename to src/main/java/com/simibubi/create/content/contraptions/chassis/StickerRenderer.java
index 4aaeb367c..846663029 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerRenderer.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/chassis/StickerRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.chassis;
+package com.simibubi.create.content.contraptions.chassis;
 
 import com.jozufozu.flywheel.backend.Backend;
 import com.mojang.blaze3d.vertex.PoseStack;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/mixer/CompactingRecipe.java b/src/main/java/com/simibubi/create/content/contraptions/components/mixer/CompactingRecipe.java
deleted file mode 100644
index 7e25e410e..000000000
--- a/src/main/java/com/simibubi/create/content/contraptions/components/mixer/CompactingRecipe.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.simibubi.create.content.contraptions.components.mixer;
-
-import com.simibubi.create.AllRecipeTypes;
-import com.simibubi.create.content.contraptions.processing.BasinRecipe;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipeBuilder.ProcessingRecipeParams;
-
-public class CompactingRecipe extends BasinRecipe {
-
-	public CompactingRecipe(ProcessingRecipeParams params) {
-		super(AllRecipeTypes.COMPACTING, params);
-	}
-
-}
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/mixer/MixingRecipe.java b/src/main/java/com/simibubi/create/content/contraptions/components/mixer/MixingRecipe.java
deleted file mode 100644
index 12e1d7b0f..000000000
--- a/src/main/java/com/simibubi/create/content/contraptions/components/mixer/MixingRecipe.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.simibubi.create.content.contraptions.components.mixer;
-
-import com.simibubi.create.AllRecipeTypes;
-import com.simibubi.create.content.contraptions.processing.BasinRecipe;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipeBuilder.ProcessingRecipeParams;
-
-public class MixingRecipe extends BasinRecipe {
-
-	public MixingRecipe(ProcessingRecipeParams params) {
-		super(AllRecipeTypes.MIXING, params);
-	}
-
-}
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/elevator/ElevatorColumn.java b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorColumn.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/elevator/ElevatorColumn.java
rename to src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorColumn.java
index 8c383dfdf..6a4715198 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/elevator/ElevatorColumn.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorColumn.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.elevator;
+package com.simibubi.create.content.contraptions.elevator;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/elevator/ElevatorContactBlock.java b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorContactBlock.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/elevator/ElevatorContactBlock.java
rename to src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorContactBlock.java
index 8a8da6e12..18eeb64e5 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/elevator/ElevatorContactBlock.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorContactBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.elevator;
+package com.simibubi.create.content.contraptions.elevator;
 
 import java.util.Optional;
 
@@ -7,11 +7,11 @@ import javax.annotation.Nullable;
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.contraptions.components.structureMovement.elevator.ElevatorColumn.ColumnCoords;
-import com.simibubi.create.content.logistics.block.diodes.BrassDiodeBlock;
-import com.simibubi.create.content.logistics.block.redstone.RedstoneContactBlock;
-import com.simibubi.create.content.schematics.ISpecialBlockItemRequirement;
-import com.simibubi.create.content.schematics.ItemRequirement;
+import com.simibubi.create.content.contraptions.elevator.ElevatorColumn.ColumnCoords;
+import com.simibubi.create.content.redstone.contact.RedstoneContactBlock;
+import com.simibubi.create.content.redstone.diodes.BrassDiodeBlock;
+import com.simibubi.create.content.schematics.requirement.ISpecialBlockItemRequirement;
+import com.simibubi.create.content.schematics.requirement.ItemRequirement;
 import com.simibubi.create.foundation.block.IBE;
 import com.simibubi.create.foundation.block.WrenchableDirectionalBlock;
 import com.simibubi.create.foundation.gui.ScreenOpener;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/elevator/ElevatorContactBlockEntity.java b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorContactBlockEntity.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/elevator/ElevatorContactBlockEntity.java
rename to src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorContactBlockEntity.java
index f46f67bf4..8a3f09b27 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/elevator/ElevatorContactBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorContactBlockEntity.java
@@ -1,12 +1,12 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.elevator;
+package com.simibubi.create.content.contraptions.elevator;
 
 import java.util.List;
 
-import com.simibubi.create.content.contraptions.components.actors.DoorControlBehaviour;
-import com.simibubi.create.content.contraptions.components.structureMovement.elevator.ElevatorColumn.ColumnCoords;
-import com.simibubi.create.content.logistics.block.display.DisplayLinkBlock;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.contraptions.elevator.ElevatorColumn.ColumnCoords;
+import com.simibubi.create.content.decoration.slidingDoor.DoorControlBehaviour;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkBlock;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.NBTHelper;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/elevator/ElevatorContactEditPacket.java b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorContactEditPacket.java
similarity index 88%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/elevator/ElevatorContactEditPacket.java
rename to src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorContactEditPacket.java
index 6011ef81e..81d331d54 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/elevator/ElevatorContactEditPacket.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorContactEditPacket.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.elevator;
+package com.simibubi.create.content.contraptions.elevator;
 
-import com.simibubi.create.content.contraptions.components.actors.DoorControl;
+import com.simibubi.create.content.decoration.slidingDoor.DoorControl;
 import com.simibubi.create.foundation.networking.BlockEntityConfigurationPacket;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/elevator/ElevatorContactScreen.java b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorContactScreen.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/elevator/ElevatorContactScreen.java
rename to src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorContactScreen.java
index 10cdb1a9c..67383347d 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/elevator/ElevatorContactScreen.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorContactScreen.java
@@ -1,11 +1,12 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.elevator;
+package com.simibubi.create.content.contraptions.elevator;
 
 import org.lwjgl.glfw.GLFW;
 
 import com.google.common.collect.ImmutableList;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.components.actors.DoorControl;
+import com.simibubi.create.AllPackets;
+import com.simibubi.create.content.decoration.slidingDoor.DoorControl;
 import com.simibubi.create.foundation.gui.AbstractSimiScreen;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
 import com.simibubi.create.foundation.gui.AllIcons;
@@ -14,7 +15,6 @@ import com.simibubi.create.foundation.gui.widget.IconButton;
 import com.simibubi.create.foundation.gui.widget.Label;
 import com.simibubi.create.foundation.gui.widget.ScrollInput;
 import com.simibubi.create.foundation.gui.widget.TooltipArea;
-import com.simibubi.create.foundation.networking.AllPackets;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.Pair;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/elevator/ElevatorContraption.java b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorContraption.java
similarity index 84%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/elevator/ElevatorContraption.java
rename to src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorContraption.java
index 7ec0811d9..1d1448bb5 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/elevator/ElevatorContraption.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorContraption.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.elevator;
+package com.simibubi.create.content.contraptions.elevator;
 
 import java.util.List;
 
@@ -7,15 +7,15 @@ import org.apache.commons.lang3.tuple.Pair;
 
 import com.google.common.collect.ImmutableList;
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.components.actors.controls.ContraptionControlsMovement.ElevatorFloorSelection;
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.AssemblyException;
-import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionType;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
-import com.simibubi.create.content.contraptions.components.structureMovement.elevator.ElevatorColumn.ColumnCoords;
-import com.simibubi.create.content.contraptions.components.structureMovement.pulley.PulleyContraption;
-import com.simibubi.create.content.logistics.block.redstone.RedstoneContactBlock;
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.AllPackets;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.AssemblyException;
+import com.simibubi.create.content.contraptions.ContraptionType;
+import com.simibubi.create.content.contraptions.actors.contraptionControls.ContraptionControlsMovement.ElevatorFloorSelection;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
+import com.simibubi.create.content.contraptions.elevator.ElevatorColumn.ColumnCoords;
+import com.simibubi.create.content.contraptions.pulley.PulleyContraption;
+import com.simibubi.create.content.redstone.contact.RedstoneContactBlock;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.IntAttached;
 import com.simibubi.create.foundation.utility.Lang;
@@ -169,7 +169,7 @@ public class ElevatorContraption extends PulleyContraption {
 	}
 
 	@Override
-	protected ContraptionType getType() {
+	public ContraptionType getType() {
 		return ContraptionType.ELEVATOR;
 	}
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/elevator/ElevatorControlsHandler.java b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorControlsHandler.java
similarity index 77%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/elevator/ElevatorControlsHandler.java
rename to src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorControlsHandler.java
index 01208138f..ed99e353b 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/elevator/ElevatorControlsHandler.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorControlsHandler.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.elevator;
+package com.simibubi.create.content.contraptions.elevator;
 
 import java.lang.ref.WeakReference;
 import java.util.Collection;
@@ -7,15 +7,15 @@ import org.apache.commons.lang3.tuple.MutablePair;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllSoundEvents;
-import com.simibubi.create.content.contraptions.components.actors.controls.ContraptionControlsBlockEntity;
-import com.simibubi.create.content.contraptions.components.actors.controls.ContraptionControlsBlockEntity.ControlsSlot;
-import com.simibubi.create.content.contraptions.components.actors.controls.ContraptionControlsMovement;
-import com.simibubi.create.content.contraptions.components.actors.controls.ContraptionControlsMovement.ElevatorFloorSelection;
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.Contraption;
-import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionHandler;
-import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionHandlerClient;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.Contraption;
+import com.simibubi.create.content.contraptions.ContraptionHandler;
+import com.simibubi.create.content.contraptions.ContraptionHandlerClient;
+import com.simibubi.create.content.contraptions.actors.contraptionControls.ContraptionControlsBlockEntity;
+import com.simibubi.create.content.contraptions.actors.contraptionControls.ContraptionControlsBlockEntity.ControlsSlot;
+import com.simibubi.create.content.contraptions.actors.contraptionControls.ContraptionControlsMovement;
+import com.simibubi.create.content.contraptions.actors.contraptionControls.ContraptionControlsMovement.ElevatorFloorSelection;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
 import com.simibubi.create.foundation.utility.Couple;
 
 import net.minecraft.client.Minecraft;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/elevator/ElevatorFloorListPacket.java b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorFloorListPacket.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/elevator/ElevatorFloorListPacket.java
rename to src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorFloorListPacket.java
index 02f60a621..fac96cced 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/elevator/ElevatorFloorListPacket.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorFloorListPacket.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.elevator;
+package com.simibubi.create.content.contraptions.elevator;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.AllPackets;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.IntAttached;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/elevator/ElevatorPulleyBlock.java b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorPulleyBlock.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/elevator/ElevatorPulleyBlock.java
rename to src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorPulleyBlock.java
index adc7d3704..03e64c027 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/elevator/ElevatorPulleyBlock.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorPulleyBlock.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.elevator;
+package com.simibubi.create.content.contraptions.elevator;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.base.HorizontalKineticBlock;
+import com.simibubi.create.content.kinetics.base.HorizontalKineticBlock;
 import com.simibubi.create.foundation.block.IBE;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/elevator/ElevatorPulleyBlockEntity.java b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorPulleyBlockEntity.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/elevator/ElevatorPulleyBlockEntity.java
rename to src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorPulleyBlockEntity.java
index 16e5bdf3f..a5c8cea74 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/elevator/ElevatorPulleyBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorPulleyBlockEntity.java
@@ -1,17 +1,17 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.elevator;
+package com.simibubi.create.content.contraptions.elevator;
 
 import java.util.List;
 
 import com.simibubi.create.AllBlocks;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.AllSoundEvents;
-import com.simibubi.create.content.contraptions.components.structureMovement.AssemblyException;
-import com.simibubi.create.content.contraptions.components.structureMovement.ControlledContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.elevator.ElevatorColumn.ColumnCoords;
-import com.simibubi.create.content.contraptions.components.structureMovement.pulley.PulleyBlockEntity;
+import com.simibubi.create.content.contraptions.AssemblyException;
+import com.simibubi.create.content.contraptions.ControlledContraptionEntity;
+import com.simibubi.create.content.contraptions.elevator.ElevatorColumn.ColumnCoords;
+import com.simibubi.create.content.contraptions.pulley.PulleyBlockEntity;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
-import com.simibubi.create.foundation.config.AllConfigs;
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/elevator/ElevatorPulleyInstance.java b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorPulleyInstance.java
similarity index 77%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/elevator/ElevatorPulleyInstance.java
rename to src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorPulleyInstance.java
index bb99d58c1..ac5e07f78 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/elevator/ElevatorPulleyInstance.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorPulleyInstance.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.elevator;
+package com.simibubi.create.content.contraptions.elevator;
 
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.jozufozu.flywheel.api.instance.DynamicInstance;
 import com.jozufozu.flywheel.light.TickingLightListener;
-import com.simibubi.create.content.contraptions.relays.encased.ShaftInstance;
+import com.simibubi.create.content.kinetics.base.ShaftInstance;
 
 // TODO
 public class ElevatorPulleyInstance extends ShaftInstance<ElevatorPulleyBlockEntity> implements DynamicInstance, TickingLightListener {
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/elevator/ElevatorPulleyRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorPulleyRenderer.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/elevator/ElevatorPulleyRenderer.java
rename to src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorPulleyRenderer.java
index cc26290c6..c34c701dd 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/elevator/ElevatorPulleyRenderer.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorPulleyRenderer.java
@@ -1,13 +1,13 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.elevator;
+package com.simibubi.create.content.contraptions.elevator;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.simibubi.create.AllPartialModels;
 import com.simibubi.create.AllSpriteShifts;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityRenderer;
-import com.simibubi.create.content.contraptions.components.structureMovement.pulley.AbstractPulleyRenderer;
-import com.simibubi.create.content.contraptions.components.structureMovement.pulley.PulleyRenderer;
+import com.simibubi.create.content.contraptions.pulley.AbstractPulleyRenderer;
+import com.simibubi.create.content.contraptions.pulley.PulleyRenderer;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
 import com.simibubi.create.foundation.block.render.SpriteShiftEntry;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/elevator/ElevatorTargetFloorPacket.java b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorTargetFloorPacket.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/elevator/ElevatorTargetFloorPacket.java
rename to src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorTargetFloorPacket.java
index caa116166..1e6ec3afc 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/elevator/ElevatorTargetFloorPacket.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorTargetFloorPacket.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.elevator;
+package com.simibubi.create.content.contraptions.elevator;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryCarriageBlock.java b/src/main/java/com/simibubi/create/content/contraptions/gantry/GantryCarriageBlock.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryCarriageBlock.java
rename to src/main/java/com/simibubi/create/content/contraptions/gantry/GantryCarriageBlock.java
index 30c450bc3..84b4a9c4d 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryCarriageBlock.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/gantry/GantryCarriageBlock.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.gantry;
+package com.simibubi.create.content.contraptions.gantry;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.base.DirectionalAxisKineticBlock;
-import com.simibubi.create.content.contraptions.base.IRotate;
-import com.simibubi.create.content.contraptions.relays.advanced.GantryShaftBlock;
+import com.simibubi.create.content.kinetics.base.DirectionalAxisKineticBlock;
+import com.simibubi.create.content.kinetics.base.IRotate;
+import com.simibubi.create.content.kinetics.gantry.GantryShaftBlock;
 import com.simibubi.create.foundation.block.IBE;
 import com.simibubi.create.foundation.utility.Iterate;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryCarriageBlockEntity.java b/src/main/java/com/simibubi/create/content/contraptions/gantry/GantryCarriageBlockEntity.java
similarity index 88%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryCarriageBlockEntity.java
rename to src/main/java/com/simibubi/create/content/contraptions/gantry/GantryCarriageBlockEntity.java
index e021dbafe..540ba53ab 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryCarriageBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/gantry/GantryCarriageBlockEntity.java
@@ -1,18 +1,18 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.gantry;
+package com.simibubi.create.content.contraptions.gantry;
 
 import java.util.List;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllSoundEvents;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.AssemblyException;
-import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionCollider;
-import com.simibubi.create.content.contraptions.components.structureMovement.IDisplayAssemblyExceptions;
-import com.simibubi.create.content.contraptions.relays.advanced.GantryShaftBlock;
-import com.simibubi.create.content.contraptions.relays.advanced.GantryShaftBlockEntity;
-import com.simibubi.create.content.contraptions.relays.advanced.sequencer.SequencerInstructions;
+import com.simibubi.create.content.contraptions.AssemblyException;
+import com.simibubi.create.content.contraptions.ContraptionCollider;
+import com.simibubi.create.content.contraptions.IDisplayAssemblyExceptions;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.gantry.GantryShaftBlock;
+import com.simibubi.create.content.kinetics.gantry.GantryShaftBlockEntity;
+import com.simibubi.create.content.kinetics.transmission.sequencer.SequencerInstructions;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryCarriageInstance.java b/src/main/java/com/simibubi/create/content/contraptions/gantry/GantryCarriageInstance.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryCarriageInstance.java
rename to src/main/java/com/simibubi/create/content/contraptions/gantry/GantryCarriageInstance.java
index efc35938e..e37f9ff40 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryCarriageInstance.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/gantry/GantryCarriageInstance.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.gantry;
+package com.simibubi.create.content.contraptions.gantry;
 
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.jozufozu.flywheel.api.instance.DynamicInstance;
 import com.jozufozu.flywheel.core.materials.model.ModelData;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityRenderer;
-import com.simibubi.create.content.contraptions.relays.encased.ShaftInstance;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
+import com.simibubi.create.content.kinetics.base.ShaftInstance;
 import com.simibubi.create.foundation.utility.AngleHelper;
 import com.simibubi.create.foundation.utility.Iterate;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryCarriageRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/gantry/GantryCarriageRenderer.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryCarriageRenderer.java
rename to src/main/java/com/simibubi/create/content/contraptions/gantry/GantryCarriageRenderer.java
index 763febcfc..f99fe8794 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryCarriageRenderer.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/gantry/GantryCarriageRenderer.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.gantry;
+package com.simibubi.create.content.contraptions.gantry;
 
 import com.jozufozu.flywheel.backend.Backend;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityRenderer;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.utility.AngleHelper;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryContraption.java b/src/main/java/com/simibubi/create/content/contraptions/gantry/GantryContraption.java
similarity index 73%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryContraption.java
rename to src/main/java/com/simibubi/create/content/contraptions/gantry/GantryContraption.java
index bbb995b66..5b66790d9 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryContraption.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/gantry/GantryContraption.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.gantry;
+package com.simibubi.create.content.contraptions.gantry;
 
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.components.structureMovement.AssemblyException;
-import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionType;
-import com.simibubi.create.content.contraptions.components.structureMovement.NonStationaryLighter;
-import com.simibubi.create.content.contraptions.components.structureMovement.TranslatingContraption;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionLighter;
+import com.simibubi.create.content.contraptions.AssemblyException;
+import com.simibubi.create.content.contraptions.ContraptionType;
+import com.simibubi.create.content.contraptions.TranslatingContraption;
+import com.simibubi.create.content.contraptions.render.ContraptionLighter;
+import com.simibubi.create.content.contraptions.render.NonStationaryLighter;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -52,7 +52,7 @@ public class GantryContraption extends TranslatingContraption {
 	}
 
 	@Override
-	protected ContraptionType getType() {
+	public ContraptionType getType() {
 		return ContraptionType.GANTRY;
 	}
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryContraptionEntity.java b/src/main/java/com/simibubi/create/content/contraptions/gantry/GantryContraptionEntity.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryContraptionEntity.java
rename to src/main/java/com/simibubi/create/content/contraptions/gantry/GantryContraptionEntity.java
index d3cd16ded..36e18726b 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryContraptionEntity.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/gantry/GantryContraptionEntity.java
@@ -1,15 +1,15 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.gantry;
+package com.simibubi.create.content.contraptions.gantry;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllEntityTypes;
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.Contraption;
-import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionCollider;
-import com.simibubi.create.content.contraptions.components.structureMovement.StructureTransform;
-import com.simibubi.create.content.contraptions.relays.advanced.GantryShaftBlock;
-import com.simibubi.create.content.contraptions.relays.advanced.GantryShaftBlockEntity;
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.AllPackets;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.Contraption;
+import com.simibubi.create.content.contraptions.ContraptionCollider;
+import com.simibubi.create.content.contraptions.StructureTransform;
+import com.simibubi.create.content.kinetics.gantry.GantryShaftBlock;
+import com.simibubi.create.content.kinetics.gantry.GantryShaftBlockEntity;
 import com.simibubi.create.foundation.utility.NBTHelper;
 import com.simibubi.create.foundation.utility.ServerSpeedProvider;
 import com.simibubi.create.foundation.utility.VecHelper;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryContraptionUpdatePacket.java b/src/main/java/com/simibubi/create/content/contraptions/gantry/GantryContraptionUpdatePacket.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryContraptionUpdatePacket.java
rename to src/main/java/com/simibubi/create/content/contraptions/gantry/GantryContraptionUpdatePacket.java
index 5aea853c7..0ef5e7850 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryContraptionUpdatePacket.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/gantry/GantryContraptionUpdatePacket.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.gantry;
+package com.simibubi.create.content.contraptions.gantry;
 
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/GlueEffectPacket.java b/src/main/java/com/simibubi/create/content/contraptions/glue/GlueEffectPacket.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/GlueEffectPacket.java
rename to src/main/java/com/simibubi/create/content/contraptions/glue/GlueEffectPacket.java
index dafedabb2..817cdf963 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/GlueEffectPacket.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/glue/GlueEffectPacket.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.glue;
+package com.simibubi.create.content.contraptions.glue;
 
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueEntity.java b/src/main/java/com/simibubi/create/content/contraptions/glue/SuperGlueEntity.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueEntity.java
rename to src/main/java/com/simibubi/create/content/contraptions/glue/SuperGlueEntity.java
index 2c74e3b0f..0efe74944 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueEntity.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/glue/SuperGlueEntity.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.glue;
+package com.simibubi.create.content.contraptions.glue;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -8,13 +8,13 @@ import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllEntityTypes;
 import com.simibubi.create.AllItems;
 import com.simibubi.create.AllSoundEvents;
-import com.simibubi.create.content.contraptions.base.DirectionalKineticBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.BlockMovementChecks;
-import com.simibubi.create.content.contraptions.components.structureMovement.bearing.BearingBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.chassis.AbstractChassisBlock;
-import com.simibubi.create.content.schematics.ISpecialEntityItemRequirement;
-import com.simibubi.create.content.schematics.ItemRequirement;
-import com.simibubi.create.content.schematics.ItemRequirement.ItemUseType;
+import com.simibubi.create.content.contraptions.BlockMovementChecks;
+import com.simibubi.create.content.contraptions.bearing.BearingBlock;
+import com.simibubi.create.content.contraptions.chassis.AbstractChassisBlock;
+import com.simibubi.create.content.kinetics.base.DirectionalKineticBlock;
+import com.simibubi.create.content.schematics.requirement.ISpecialEntityItemRequirement;
+import com.simibubi.create.content.schematics.requirement.ItemRequirement;
+import com.simibubi.create.content.schematics.requirement.ItemRequirement.ItemUseType;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.VecHelper;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueHandler.java b/src/main/java/com/simibubi/create/content/contraptions/glue/SuperGlueHandler.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueHandler.java
rename to src/main/java/com/simibubi/create/content/contraptions/glue/SuperGlueHandler.java
index cc7b3844c..87f060847 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueHandler.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/glue/SuperGlueHandler.java
@@ -1,13 +1,13 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.glue;
+package com.simibubi.create.content.contraptions.glue;
 
 import java.util.HashSet;
 import java.util.Set;
 
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.contraptions.components.structureMovement.BlockMovementChecks;
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.AllPackets;
+import com.simibubi.create.content.contraptions.BlockMovementChecks;
+import com.simibubi.create.foundation.placement.IPlacementHelper;
 import com.simibubi.create.foundation.utility.Iterate;
-import com.simibubi.create.foundation.utility.placement.IPlacementHelper;
 import com.simibubi.create.foundation.utility.worldWrappers.RayTraceWorld;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueItem.java b/src/main/java/com/simibubi/create/content/contraptions/glue/SuperGlueItem.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueItem.java
rename to src/main/java/com/simibubi/create/content/contraptions/glue/SuperGlueItem.java
index ee3b0ff27..753c3cf31 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueItem.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/glue/SuperGlueItem.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.glue;
+package com.simibubi.create.content.contraptions.glue;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.chassis.AbstractChassisBlock;
+import com.simibubi.create.content.contraptions.chassis.AbstractChassisBlock;
 import com.simibubi.create.foundation.utility.VecHelper;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueRemovalPacket.java b/src/main/java/com/simibubi/create/content/contraptions/glue/SuperGlueRemovalPacket.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueRemovalPacket.java
rename to src/main/java/com/simibubi/create/content/contraptions/glue/SuperGlueRemovalPacket.java
index 323d1eb32..2611c5cf0 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueRemovalPacket.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/glue/SuperGlueRemovalPacket.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.glue;
+package com.simibubi.create.content.contraptions.glue;
 
 import com.simibubi.create.AllSoundEvents;
 import com.simibubi.create.foundation.networking.SimplePacketBase;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/glue/SuperGlueRenderer.java
similarity index 89%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueRenderer.java
rename to src/main/java/com/simibubi/create/content/contraptions/glue/SuperGlueRenderer.java
index 8c6beab89..748ec9e0f 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueRenderer.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/glue/SuperGlueRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.glue;
+package com.simibubi.create.content.contraptions.glue;
 
 import net.minecraft.client.renderer.culling.Frustum;
 import net.minecraft.client.renderer.entity.EntityRenderer;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueSelectionHandler.java b/src/main/java/com/simibubi/create/content/contraptions/glue/SuperGlueSelectionHandler.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueSelectionHandler.java
rename to src/main/java/com/simibubi/create/content/contraptions/glue/SuperGlueSelectionHandler.java
index 810cd4066..13ba07060 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueSelectionHandler.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/glue/SuperGlueSelectionHandler.java
@@ -1,15 +1,15 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.glue;
+package com.simibubi.create.content.contraptions.glue;
 
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 
 import com.google.common.base.Objects;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.AllSoundEvents;
 import com.simibubi.create.AllSpecialTextures;
 import com.simibubi.create.CreateClient;
-import com.simibubi.create.content.contraptions.components.structureMovement.chassis.AbstractChassisBlock;
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.content.contraptions.chassis.AbstractChassisBlock;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.RaycastHelper;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueSelectionHelper.java b/src/main/java/com/simibubi/create/content/contraptions/glue/SuperGlueSelectionHelper.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueSelectionHelper.java
rename to src/main/java/com/simibubi/create/content/contraptions/glue/SuperGlueSelectionHelper.java
index 4089269d5..70436fd76 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueSelectionHelper.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/glue/SuperGlueSelectionHelper.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.glue;
+package com.simibubi.create.content.contraptions.glue;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.BlockMovementChecks;
+import com.simibubi.create.content.contraptions.BlockMovementChecks;
 import com.simibubi.create.foundation.utility.Iterate;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueSelectionPacket.java b/src/main/java/com/simibubi/create/content/contraptions/glue/SuperGlueSelectionPacket.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueSelectionPacket.java
rename to src/main/java/com/simibubi/create/content/contraptions/glue/SuperGlueSelectionPacket.java
index 68fe63a6a..b1c3713fa 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueSelectionPacket.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/glue/SuperGlueSelectionPacket.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.glue;
+package com.simibubi.create.content.contraptions.glue;
 
 import java.util.Set;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/CouplingCreationPacket.java b/src/main/java/com/simibubi/create/content/contraptions/minecart/CouplingCreationPacket.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/CouplingCreationPacket.java
rename to src/main/java/com/simibubi/create/content/contraptions/minecart/CouplingCreationPacket.java
index 5ca463020..4e2889232 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/CouplingCreationPacket.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/minecart/CouplingCreationPacket.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.train;
+package com.simibubi.create.content.contraptions.minecart;
 
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/CouplingHandler.java b/src/main/java/com/simibubi/create/content/contraptions/minecart/CouplingHandler.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/CouplingHandler.java
rename to src/main/java/com/simibubi/create/content/contraptions/minecart/CouplingHandler.java
index d7886e29a..22abc9b40 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/CouplingHandler.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/minecart/CouplingHandler.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.train;
+package com.simibubi.create.content.contraptions.minecart;
 
 import java.util.Set;
 import java.util.UUID;
@@ -8,13 +8,13 @@ import javax.annotation.Nullable;
 
 import com.simibubi.create.AllItems;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.train.capability.CapabilityMinecartController;
-import com.simibubi.create.content.contraptions.components.structureMovement.train.capability.MinecartController;
-import com.simibubi.create.foundation.config.AllConfigs;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.minecart.capability.CapabilityMinecartController;
+import com.simibubi.create.content.contraptions.minecart.capability.MinecartController;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.Lang;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.Entity;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/CouplingHandlerClient.java b/src/main/java/com/simibubi/create/content/contraptions/minecart/CouplingHandlerClient.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/CouplingHandlerClient.java
rename to src/main/java/com/simibubi/create/content/contraptions/minecart/CouplingHandlerClient.java
index 985985dab..b26108d6b 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/CouplingHandlerClient.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/minecart/CouplingHandlerClient.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.train;
+package com.simibubi.create.content.contraptions.minecart;
 
 import com.mojang.math.Vector3f;
 import com.simibubi.create.AllItems;
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.foundation.utility.VecHelper;
 
 import net.minecraft.client.Minecraft;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/CouplingPhysics.java b/src/main/java/com/simibubi/create/content/contraptions/minecart/CouplingPhysics.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/CouplingPhysics.java
rename to src/main/java/com/simibubi/create/content/contraptions/minecart/CouplingPhysics.java
index d4c02314a..6031c7ea2 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/CouplingPhysics.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/minecart/CouplingPhysics.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.train;
+package com.simibubi.create.content.contraptions.minecart;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.train.capability.MinecartController;
+import com.simibubi.create.content.contraptions.minecart.capability.MinecartController;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.VecHelper;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/CouplingRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/minecart/CouplingRenderer.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/CouplingRenderer.java
rename to src/main/java/com/simibubi/create/content/contraptions/minecart/CouplingRenderer.java
index 1fd14be41..c8e193efa 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/CouplingRenderer.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/minecart/CouplingRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.train;
+package com.simibubi.create.content.contraptions.minecart;
 
 import static net.minecraft.util.Mth.lerp;
 
@@ -7,8 +7,8 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.simibubi.create.AllPartialModels;
 import com.simibubi.create.CreateClient;
-import com.simibubi.create.content.contraptions.KineticDebugger;
-import com.simibubi.create.content.contraptions.components.structureMovement.train.capability.MinecartController;
+import com.simibubi.create.content.contraptions.minecart.capability.MinecartController;
+import com.simibubi.create.content.kinetics.KineticDebugger;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/MinecartCouplingItem.java b/src/main/java/com/simibubi/create/content/contraptions/minecart/MinecartCouplingItem.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/MinecartCouplingItem.java
rename to src/main/java/com/simibubi/create/content/contraptions/minecart/MinecartCouplingItem.java
index ed8094cdb..e55cbaeda 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/MinecartCouplingItem.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/minecart/MinecartCouplingItem.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.train;
+package com.simibubi.create.content.contraptions.minecart;
 
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.contraptions.components.structureMovement.train.capability.CapabilityMinecartController;
-import com.simibubi.create.content.contraptions.components.structureMovement.train.capability.MinecartController;
+import com.simibubi.create.content.contraptions.minecart.capability.CapabilityMinecartController;
+import com.simibubi.create.content.contraptions.minecart.capability.MinecartController;
 import com.simibubi.create.foundation.utility.Iterate;
 
 import net.minecraft.world.InteractionResult;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/MinecartSim2020.java b/src/main/java/com/simibubi/create/content/contraptions/minecart/MinecartSim2020.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/MinecartSim2020.java
rename to src/main/java/com/simibubi/create/content/contraptions/minecart/MinecartSim2020.java
index ebdfd34c5..f10eab8f7 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/MinecartSim2020.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/minecart/MinecartSim2020.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.train;
+package com.simibubi.create.content.contraptions.minecart;
 
 import java.util.Map;
 
 import com.google.common.collect.Maps;
 import com.mojang.datafixers.util.Pair;
-import com.simibubi.create.content.contraptions.components.structureMovement.train.capability.CapabilityMinecartController;
-import com.simibubi.create.content.contraptions.components.structureMovement.train.capability.MinecartController;
+import com.simibubi.create.content.contraptions.minecart.capability.CapabilityMinecartController;
+import com.simibubi.create.content.contraptions.minecart.capability.MinecartController;
 import com.simibubi.create.foundation.utility.VecHelper;
 
 import net.minecraft.Util;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/TrainCargoManager.java b/src/main/java/com/simibubi/create/content/contraptions/minecart/TrainCargoManager.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/TrainCargoManager.java
rename to src/main/java/com/simibubi/create/content/contraptions/minecart/TrainCargoManager.java
index f8b45e270..6b045b69a 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/TrainCargoManager.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/minecart/TrainCargoManager.java
@@ -1,12 +1,12 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.train;
+package com.simibubi.create.content.contraptions.minecart;
 
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.Contraption.ContraptionInvWrapper;
-import com.simibubi.create.content.contraptions.components.structureMovement.MountedStorageManager;
+import com.simibubi.create.content.contraptions.Contraption.ContraptionInvWrapper;
+import com.simibubi.create.content.contraptions.MountedStorageManager;
 import com.simibubi.create.foundation.fluid.CombinedTankWrapper;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/capability/CapabilityMinecartController.java b/src/main/java/com/simibubi/create/content/contraptions/minecart/capability/CapabilityMinecartController.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/capability/CapabilityMinecartController.java
rename to src/main/java/com/simibubi/create/content/contraptions/minecart/capability/CapabilityMinecartController.java
index a3fbf8c69..24f172f4a 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/capability/CapabilityMinecartController.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/minecart/capability/CapabilityMinecartController.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.train.capability;
+package com.simibubi.create.content.contraptions.minecart.capability;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -13,7 +13,7 @@ import javax.annotation.Nullable;
 
 import com.simibubi.create.AllItems;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.contraptions.components.structureMovement.train.CouplingHandler;
+import com.simibubi.create.content.contraptions.minecart.CouplingHandler;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.WorldAttached;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/capability/MinecartController.java b/src/main/java/com/simibubi/create/content/contraptions/minecart/capability/MinecartController.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/capability/MinecartController.java
rename to src/main/java/com/simibubi/create/content/contraptions/minecart/capability/MinecartController.java
index 2ba6b3de1..77677dfdb 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/capability/MinecartController.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/minecart/capability/MinecartController.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.train.capability;
+package com.simibubi.create.content.contraptions.minecart.capability;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
@@ -10,11 +10,11 @@ import javax.annotation.Nullable;
 
 import org.apache.commons.lang3.mutable.MutableBoolean;
 
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.OrientedContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.train.CouplingHandler;
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.OrientedContraptionEntity;
+import com.simibubi.create.content.contraptions.minecart.CouplingHandler;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.NBTHelper;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/capability/MinecartControllerUpdatePacket.java b/src/main/java/com/simibubi/create/content/contraptions/minecart/capability/MinecartControllerUpdatePacket.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/capability/MinecartControllerUpdatePacket.java
rename to src/main/java/com/simibubi/create/content/contraptions/minecart/capability/MinecartControllerUpdatePacket.java
index 32dde2ef2..009edc376 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/capability/MinecartControllerUpdatePacket.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/minecart/capability/MinecartControllerUpdatePacket.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.train.capability;
+package com.simibubi.create.content.contraptions.minecart.capability;
 
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssembleRailType.java b/src/main/java/com/simibubi/create/content/contraptions/mounted/CartAssembleRailType.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssembleRailType.java
rename to src/main/java/com/simibubi/create/content/contraptions/mounted/CartAssembleRailType.java
index 0810b6a34..bca741cc7 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssembleRailType.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/mounted/CartAssembleRailType.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.mounted;
+package com.simibubi.create.content.contraptions.mounted;
 
 import java.util.function.Supplier;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerBlock.java b/src/main/java/com/simibubi/create/content/contraptions/mounted/CartAssemblerBlock.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerBlock.java
rename to src/main/java/com/simibubi/create/content/contraptions/mounted/CartAssemblerBlock.java
index 232c8bbfd..90c760339 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerBlock.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/mounted/CartAssemblerBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.mounted;
+package com.simibubi.create.content.contraptions.mounted;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -9,11 +9,11 @@ import javax.annotation.Nullable;
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.components.tracks.ControllerRailBlock;
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
-import com.simibubi.create.content.schematics.ISpecialBlockItemRequirement;
-import com.simibubi.create.content.schematics.ItemRequirement;
-import com.simibubi.create.content.schematics.ItemRequirement.ItemUseType;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
+import com.simibubi.create.content.redstone.rail.ControllerRailBlock;
+import com.simibubi.create.content.schematics.requirement.ISpecialBlockItemRequirement;
+import com.simibubi.create.content.schematics.requirement.ItemRequirement;
+import com.simibubi.create.content.schematics.requirement.ItemRequirement.ItemUseType;
 import com.simibubi.create.foundation.block.IBE;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerBlockEntity.java b/src/main/java/com/simibubi/create/content/contraptions/mounted/CartAssemblerBlockEntity.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerBlockEntity.java
rename to src/main/java/com/simibubi/create/content/contraptions/mounted/CartAssemblerBlockEntity.java
index ff5a6844a..f7de3c401 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/mounted/CartAssemblerBlockEntity.java
@@ -1,23 +1,23 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.mounted;
+package com.simibubi.create.content.contraptions.mounted;
 
 import java.util.List;
 import java.util.UUID;
 
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.components.structureMovement.AssemblyException;
-import com.simibubi.create.content.contraptions.components.structureMovement.IDisplayAssemblyExceptions;
-import com.simibubi.create.content.contraptions.components.structureMovement.OrientedContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.train.CouplingHandler;
-import com.simibubi.create.content.contraptions.components.structureMovement.train.capability.CapabilityMinecartController;
-import com.simibubi.create.content.contraptions.components.structureMovement.train.capability.MinecartController;
-import com.simibubi.create.content.contraptions.components.tracks.ControllerRailBlock;
+import com.simibubi.create.content.contraptions.AssemblyException;
+import com.simibubi.create.content.contraptions.IDisplayAssemblyExceptions;
+import com.simibubi.create.content.contraptions.OrientedContraptionEntity;
+import com.simibubi.create.content.contraptions.minecart.CouplingHandler;
+import com.simibubi.create.content.contraptions.minecart.capability.CapabilityMinecartController;
+import com.simibubi.create.content.contraptions.minecart.capability.MinecartController;
+import com.simibubi.create.content.redstone.rail.ControllerRailBlock;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.CenteredSideValueBoxTransform;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform;
-import com.simibubi.create.foundation.blockEntity.behaviour.scrollvalue.INamedIconOptions;
-import com.simibubi.create.foundation.blockEntity.behaviour.scrollvalue.ScrollOptionBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.INamedIconOptions;
+import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollOptionBehaviour;
 import com.simibubi.create.foundation.gui.AllIcons;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.Iterate;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerBlockItem.java b/src/main/java/com/simibubi/create/content/contraptions/mounted/CartAssemblerBlockItem.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerBlockItem.java
rename to src/main/java/com/simibubi/create/content/contraptions/mounted/CartAssemblerBlockItem.java
index 7482573da..b7fc2ea08 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerBlockItem.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/mounted/CartAssemblerBlockItem.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.mounted;
+package com.simibubi.create.content.contraptions.mounted;
 
 import javax.annotation.Nonnull;
 
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.components.tracks.ControllerRailBlock;
+import com.simibubi.create.content.redstone.rail.ControllerRailBlock;
 import com.simibubi.create.foundation.advancement.AdvancementBehaviour;
 import com.simibubi.create.foundation.utility.Lang;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/ItemHandlerModifiableFromIInventory.java b/src/main/java/com/simibubi/create/content/contraptions/mounted/ItemHandlerModifiableFromIInventory.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/ItemHandlerModifiableFromIInventory.java
rename to src/main/java/com/simibubi/create/content/contraptions/mounted/ItemHandlerModifiableFromIInventory.java
index f70ee51f9..326e08ee3 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/ItemHandlerModifiableFromIInventory.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/mounted/ItemHandlerModifiableFromIInventory.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.mounted;
+package com.simibubi.create.content.contraptions.mounted;
 
 import javax.annotation.Nonnull;
 import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MinecartContraptionItem.java b/src/main/java/com/simibubi/create/content/contraptions/mounted/MinecartContraptionItem.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MinecartContraptionItem.java
rename to src/main/java/com/simibubi/create/content/contraptions/mounted/MinecartContraptionItem.java
index 9261fa758..1a28ff3e1 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MinecartContraptionItem.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/mounted/MinecartContraptionItem.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.mounted;
+package com.simibubi.create.content.contraptions.mounted;
 
 import java.util.List;
 
@@ -8,18 +8,18 @@ import org.apache.commons.lang3.tuple.MutablePair;
 
 import com.simibubi.create.AllItems;
 import com.simibubi.create.AllMovementBehaviours;
-import com.simibubi.create.content.contraptions.components.actors.PortableStorageInterfaceMovement;
-import com.simibubi.create.content.contraptions.components.deployer.DeployerFakePlayer;
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.Contraption;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
-import com.simibubi.create.content.contraptions.components.structureMovement.OrientedContraptionEntity;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.Contraption;
+import com.simibubi.create.content.contraptions.ContraptionData;
+import com.simibubi.create.content.contraptions.ContraptionMovementSetting;
+import com.simibubi.create.content.contraptions.OrientedContraptionEntity;
+import com.simibubi.create.content.contraptions.actors.psi.PortableStorageInterfaceMovement;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
+import com.simibubi.create.content.kinetics.deployer.DeployerFakePlayer;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
-import com.simibubi.create.foundation.config.AllConfigs;
-import com.simibubi.create.foundation.config.ContraptionMovementSetting;
-import com.simibubi.create.foundation.utility.ContraptionData;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.NBTHelper;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.ChatFormatting;
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MountedContraption.java b/src/main/java/com/simibubi/create/content/contraptions/mounted/MountedContraption.java
similarity index 85%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MountedContraption.java
rename to src/main/java/com/simibubi/create/content/contraptions/mounted/MountedContraption.java
index 5f2be6036..87c5a9232 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MountedContraption.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/mounted/MountedContraption.java
@@ -1,18 +1,18 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.mounted;
+package com.simibubi.create.content.contraptions.mounted;
 
-import static com.simibubi.create.content.contraptions.components.structureMovement.mounted.CartAssemblerBlock.RAIL_SHAPE;
+import static com.simibubi.create.content.contraptions.mounted.CartAssemblerBlock.RAIL_SHAPE;
 
 import java.util.Queue;
 
 import org.apache.commons.lang3.tuple.Pair;
 
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.components.structureMovement.AssemblyException;
-import com.simibubi.create.content.contraptions.components.structureMovement.Contraption;
-import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionType;
-import com.simibubi.create.content.contraptions.components.structureMovement.NonStationaryLighter;
-import com.simibubi.create.content.contraptions.components.structureMovement.mounted.CartAssemblerBlockEntity.CartMovementMode;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionLighter;
+import com.simibubi.create.content.contraptions.AssemblyException;
+import com.simibubi.create.content.contraptions.Contraption;
+import com.simibubi.create.content.contraptions.ContraptionType;
+import com.simibubi.create.content.contraptions.mounted.CartAssemblerBlockEntity.CartMovementMode;
+import com.simibubi.create.content.contraptions.render.ContraptionLighter;
+import com.simibubi.create.content.contraptions.render.NonStationaryLighter;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.NBTHelper;
 import com.simibubi.create.foundation.utility.VecHelper;
@@ -50,7 +50,7 @@ public class MountedContraption extends Contraption {
 	}
 
 	@Override
-	protected ContraptionType getType() {
+	public ContraptionType getType() {
 		return ContraptionType.MOUNTED;
 	}
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/particle/HeaterParticle.java b/src/main/java/com/simibubi/create/content/contraptions/particle/HeaterParticle.java
deleted file mode 100644
index 3d02e32ea..000000000
--- a/src/main/java/com/simibubi/create/content/contraptions/particle/HeaterParticle.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package com.simibubi.create.content.contraptions.particle;
-
-import javax.annotation.ParametersAreNonnullByDefault;
-
-import net.minecraft.MethodsReturnNonnullByDefault;
-import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.client.particle.Particle;
-import net.minecraft.client.particle.ParticleProvider;
-import net.minecraft.client.particle.ParticleRenderType;
-import net.minecraft.client.particle.SimpleAnimatedParticle;
-import net.minecraft.client.particle.SpriteSet;
-import net.minecraft.util.Mth;
-
-@ParametersAreNonnullByDefault
-@MethodsReturnNonnullByDefault
-public class HeaterParticle extends SimpleAnimatedParticle {
-
-	private final SpriteSet animatedSprite;
-
-	public HeaterParticle(ClientLevel worldIn, float r, float g, float b, double x, double y, double z, double vx, double vy,
-						  double vz, SpriteSet spriteSet) {
-		super(worldIn, x, y, z, spriteSet, worldIn.random.nextFloat() * .5f);
-
-		this.animatedSprite = spriteSet;
-
-		this.xd = this.xd * (double) 0.01F + vx;
-		this.yd = this.yd * (double) 0.01F + vy;
-		this.zd = this.zd * (double) 0.01F + vz;
-
-		this.rCol = r;
-		this.gCol = g;
-		this.bCol = b;
-
-		this.x += (this.random.nextFloat() - this.random.nextFloat()) * 0.05F;
-		this.y += (this.random.nextFloat() - this.random.nextFloat()) * 0.05F;
-		this.z += (this.random.nextFloat() - this.random.nextFloat()) * 0.05F;
-
-		this.lifetime = (int) (8.0D / (Math.random() * 0.8D + 0.2D)) + 4;
-		this.quadSize *= 1.875F;
-		this.setSpriteFromAge(animatedSprite);
-
-	}
-
-	@Override
-	public ParticleRenderType getRenderType() {
-		return ParticleRenderType.PARTICLE_SHEET_LIT;
-	}
-
-	@Override
-	public float getQuadSize(float p_217561_1_) {
-		float f = ((float) this.age + p_217561_1_) / (float) this.lifetime;
-		return this.quadSize * (1.0F - f * f * 0.5F);
-	}
-
-	@Override
-	public void move(double x, double y, double z) {
-		this.setBoundingBox(this.getBoundingBox()
-			.move(x, y, z));
-		this.setLocationFromBoundingbox();
-	}
-
-	@Override
-	public int getLightColor(float p_189214_1_) {
-		float f = ((float) this.age + p_189214_1_) / (float) this.lifetime;
-		f = Mth.clamp(f, 0.0F, 1.0F);
-		int i = super.getLightColor(p_189214_1_);
-		int j = i & 255;
-		int k = i >> 16 & 255;
-		j = j + (int) (f * 15.0F * 16.0F);
-		if (j > 240) {
-			j = 240;
-		}
-
-		return j | k << 16;
-	}
-
-	@Override
-	public void tick() {
-		this.xo = this.x;
-		this.yo = this.y;
-		this.zo = this.z;
-		if (this.age++ >= this.lifetime) {
-			this.remove();
-		} else {
-			this.setSpriteFromAge(animatedSprite);
-			this.move(this.xd, this.yd, this.zd);
-			this.xd *= (double) 0.96F;
-			this.yd *= (double) 0.96F;
-			this.zd *= (double) 0.96F;
-			if (this.onGround) {
-				this.xd *= (double) 0.7F;
-				this.zd *= (double) 0.7F;
-			}
-		}
-	}
-
-	public static class Factory implements ParticleProvider<HeaterParticleData> {
-		private final SpriteSet spriteSet;
-
-		public Factory(SpriteSet animatedSprite) {
-			this.spriteSet = animatedSprite;
-		}
-
-		@Override
-		public Particle createParticle(HeaterParticleData data, ClientLevel worldIn, double x, double y, double z, double vx,
-			double vy, double vz) {
-			return new HeaterParticle(worldIn, data.r, data.g, data.b, x, y, z, vx, vy, vz, this.spriteSet);
-		}
-	}
-}
diff --git a/src/main/java/com/simibubi/create/content/contraptions/particle/HeaterParticleData.java b/src/main/java/com/simibubi/create/content/contraptions/particle/HeaterParticleData.java
deleted file mode 100644
index bcaebea9b..000000000
--- a/src/main/java/com/simibubi/create/content/contraptions/particle/HeaterParticleData.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.simibubi.create.content.contraptions.particle;
-
-import java.util.Locale;
-
-import javax.annotation.ParametersAreNonnullByDefault;
-
-import com.mojang.brigadier.StringReader;
-import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import com.mojang.serialization.Codec;
-import com.mojang.serialization.codecs.RecordCodecBuilder;
-import com.simibubi.create.AllParticleTypes;
-
-import net.minecraft.MethodsReturnNonnullByDefault;
-import net.minecraft.client.particle.ParticleEngine.SpriteParticleRegistration;
-import net.minecraft.core.particles.ParticleOptions;
-import net.minecraft.core.particles.ParticleType;
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
-
-@ParametersAreNonnullByDefault
-@MethodsReturnNonnullByDefault
-public class HeaterParticleData implements ParticleOptions, ICustomParticleDataWithSprite<HeaterParticleData> {
-
-	public static final Codec<HeaterParticleData> CODEC = RecordCodecBuilder.create(i -> 
-		i.group(
-			Codec.FLOAT.fieldOf("r").forGetter(p -> p.r),
-			Codec.FLOAT.fieldOf("g").forGetter(p -> p.g),
-			Codec.FLOAT.fieldOf("b").forGetter(p -> p.b))
-		.apply(i, HeaterParticleData::new));
-
-	public static final ParticleOptions.Deserializer<HeaterParticleData> DESERIALIZER =
-		new ParticleOptions.Deserializer<HeaterParticleData>() {
-			@Override
-			public HeaterParticleData fromCommand(ParticleType<HeaterParticleData> arg0, StringReader reader)
-				throws CommandSyntaxException {
-				reader.expect(' ');
-				float r = reader.readFloat();
-				reader.expect(' ');
-				float g = reader.readFloat();
-				reader.expect(' ');
-				float b = reader.readFloat();
-				return new HeaterParticleData(r, g, b);
-			}
-
-			@Override
-			public HeaterParticleData fromNetwork(ParticleType<HeaterParticleData> type, FriendlyByteBuf buffer) {
-				return new HeaterParticleData(buffer.readFloat(), buffer.readFloat(), buffer.readFloat());
-			}
-		};
-
-	final float r;
-	final float g;
-	final float b;
-
-	public HeaterParticleData(float r, float g, float b) {
-		this.r = r;
-		this.g = g;
-		this.b = b;
-	}
-
-	public HeaterParticleData() {
-		this(0, 0, 0);
-	}
-
-	@Override
-	public Deserializer<HeaterParticleData> getDeserializer() {
-		return DESERIALIZER;
-	}
-
-	@Override
-	public Codec<HeaterParticleData> getCodec(ParticleType<HeaterParticleData> type) {
-		return CODEC;
-	}
-
-	@Override
-	@OnlyIn(Dist.CLIENT)
-	public SpriteParticleRegistration<HeaterParticleData> getMetaFactory() {
-		return HeaterParticle.Factory::new;
-	}
-
-	@Override
-	public String writeToString() {
-		return String.format(Locale.ROOT, "%s %f %f %f", AllParticleTypes.HEATER_PARTICLE.parameter(), r, g, b);
-	}
-
-	@Override
-	public ParticleType<?> getType() {
-		return AllParticleTypes.HEATER_PARTICLE.get();
-	}
-
-	@Override
-	public void writeToNetwork(FriendlyByteBuf buffer) {
-		buffer.writeFloat(r);
-		buffer.writeFloat(g);
-		buffer.writeFloat(b);
-	}
-
-}
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/LinearActuatorBlockEntity.java b/src/main/java/com/simibubi/create/content/contraptions/piston/LinearActuatorBlockEntity.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/LinearActuatorBlockEntity.java
rename to src/main/java/com/simibubi/create/content/contraptions/piston/LinearActuatorBlockEntity.java
index 9de66a0e2..7f627f7d3 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/LinearActuatorBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/piston/LinearActuatorBlockEntity.java
@@ -1,19 +1,19 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.piston;
+package com.simibubi.create.content.contraptions.piston;
 
 import java.util.List;
 
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.AssemblyException;
-import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionCollider;
-import com.simibubi.create.content.contraptions.components.structureMovement.ControlledContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.IControlContraption;
-import com.simibubi.create.content.contraptions.components.structureMovement.IDisplayAssemblyExceptions;
-import com.simibubi.create.content.contraptions.relays.advanced.sequencer.SequencerInstructions;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.AssemblyException;
+import com.simibubi.create.content.contraptions.ContraptionCollider;
+import com.simibubi.create.content.contraptions.ControlledContraptionEntity;
+import com.simibubi.create.content.contraptions.IControlContraption;
+import com.simibubi.create.content.contraptions.IDisplayAssemblyExceptions;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.transmission.sequencer.SequencerInstructions;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform;
-import com.simibubi.create.foundation.blockEntity.behaviour.scrollvalue.ScrollOptionBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollOptionBehaviour;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.ServerSpeedProvider;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonBlock.java b/src/main/java/com/simibubi/create/content/contraptions/piston/MechanicalPistonBlock.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonBlock.java
rename to src/main/java/com/simibubi/create/content/contraptions/piston/MechanicalPistonBlock.java
index b175b4f7c..a30a17c09 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonBlock.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/piston/MechanicalPistonBlock.java
@@ -1,13 +1,13 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.piston;
+package com.simibubi.create.content.contraptions.piston;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllShapes;
 import com.simibubi.create.AllSoundEvents;
-import com.simibubi.create.content.contraptions.base.DirectionalAxisKineticBlock;
+import com.simibubi.create.content.kinetics.base.DirectionalAxisKineticBlock;
 import com.simibubi.create.foundation.block.IBE;
-import com.simibubi.create.foundation.config.AllConfigs;
 import com.simibubi.create.foundation.utility.Lang;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonBlockEntity.java b/src/main/java/com/simibubi/create/content/contraptions/piston/MechanicalPistonBlockEntity.java
similarity index 89%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonBlockEntity.java
rename to src/main/java/com/simibubi/create/content/contraptions/piston/MechanicalPistonBlockEntity.java
index 7daf574ab..454be0101 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/piston/MechanicalPistonBlockEntity.java
@@ -1,13 +1,13 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.piston;
+package com.simibubi.create.content.contraptions.piston;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllSoundEvents;
-import com.simibubi.create.content.contraptions.base.IRotate;
-import com.simibubi.create.content.contraptions.components.structureMovement.AssemblyException;
-import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionCollider;
-import com.simibubi.create.content.contraptions.components.structureMovement.ControlledContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.DirectionalExtenderScrollOptionSlot;
-import com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock.PistonState;
+import com.simibubi.create.content.contraptions.AssemblyException;
+import com.simibubi.create.content.contraptions.ContraptionCollider;
+import com.simibubi.create.content.contraptions.ControlledContraptionEntity;
+import com.simibubi.create.content.contraptions.DirectionalExtenderScrollOptionSlot;
+import com.simibubi.create.content.contraptions.piston.MechanicalPistonBlock.PistonState;
+import com.simibubi.create.content.kinetics.base.IRotate;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform;
 import com.simibubi.create.foundation.utility.ServerSpeedProvider;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonGenerator.java b/src/main/java/com/simibubi/create/content/contraptions/piston/MechanicalPistonGenerator.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonGenerator.java
rename to src/main/java/com/simibubi/create/content/contraptions/piston/MechanicalPistonGenerator.java
index 2483e8ac1..f28a426d0 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonGenerator.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/piston/MechanicalPistonGenerator.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.piston;
+package com.simibubi.create.content.contraptions.piston;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock.PistonState;
+import com.simibubi.create.content.contraptions.piston.MechanicalPistonBlock.PistonState;
 import com.simibubi.create.foundation.data.SpecialBlockStateGen;
 import com.tterrag.registrate.providers.DataGenContext;
 import com.tterrag.registrate.providers.RegistrateBlockstateProvider;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonHeadBlock.java b/src/main/java/com/simibubi/create/content/contraptions/piston/MechanicalPistonHeadBlock.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonHeadBlock.java
rename to src/main/java/com/simibubi/create/content/contraptions/piston/MechanicalPistonHeadBlock.java
index 202a8ffa9..cecd5a2ab 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonHeadBlock.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/piston/MechanicalPistonHeadBlock.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.piston;
+package com.simibubi.create.content.contraptions.piston;
 
-import static com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock.isExtensionPole;
+import static com.simibubi.create.content.contraptions.piston.MechanicalPistonBlock.isExtensionPole;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock.PistonState;
+import com.simibubi.create.content.contraptions.piston.MechanicalPistonBlock.PistonState;
 import com.simibubi.create.foundation.block.WrenchableDirectionalBlock;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/piston/MechanicalPistonRenderer.java
similarity index 74%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonRenderer.java
rename to src/main/java/com/simibubi/create/content/contraptions/piston/MechanicalPistonRenderer.java
index 9b36fc6d6..e1ec5901d 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonRenderer.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/piston/MechanicalPistonRenderer.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.piston;
+package com.simibubi.create.content.contraptions.piston;
 
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityRenderer;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
 
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
 import net.minecraft.world.level.block.state.BlockState;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonContraption.java b/src/main/java/com/simibubi/create/content/contraptions/piston/PistonContraption.java
similarity index 87%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonContraption.java
rename to src/main/java/com/simibubi/create/content/contraptions/piston/PistonContraption.java
index b67e3f5ef..4f435fc32 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonContraption.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/piston/PistonContraption.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.piston;
+package com.simibubi.create.content.contraptions.piston;
 
 import static com.simibubi.create.AllBlocks.MECHANICAL_PISTON_HEAD;
 import static com.simibubi.create.AllBlocks.PISTON_EXTENSION_POLE;
-import static com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock.isExtensionPole;
-import static com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock.isPiston;
-import static com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock.isPistonHead;
-import static com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock.isStickyPiston;
+import static com.simibubi.create.content.contraptions.piston.MechanicalPistonBlock.isExtensionPole;
+import static com.simibubi.create.content.contraptions.piston.MechanicalPistonBlock.isPiston;
+import static com.simibubi.create.content.contraptions.piston.MechanicalPistonBlock.isPistonHead;
+import static com.simibubi.create.content.contraptions.piston.MechanicalPistonBlock.isStickyPiston;
 import static net.minecraft.world.level.block.state.properties.BlockStateProperties.FACING;
 
 import java.util.ArrayList;
@@ -14,14 +14,14 @@ import java.util.Queue;
 
 import org.apache.commons.lang3.tuple.Pair;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.AssemblyException;
-import com.simibubi.create.content.contraptions.components.structureMovement.BlockMovementChecks;
-import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionType;
-import com.simibubi.create.content.contraptions.components.structureMovement.TranslatingContraption;
-import com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock.PistonState;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionLighter;
-import com.simibubi.create.foundation.config.AllConfigs;
+import com.simibubi.create.content.contraptions.AssemblyException;
+import com.simibubi.create.content.contraptions.BlockMovementChecks;
+import com.simibubi.create.content.contraptions.ContraptionType;
+import com.simibubi.create.content.contraptions.TranslatingContraption;
+import com.simibubi.create.content.contraptions.piston.MechanicalPistonBlock.PistonState;
+import com.simibubi.create.content.contraptions.render.ContraptionLighter;
 import com.simibubi.create.foundation.utility.VecHelper;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -49,7 +49,7 @@ public class PistonContraption extends TranslatingContraption {
 	private boolean retract;
 
 	@Override
-	protected ContraptionType getType() {
+	public ContraptionType getType() {
 		return ContraptionType.PISTON;
 	}
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonExtensionPoleBlock.java b/src/main/java/com/simibubi/create/content/contraptions/piston/PistonExtensionPoleBlock.java
similarity index 88%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonExtensionPoleBlock.java
rename to src/main/java/com/simibubi/create/content/contraptions/piston/PistonExtensionPoleBlock.java
index df70144c4..76d0bcf13 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonExtensionPoleBlock.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/piston/PistonExtensionPoleBlock.java
@@ -1,19 +1,19 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.piston;
+package com.simibubi.create.content.contraptions.piston;
 
-import static com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock.isExtensionPole;
-import static com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock.isPiston;
-import static com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock.isPistonHead;
+import static com.simibubi.create.content.contraptions.piston.MechanicalPistonBlock.isExtensionPole;
+import static com.simibubi.create.content.contraptions.piston.MechanicalPistonBlock.isPiston;
+import static com.simibubi.create.content.contraptions.piston.MechanicalPistonBlock.isPistonHead;
 
 import java.util.function.Predicate;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock.PistonState;
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
+import com.simibubi.create.content.contraptions.piston.MechanicalPistonBlock.PistonState;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
 import com.simibubi.create.foundation.block.WrenchableDirectionalBlock;
-import com.simibubi.create.foundation.utility.placement.IPlacementHelper;
-import com.simibubi.create.foundation.utility.placement.PlacementHelpers;
-import com.simibubi.create.foundation.utility.placement.util.PoleHelper;
+import com.simibubi.create.foundation.placement.IPlacementHelper;
+import com.simibubi.create.foundation.placement.PlacementHelpers;
+import com.simibubi.create.foundation.placement.PoleHelper;
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonLighter.java b/src/main/java/com/simibubi/create/content/contraptions/piston/PistonLighter.java
similarity index 84%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonLighter.java
rename to src/main/java/com/simibubi/create/content/contraptions/piston/PistonLighter.java
index cf1b2f961..b21c79505 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonLighter.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/piston/PistonLighter.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.piston;
+package com.simibubi.create.content.contraptions.piston;
 
 import com.jozufozu.flywheel.util.box.GridAlignedBB;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionLighter;
+import com.simibubi.create.content.contraptions.render.ContraptionLighter;
 
 import net.minecraft.core.Vec3i;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/AbstractPulleyInstance.java b/src/main/java/com/simibubi/create/content/contraptions/pulley/AbstractPulleyInstance.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/AbstractPulleyInstance.java
rename to src/main/java/com/simibubi/create/content/contraptions/pulley/AbstractPulleyInstance.java
index 6a8bad079..5f0ec4461 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/AbstractPulleyInstance.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/pulley/AbstractPulleyInstance.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.pulley;
+package com.simibubi.create.content.contraptions.pulley;
 
 import com.jozufozu.flywheel.api.Instancer;
 import com.jozufozu.flywheel.api.MaterialManager;
@@ -13,8 +13,8 @@ import com.jozufozu.flywheel.light.TickingLightListener;
 import com.jozufozu.flywheel.util.box.GridAlignedBB;
 import com.jozufozu.flywheel.util.box.ImmutableBox;
 import com.mojang.math.Vector3f;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.relays.encased.ShaftInstance;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.base.ShaftInstance;
 
 import net.minecraft.core.Direction;
 import net.minecraft.util.Mth;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/AbstractPulleyRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/pulley/AbstractPulleyRenderer.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/AbstractPulleyRenderer.java
rename to src/main/java/com/simibubi/create/content/contraptions/pulley/AbstractPulleyRenderer.java
index 46c2e76ff..7983fd0ee 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/AbstractPulleyRenderer.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/pulley/AbstractPulleyRenderer.java
@@ -1,12 +1,12 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.pulley;
+package com.simibubi.create.content.contraptions.pulley;
 
 import com.jozufozu.flywheel.backend.Backend;
 import com.jozufozu.flywheel.core.PartialModel;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
-import com.simibubi.create.content.contraptions.base.IRotate;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityRenderer;
+import com.simibubi.create.content.kinetics.base.IRotate;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.utility.AngleHelper;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/HosePulleyInstance.java b/src/main/java/com/simibubi/create/content/contraptions/pulley/HosePulleyInstance.java
similarity index 89%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/HosePulleyInstance.java
rename to src/main/java/com/simibubi/create/content/contraptions/pulley/HosePulleyInstance.java
index 9361396be..862954199 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/HosePulleyInstance.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/pulley/HosePulleyInstance.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.pulley;
+package com.simibubi.create.content.contraptions.pulley;
 
 import com.jozufozu.flywheel.api.Instancer;
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.jozufozu.flywheel.core.Materials;
 import com.jozufozu.flywheel.core.materials.oriented.OrientedData;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.fluids.actors.HosePulleyBlockEntity;
+import com.simibubi.create.content.fluids.hosePulley.HosePulleyBlockEntity;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 
 public class HosePulleyInstance extends AbstractPulleyInstance<HosePulleyBlockEntity> {
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyBlock.java b/src/main/java/com/simibubi/create/content/contraptions/pulley/PulleyBlock.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyBlock.java
rename to src/main/java/com/simibubi/create/content/contraptions/pulley/PulleyBlock.java
index 6c0fe0df2..79e327794 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyBlock.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/pulley/PulleyBlock.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.pulley;
+package com.simibubi.create.content.contraptions.pulley;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.base.HorizontalAxisKineticBlock;
+import com.simibubi.create.content.kinetics.base.HorizontalAxisKineticBlock;
 import com.simibubi.create.foundation.block.IBE;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyBlockEntity.java b/src/main/java/com/simibubi/create/content/contraptions/pulley/PulleyBlockEntity.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyBlockEntity.java
rename to src/main/java/com/simibubi/create/content/contraptions/pulley/PulleyBlockEntity.java
index 1fde9db07..15202a275 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/pulley/PulleyBlockEntity.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.pulley;
+package com.simibubi.create.content.contraptions.pulley;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
@@ -7,19 +7,19 @@ import java.util.List;
 import javax.annotation.Nullable;
 
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.AssemblyException;
-import com.simibubi.create.content.contraptions.components.structureMovement.BlockMovementChecks;
-import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionCollider;
-import com.simibubi.create.content.contraptions.components.structureMovement.ControlledContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.piston.LinearActuatorBlockEntity;
-import com.simibubi.create.content.logistics.block.redstone.ThresholdSwitchObservable;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.AssemblyException;
+import com.simibubi.create.content.contraptions.BlockMovementChecks;
+import com.simibubi.create.content.contraptions.ContraptionCollider;
+import com.simibubi.create.content.contraptions.ControlledContraptionEntity;
+import com.simibubi.create.content.contraptions.piston.LinearActuatorBlockEntity;
+import com.simibubi.create.content.redstone.thresholdSwitch.ThresholdSwitchObservable;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.CenteredSideValueBoxTransform;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform;
-import com.simibubi.create.foundation.config.AllConfigs;
 import com.simibubi.create.foundation.utility.NBTHelper;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyContraption.java b/src/main/java/com/simibubi/create/content/contraptions/pulley/PulleyContraption.java
similarity index 73%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyContraption.java
rename to src/main/java/com/simibubi/create/content/contraptions/pulley/PulleyContraption.java
index 76fc5474b..cc4eb19a4 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyContraption.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/pulley/PulleyContraption.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.pulley;
+package com.simibubi.create.content.contraptions.pulley;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.AssemblyException;
-import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionType;
-import com.simibubi.create.content.contraptions.components.structureMovement.TranslatingContraption;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionLighter;
+import com.simibubi.create.content.contraptions.AssemblyException;
+import com.simibubi.create.content.contraptions.ContraptionType;
+import com.simibubi.create.content.contraptions.TranslatingContraption;
+import com.simibubi.create.content.contraptions.render.ContraptionLighter;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
@@ -16,7 +16,7 @@ public class PulleyContraption extends TranslatingContraption {
 	int initialOffset;
 	
 	@Override
-	protected ContraptionType getType() {
+	public ContraptionType getType() {
 		return ContraptionType.PULLEY;
 	}
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyLighter.java b/src/main/java/com/simibubi/create/content/contraptions/pulley/PulleyLighter.java
similarity index 81%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyLighter.java
rename to src/main/java/com/simibubi/create/content/contraptions/pulley/PulleyLighter.java
index 01c9d289d..0b723c453 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyLighter.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/pulley/PulleyLighter.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.pulley;
+package com.simibubi.create.content.contraptions.pulley;
 
 import com.jozufozu.flywheel.util.box.GridAlignedBB;
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionLighter;
+import com.simibubi.create.content.contraptions.render.ContraptionLighter;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/pulley/PulleyRenderer.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyRenderer.java
rename to src/main/java/com/simibubi/create/content/contraptions/pulley/PulleyRenderer.java
index ecb23dce0..0be9e3c42 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyRenderer.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/pulley/PulleyRenderer.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.pulley;
+package com.simibubi.create.content.contraptions.pulley;
 
 import com.jozufozu.flywheel.core.PartialModel;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/RopePulleyInstance.java b/src/main/java/com/simibubi/create/content/contraptions/pulley/RopePulleyInstance.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/RopePulleyInstance.java
rename to src/main/java/com/simibubi/create/content/contraptions/pulley/RopePulleyInstance.java
index 9e3a7a303..70ce307ff 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/RopePulleyInstance.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/pulley/RopePulleyInstance.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.pulley;
+package com.simibubi.create.content.contraptions.pulley;
 
 
 import com.jozufozu.flywheel.api.Instancer;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/OnIsPoweredResult.java b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/OnIsPoweredResult.java
deleted file mode 100644
index e942da652..000000000
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/OnIsPoweredResult.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.simibubi.create.content.contraptions.relays.advanced.sequencer;
-
-public enum OnIsPoweredResult {
-    NOTHING,
-    CONTINUE
-}
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ActorInstance.java b/src/main/java/com/simibubi/create/content/contraptions/render/ActorInstance.java
similarity index 81%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ActorInstance.java
rename to src/main/java/com/simibubi/create/content/contraptions/render/ActorInstance.java
index 0097df6e5..ff37307d8 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ActorInstance.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/render/ActorInstance.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.render;
+package com.simibubi.create.content.contraptions.render;
 
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.jozufozu.flywheel.core.virtual.VirtualRenderWorld;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
 
 import net.minecraft.world.level.LightLayer;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionEntityRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/render/ContraptionEntityRenderer.java
similarity index 82%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionEntityRenderer.java
rename to src/main/java/com/simibubi/create/content/contraptions/render/ContraptionEntityRenderer.java
index 9a9a965c5..9005060ae 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionEntityRenderer.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/render/ContraptionEntityRenderer.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.render;
+package com.simibubi.create.content.contraptions.render;
 
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.Contraption;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.Contraption;
 
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.culling.Frustum;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionGroup.java b/src/main/java/com/simibubi/create/content/contraptions/render/ContraptionGroup.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionGroup.java
rename to src/main/java/com/simibubi/create/content/contraptions/render/ContraptionGroup.java
index a51193ecd..17a92c880 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionGroup.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/render/ContraptionGroup.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.render;
+package com.simibubi.create.content.contraptions.render;
 
 import com.jozufozu.flywheel.backend.instancing.instancing.InstancedMaterialGroup;
 import com.jozufozu.flywheel.backend.instancing.instancing.InstancingEngine;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionInstanceManager.java b/src/main/java/com/simibubi/create/content/contraptions/render/ContraptionInstanceManager.java
similarity index 86%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionInstanceManager.java
rename to src/main/java/com/simibubi/create/content/contraptions/render/ContraptionInstanceManager.java
index e23505303..adec03d1e 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionInstanceManager.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/render/ContraptionInstanceManager.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.render;
+package com.simibubi.create.content.contraptions.render;
 
 import java.util.ArrayList;
 
@@ -12,9 +12,9 @@ import com.jozufozu.flywheel.backend.instancing.TaskEngine;
 import com.jozufozu.flywheel.backend.instancing.blockentity.BlockEntityInstanceManager;
 import com.jozufozu.flywheel.core.virtual.VirtualRenderWorld;
 import com.simibubi.create.AllMovementBehaviours;
-import com.simibubi.create.content.contraptions.components.structureMovement.Contraption;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
+import com.simibubi.create.content.contraptions.Contraption;
+import com.simibubi.create.content.contraptions.behaviour.MovementBehaviour;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
 
 import net.minecraft.client.Camera;
 import net.minecraft.world.level.block.entity.BlockEntity;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionLighter.java b/src/main/java/com/simibubi/create/content/contraptions/render/ContraptionLighter.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionLighter.java
rename to src/main/java/com/simibubi/create/content/contraptions/render/ContraptionLighter.java
index 4ecd4c3cd..d1abc1719 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionLighter.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/render/ContraptionLighter.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.render;
+package com.simibubi.create.content.contraptions.render;
 
 import com.jozufozu.flywheel.light.GPULightVolume;
 import com.jozufozu.flywheel.light.LightListener;
 import com.jozufozu.flywheel.light.LightUpdater;
 import com.jozufozu.flywheel.util.box.GridAlignedBB;
 import com.jozufozu.flywheel.util.box.ImmutableBox;
-import com.simibubi.create.content.contraptions.components.structureMovement.Contraption;
+import com.simibubi.create.content.contraptions.Contraption;
 
 import net.minecraft.world.level.LightLayer;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionMatrices.java b/src/main/java/com/simibubi/create/content/contraptions/render/ContraptionMatrices.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionMatrices.java
rename to src/main/java/com/simibubi/create/content/contraptions/render/ContraptionMatrices.java
index 1b6ab8520..3fed704db 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionMatrices.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/render/ContraptionMatrices.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.render;
+package com.simibubi.create.content.contraptions.render;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Matrix4f;
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 
 import net.minecraft.util.Mth;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionProgram.java b/src/main/java/com/simibubi/create/content/contraptions/render/ContraptionProgram.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionProgram.java
rename to src/main/java/com/simibubi/create/content/contraptions/render/ContraptionProgram.java
index c1c6e7f91..b00e1ccee 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionProgram.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/render/ContraptionProgram.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.render;
+package com.simibubi.create.content.contraptions.render;
 
 import org.lwjgl.opengl.GL20;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionRenderDispatcher.java b/src/main/java/com/simibubi/create/content/contraptions/render/ContraptionRenderDispatcher.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionRenderDispatcher.java
rename to src/main/java/com/simibubi/create/content/contraptions/render/ContraptionRenderDispatcher.java
index 232f7bcc4..547ba8059 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionRenderDispatcher.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/render/ContraptionRenderDispatcher.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.render;
+package com.simibubi.create.content.contraptions.render;
 
 import java.util.Collection;
 
@@ -18,11 +18,11 @@ import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.BufferBuilder.RenderedBuffer;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllMovementBehaviours;
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.Contraption;
-import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionWorld;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.Contraption;
+import com.simibubi.create.content.contraptions.ContraptionWorld;
+import com.simibubi.create.content.contraptions.behaviour.MovementBehaviour;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
 import com.simibubi.create.foundation.render.BlockEntityRenderHelper;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionRenderInfo.java b/src/main/java/com/simibubi/create/content/contraptions/render/ContraptionRenderInfo.java
similarity index 87%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionRenderInfo.java
rename to src/main/java/com/simibubi/create/content/contraptions/render/ContraptionRenderInfo.java
index 857a1ec4b..ff3ebf3e3 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionRenderInfo.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/render/ContraptionRenderInfo.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.render;
+package com.simibubi.create.content.contraptions.render;
 
 import com.jozufozu.flywheel.core.virtual.VirtualRenderWorld;
 import com.jozufozu.flywheel.event.BeginFrameEvent;
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.Contraption;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.Contraption;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 
 import net.minecraft.util.Mth;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionRenderingWorld.java b/src/main/java/com/simibubi/create/content/contraptions/render/ContraptionRenderingWorld.java
similarity index 87%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionRenderingWorld.java
rename to src/main/java/com/simibubi/create/content/contraptions/render/ContraptionRenderingWorld.java
index f09549fa5..de71b0d94 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionRenderingWorld.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/render/ContraptionRenderingWorld.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.render;
+package com.simibubi.create.content.contraptions.render;
 
 import java.lang.ref.Reference;
 import java.util.List;
@@ -7,9 +7,9 @@ import java.util.Objects;
 
 import com.jozufozu.flywheel.event.BeginFrameEvent;
 import com.jozufozu.flywheel.event.RenderLayerEvent;
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.Contraption;
-import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionHandler;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.Contraption;
+import com.simibubi.create.content.contraptions.ContraptionHandler;
 
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/EmptyLighter.java b/src/main/java/com/simibubi/create/content/contraptions/render/EmptyLighter.java
similarity index 67%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/EmptyLighter.java
rename to src/main/java/com/simibubi/create/content/contraptions/render/EmptyLighter.java
index c223dea3b..6ff1e1bd8 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/EmptyLighter.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/render/EmptyLighter.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.render;
+package com.simibubi.create.content.contraptions.render;
 
 import com.jozufozu.flywheel.util.box.GridAlignedBB;
-import com.simibubi.create.content.contraptions.components.structureMovement.Contraption;
+import com.simibubi.create.content.contraptions.Contraption;
 
 // so other contraptions don't crash before they have a lighter
 public class EmptyLighter extends ContraptionLighter<Contraption> {
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/FlwContraption.java b/src/main/java/com/simibubi/create/content/contraptions/render/FlwContraption.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/FlwContraption.java
rename to src/main/java/com/simibubi/create/content/contraptions/render/FlwContraption.java
index 1fb76906c..a79f7fbc5 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/FlwContraption.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/render/FlwContraption.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.render;
+package com.simibubi.create.content.contraptions.render;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -20,8 +20,8 @@ import com.jozufozu.flywheel.event.BeginFrameEvent;
 import com.jozufozu.flywheel.event.RenderLayerEvent;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Matrix4f;
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.Contraption;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.Contraption;
 import com.simibubi.create.foundation.render.CreateContexts;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/FlwContraptionManager.java b/src/main/java/com/simibubi/create/content/contraptions/render/FlwContraptionManager.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/FlwContraptionManager.java
rename to src/main/java/com/simibubi/create/content/contraptions/render/FlwContraptionManager.java
index 3c44caea7..47a58f380 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/FlwContraptionManager.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/render/FlwContraptionManager.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.render;
+package com.simibubi.create.content.contraptions.render;
 
 import static org.lwjgl.opengl.GL11.glBindTexture;
 import static org.lwjgl.opengl.GL12.GL_TEXTURE_3D;
@@ -14,7 +14,7 @@ import com.jozufozu.flywheel.core.compile.ProgramContext;
 import com.jozufozu.flywheel.core.virtual.VirtualRenderWorld;
 import com.jozufozu.flywheel.event.RenderLayerEvent;
 import com.jozufozu.flywheel.util.Textures;
-import com.simibubi.create.content.contraptions.components.structureMovement.Contraption;
+import com.simibubi.create.content.contraptions.Contraption;
 import com.simibubi.create.foundation.render.CreateContexts;
 
 import net.minecraft.world.level.LevelAccessor;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/NonStationaryLighter.java b/src/main/java/com/simibubi/create/content/contraptions/render/NonStationaryLighter.java
similarity index 80%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/NonStationaryLighter.java
rename to src/main/java/com/simibubi/create/content/contraptions/render/NonStationaryLighter.java
index c65140e04..d339258fd 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/NonStationaryLighter.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/render/NonStationaryLighter.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.contraptions.components.structureMovement;
+package com.simibubi.create.content.contraptions.render;
 
 import com.jozufozu.flywheel.light.TickingLightListener;
 import com.jozufozu.flywheel.util.box.GridAlignedBB;
 import com.jozufozu.flywheel.util.box.ImmutableBox;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionLighter;
-import com.simibubi.create.foundation.config.AllConfigs;
+import com.simibubi.create.content.contraptions.Contraption;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 public class NonStationaryLighter<C extends Contraption> extends ContraptionLighter<C> implements TickingLightListener {
     public NonStationaryLighter(C contraption) {
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/OrientedContraptionEntityRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/render/OrientedContraptionEntityRenderer.java
similarity index 79%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/OrientedContraptionEntityRenderer.java
rename to src/main/java/com/simibubi/create/content/contraptions/render/OrientedContraptionEntityRenderer.java
index 0789157fa..53b8e89af 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/OrientedContraptionEntityRenderer.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/render/OrientedContraptionEntityRenderer.java
@@ -1,6 +1,7 @@
-package com.simibubi.create.content.contraptions.components.structureMovement;
+package com.simibubi.create.content.contraptions.render;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionEntityRenderer;
+import com.simibubi.create.content.contraptions.ContraptionType;
+import com.simibubi.create.content.contraptions.OrientedContraptionEntity;
 
 import net.minecraft.client.renderer.culling.Frustum;
 import net.minecraft.client.renderer.entity.EntityRendererProvider;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/SBBContraptionManager.java b/src/main/java/com/simibubi/create/content/contraptions/render/SBBContraptionManager.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/SBBContraptionManager.java
rename to src/main/java/com/simibubi/create/content/contraptions/render/SBBContraptionManager.java
index ce34578b3..2a779d7aa 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/SBBContraptionManager.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/render/SBBContraptionManager.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.render;
+package com.simibubi.create.content.contraptions.render;
 
 import com.jozufozu.flywheel.core.virtual.VirtualRenderWorld;
 import com.jozufozu.flywheel.event.RenderLayerEvent;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.simibubi.create.CreateClient;
-import com.simibubi.create.content.contraptions.components.structureMovement.Contraption;
+import com.simibubi.create.content.contraptions.Contraption;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.render.SuperByteBufferCache;
 import com.simibubi.create.foundation.utility.Pair;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/flap/package-info.java b/src/main/java/com/simibubi/create/content/contraptions/render/package-info.java
similarity index 74%
rename from src/main/java/com/simibubi/create/content/logistics/block/flap/package-info.java
rename to src/main/java/com/simibubi/create/content/contraptions/render/package-info.java
index 2ec0735b8..7c51e431d 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/flap/package-info.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/render/package-info.java
@@ -1,5 +1,5 @@
 @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault
-package com.simibubi.create.content.logistics.block.flap;
+package com.simibubi.create.content.contraptions.render;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/sync/ClientMotionPacket.java b/src/main/java/com/simibubi/create/content/contraptions/sync/ClientMotionPacket.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/sync/ClientMotionPacket.java
rename to src/main/java/com/simibubi/create/content/contraptions/sync/ClientMotionPacket.java
index f687722c9..8b98a2a16 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/sync/ClientMotionPacket.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/sync/ClientMotionPacket.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.sync;
+package com.simibubi.create.content.contraptions.sync;
 
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 
 import net.minecraft.network.FriendlyByteBuf;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/sync/ContraptionFluidPacket.java b/src/main/java/com/simibubi/create/content/contraptions/sync/ContraptionFluidPacket.java
similarity index 88%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/sync/ContraptionFluidPacket.java
rename to src/main/java/com/simibubi/create/content/contraptions/sync/ContraptionFluidPacket.java
index d49f22bad..2c94225b8 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/sync/ContraptionFluidPacket.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/sync/ContraptionFluidPacket.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.sync;
+package com.simibubi.create.content.contraptions.sync;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 
 import net.minecraft.client.Minecraft;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/sync/ContraptionInteractionPacket.java b/src/main/java/com/simibubi/create/content/contraptions/sync/ContraptionInteractionPacket.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/sync/ContraptionInteractionPacket.java
rename to src/main/java/com/simibubi/create/content/contraptions/sync/ContraptionInteractionPacket.java
index dd7655a7e..51dab433e 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/sync/ContraptionInteractionPacket.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/sync/ContraptionInteractionPacket.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.sync;
+package com.simibubi.create.content.contraptions.sync;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/sync/ContraptionSeatMappingPacket.java b/src/main/java/com/simibubi/create/content/contraptions/sync/ContraptionSeatMappingPacket.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/sync/ContraptionSeatMappingPacket.java
rename to src/main/java/com/simibubi/create/content/contraptions/sync/ContraptionSeatMappingPacket.java
index 4f07daddd..0e2937560 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/sync/ContraptionSeatMappingPacket.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/sync/ContraptionSeatMappingPacket.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.sync;
+package com.simibubi.create.content.contraptions.sync;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 import com.simibubi.create.foundation.utility.VecHelper;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/sync/LimbSwingUpdatePacket.java b/src/main/java/com/simibubi/create/content/contraptions/sync/LimbSwingUpdatePacket.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/sync/LimbSwingUpdatePacket.java
rename to src/main/java/com/simibubi/create/content/contraptions/sync/LimbSwingUpdatePacket.java
index 98582e613..cfde843d6 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/sync/LimbSwingUpdatePacket.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/sync/LimbSwingUpdatePacket.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.sync;
+package com.simibubi.create.content.contraptions.sync;
 
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 
diff --git a/src/main/java/com/simibubi/create/content/curiosities/deco/MetalLadderBlock.java b/src/main/java/com/simibubi/create/content/decoration/MetalLadderBlock.java
similarity index 87%
rename from src/main/java/com/simibubi/create/content/curiosities/deco/MetalLadderBlock.java
rename to src/main/java/com/simibubi/create/content/decoration/MetalLadderBlock.java
index af95ae898..937ee38d1 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/deco/MetalLadderBlock.java
+++ b/src/main/java/com/simibubi/create/content/decoration/MetalLadderBlock.java
@@ -1,13 +1,13 @@
-package com.simibubi.create.content.curiosities.deco;
+package com.simibubi.create.content.decoration;
 
 import java.util.function.Predicate;
 
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
-import com.simibubi.create.content.curiosities.tools.ExtendoGripItem;
-import com.simibubi.create.foundation.config.AllConfigs;
-import com.simibubi.create.foundation.utility.placement.IPlacementHelper;
-import com.simibubi.create.foundation.utility.placement.PlacementHelpers;
-import com.simibubi.create.foundation.utility.placement.PlacementOffset;
+import com.simibubi.create.content.equipment.extendoGrip.ExtendoGripItem;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
+import com.simibubi.create.foundation.placement.IPlacementHelper;
+import com.simibubi.create.foundation.placement.PlacementHelpers;
+import com.simibubi.create.foundation.placement.PlacementOffset;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.core.BlockPos;
@@ -90,7 +90,7 @@ public class MetalLadderBlock extends LadderBlock implements IWrenchable {
 			BlockHitResult ray) {
 			Direction dir = player.getXRot() < 0 ? Direction.UP : Direction.DOWN;
 
-			int range = AllConfigs.server().curiosities.placementAssistRange.get();
+			int range = AllConfigs.server().equipment.placementAssistRange.get();
 			if (player != null) {
 				AttributeInstance reach = player.getAttribute(ForgeMod.REACH_DISTANCE.get());
 				if (reach != null && reach.hasModifier(ExtendoGripItem.singleRangeAttributeModifier))
diff --git a/src/main/java/com/simibubi/create/content/curiosities/deco/MetalScaffoldingBlock.java b/src/main/java/com/simibubi/create/content/decoration/MetalScaffoldingBlock.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/curiosities/deco/MetalScaffoldingBlock.java
rename to src/main/java/com/simibubi/create/content/decoration/MetalScaffoldingBlock.java
index 57a601bd7..023af808a 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/deco/MetalScaffoldingBlock.java
+++ b/src/main/java/com/simibubi/create/content/decoration/MetalScaffoldingBlock.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.content.curiosities.deco;
+package com.simibubi.create.content.decoration;
 
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/deco/MetalScaffoldingBlockItem.java b/src/main/java/com/simibubi/create/content/decoration/MetalScaffoldingBlockItem.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/curiosities/deco/MetalScaffoldingBlockItem.java
rename to src/main/java/com/simibubi/create/content/decoration/MetalScaffoldingBlockItem.java
index 8d88b3d1e..a8f45795f 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/deco/MetalScaffoldingBlockItem.java
+++ b/src/main/java/com/simibubi/create/content/decoration/MetalScaffoldingBlockItem.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.deco;
+package com.simibubi.create.content.decoration;
 
 import javax.annotation.Nullable;
 
diff --git a/src/main/java/com/simibubi/create/content/curiosities/deco/MetalScaffoldingCTBehaviour.java b/src/main/java/com/simibubi/create/content/decoration/MetalScaffoldingCTBehaviour.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/curiosities/deco/MetalScaffoldingCTBehaviour.java
rename to src/main/java/com/simibubi/create/content/decoration/MetalScaffoldingCTBehaviour.java
index 042ce4424..a85e7d2e1 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/deco/MetalScaffoldingCTBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/decoration/MetalScaffoldingCTBehaviour.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.deco;
+package com.simibubi.create.content.decoration;
 
 import org.jetbrains.annotations.Nullable;
 
diff --git a/src/main/java/com/simibubi/create/content/curiosities/deco/TrainTrapdoorBlock.java b/src/main/java/com/simibubi/create/content/decoration/TrainTrapdoorBlock.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/curiosities/deco/TrainTrapdoorBlock.java
rename to src/main/java/com/simibubi/create/content/decoration/TrainTrapdoorBlock.java
index 339354b4c..701866bb6 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/deco/TrainTrapdoorBlock.java
+++ b/src/main/java/com/simibubi/create/content/decoration/TrainTrapdoorBlock.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.curiosities.deco;
+package com.simibubi.create.content.decoration;
 
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/deco/TrapdoorCTBehaviour.java b/src/main/java/com/simibubi/create/content/decoration/TrapdoorCTBehaviour.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/curiosities/deco/TrapdoorCTBehaviour.java
rename to src/main/java/com/simibubi/create/content/decoration/TrapdoorCTBehaviour.java
index 8856fa52e..1b1ea63cf 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/deco/TrapdoorCTBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/decoration/TrapdoorCTBehaviour.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.deco;
+package com.simibubi.create.content.decoration;
 
 import org.jetbrains.annotations.Nullable;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/BracketBlock.java b/src/main/java/com/simibubi/create/content/decoration/bracket/BracketBlock.java
similarity index 84%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/BracketBlock.java
rename to src/main/java/com/simibubi/create/content/decoration/bracket/BracketBlock.java
index 2d663dd90..52071130b 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/BracketBlock.java
+++ b/src/main/java/com/simibubi/create/content/decoration/bracket/BracketBlock.java
@@ -1,12 +1,12 @@
-package com.simibubi.create.content.contraptions.fluids.pipes;
+package com.simibubi.create.content.decoration.bracket;
 
 import java.util.Optional;
 
-import com.simibubi.create.content.contraptions.base.DirectionalAxisKineticBlock;
-import com.simibubi.create.content.contraptions.base.RotatedPillarKineticBlock;
-import com.simibubi.create.content.contraptions.fluids.FluidPropagator;
-import com.simibubi.create.content.contraptions.relays.elementary.AbstractSimpleShaftBlock;
-import com.simibubi.create.content.contraptions.relays.elementary.CogWheelBlock;
+import com.simibubi.create.content.fluids.FluidPropagator;
+import com.simibubi.create.content.kinetics.base.DirectionalAxisKineticBlock;
+import com.simibubi.create.content.kinetics.base.RotatedPillarKineticBlock;
+import com.simibubi.create.content.kinetics.simpleRelays.AbstractSimpleShaftBlock;
+import com.simibubi.create.content.kinetics.simpleRelays.CogWheelBlock;
 import com.simibubi.create.foundation.block.WrenchableDirectionalBlock;
 import com.simibubi.create.foundation.utility.Lang;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/BracketBlockItem.java b/src/main/java/com/simibubi/create/content/decoration/bracket/BracketBlockItem.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/BracketBlockItem.java
rename to src/main/java/com/simibubi/create/content/decoration/bracket/BracketBlockItem.java
index 61caa8059..18ecd1522 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/BracketBlockItem.java
+++ b/src/main/java/com/simibubi/create/content/decoration/bracket/BracketBlockItem.java
@@ -1,9 +1,8 @@
-package com.simibubi.create.content.contraptions.fluids.pipes;
+package com.simibubi.create.content.decoration.bracket;
 
 import java.util.Optional;
 
-import com.simibubi.create.content.contraptions.relays.elementary.BracketedBlockEntityBehaviour;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/BracketGenerator.java b/src/main/java/com/simibubi/create/content/decoration/bracket/BracketGenerator.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/BracketGenerator.java
rename to src/main/java/com/simibubi/create/content/decoration/bracket/BracketGenerator.java
index 4b11ad2c0..30a2b0142 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/BracketGenerator.java
+++ b/src/main/java/com/simibubi/create/content/decoration/bracket/BracketGenerator.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.fluids.pipes;
+package com.simibubi.create.content.decoration.bracket;
 
 import com.simibubi.create.foundation.data.DirectionalAxisBlockStateGen;
 import com.tterrag.registrate.builders.ItemBuilder;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/BracketedBlockEntityBehaviour.java b/src/main/java/com/simibubi/create/content/decoration/bracket/BracketedBlockEntityBehaviour.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/elementary/BracketedBlockEntityBehaviour.java
rename to src/main/java/com/simibubi/create/content/decoration/bracket/BracketedBlockEntityBehaviour.java
index 91fc749b5..fc7a54abf 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/BracketedBlockEntityBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/decoration/bracket/BracketedBlockEntityBehaviour.java
@@ -1,14 +1,14 @@
-package com.simibubi.create.content.contraptions.relays.elementary;
+package com.simibubi.create.content.decoration.bracket;
 
 import java.util.function.Predicate;
 
 import org.jetbrains.annotations.Nullable;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.StructureTransform;
-import com.simibubi.create.content.schematics.ItemRequirement;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.contraptions.StructureTransform;
+import com.simibubi.create.content.schematics.requirement.ItemRequirement;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
 import com.simibubi.create.foundation.blockEntity.behaviour.BehaviourType;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.NBTHelper;
 
 import net.minecraft.nbt.CompoundTag;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/frames/CopycatBarsModel.java b/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatBarsModel.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/curiosities/frames/CopycatBarsModel.java
rename to src/main/java/com/simibubi/create/content/decoration/copycat/CopycatBarsModel.java
index b04f1ea5f..19c56d283 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/frames/CopycatBarsModel.java
+++ b/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatBarsModel.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.frames;
+package com.simibubi.create.content.decoration.copycat;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/frames/CopycatBlock.java b/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatBlock.java
similarity index 99%
rename from src/main/java/com/simibubi/create/content/curiosities/frames/CopycatBlock.java
rename to src/main/java/com/simibubi/create/content/decoration/copycat/CopycatBlock.java
index 9e1647a10..6d526d17b 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/frames/CopycatBlock.java
+++ b/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatBlock.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.curiosities.frames;
+package com.simibubi.create.content.decoration.copycat;
 
 import javax.annotation.Nullable;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllTags.AllBlockTags;
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
 import com.simibubi.create.foundation.block.IBE;
 
 import net.minecraft.client.Minecraft;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/frames/CopycatBlockEntity.java b/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatBlockEntity.java
similarity index 88%
rename from src/main/java/com/simibubi/create/content/curiosities/frames/CopycatBlockEntity.java
rename to src/main/java/com/simibubi/create/content/decoration/copycat/CopycatBlockEntity.java
index b65b67dce..24153e4c0 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/frames/CopycatBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatBlockEntity.java
@@ -1,16 +1,16 @@
-package com.simibubi.create.content.curiosities.frames;
+package com.simibubi.create.content.decoration.copycat;
 
 import java.util.List;
 
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.components.structureMovement.ITransformableBlockEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.StructureTransform;
-import com.simibubi.create.content.logistics.block.redstone.RoseQuartzLampBlock;
-import com.simibubi.create.content.schematics.ISpecialBlockEntityItemRequirement;
-import com.simibubi.create.content.schematics.ItemRequirement;
-import com.simibubi.create.content.schematics.ItemRequirement.ItemUseType;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.contraptions.ITransformableBlockEntity;
+import com.simibubi.create.content.contraptions.StructureTransform;
+import com.simibubi.create.content.redstone.RoseQuartzLampBlock;
+import com.simibubi.create.content.schematics.requirement.ISpecialBlockEntityItemRequirement;
+import com.simibubi.create.content.schematics.requirement.ItemRequirement;
+import com.simibubi.create.content.schematics.requirement.ItemRequirement.ItemUseType;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.Iterate;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/frames/CopycatModel.java b/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatModel.java
similarity index 99%
rename from src/main/java/com/simibubi/create/content/curiosities/frames/CopycatModel.java
rename to src/main/java/com/simibubi/create/content/decoration/copycat/CopycatModel.java
index 1018e2848..7bd452d99 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/frames/CopycatModel.java
+++ b/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatModel.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.frames;
+package com.simibubi.create.content.decoration.copycat;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/frames/CopycatPanelBlock.java b/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatPanelBlock.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/curiosities/frames/CopycatPanelBlock.java
rename to src/main/java/com/simibubi/create/content/decoration/copycat/CopycatPanelBlock.java
index 31e7d33f2..a3d22fae3 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/frames/CopycatPanelBlock.java
+++ b/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatPanelBlock.java
@@ -1,13 +1,13 @@
-package com.simibubi.create.content.curiosities.frames;
+package com.simibubi.create.content.decoration.copycat;
 
 import java.util.List;
 import java.util.function.Predicate;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.foundation.utility.placement.IPlacementHelper;
-import com.simibubi.create.foundation.utility.placement.PlacementHelpers;
-import com.simibubi.create.foundation.utility.placement.PlacementOffset;
+import com.simibubi.create.foundation.placement.IPlacementHelper;
+import com.simibubi.create.foundation.placement.PlacementHelpers;
+import com.simibubi.create.foundation.placement.PlacementOffset;
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/frames/CopycatPanelModel.java b/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatPanelModel.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/curiosities/frames/CopycatPanelModel.java
rename to src/main/java/com/simibubi/create/content/decoration/copycat/CopycatPanelModel.java
index 3603d0fcf..3bd5c298d 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/frames/CopycatPanelModel.java
+++ b/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatPanelModel.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.frames;
+package com.simibubi.create.content.decoration.copycat;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/frames/CopycatSpecialCases.java b/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatSpecialCases.java
similarity index 85%
rename from src/main/java/com/simibubi/create/content/curiosities/frames/CopycatSpecialCases.java
rename to src/main/java/com/simibubi/create/content/decoration/copycat/CopycatSpecialCases.java
index 097fb1fe6..a7ba28e3d 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/frames/CopycatSpecialCases.java
+++ b/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatSpecialCases.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.curiosities.frames;
+package com.simibubi.create.content.decoration.copycat;
 
-import com.simibubi.create.content.palettes.GlassPaneBlock;
+import com.simibubi.create.content.decoration.palettes.GlassPaneBlock;
 
 import net.minecraft.world.level.block.IronBarsBlock;
 import net.minecraft.world.level.block.StainedGlassPaneBlock;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/frames/CopycatStepBlock.java b/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatStepBlock.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/curiosities/frames/CopycatStepBlock.java
rename to src/main/java/com/simibubi/create/content/decoration/copycat/CopycatStepBlock.java
index 4ac193e9f..b5237aec3 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/frames/CopycatStepBlock.java
+++ b/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatStepBlock.java
@@ -1,13 +1,13 @@
-package com.simibubi.create.content.curiosities.frames;
+package com.simibubi.create.content.decoration.copycat;
 
 import java.util.function.Predicate;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllShapes;
+import com.simibubi.create.foundation.placement.IPlacementHelper;
+import com.simibubi.create.foundation.placement.PlacementHelpers;
+import com.simibubi.create.foundation.placement.PoleHelper;
 import com.simibubi.create.foundation.utility.VoxelShaper;
-import com.simibubi.create.foundation.utility.placement.IPlacementHelper;
-import com.simibubi.create.foundation.utility.placement.PlacementHelpers;
-import com.simibubi.create.foundation.utility.placement.util.PoleHelper;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/frames/CopycatStepModel.java b/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatStepModel.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/curiosities/frames/CopycatStepModel.java
rename to src/main/java/com/simibubi/create/content/decoration/copycat/CopycatStepModel.java
index 7eba56dd4..673c27cf3 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/frames/CopycatStepModel.java
+++ b/src/main/java/com/simibubi/create/content/decoration/copycat/CopycatStepModel.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.frames;
+package com.simibubi.create.content.decoration.copycat;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/frames/FilteredBlockAndTintGetter.java b/src/main/java/com/simibubi/create/content/decoration/copycat/FilteredBlockAndTintGetter.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/curiosities/frames/FilteredBlockAndTintGetter.java
rename to src/main/java/com/simibubi/create/content/decoration/copycat/FilteredBlockAndTintGetter.java
index 6649f06bf..a2f58340b 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/frames/FilteredBlockAndTintGetter.java
+++ b/src/main/java/com/simibubi/create/content/decoration/copycat/FilteredBlockAndTintGetter.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.frames;
+package com.simibubi.create.content.decoration.copycat;
 
 import java.util.function.Predicate;
 
diff --git a/src/main/java/com/simibubi/create/content/curiosities/frames/SpecialCopycatPanelBlockState.java b/src/main/java/com/simibubi/create/content/decoration/copycat/SpecialCopycatPanelBlockState.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/curiosities/frames/SpecialCopycatPanelBlockState.java
rename to src/main/java/com/simibubi/create/content/decoration/copycat/SpecialCopycatPanelBlockState.java
index c52beb194..3cf375ace 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/frames/SpecialCopycatPanelBlockState.java
+++ b/src/main/java/com/simibubi/create/content/decoration/copycat/SpecialCopycatPanelBlockState.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.frames;
+package com.simibubi.create.content.decoration.copycat;
 
 import com.simibubi.create.foundation.data.SpecialBlockStateGen;
 import com.tterrag.registrate.providers.DataGenContext;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/frames/WaterloggedCopycatBlock.java b/src/main/java/com/simibubi/create/content/decoration/copycat/WaterloggedCopycatBlock.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/curiosities/frames/WaterloggedCopycatBlock.java
rename to src/main/java/com/simibubi/create/content/decoration/copycat/WaterloggedCopycatBlock.java
index 169d73039..a82f162ab 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/frames/WaterloggedCopycatBlock.java
+++ b/src/main/java/com/simibubi/create/content/decoration/copycat/WaterloggedCopycatBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.frames;
+package com.simibubi.create.content.decoration.copycat;
 
 import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/CasingBlock.java b/src/main/java/com/simibubi/create/content/decoration/encasing/CasingBlock.java
similarity index 89%
rename from src/main/java/com/simibubi/create/content/contraptions/base/CasingBlock.java
rename to src/main/java/com/simibubi/create/content/decoration/encasing/CasingBlock.java
index b774a12cb..547fb4df6 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/base/CasingBlock.java
+++ b/src/main/java/com/simibubi/create/content/decoration/encasing/CasingBlock.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.contraptions.base;
+package com.simibubi.create.content.decoration.encasing;
 
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
 
 import net.minecraft.core.NonNullList;
 import net.minecraft.world.InteractionResult;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/CasingConnectivity.java b/src/main/java/com/simibubi/create/content/decoration/encasing/CasingConnectivity.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/encased/CasingConnectivity.java
rename to src/main/java/com/simibubi/create/content/decoration/encasing/CasingConnectivity.java
index d35261713..04405ac91 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/CasingConnectivity.java
+++ b/src/main/java/com/simibubi/create/content/decoration/encasing/CasingConnectivity.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.relays.encased;
+package com.simibubi.create.content.decoration.encasing;
 
 import java.util.IdentityHashMap;
 import java.util.Map;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/EncasableBlock.java b/src/main/java/com/simibubi/create/content/decoration/encasing/EncasableBlock.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/elementary/EncasableBlock.java
rename to src/main/java/com/simibubi/create/content/decoration/encasing/EncasableBlock.java
index a09a20703..6c31ae78c 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/EncasableBlock.java
+++ b/src/main/java/com/simibubi/create/content/decoration/encasing/EncasableBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.relays.elementary;
+package com.simibubi.create.content.decoration.encasing;
 
 import java.util.List;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/EncasedBlock.java b/src/main/java/com/simibubi/create/content/decoration/encasing/EncasedBlock.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/elementary/EncasedBlock.java
rename to src/main/java/com/simibubi/create/content/decoration/encasing/EncasedBlock.java
index 64f6c167c..acaca578d 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/EncasedBlock.java
+++ b/src/main/java/com/simibubi/create/content/decoration/encasing/EncasedBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.relays.elementary;
+package com.simibubi.create.content.decoration.encasing;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.InteractionHand;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedCTBehaviour.java b/src/main/java/com/simibubi/create/content/decoration/encasing/EncasedCTBehaviour.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedCTBehaviour.java
rename to src/main/java/com/simibubi/create/content/decoration/encasing/EncasedCTBehaviour.java
index 9afdaacb9..7c3d046bd 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedCTBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/decoration/encasing/EncasedCTBehaviour.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.relays.encased;
+package com.simibubi.create.content.decoration.encasing;
 
 import org.jetbrains.annotations.Nullable;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/EncasingRegistry.java b/src/main/java/com/simibubi/create/content/decoration/encasing/EncasingRegistry.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/elementary/EncasingRegistry.java
rename to src/main/java/com/simibubi/create/content/decoration/encasing/EncasingRegistry.java
index f529ab7d0..c33ae383d 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/EncasingRegistry.java
+++ b/src/main/java/com/simibubi/create/content/decoration/encasing/EncasingRegistry.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.relays.elementary;
+package com.simibubi.create.content.decoration.encasing;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/girder/ConnectedGirderModel.java b/src/main/java/com/simibubi/create/content/decoration/girder/ConnectedGirderModel.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/curiosities/girder/ConnectedGirderModel.java
rename to src/main/java/com/simibubi/create/content/decoration/girder/ConnectedGirderModel.java
index 1f15a7a36..b8878f6b1 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/girder/ConnectedGirderModel.java
+++ b/src/main/java/com/simibubi/create/content/decoration/girder/ConnectedGirderModel.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.girder;
+package com.simibubi.create.content.decoration.girder;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/girder/GirderBlock.java b/src/main/java/com/simibubi/create/content/decoration/girder/GirderBlock.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/curiosities/girder/GirderBlock.java
rename to src/main/java/com/simibubi/create/content/decoration/girder/GirderBlock.java
index d7d369c71..d29d249be 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/girder/GirderBlock.java
+++ b/src/main/java/com/simibubi/create/content/decoration/girder/GirderBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.girder;
+package com.simibubi.create.content.decoration.girder;
 
 import static net.minecraft.world.level.block.FaceAttachedHorizontalDirectionalBlock.FACE;
 import static net.minecraft.world.level.block.state.properties.BlockStateProperties.WATERLOGGED;
@@ -7,20 +7,20 @@ import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
 import com.simibubi.create.AllShapes;
 import com.simibubi.create.AllTags;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.fluids.pipes.BracketBlock;
-import com.simibubi.create.content.contraptions.relays.elementary.BracketedBlockEntityBehaviour;
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
-import com.simibubi.create.content.curiosities.deco.PlacardBlock;
-import com.simibubi.create.content.logistics.block.chute.AbstractChuteBlock;
-import com.simibubi.create.content.logistics.block.redstone.NixieTubeBlock;
-import com.simibubi.create.content.logistics.trains.management.display.FlapDisplayBlock;
-import com.simibubi.create.content.logistics.trains.track.TrackBlock;
-import com.simibubi.create.content.logistics.trains.track.TrackShape;
+import com.simibubi.create.content.decoration.bracket.BracketBlock;
+import com.simibubi.create.content.decoration.bracket.BracketedBlockEntityBehaviour;
+import com.simibubi.create.content.decoration.placard.PlacardBlock;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.content.logistics.chute.AbstractChuteBlock;
+import com.simibubi.create.content.redstone.nixieTube.NixieTubeBlock;
+import com.simibubi.create.content.trains.display.FlapDisplayBlock;
+import com.simibubi.create.content.trains.track.TrackBlock;
+import com.simibubi.create.content.trains.track.TrackShape;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
+import com.simibubi.create.foundation.placement.IPlacementHelper;
+import com.simibubi.create.foundation.placement.PlacementHelpers;
 import com.simibubi.create.foundation.utility.Iterate;
-import com.simibubi.create.foundation.utility.placement.IPlacementHelper;
-import com.simibubi.create.foundation.utility.placement.PlacementHelpers;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/girder/GirderBlockStateGenerator.java b/src/main/java/com/simibubi/create/content/decoration/girder/GirderBlockStateGenerator.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/curiosities/girder/GirderBlockStateGenerator.java
rename to src/main/java/com/simibubi/create/content/decoration/girder/GirderBlockStateGenerator.java
index 1c387539c..72f3a181c 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/girder/GirderBlockStateGenerator.java
+++ b/src/main/java/com/simibubi/create/content/decoration/girder/GirderBlockStateGenerator.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.girder;
+package com.simibubi.create.content.decoration.girder;
 
 import com.simibubi.create.foundation.data.AssetLookup;
 import com.simibubi.create.foundation.utility.Iterate;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/girder/GirderCTBehaviour.java b/src/main/java/com/simibubi/create/content/decoration/girder/GirderCTBehaviour.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/curiosities/girder/GirderCTBehaviour.java
rename to src/main/java/com/simibubi/create/content/decoration/girder/GirderCTBehaviour.java
index 31eb029c1..55d09ea61 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/girder/GirderCTBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/decoration/girder/GirderCTBehaviour.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.girder;
+package com.simibubi.create.content.decoration.girder;
 
 import org.jetbrains.annotations.Nullable;
 
diff --git a/src/main/java/com/simibubi/create/content/curiosities/girder/GirderEncasedShaftBlock.java b/src/main/java/com/simibubi/create/content/decoration/girder/GirderEncasedShaftBlock.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/curiosities/girder/GirderEncasedShaftBlock.java
rename to src/main/java/com/simibubi/create/content/decoration/girder/GirderEncasedShaftBlock.java
index bbd3b0591..4a46cae8f 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/girder/GirderEncasedShaftBlock.java
+++ b/src/main/java/com/simibubi/create/content/decoration/girder/GirderEncasedShaftBlock.java
@@ -1,15 +1,15 @@
-package com.simibubi.create.content.curiosities.girder;
+package com.simibubi.create.content.decoration.girder;
 
 import static net.minecraft.world.level.block.state.properties.BlockStateProperties.WATERLOGGED;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.base.HorizontalAxisKineticBlock;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
-import com.simibubi.create.content.schematics.ISpecialBlockItemRequirement;
-import com.simibubi.create.content.schematics.ItemRequirement;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
+import com.simibubi.create.content.kinetics.base.HorizontalAxisKineticBlock;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.content.schematics.requirement.ISpecialBlockItemRequirement;
+import com.simibubi.create.content.schematics.requirement.ItemRequirement;
 import com.simibubi.create.foundation.block.IBE;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/girder/GirderPlacementHelper.java b/src/main/java/com/simibubi/create/content/decoration/girder/GirderPlacementHelper.java
similarity index 89%
rename from src/main/java/com/simibubi/create/content/curiosities/girder/GirderPlacementHelper.java
rename to src/main/java/com/simibubi/create/content/decoration/girder/GirderPlacementHelper.java
index 208d4f86f..217753ddf 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/girder/GirderPlacementHelper.java
+++ b/src/main/java/com/simibubi/create/content/decoration/girder/GirderPlacementHelper.java
@@ -1,14 +1,14 @@
-package com.simibubi.create.content.curiosities.girder;
+package com.simibubi.create.content.decoration.girder;
 
 import java.util.List;
 import java.util.function.Predicate;
 
 import com.google.common.base.Predicates;
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.curiosities.tools.ExtendoGripItem;
-import com.simibubi.create.foundation.config.AllConfigs;
-import com.simibubi.create.foundation.utility.placement.IPlacementHelper;
-import com.simibubi.create.foundation.utility.placement.PlacementOffset;
+import com.simibubi.create.content.equipment.extendoGrip.ExtendoGripItem;
+import com.simibubi.create.foundation.placement.IPlacementHelper;
+import com.simibubi.create.foundation.placement.PlacementOffset;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -79,7 +79,7 @@ public class GirderPlacementHelper implements IPlacementHelper {
 		List<Direction> directions =
 			IPlacementHelper.orderedByDistance(pos, ray.getLocation(), dir -> canExtendToward(state, dir));
 		for (Direction dir : directions) {
-			int range = AllConfigs.server().curiosities.placementAssistRange.get();
+			int range = AllConfigs.server().equipment.placementAssistRange.get();
 			if (player != null) {
 				AttributeInstance reach = player.getAttribute(ForgeMod.REACH_DISTANCE.get());
 				if (reach != null && reach.hasModifier(ExtendoGripItem.singleRangeAttributeModifier))
diff --git a/src/main/java/com/simibubi/create/content/curiosities/girder/GirderWrenchBehavior.java b/src/main/java/com/simibubi/create/content/decoration/girder/GirderWrenchBehavior.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/curiosities/girder/GirderWrenchBehavior.java
rename to src/main/java/com/simibubi/create/content/decoration/girder/GirderWrenchBehavior.java
index dd8fe7a89..d9e68cf6b 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/girder/GirderWrenchBehavior.java
+++ b/src/main/java/com/simibubi/create/content/decoration/girder/GirderWrenchBehavior.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.girder;
+package com.simibubi.create.content.decoration.girder;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -9,11 +9,11 @@ import org.jetbrains.annotations.Nullable;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
 import com.simibubi.create.CreateClient;
+import com.simibubi.create.foundation.placement.IPlacementHelper;
 import com.simibubi.create.foundation.utility.Color;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.Pair;
 import com.simibubi.create.foundation.utility.VecHelper;
-import com.simibubi.create.foundation.utility.placement.IPlacementHelper;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ClientLevel;
diff --git a/src/main/java/com/simibubi/create/content/palettes/AllPaletteBlocks.java b/src/main/java/com/simibubi/create/content/decoration/palettes/AllPaletteBlocks.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/palettes/AllPaletteBlocks.java
rename to src/main/java/com/simibubi/create/content/decoration/palettes/AllPaletteBlocks.java
index d728acc5b..ec381c7d8 100644
--- a/src/main/java/com/simibubi/create/content/palettes/AllPaletteBlocks.java
+++ b/src/main/java/com/simibubi/create/content/decoration/palettes/AllPaletteBlocks.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.palettes;
+package com.simibubi.create.content.decoration.palettes;
 
 import static com.simibubi.create.Create.REGISTRATE;
 import static com.simibubi.create.foundation.data.WindowGen.customWindowBlock;
diff --git a/src/main/java/com/simibubi/create/content/palettes/AllPaletteStoneTypes.java b/src/main/java/com/simibubi/create/content/decoration/palettes/AllPaletteStoneTypes.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/palettes/AllPaletteStoneTypes.java
rename to src/main/java/com/simibubi/create/content/decoration/palettes/AllPaletteStoneTypes.java
index 7bae225c8..13142b06e 100644
--- a/src/main/java/com/simibubi/create/content/palettes/AllPaletteStoneTypes.java
+++ b/src/main/java/com/simibubi/create/content/decoration/palettes/AllPaletteStoneTypes.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.content.palettes;
+package com.simibubi.create.content.decoration.palettes;
 
-import static com.simibubi.create.content.palettes.PaletteBlockPattern.STANDARD_RANGE;
-import static com.simibubi.create.content.palettes.PaletteBlockPattern.VANILLA_RANGE;
+import static com.simibubi.create.content.decoration.palettes.PaletteBlockPattern.STANDARD_RANGE;
+import static com.simibubi.create.content.decoration.palettes.PaletteBlockPattern.VANILLA_RANGE;
 
 import java.util.function.Function;
 
diff --git a/src/main/java/com/simibubi/create/content/palettes/ConnectedGlassBlock.java b/src/main/java/com/simibubi/create/content/decoration/palettes/ConnectedGlassBlock.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/palettes/ConnectedGlassBlock.java
rename to src/main/java/com/simibubi/create/content/decoration/palettes/ConnectedGlassBlock.java
index d961a0aff..378137545 100644
--- a/src/main/java/com/simibubi/create/content/palettes/ConnectedGlassBlock.java
+++ b/src/main/java/com/simibubi/create/content/decoration/palettes/ConnectedGlassBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.palettes;
+package com.simibubi.create.content.decoration.palettes;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/palettes/ConnectedGlassPaneBlock.java b/src/main/java/com/simibubi/create/content/decoration/palettes/ConnectedGlassPaneBlock.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/palettes/ConnectedGlassPaneBlock.java
rename to src/main/java/com/simibubi/create/content/decoration/palettes/ConnectedGlassPaneBlock.java
index e789ac515..8a67e55f6 100644
--- a/src/main/java/com/simibubi/create/content/palettes/ConnectedGlassPaneBlock.java
+++ b/src/main/java/com/simibubi/create/content/decoration/palettes/ConnectedGlassPaneBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.palettes;
+package com.simibubi.create.content.decoration.palettes;
 
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
diff --git a/src/main/java/com/simibubi/create/content/palettes/ConnectedPillarBlock.java b/src/main/java/com/simibubi/create/content/decoration/palettes/ConnectedPillarBlock.java
similarity index 99%
rename from src/main/java/com/simibubi/create/content/palettes/ConnectedPillarBlock.java
rename to src/main/java/com/simibubi/create/content/decoration/palettes/ConnectedPillarBlock.java
index a8d7c192a..8c2d4ce60 100644
--- a/src/main/java/com/simibubi/create/content/palettes/ConnectedPillarBlock.java
+++ b/src/main/java/com/simibubi/create/content/decoration/palettes/ConnectedPillarBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.palettes;
+package com.simibubi.create.content.decoration.palettes;
 
 import com.simibubi.create.foundation.utility.Iterate;
 
diff --git a/src/main/java/com/simibubi/create/content/palettes/GlassPaneBlock.java b/src/main/java/com/simibubi/create/content/decoration/palettes/GlassPaneBlock.java
similarity index 75%
rename from src/main/java/com/simibubi/create/content/palettes/GlassPaneBlock.java
rename to src/main/java/com/simibubi/create/content/decoration/palettes/GlassPaneBlock.java
index ce07f4aee..b9e1f6bc5 100644
--- a/src/main/java/com/simibubi/create/content/palettes/GlassPaneBlock.java
+++ b/src/main/java/com/simibubi/create/content/decoration/palettes/GlassPaneBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.palettes;
+package com.simibubi.create.content.decoration.palettes;
 
 import net.minecraft.world.level.block.IronBarsBlock;
 
diff --git a/src/main/java/com/simibubi/create/content/palettes/LayeredBlock.java b/src/main/java/com/simibubi/create/content/decoration/palettes/LayeredBlock.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/palettes/LayeredBlock.java
rename to src/main/java/com/simibubi/create/content/decoration/palettes/LayeredBlock.java
index e2f84ef33..8bc7f63e9 100644
--- a/src/main/java/com/simibubi/create/content/palettes/LayeredBlock.java
+++ b/src/main/java/com/simibubi/create/content/decoration/palettes/LayeredBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.palettes;
+package com.simibubi.create.content.decoration.palettes;
 
 import net.minecraft.world.item.context.BlockPlaceContext;
 import net.minecraft.world.level.block.RotatedPillarBlock;
diff --git a/src/main/java/com/simibubi/create/content/palettes/PaletteBlockPartial.java b/src/main/java/com/simibubi/create/content/decoration/palettes/PaletteBlockPartial.java
similarity index 99%
rename from src/main/java/com/simibubi/create/content/palettes/PaletteBlockPartial.java
rename to src/main/java/com/simibubi/create/content/decoration/palettes/PaletteBlockPartial.java
index 5c3e60b39..018a3c641 100644
--- a/src/main/java/com/simibubi/create/content/palettes/PaletteBlockPartial.java
+++ b/src/main/java/com/simibubi/create/content/decoration/palettes/PaletteBlockPartial.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.palettes;
+package com.simibubi.create.content.decoration.palettes;
 
 import static com.simibubi.create.foundation.data.TagGen.pickaxeOnly;
 
diff --git a/src/main/java/com/simibubi/create/content/palettes/PaletteBlockPattern.java b/src/main/java/com/simibubi/create/content/decoration/palettes/PaletteBlockPattern.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/palettes/PaletteBlockPattern.java
rename to src/main/java/com/simibubi/create/content/decoration/palettes/PaletteBlockPattern.java
index 8ed4b0f71..7010c2fc7 100644
--- a/src/main/java/com/simibubi/create/content/palettes/PaletteBlockPattern.java
+++ b/src/main/java/com/simibubi/create/content/decoration/palettes/PaletteBlockPattern.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.palettes;
+package com.simibubi.create.content.decoration.palettes;
 
-import static com.simibubi.create.content.palettes.PaletteBlockPartial.ALL_PARTIALS;
-import static com.simibubi.create.content.palettes.PaletteBlockPartial.FOR_POLISHED;
-import static com.simibubi.create.content.palettes.PaletteBlockPattern.PatternNameType.PREFIX;
-import static com.simibubi.create.content.palettes.PaletteBlockPattern.PatternNameType.SUFFIX;
-import static com.simibubi.create.content.palettes.PaletteBlockPattern.PatternNameType.WRAP;
+import static com.simibubi.create.content.decoration.palettes.PaletteBlockPartial.ALL_PARTIALS;
+import static com.simibubi.create.content.decoration.palettes.PaletteBlockPartial.FOR_POLISHED;
+import static com.simibubi.create.content.decoration.palettes.PaletteBlockPattern.PatternNameType.PREFIX;
+import static com.simibubi.create.content.decoration.palettes.PaletteBlockPattern.PatternNameType.SUFFIX;
+import static com.simibubi.create.content.decoration.palettes.PaletteBlockPattern.PatternNameType.WRAP;
 
 import java.util.Optional;
 import java.util.function.Function;
diff --git a/src/main/java/com/simibubi/create/content/palettes/PalettesCreativeModeTab.java b/src/main/java/com/simibubi/create/content/decoration/palettes/PalettesCreativeModeTab.java
similarity index 76%
rename from src/main/java/com/simibubi/create/content/palettes/PalettesCreativeModeTab.java
rename to src/main/java/com/simibubi/create/content/decoration/palettes/PalettesCreativeModeTab.java
index c8519cd87..d267cacfb 100644
--- a/src/main/java/com/simibubi/create/content/palettes/PalettesCreativeModeTab.java
+++ b/src/main/java/com/simibubi/create/content/decoration/palettes/PalettesCreativeModeTab.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.palettes;
+package com.simibubi.create.content.decoration.palettes;
 
-import com.simibubi.create.foundation.item.CreateCreativeModeTab;
+import com.simibubi.create.infrastructure.item.CreateCreativeModeTab;
 
 import net.minecraft.core.NonNullList;
 import net.minecraft.world.item.ItemStack;
diff --git a/src/main/java/com/simibubi/create/content/palettes/PalettesVariantEntry.java b/src/main/java/com/simibubi/create/content/decoration/palettes/PalettesVariantEntry.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/palettes/PalettesVariantEntry.java
rename to src/main/java/com/simibubi/create/content/decoration/palettes/PalettesVariantEntry.java
index ccbcd90d8..e4758718e 100644
--- a/src/main/java/com/simibubi/create/content/palettes/PalettesVariantEntry.java
+++ b/src/main/java/com/simibubi/create/content/decoration/palettes/PalettesVariantEntry.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.palettes;
+package com.simibubi.create.content.decoration.palettes;
 
 import static com.simibubi.create.Create.REGISTRATE;
 import static com.simibubi.create.foundation.data.CreateRegistrate.connectedTextures;
diff --git a/src/main/java/com/simibubi/create/content/palettes/WindowBlock.java b/src/main/java/com/simibubi/create/content/decoration/palettes/WindowBlock.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/palettes/WindowBlock.java
rename to src/main/java/com/simibubi/create/content/decoration/palettes/WindowBlock.java
index c7695ed2b..8c617a0cd 100644
--- a/src/main/java/com/simibubi/create/content/palettes/WindowBlock.java
+++ b/src/main/java/com/simibubi/create/content/decoration/palettes/WindowBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.palettes;
+package com.simibubi.create.content.decoration.palettes;
 
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/deco/PlacardBlock.java b/src/main/java/com/simibubi/create/content/decoration/placard/PlacardBlock.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/curiosities/deco/PlacardBlock.java
rename to src/main/java/com/simibubi/create/content/decoration/placard/PlacardBlock.java
index 70a2dd2f0..4b7012c4d 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/deco/PlacardBlock.java
+++ b/src/main/java/com/simibubi/create/content/decoration/placard/PlacardBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.deco;
+package com.simibubi.create.content.decoration.placard;
 
 import java.util.List;
 
@@ -6,11 +6,11 @@ import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllShapes;
 import com.simibubi.create.AllSoundEvents;
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
-import com.simibubi.create.content.logistics.item.filter.FilterItem;
-import com.simibubi.create.content.schematics.ISpecialBlockItemRequirement;
-import com.simibubi.create.content.schematics.ItemRequirement;
-import com.simibubi.create.content.schematics.ItemRequirement.ItemUseType;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
+import com.simibubi.create.content.logistics.filter.FilterItem;
+import com.simibubi.create.content.schematics.requirement.ISpecialBlockItemRequirement;
+import com.simibubi.create.content.schematics.requirement.ItemRequirement;
+import com.simibubi.create.content.schematics.requirement.ItemRequirement.ItemUseType;
 import com.simibubi.create.foundation.block.IBE;
 import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
 
diff --git a/src/main/java/com/simibubi/create/content/curiosities/deco/PlacardBlockEntity.java b/src/main/java/com/simibubi/create/content/decoration/placard/PlacardBlockEntity.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/curiosities/deco/PlacardBlockEntity.java
rename to src/main/java/com/simibubi/create/content/decoration/placard/PlacardBlockEntity.java
index a1cd227c9..ea6c58420 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/deco/PlacardBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/decoration/placard/PlacardBlockEntity.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.curiosities.deco;
+package com.simibubi.create.content.decoration.placard;
 
 import java.util.List;
 
 import com.mojang.math.Vector3f;
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.VecHelper;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/deco/PlacardRenderer.java b/src/main/java/com/simibubi/create/content/decoration/placard/PlacardRenderer.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/curiosities/deco/PlacardRenderer.java
rename to src/main/java/com/simibubi/create/content/decoration/placard/PlacardRenderer.java
index 665f3c25d..7081b98ae 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/deco/PlacardRenderer.java
+++ b/src/main/java/com/simibubi/create/content/decoration/placard/PlacardRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.deco;
+package com.simibubi.create.content.decoration.placard;
 
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/DoorControl.java b/src/main/java/com/simibubi/create/content/decoration/slidingDoor/DoorControl.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/DoorControl.java
rename to src/main/java/com/simibubi/create/content/decoration/slidingDoor/DoorControl.java
index f6cf7af1d..7c23e4c38 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/DoorControl.java
+++ b/src/main/java/com/simibubi/create/content/decoration/slidingDoor/DoorControl.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.actors;
+package com.simibubi.create.content.decoration.slidingDoor;
 
 import java.util.Arrays;
 import java.util.function.Consumer;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/DoorControlBehaviour.java b/src/main/java/com/simibubi/create/content/decoration/slidingDoor/DoorControlBehaviour.java
similarity index 88%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/DoorControlBehaviour.java
rename to src/main/java/com/simibubi/create/content/decoration/slidingDoor/DoorControlBehaviour.java
index df25f85d2..755dca038 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/DoorControlBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/decoration/slidingDoor/DoorControlBehaviour.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.contraptions.components.actors;
+package com.simibubi.create.content.decoration.slidingDoor;
 
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
 import com.simibubi.create.foundation.blockEntity.behaviour.BehaviourType;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.NBTHelper;
 
 import net.minecraft.nbt.CompoundTag;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/deco/SlidingDoorBlock.java b/src/main/java/com/simibubi/create/content/decoration/slidingDoor/SlidingDoorBlock.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/curiosities/deco/SlidingDoorBlock.java
rename to src/main/java/com/simibubi/create/content/decoration/slidingDoor/SlidingDoorBlock.java
index 98241b8db..c02874e41 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/deco/SlidingDoorBlock.java
+++ b/src/main/java/com/simibubi/create/content/decoration/slidingDoor/SlidingDoorBlock.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.curiosities.deco;
+package com.simibubi.create.content.decoration.slidingDoor;
 
 import javax.annotation.Nullable;
 
 import com.simibubi.create.AllBlockEntityTypes;
-import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionWorld;
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
+import com.simibubi.create.content.contraptions.ContraptionWorld;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
 import com.simibubi.create.foundation.block.IBE;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/deco/SlidingDoorBlockEntity.java b/src/main/java/com/simibubi/create/content/decoration/slidingDoor/SlidingDoorBlockEntity.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/curiosities/deco/SlidingDoorBlockEntity.java
rename to src/main/java/com/simibubi/create/content/decoration/slidingDoor/SlidingDoorBlockEntity.java
index 5c01a2c19..20d9b0be3 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/deco/SlidingDoorBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/decoration/slidingDoor/SlidingDoorBlockEntity.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.curiosities.deco;
+package com.simibubi.create.content.decoration.slidingDoor;
 
 import java.util.List;
 
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat.Chaser;
 
diff --git a/src/main/java/com/simibubi/create/content/curiosities/deco/SlidingDoorMovementBehaviour.java b/src/main/java/com/simibubi/create/content/decoration/slidingDoor/SlidingDoorMovementBehaviour.java
similarity index 86%
rename from src/main/java/com/simibubi/create/content/curiosities/deco/SlidingDoorMovementBehaviour.java
rename to src/main/java/com/simibubi/create/content/decoration/slidingDoor/SlidingDoorMovementBehaviour.java
index b8e08bc8e..12a708de8 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/deco/SlidingDoorMovementBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/decoration/slidingDoor/SlidingDoorMovementBehaviour.java
@@ -1,20 +1,18 @@
-package com.simibubi.create.content.curiosities.deco;
+package com.simibubi.create.content.decoration.slidingDoor;
 
 import java.lang.ref.WeakReference;
 import java.util.Map;
 
-import com.simibubi.create.content.contraptions.components.actors.DoorControl;
-import com.simibubi.create.content.contraptions.components.actors.DoorControlBehaviour;
-import com.simibubi.create.content.contraptions.components.structureMovement.Contraption;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
-import com.simibubi.create.content.contraptions.components.structureMovement.elevator.ElevatorColumn;
-import com.simibubi.create.content.contraptions.components.structureMovement.elevator.ElevatorColumn.ColumnCoords;
-import com.simibubi.create.content.contraptions.components.structureMovement.elevator.ElevatorContraption;
-import com.simibubi.create.content.logistics.trains.entity.Carriage;
-import com.simibubi.create.content.logistics.trains.entity.CarriageContraptionEntity;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.station.GlobalStation;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.contraptions.Contraption;
+import com.simibubi.create.content.contraptions.behaviour.MovementBehaviour;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
+import com.simibubi.create.content.contraptions.elevator.ElevatorColumn;
+import com.simibubi.create.content.contraptions.elevator.ElevatorColumn.ColumnCoords;
+import com.simibubi.create.content.contraptions.elevator.ElevatorContraption;
+import com.simibubi.create.content.trains.entity.Carriage;
+import com.simibubi.create.content.trains.entity.CarriageContraptionEntity;
+import com.simibubi.create.content.trains.station.GlobalStation;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat.Chaser;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/deco/SlidingDoorRenderer.java b/src/main/java/com/simibubi/create/content/decoration/slidingDoor/SlidingDoorRenderer.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/curiosities/deco/SlidingDoorRenderer.java
rename to src/main/java/com/simibubi/create/content/decoration/slidingDoor/SlidingDoorRenderer.java
index 051a1401d..5d1338066 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/deco/SlidingDoorRenderer.java
+++ b/src/main/java/com/simibubi/create/content/decoration/slidingDoor/SlidingDoorRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.deco;
+package com.simibubi.create.content.decoration.slidingDoor;
 
 import com.jozufozu.flywheel.core.PartialModel;
 import com.mojang.blaze3d.vertex.PoseStack;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/deco/SlidingDoorShapes.java b/src/main/java/com/simibubi/create/content/decoration/slidingDoor/SlidingDoorShapes.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/curiosities/deco/SlidingDoorShapes.java
rename to src/main/java/com/simibubi/create/content/decoration/slidingDoor/SlidingDoorShapes.java
index 00b4759bd..54697ac86 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/deco/SlidingDoorShapes.java
+++ b/src/main/java/com/simibubi/create/content/decoration/slidingDoor/SlidingDoorShapes.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.deco;
+package com.simibubi.create.content.decoration.slidingDoor;
 
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.Block;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/steam/whistle/WhistleBlock.java b/src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleBlock.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/components/steam/whistle/WhistleBlock.java
rename to src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleBlock.java
index 269dd07dc..1fb3b2164 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/steam/whistle/WhistleBlock.java
+++ b/src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleBlock.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.contraptions.components.steam.whistle;
+package com.simibubi.create.content.decoration.steamWhistle;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.components.steam.whistle.WhistleExtenderBlock.WhistleExtenderShape;
-import com.simibubi.create.content.contraptions.fluids.tank.FluidTankBlock;
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
+import com.simibubi.create.content.decoration.steamWhistle.WhistleExtenderBlock.WhistleExtenderShape;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
+import com.simibubi.create.content.fluids.tank.FluidTankBlock;
 import com.simibubi.create.foundation.advancement.AdvancementBehaviour;
 import com.simibubi.create.foundation.block.IBE;
 import com.simibubi.create.foundation.utility.Lang;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/steam/whistle/WhistleBlockEntity.java b/src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleBlockEntity.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/components/steam/whistle/WhistleBlockEntity.java
rename to src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleBlockEntity.java
index edf00fa07..583aafe25 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/steam/whistle/WhistleBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleBlockEntity.java
@@ -1,18 +1,18 @@
-package com.simibubi.create.content.contraptions.components.steam.whistle;
+package com.simibubi.create.content.decoration.steamWhistle;
 
 import java.lang.ref.WeakReference;
 import java.util.List;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllSoundEvents;
-import com.simibubi.create.content.contraptions.components.steam.SteamJetParticleData;
-import com.simibubi.create.content.contraptions.components.steam.whistle.WhistleBlock.WhistleSize;
-import com.simibubi.create.content.contraptions.components.steam.whistle.WhistleExtenderBlock.WhistleExtenderShape;
-import com.simibubi.create.content.contraptions.fluids.tank.FluidTankBlockEntity;
-import com.simibubi.create.content.contraptions.goggles.IHaveGoggleInformation;
+import com.simibubi.create.content.decoration.steamWhistle.WhistleBlock.WhistleSize;
+import com.simibubi.create.content.decoration.steamWhistle.WhistleExtenderBlock.WhistleExtenderShape;
+import com.simibubi.create.content.equipment.goggles.IHaveGoggleInformation;
+import com.simibubi.create.content.fluids.tank.FluidTankBlockEntity;
+import com.simibubi.create.content.kinetics.steamEngine.SteamJetParticleData;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.AngleHelper;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Lang;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/steam/whistle/WhistleExtenderBlock.java b/src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleExtenderBlock.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/components/steam/whistle/WhistleExtenderBlock.java
rename to src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleExtenderBlock.java
index 8fd4dd69a..9027d07d7 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/steam/whistle/WhistleExtenderBlock.java
+++ b/src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleExtenderBlock.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.contraptions.components.steam.whistle;
+package com.simibubi.create.content.decoration.steamWhistle;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.components.steam.whistle.WhistleBlock.WhistleSize;
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
+import com.simibubi.create.content.decoration.steamWhistle.WhistleBlock.WhistleSize;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
 import com.simibubi.create.foundation.utility.Lang;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/steam/whistle/WhistleGenerator.java b/src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleGenerator.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/components/steam/whistle/WhistleGenerator.java
rename to src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleGenerator.java
index 15317a1ca..2923980a7 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/steam/whistle/WhistleGenerator.java
+++ b/src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleGenerator.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.steam.whistle;
+package com.simibubi.create.content.decoration.steamWhistle;
 
 import com.simibubi.create.Create;
 import com.simibubi.create.foundation.data.AssetLookup;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/steam/whistle/WhistleRenderer.java b/src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleRenderer.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/components/steam/whistle/WhistleRenderer.java
rename to src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleRenderer.java
index a5f1e4720..78e9ea9c5 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/steam/whistle/WhistleRenderer.java
+++ b/src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleRenderer.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.contraptions.components.steam.whistle;
+package com.simibubi.create.content.decoration.steamWhistle;
 
 import com.jozufozu.flywheel.core.PartialModel;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.components.steam.whistle.WhistleBlock.WhistleSize;
+import com.simibubi.create.content.decoration.steamWhistle.WhistleBlock.WhistleSize;
 import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.utility.AngleHelper;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/steam/whistle/WhistleSoundInstance.java b/src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleSoundInstance.java
similarity index 89%
rename from src/main/java/com/simibubi/create/content/contraptions/components/steam/whistle/WhistleSoundInstance.java
rename to src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleSoundInstance.java
index f48202603..a768d1aeb 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/steam/whistle/WhistleSoundInstance.java
+++ b/src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleSoundInstance.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.contraptions.components.steam.whistle;
+package com.simibubi.create.content.decoration.steamWhistle;
 
 import static com.simibubi.create.AllSoundEvents.WHISTLE_HIGH;
 import static com.simibubi.create.AllSoundEvents.WHISTLE_LOW;
 import static com.simibubi.create.AllSoundEvents.WHISTLE_MEDIUM;
 
-import com.simibubi.create.content.contraptions.components.steam.whistle.WhistleBlock.WhistleSize;
+import com.simibubi.create.content.decoration.steamWhistle.WhistleBlock.WhistleSize;
 
 import net.minecraft.client.resources.sounds.AbstractTickableSoundInstance;
 import net.minecraft.client.resources.sounds.SoundInstance;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/BuildersTeaItem.java b/src/main/java/com/simibubi/create/content/equipment/BuildersTeaItem.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/curiosities/BuildersTeaItem.java
rename to src/main/java/com/simibubi/create/content/equipment/BuildersTeaItem.java
index 15b25d3b6..caea8034c 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/BuildersTeaItem.java
+++ b/src/main/java/com/simibubi/create/content/equipment/BuildersTeaItem.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities;
+package com.simibubi.create.content.equipment;
 
 import net.minecraft.advancements.CriteriaTriggers;
 import net.minecraft.server.level.ServerPlayer;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/TreeFertilizerItem.java b/src/main/java/com/simibubi/create/content/equipment/TreeFertilizerItem.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/curiosities/TreeFertilizerItem.java
rename to src/main/java/com/simibubi/create/content/equipment/TreeFertilizerItem.java
index 4c1c9f48e..57e38aa90 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/TreeFertilizerItem.java
+++ b/src/main/java/com/simibubi/create/content/equipment/TreeFertilizerItem.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities;
+package com.simibubi.create.content.equipment;
 
 import com.simibubi.create.foundation.utility.worldWrappers.PlacementSimulationServerWorld;
 
diff --git a/src/main/java/com/simibubi/create/content/curiosities/armor/AllArmorMaterials.java b/src/main/java/com/simibubi/create/content/equipment/armor/AllArmorMaterials.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/curiosities/armor/AllArmorMaterials.java
rename to src/main/java/com/simibubi/create/content/equipment/armor/AllArmorMaterials.java
index 38ac71de6..3064b5bcf 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/armor/AllArmorMaterials.java
+++ b/src/main/java/com/simibubi/create/content/equipment/armor/AllArmorMaterials.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.armor;
+package com.simibubi.create.content.equipment.armor;
 
 import java.util.function.Supplier;
 
diff --git a/src/main/java/com/simibubi/create/content/curiosities/armor/BacktankArmorLayer.java b/src/main/java/com/simibubi/create/content/equipment/armor/BacktankArmorLayer.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/curiosities/armor/BacktankArmorLayer.java
rename to src/main/java/com/simibubi/create/content/equipment/armor/BacktankArmorLayer.java
index 23928a49a..b75568278 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/armor/BacktankArmorLayer.java
+++ b/src/main/java/com/simibubi/create/content/equipment/armor/BacktankArmorLayer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.armor;
+package com.simibubi.create.content.equipment.armor;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.foundation.render.CachedBufferer;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/armor/BacktankBlock.java b/src/main/java/com/simibubi/create/content/equipment/armor/BacktankBlock.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/curiosities/armor/BacktankBlock.java
rename to src/main/java/com/simibubi/create/content/equipment/armor/BacktankBlock.java
index a97bd91a2..9ab4e36db 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/armor/BacktankBlock.java
+++ b/src/main/java/com/simibubi/create/content/equipment/armor/BacktankBlock.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.curiosities.armor;
+package com.simibubi.create.content.equipment.armor;
 
 import java.util.Optional;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllEnchantments;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.base.HorizontalKineticBlock;
+import com.simibubi.create.content.kinetics.base.HorizontalKineticBlock;
 import com.simibubi.create.foundation.block.IBE;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/armor/BacktankBlockEntity.java b/src/main/java/com/simibubi/create/content/equipment/armor/BacktankBlockEntity.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/curiosities/armor/BacktankBlockEntity.java
rename to src/main/java/com/simibubi/create/content/equipment/armor/BacktankBlockEntity.java
index 6b2412c5d..20f3c4518 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/armor/BacktankBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/equipment/armor/BacktankBlockEntity.java
@@ -1,15 +1,15 @@
-package com.simibubi.create.content.curiosities.armor;
+package com.simibubi.create.content.equipment.armor;
 
 import java.util.List;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
 import com.simibubi.create.AllSoundEvents;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.particle.AirParticleData;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.ComparatorUtil;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
+import com.simibubi.create.foundation.particle.AirParticleData;
 import com.simibubi.create.foundation.utility.VecHelper;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/armor/BacktankInstance.java b/src/main/java/com/simibubi/create/content/equipment/armor/BacktankInstance.java
similarity index 69%
rename from src/main/java/com/simibubi/create/content/curiosities/armor/BacktankInstance.java
rename to src/main/java/com/simibubi/create/content/equipment/armor/BacktankInstance.java
index 8aa7e3f63..c382e3ff5 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/armor/BacktankInstance.java
+++ b/src/main/java/com/simibubi/create/content/equipment/armor/BacktankInstance.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.curiosities.armor;
+package com.simibubi.create.content.equipment.armor;
 
 import com.jozufozu.flywheel.api.Instancer;
 import com.jozufozu.flywheel.api.MaterialManager;
-import com.simibubi.create.content.contraptions.base.SingleRotatingInstance;
-import com.simibubi.create.content.contraptions.base.flwdata.RotatingData;
+import com.simibubi.create.content.kinetics.base.SingleRotatingInstance;
+import com.simibubi.create.content.kinetics.base.flwdata.RotatingData;
 
 public class BacktankInstance extends SingleRotatingInstance<BacktankBlockEntity> {
 
diff --git a/src/main/java/com/simibubi/create/content/curiosities/armor/BacktankItem.java b/src/main/java/com/simibubi/create/content/equipment/armor/BacktankItem.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/curiosities/armor/BacktankItem.java
rename to src/main/java/com/simibubi/create/content/equipment/armor/BacktankItem.java
index 02feb8714..fe23e0133 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/armor/BacktankItem.java
+++ b/src/main/java/com/simibubi/create/content/equipment/armor/BacktankItem.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.curiosities.armor;
+package com.simibubi.create.content.equipment.armor;
 
 import java.util.Locale;
 import java.util.function.Supplier;
 
 import org.jetbrains.annotations.Nullable;
 
-import com.simibubi.create.content.curiosities.armor.CapacityEnchantment.ICapacityEnchantable;
+import com.simibubi.create.content.equipment.armor.CapacityEnchantment.ICapacityEnchantable;
 import com.simibubi.create.foundation.item.LayeredArmorItem;
 
 import net.minecraft.core.NonNullList;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/armor/BacktankRenderer.java b/src/main/java/com/simibubi/create/content/equipment/armor/BacktankRenderer.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/curiosities/armor/BacktankRenderer.java
rename to src/main/java/com/simibubi/create/content/equipment/armor/BacktankRenderer.java
index da9545e35..11f52aab5 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/armor/BacktankRenderer.java
+++ b/src/main/java/com/simibubi/create/content/equipment/armor/BacktankRenderer.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.curiosities.armor;
+package com.simibubi.create.content.equipment.armor;
 
 import com.jozufozu.flywheel.core.PartialModel;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityRenderer;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.utility.AngleHelper;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/armor/BacktankUtil.java b/src/main/java/com/simibubi/create/content/equipment/armor/BacktankUtil.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/curiosities/armor/BacktankUtil.java
rename to src/main/java/com/simibubi/create/content/equipment/armor/BacktankUtil.java
index ca8a53433..9eb73dc03 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/armor/BacktankUtil.java
+++ b/src/main/java/com/simibubi/create/content/equipment/armor/BacktankUtil.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.curiosities.armor;
+package com.simibubi.create.content.equipment.armor;
 
 import com.simibubi.create.AllEnchantments;
 import com.simibubi.create.AllSoundEvents;
 import com.simibubi.create.AllTags;
-import com.simibubi.create.foundation.config.AllConfigs;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Lang;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
@@ -78,12 +78,12 @@ public class BacktankUtil {
 	}
 
 	public static int maxAir(int enchantLevel) {
-		return AllConfigs.server().curiosities.airInBacktank.get()
-			+ AllConfigs.server().curiosities.enchantedBacktankCapacity.get() * enchantLevel;
+		return AllConfigs.server().equipment.airInBacktank.get()
+			+ AllConfigs.server().equipment.enchantedBacktankCapacity.get() * enchantLevel;
 	}
 
 	public static int maxAirWithoutEnchants() {
-		return AllConfigs.server().curiosities.airInBacktank.get();
+		return AllConfigs.server().equipment.airInBacktank.get();
 	}
 
 	public static boolean canAbsorbDamage(LivingEntity entity, int usesPerTank) {
diff --git a/src/main/java/com/simibubi/create/content/curiosities/armor/BaseArmorItem.java b/src/main/java/com/simibubi/create/content/equipment/armor/BaseArmorItem.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/curiosities/armor/BaseArmorItem.java
rename to src/main/java/com/simibubi/create/content/equipment/armor/BaseArmorItem.java
index de5eb487b..5c1fbeb14 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/armor/BaseArmorItem.java
+++ b/src/main/java/com/simibubi/create/content/equipment/armor/BaseArmorItem.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.armor;
+package com.simibubi.create.content.equipment.armor;
 
 import java.util.Locale;
 
diff --git a/src/main/java/com/simibubi/create/content/curiosities/armor/CapacityEnchantment.java b/src/main/java/com/simibubi/create/content/equipment/armor/CapacityEnchantment.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/curiosities/armor/CapacityEnchantment.java
rename to src/main/java/com/simibubi/create/content/equipment/armor/CapacityEnchantment.java
index 3d894e219..d1109caa2 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/armor/CapacityEnchantment.java
+++ b/src/main/java/com/simibubi/create/content/equipment/armor/CapacityEnchantment.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.armor;
+package com.simibubi.create.content.equipment.armor;
 
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.item.ItemStack;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/armor/DivingBootsItem.java b/src/main/java/com/simibubi/create/content/equipment/armor/DivingBootsItem.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/curiosities/armor/DivingBootsItem.java
rename to src/main/java/com/simibubi/create/content/equipment/armor/DivingBootsItem.java
index 1661bf22e..6b7c3141f 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/armor/DivingBootsItem.java
+++ b/src/main/java/com/simibubi/create/content/equipment/armor/DivingBootsItem.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.armor;
+package com.simibubi.create.content.equipment.armor;
 
 import org.jetbrains.annotations.Nullable;
 
diff --git a/src/main/java/com/simibubi/create/content/curiosities/armor/DivingHelmetItem.java b/src/main/java/com/simibubi/create/content/equipment/armor/DivingHelmetItem.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/curiosities/armor/DivingHelmetItem.java
rename to src/main/java/com/simibubi/create/content/equipment/armor/DivingHelmetItem.java
index f827996ae..1be13ae2f 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/armor/DivingHelmetItem.java
+++ b/src/main/java/com/simibubi/create/content/equipment/armor/DivingHelmetItem.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.armor;
+package com.simibubi.create.content.equipment.armor;
 
 import java.util.Map;
 
diff --git a/src/main/java/com/simibubi/create/content/curiosities/armor/NetheriteBacktankFirstPersonRenderer.java b/src/main/java/com/simibubi/create/content/equipment/armor/NetheriteBacktankFirstPersonRenderer.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/curiosities/armor/NetheriteBacktankFirstPersonRenderer.java
rename to src/main/java/com/simibubi/create/content/equipment/armor/NetheriteBacktankFirstPersonRenderer.java
index df6068242..9d995838a 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/armor/NetheriteBacktankFirstPersonRenderer.java
+++ b/src/main/java/com/simibubi/create/content/equipment/armor/NetheriteBacktankFirstPersonRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.armor;
+package com.simibubi.create.content.equipment.armor;
 
 import com.simibubi.create.AllItems;
 import com.simibubi.create.Create;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/armor/NetheriteDivingHandler.java b/src/main/java/com/simibubi/create/content/equipment/armor/NetheriteDivingHandler.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/curiosities/armor/NetheriteDivingHandler.java
rename to src/main/java/com/simibubi/create/content/equipment/armor/NetheriteDivingHandler.java
index 3c355f713..b3a223756 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/armor/NetheriteDivingHandler.java
+++ b/src/main/java/com/simibubi/create/content/equipment/armor/NetheriteDivingHandler.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.armor;
+package com.simibubi.create.content.equipment.armor;
 
 import com.simibubi.create.AllItems;
 
diff --git a/src/main/java/com/simibubi/create/content/curiosities/armor/RemainingAirOverlay.java b/src/main/java/com/simibubi/create/content/equipment/armor/RemainingAirOverlay.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/curiosities/armor/RemainingAirOverlay.java
rename to src/main/java/com/simibubi/create/content/equipment/armor/RemainingAirOverlay.java
index 00c17f4cc..42111e586 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/armor/RemainingAirOverlay.java
+++ b/src/main/java/com/simibubi/create/content/equipment/armor/RemainingAirOverlay.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.armor;
+package com.simibubi.create.content.equipment.armor;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllItems;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/AbstractBellBlock.java b/src/main/java/com/simibubi/create/content/equipment/bell/AbstractBellBlock.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/curiosities/bell/AbstractBellBlock.java
rename to src/main/java/com/simibubi/create/content/equipment/bell/AbstractBellBlock.java
index 358e8abb0..5467bc403 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/bell/AbstractBellBlock.java
+++ b/src/main/java/com/simibubi/create/content/equipment/bell/AbstractBellBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.bell;
+package com.simibubi.create.content.equipment.bell;
 
 import javax.annotation.Nullable;
 
diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/AbstractBellBlockEntity.java b/src/main/java/com/simibubi/create/content/equipment/bell/AbstractBellBlockEntity.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/curiosities/bell/AbstractBellBlockEntity.java
rename to src/main/java/com/simibubi/create/content/equipment/bell/AbstractBellBlockEntity.java
index 220fb2975..f5ecc5a1a 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/bell/AbstractBellBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/equipment/bell/AbstractBellBlockEntity.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.curiosities.bell;
+package com.simibubi.create.content.equipment.bell;
 
 import java.util.List;
 
 import com.jozufozu.flywheel.core.PartialModel;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.NBTHelper;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/BasicParticleData.java b/src/main/java/com/simibubi/create/content/equipment/bell/BasicParticleData.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/curiosities/bell/BasicParticleData.java
rename to src/main/java/com/simibubi/create/content/equipment/bell/BasicParticleData.java
index 987168325..452042e7f 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/bell/BasicParticleData.java
+++ b/src/main/java/com/simibubi/create/content/equipment/bell/BasicParticleData.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.curiosities.bell;
+package com.simibubi.create.content.equipment.bell;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
 import com.mojang.brigadier.StringReader;
 import com.mojang.serialization.Codec;
-import com.simibubi.create.content.contraptions.particle.ICustomParticleDataWithSprite;
+import com.simibubi.create.foundation.particle.ICustomParticleDataWithSprite;
 import com.simibubi.create.foundation.utility.RegisteredObjects;
 
 import net.minecraft.MethodsReturnNonnullByDefault;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/BellRenderer.java b/src/main/java/com/simibubi/create/content/equipment/bell/BellRenderer.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/curiosities/bell/BellRenderer.java
rename to src/main/java/com/simibubi/create/content/equipment/bell/BellRenderer.java
index e30f3ad09..9816e4f4f 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/bell/BellRenderer.java
+++ b/src/main/java/com/simibubi/create/content/equipment/bell/BellRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.bell;
+package com.simibubi.create.content.equipment.bell;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/CustomRotationParticle.java b/src/main/java/com/simibubi/create/content/equipment/bell/CustomRotationParticle.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/curiosities/bell/CustomRotationParticle.java
rename to src/main/java/com/simibubi/create/content/equipment/bell/CustomRotationParticle.java
index 3f6d0ef2c..9b80868bf 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/bell/CustomRotationParticle.java
+++ b/src/main/java/com/simibubi/create/content/equipment/bell/CustomRotationParticle.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.bell;
+package com.simibubi.create.content.equipment.bell;
 
 import com.jozufozu.flywheel.backend.ShadersModHandler;
 import com.mojang.blaze3d.vertex.VertexConsumer;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/HauntedBellBlock.java b/src/main/java/com/simibubi/create/content/equipment/bell/HauntedBellBlock.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/curiosities/bell/HauntedBellBlock.java
rename to src/main/java/com/simibubi/create/content/equipment/bell/HauntedBellBlock.java
index d19bab3d1..e7886ca61 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/bell/HauntedBellBlock.java
+++ b/src/main/java/com/simibubi/create/content/equipment/bell/HauntedBellBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.bell;
+package com.simibubi.create.content.equipment.bell;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllSoundEvents;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/HauntedBellBlockEntity.java b/src/main/java/com/simibubi/create/content/equipment/bell/HauntedBellBlockEntity.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/curiosities/bell/HauntedBellBlockEntity.java
rename to src/main/java/com/simibubi/create/content/equipment/bell/HauntedBellBlockEntity.java
index 01ba3925c..0784107b8 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/bell/HauntedBellBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/equipment/bell/HauntedBellBlockEntity.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.bell;
+package com.simibubi.create.content.equipment.bell;
 
 import com.jozufozu.flywheel.core.PartialModel;
 import com.simibubi.create.AllPartialModels;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/HauntedBellMovementBehaviour.java b/src/main/java/com/simibubi/create/content/equipment/bell/HauntedBellMovementBehaviour.java
similarity index 82%
rename from src/main/java/com/simibubi/create/content/curiosities/bell/HauntedBellMovementBehaviour.java
rename to src/main/java/com/simibubi/create/content/equipment/bell/HauntedBellMovementBehaviour.java
index ccd89aa63..239f8b924 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/bell/HauntedBellMovementBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/equipment/bell/HauntedBellMovementBehaviour.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.content.curiosities.bell;
+package com.simibubi.create.content.equipment.bell;
 
-import com.simibubi.create.content.contraptions.components.actors.BellMovementBehaviour;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
+import com.simibubi.create.content.contraptions.behaviour.BellMovementBehaviour;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
 
 import net.minecraft.core.BlockPos;
 
diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/HauntedBellPulser.java b/src/main/java/com/simibubi/create/content/equipment/bell/HauntedBellPulser.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/curiosities/bell/HauntedBellPulser.java
rename to src/main/java/com/simibubi/create/content/equipment/bell/HauntedBellPulser.java
index 46a24cfc5..ec80317c0 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/bell/HauntedBellPulser.java
+++ b/src/main/java/com/simibubi/create/content/equipment/bell/HauntedBellPulser.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.bell;
+package com.simibubi.create.content.equipment.bell;
 
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
@@ -7,7 +7,7 @@ import java.util.concurrent.TimeUnit;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.foundation.utility.IntAttached;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/PeculiarBellBlock.java b/src/main/java/com/simibubi/create/content/equipment/bell/PeculiarBellBlock.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/curiosities/bell/PeculiarBellBlock.java
rename to src/main/java/com/simibubi/create/content/equipment/bell/PeculiarBellBlock.java
index 5a2e022c4..eb220828e 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/bell/PeculiarBellBlock.java
+++ b/src/main/java/com/simibubi/create/content/equipment/bell/PeculiarBellBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.bell;
+package com.simibubi.create.content.equipment.bell;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/PeculiarBellBlockEntity.java b/src/main/java/com/simibubi/create/content/equipment/bell/PeculiarBellBlockEntity.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/curiosities/bell/PeculiarBellBlockEntity.java
rename to src/main/java/com/simibubi/create/content/equipment/bell/PeculiarBellBlockEntity.java
index 567ea7de7..6cb81e257 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/bell/PeculiarBellBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/equipment/bell/PeculiarBellBlockEntity.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.bell;
+package com.simibubi.create.content.equipment.bell;
 
 import com.jozufozu.flywheel.core.PartialModel;
 import com.simibubi.create.AllPartialModels;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/SoulBaseParticle.java b/src/main/java/com/simibubi/create/content/equipment/bell/SoulBaseParticle.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/curiosities/bell/SoulBaseParticle.java
rename to src/main/java/com/simibubi/create/content/equipment/bell/SoulBaseParticle.java
index 5c979d5c7..24bd614cc 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/bell/SoulBaseParticle.java
+++ b/src/main/java/com/simibubi/create/content/equipment/bell/SoulBaseParticle.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.bell;
+package com.simibubi.create.content.equipment.bell;
 
 import com.mojang.math.Quaternion;
 import com.mojang.math.Vector3f;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/SoulParticle.java b/src/main/java/com/simibubi/create/content/equipment/bell/SoulParticle.java
similarity index 99%
rename from src/main/java/com/simibubi/create/content/curiosities/bell/SoulParticle.java
rename to src/main/java/com/simibubi/create/content/equipment/bell/SoulParticle.java
index b878d5142..8f0db29f4 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/bell/SoulParticle.java
+++ b/src/main/java/com/simibubi/create/content/equipment/bell/SoulParticle.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.bell;
+package com.simibubi.create.content.equipment.bell;
 
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.mojang.math.Quaternion;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/SoulPulseEffect.java b/src/main/java/com/simibubi/create/content/equipment/bell/SoulPulseEffect.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/curiosities/bell/SoulPulseEffect.java
rename to src/main/java/com/simibubi/create/content/equipment/bell/SoulPulseEffect.java
index 892020b1f..87c9cee98 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/bell/SoulPulseEffect.java
+++ b/src/main/java/com/simibubi/create/content/equipment/bell/SoulPulseEffect.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.bell;
+package com.simibubi.create.content.equipment.bell;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -6,7 +6,7 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import com.google.common.collect.Streams;
-import com.simibubi.create.content.curiosities.bell.SoulParticle.ExpandingPerimeterData;
+import com.simibubi.create.content.equipment.bell.SoulParticle.ExpandingPerimeterData;
 import com.simibubi.create.foundation.utility.VecHelper;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/SoulPulseEffectHandler.java b/src/main/java/com/simibubi/create/content/equipment/bell/SoulPulseEffectHandler.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/curiosities/bell/SoulPulseEffectHandler.java
rename to src/main/java/com/simibubi/create/content/equipment/bell/SoulPulseEffectHandler.java
index 99217687e..93224e6aa 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/bell/SoulPulseEffectHandler.java
+++ b/src/main/java/com/simibubi/create/content/equipment/bell/SoulPulseEffectHandler.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.bell;
+package com.simibubi.create.content.equipment.bell;
 
 import java.util.ArrayList;
 import java.util.HashSet;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/SoulPulseEffectPacket.java b/src/main/java/com/simibubi/create/content/equipment/bell/SoulPulseEffectPacket.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/curiosities/bell/SoulPulseEffectPacket.java
rename to src/main/java/com/simibubi/create/content/equipment/bell/SoulPulseEffectPacket.java
index 0fa2bb6dc..74652139a 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/bell/SoulPulseEffectPacket.java
+++ b/src/main/java/com/simibubi/create/content/equipment/bell/SoulPulseEffectPacket.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.bell;
+package com.simibubi.create.content.equipment.bell;
 
 import com.simibubi.create.CreateClient;
 import com.simibubi.create.foundation.networking.SimplePacketBase;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintAssignCompleteRecipePacket.java b/src/main/java/com/simibubi/create/content/equipment/blueprint/BlueprintAssignCompleteRecipePacket.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintAssignCompleteRecipePacket.java
rename to src/main/java/com/simibubi/create/content/equipment/blueprint/BlueprintAssignCompleteRecipePacket.java
index 966386c9e..707fb974f 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintAssignCompleteRecipePacket.java
+++ b/src/main/java/com/simibubi/create/content/equipment/blueprint/BlueprintAssignCompleteRecipePacket.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.tools;
+package com.simibubi.create.content.equipment.blueprint;
 
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 
diff --git a/src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintEntity.java b/src/main/java/com/simibubi/create/content/equipment/blueprint/BlueprintEntity.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintEntity.java
rename to src/main/java/com/simibubi/create/content/equipment/blueprint/BlueprintEntity.java
index e4a743271..728f3b423 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintEntity.java
+++ b/src/main/java/com/simibubi/create/content/equipment/blueprint/BlueprintEntity.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.tools;
+package com.simibubi.create.content.equipment.blueprint;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -12,10 +12,10 @@ import org.apache.commons.lang3.Validate;
 import com.simibubi.create.AllEntityTypes;
 import com.simibubi.create.AllItems;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.item.filter.FilterItem;
-import com.simibubi.create.content.schematics.ISpecialEntityItemRequirement;
-import com.simibubi.create.content.schematics.ItemRequirement;
-import com.simibubi.create.content.schematics.ItemRequirement.ItemUseType;
+import com.simibubi.create.content.logistics.filter.FilterItem;
+import com.simibubi.create.content.schematics.requirement.ISpecialEntityItemRequirement;
+import com.simibubi.create.content.schematics.requirement.ItemRequirement;
+import com.simibubi.create.content.schematics.requirement.ItemRequirement.ItemUseType;
 import com.simibubi.create.foundation.networking.ISyncPersistentData;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.IInteractionChecker;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintItem.java b/src/main/java/com/simibubi/create/content/equipment/blueprint/BlueprintItem.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintItem.java
rename to src/main/java/com/simibubi/create/content/equipment/blueprint/BlueprintItem.java
index b903d891e..fb9791da3 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintItem.java
+++ b/src/main/java/com/simibubi/create/content/equipment/blueprint/BlueprintItem.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.curiosities.tools;
+package com.simibubi.create.content.equipment.blueprint;
 
 import java.util.Collection;
 
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.logistics.item.filter.AttributeFilterMenu.WhitelistMode;
-import com.simibubi.create.content.logistics.item.filter.FilterItem;
-import com.simibubi.create.content.logistics.item.filter.ItemAttribute;
+import com.simibubi.create.content.logistics.filter.AttributeFilterMenu.WhitelistMode;
+import com.simibubi.create.content.logistics.filter.FilterItem;
+import com.simibubi.create.content.logistics.filter.ItemAttribute;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintMenu.java b/src/main/java/com/simibubi/create/content/equipment/blueprint/BlueprintMenu.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintMenu.java
rename to src/main/java/com/simibubi/create/content/equipment/blueprint/BlueprintMenu.java
index 6987c62de..4aaf0bb39 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintMenu.java
+++ b/src/main/java/com/simibubi/create/content/equipment/blueprint/BlueprintMenu.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.curiosities.tools;
+package com.simibubi.create.content.equipment.blueprint;
 
 import java.util.Optional;
 
 import com.simibubi.create.AllMenuTypes;
-import com.simibubi.create.content.curiosities.tools.BlueprintEntity.BlueprintSection;
+import com.simibubi.create.content.equipment.blueprint.BlueprintEntity.BlueprintSection;
 import com.simibubi.create.foundation.gui.menu.GhostItemMenu;
 
 import net.minecraft.client.Minecraft;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintOverlayRenderer.java b/src/main/java/com/simibubi/create/content/equipment/blueprint/BlueprintOverlayRenderer.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintOverlayRenderer.java
rename to src/main/java/com/simibubi/create/content/equipment/blueprint/BlueprintOverlayRenderer.java
index 0a839692b..7c252285e 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintOverlayRenderer.java
+++ b/src/main/java/com/simibubi/create/content/equipment/blueprint/BlueprintOverlayRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.tools;
+package com.simibubi.create.content.equipment.blueprint;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -10,12 +10,12 @@ import java.util.Optional;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.curiosities.tools.BlueprintEntity.BlueprintCraftingInventory;
-import com.simibubi.create.content.curiosities.tools.BlueprintEntity.BlueprintSection;
-import com.simibubi.create.content.logistics.item.filter.AttributeFilterMenu.WhitelistMode;
-import com.simibubi.create.content.logistics.item.filter.FilterItem;
-import com.simibubi.create.content.logistics.item.filter.ItemAttribute;
-import com.simibubi.create.content.logistics.trains.track.TrackPlacement.PlacementInfo;
+import com.simibubi.create.content.equipment.blueprint.BlueprintEntity.BlueprintCraftingInventory;
+import com.simibubi.create.content.equipment.blueprint.BlueprintEntity.BlueprintSection;
+import com.simibubi.create.content.logistics.filter.AttributeFilterMenu.WhitelistMode;
+import com.simibubi.create.content.logistics.filter.FilterItem;
+import com.simibubi.create.content.logistics.filter.ItemAttribute;
+import com.simibubi.create.content.trains.track.TrackPlacement.PlacementInfo;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
 import com.simibubi.create.foundation.gui.element.GuiGameElement;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintRenderer.java b/src/main/java/com/simibubi/create/content/equipment/blueprint/BlueprintRenderer.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintRenderer.java
rename to src/main/java/com/simibubi/create/content/equipment/blueprint/BlueprintRenderer.java
index cd380143b..de2e7f80b 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintRenderer.java
+++ b/src/main/java/com/simibubi/create/content/equipment/blueprint/BlueprintRenderer.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.curiosities.tools;
+package com.simibubi.create.content.equipment.blueprint;
 
 import com.jozufozu.flywheel.core.PartialModel;
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Matrix3f;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.curiosities.tools.BlueprintEntity.BlueprintSection;
+import com.simibubi.create.content.equipment.blueprint.BlueprintEntity.BlueprintSection;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.utility.Couple;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintScreen.java b/src/main/java/com/simibubi/create/content/equipment/blueprint/BlueprintScreen.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintScreen.java
rename to src/main/java/com/simibubi/create/content/equipment/blueprint/BlueprintScreen.java
index 8ec0eb6b0..d64b3c927 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintScreen.java
+++ b/src/main/java/com/simibubi/create/content/equipment/blueprint/BlueprintScreen.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.tools;
+package com.simibubi.create.content.equipment.blueprint;
 
 import static com.simibubi.create.foundation.gui.AllGuiTextures.PLAYER_INVENTORY;
 
@@ -8,15 +8,15 @@ import java.util.List;
 
 import com.google.common.collect.ImmutableList;
 import com.mojang.blaze3d.vertex.PoseStack;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.logistics.item.filter.FilterScreenPacket;
-import com.simibubi.create.content.logistics.item.filter.FilterScreenPacket.Option;
+import com.simibubi.create.content.logistics.filter.FilterScreenPacket;
+import com.simibubi.create.content.logistics.filter.FilterScreenPacket.Option;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
 import com.simibubi.create.foundation.gui.AllIcons;
 import com.simibubi.create.foundation.gui.element.GuiGameElement;
 import com.simibubi.create.foundation.gui.menu.AbstractSimiContainerScreen;
 import com.simibubi.create.foundation.gui.widget.IconButton;
-import com.simibubi.create.foundation.networking.AllPackets;
 import com.simibubi.create.foundation.utility.Lang;
 
 import net.minecraft.ChatFormatting;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/clipboard/ClipboardBlock.java b/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardBlock.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/curiosities/clipboard/ClipboardBlock.java
rename to src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardBlock.java
index 6c6f240a1..bb38b08a3 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/clipboard/ClipboardBlock.java
+++ b/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardBlock.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.curiosities.clipboard;
+package com.simibubi.create.content.equipment.clipboard;
 
 import java.util.List;
 
 import com.google.common.collect.ImmutableList;
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
 import com.simibubi.create.foundation.block.IBE;
 import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
 import com.simibubi.create.foundation.gui.ScreenOpener;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/clipboard/ClipboardBlockEntity.java b/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardBlockEntity.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/curiosities/clipboard/ClipboardBlockEntity.java
rename to src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardBlockEntity.java
index 117f831eb..7d1afe661 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/clipboard/ClipboardBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardBlockEntity.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.curiosities.clipboard;
+package com.simibubi.create.content.equipment.clipboard;
 
 import java.util.List;
 import java.util.UUID;
 
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/clipboard/ClipboardBlockItem.java b/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardBlockItem.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/curiosities/clipboard/ClipboardBlockItem.java
rename to src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardBlockItem.java
index 21dfe3734..58a0d4b10 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/clipboard/ClipboardBlockItem.java
+++ b/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardBlockItem.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.clipboard;
+package com.simibubi.create.content.equipment.clipboard;
 
 import javax.annotation.Nonnull;
 
diff --git a/src/main/java/com/simibubi/create/content/curiosities/clipboard/ClipboardCloneable.java b/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardCloneable.java
similarity index 86%
rename from src/main/java/com/simibubi/create/content/curiosities/clipboard/ClipboardCloneable.java
rename to src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardCloneable.java
index a9587941a..fcd783b90 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/clipboard/ClipboardCloneable.java
+++ b/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardCloneable.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.clipboard;
+package com.simibubi.create.content.equipment.clipboard;
 
 import net.minecraft.core.Direction;
 import net.minecraft.nbt.CompoundTag;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/clipboard/ClipboardEditPacket.java b/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardEditPacket.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/curiosities/clipboard/ClipboardEditPacket.java
rename to src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardEditPacket.java
index 13fa39b8e..14e7dedee 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/clipboard/ClipboardEditPacket.java
+++ b/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardEditPacket.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.clipboard;
+package com.simibubi.create.content.equipment.clipboard;
 
 import javax.annotation.Nullable;
 
diff --git a/src/main/java/com/simibubi/create/content/curiosities/clipboard/ClipboardEntry.java b/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardEntry.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/curiosities/clipboard/ClipboardEntry.java
rename to src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardEntry.java
index dcdbb066e..480d4cdab 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/clipboard/ClipboardEntry.java
+++ b/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardEntry.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.clipboard;
+package com.simibubi.create.content.equipment.clipboard;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/clipboard/ClipboardOverrides.java b/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardOverrides.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/curiosities/clipboard/ClipboardOverrides.java
rename to src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardOverrides.java
index 247362009..5d8cf71fe 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/clipboard/ClipboardOverrides.java
+++ b/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardOverrides.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.clipboard;
+package com.simibubi.create.content.equipment.clipboard;
 
 import com.simibubi.create.Create;
 import com.tterrag.registrate.providers.DataGenContext;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/clipboard/ClipboardScreen.java b/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardScreen.java
similarity index 99%
rename from src/main/java/com/simibubi/create/content/curiosities/clipboard/ClipboardScreen.java
rename to src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardScreen.java
index 0b440efc5..4f35990b8 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/clipboard/ClipboardScreen.java
+++ b/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardScreen.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.clipboard;
+package com.simibubi.create.content.equipment.clipboard;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -19,12 +19,12 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.Tesselator;
 import com.mojang.blaze3d.vertex.VertexFormat;
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.curiosities.clipboard.ClipboardOverrides.ClipboardType;
+import com.simibubi.create.AllPackets;
+import com.simibubi.create.content.equipment.clipboard.ClipboardOverrides.ClipboardType;
 import com.simibubi.create.foundation.gui.AbstractSimiScreen;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
 import com.simibubi.create.foundation.gui.AllIcons;
 import com.simibubi.create.foundation.gui.widget.IconButton;
-import com.simibubi.create.foundation.networking.AllPackets;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Lang;
 
diff --git a/src/main/java/com/simibubi/create/content/curiosities/clipboard/ClipboardValueSettingsHandler.java b/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardValueSettingsHandler.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/curiosities/clipboard/ClipboardValueSettingsHandler.java
rename to src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardValueSettingsHandler.java
index b5096d632..a404c42de 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/clipboard/ClipboardValueSettingsHandler.java
+++ b/src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardValueSettingsHandler.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.clipboard;
+package com.simibubi.create.content.equipment.clipboard;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -7,10 +7,10 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.CreateClient;
-import com.simibubi.create.content.curiosities.clipboard.ClipboardOverrides.ClipboardType;
-import com.simibubi.create.content.logistics.trains.track.TrackBlockOutline;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.equipment.clipboard.ClipboardOverrides.ClipboardType;
+import com.simibubi.create.content.trains.track.TrackBlockOutline;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Lang;
 
diff --git a/src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripInteractionPacket.java b/src/main/java/com/simibubi/create/content/equipment/extendoGrip/ExtendoGripInteractionPacket.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripInteractionPacket.java
rename to src/main/java/com/simibubi/create/content/equipment/extendoGrip/ExtendoGripInteractionPacket.java
index 465c05eca..9df32850a 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripInteractionPacket.java
+++ b/src/main/java/com/simibubi/create/content/equipment/extendoGrip/ExtendoGripInteractionPacket.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.tools;
+package com.simibubi.create.content.equipment.extendoGrip;
 
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 
diff --git a/src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripItem.java b/src/main/java/com/simibubi/create/content/equipment/extendoGrip/ExtendoGripItem.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripItem.java
rename to src/main/java/com/simibubi/create/content/equipment/extendoGrip/ExtendoGripItem.java
index 037fff7cd..0d1c46cb8 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripItem.java
+++ b/src/main/java/com/simibubi/create/content/equipment/extendoGrip/ExtendoGripItem.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.tools;
+package com.simibubi.create.content.equipment.extendoGrip;
 
 import java.util.UUID;
 import java.util.function.Consumer;
@@ -8,12 +8,12 @@ import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.Multimap;
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.curiosities.armor.BacktankUtil;
+import com.simibubi.create.AllPackets;
+import com.simibubi.create.content.equipment.armor.BacktankUtil;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
-import com.simibubi.create.foundation.config.AllConfigs;
 import com.simibubi.create.foundation.item.render.SimpleCustomRenderer;
-import com.simibubi.create.foundation.networking.AllPackets;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.player.LocalPlayer;
@@ -225,7 +225,7 @@ public class ExtendoGripItem extends Item {
 	}
 
 	private static int maxUses() {
-		return AllConfigs.server().curiosities.maxExtendoGripActions.get();
+		return AllConfigs.server().equipment.maxExtendoGripActions.get();
 	}
 
 	@SubscribeEvent
diff --git a/src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripItemRenderer.java b/src/main/java/com/simibubi/create/content/equipment/extendoGrip/ExtendoGripItemRenderer.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripItemRenderer.java
rename to src/main/java/com/simibubi/create/content/equipment/extendoGrip/ExtendoGripItemRenderer.java
index c67148b4e..e79655ef9 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripItemRenderer.java
+++ b/src/main/java/com/simibubi/create/content/equipment/extendoGrip/ExtendoGripItemRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.tools;
+package com.simibubi.create.content.equipment.extendoGrip;
 
 import com.jozufozu.flywheel.core.PartialModel;
 import com.jozufozu.flywheel.util.transform.TransformStack;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripRenderHandler.java b/src/main/java/com/simibubi/create/content/equipment/extendoGrip/ExtendoGripRenderHandler.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripRenderHandler.java
rename to src/main/java/com/simibubi/create/content/equipment/extendoGrip/ExtendoGripRenderHandler.java
index cf1346d5d..c79c8e7fe 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripRenderHandler.java
+++ b/src/main/java/com/simibubi/create/content/equipment/extendoGrip/ExtendoGripRenderHandler.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.tools;
+package com.simibubi.create.content.equipment.extendoGrip;
 
 import com.jozufozu.flywheel.core.PartialModel;
 import com.jozufozu.flywheel.util.transform.TransformStack;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/goggles/GoggleConfigScreen.java b/src/main/java/com/simibubi/create/content/equipment/goggles/GoggleConfigScreen.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/goggles/GoggleConfigScreen.java
rename to src/main/java/com/simibubi/create/content/equipment/goggles/GoggleConfigScreen.java
index 695ce960a..72060dc94 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/goggles/GoggleConfigScreen.java
+++ b/src/main/java/com/simibubi/create/content/equipment/goggles/GoggleConfigScreen.java
@@ -1,15 +1,15 @@
-package com.simibubi.create.content.contraptions.goggles;
+package com.simibubi.create.content.equipment.goggles;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllItems;
-import com.simibubi.create.foundation.config.AllConfigs;
 import com.simibubi.create.foundation.gui.AbstractSimiScreen;
 import com.simibubi.create.foundation.gui.element.GuiGameElement;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Lang;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.Component;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/goggles/GoggleOverlayRenderer.java b/src/main/java/com/simibubi/create/content/equipment/goggles/GoggleOverlayRenderer.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/goggles/GoggleOverlayRenderer.java
rename to src/main/java/com/simibubi/create/content/equipment/goggles/GoggleOverlayRenderer.java
index 18dc7556b..da9504077 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/goggles/GoggleOverlayRenderer.java
+++ b/src/main/java/com/simibubi/create/content/equipment/goggles/GoggleOverlayRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.goggles;
+package com.simibubi.create.content.equipment.goggles;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -8,22 +8,22 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
 import com.simibubi.create.CreateClient;
-import com.simibubi.create.content.contraptions.components.structureMovement.IDisplayAssemblyExceptions;
-import com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.piston.PistonExtensionPoleBlock;
-import com.simibubi.create.content.logistics.trains.entity.TrainRelocator;
+import com.simibubi.create.content.contraptions.IDisplayAssemblyExceptions;
+import com.simibubi.create.content.contraptions.piston.MechanicalPistonBlock;
+import com.simibubi.create.content.contraptions.piston.PistonExtensionPoleBlock;
+import com.simibubi.create.content.trains.entity.TrainRelocator;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBox;
-import com.simibubi.create.foundation.config.AllConfigs;
-import com.simibubi.create.foundation.config.CClient;
 import com.simibubi.create.foundation.gui.RemovedGuiUtils;
 import com.simibubi.create.foundation.gui.Theme;
 import com.simibubi.create.foundation.gui.element.GuiGameElement;
+import com.simibubi.create.foundation.outliner.Outline;
+import com.simibubi.create.foundation.outliner.Outliner.OutlineEntry;
 import com.simibubi.create.foundation.utility.Color;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.Lang;
-import com.simibubi.create.foundation.utility.outliner.Outline;
-import com.simibubi.create.foundation.utility.outliner.Outliner.OutlineEntry;
+import com.simibubi.create.infrastructure.config.AllConfigs;
+import com.simibubi.create.infrastructure.config.CClient;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ClientLevel;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/goggles/GogglesItem.java b/src/main/java/com/simibubi/create/content/equipment/goggles/GogglesItem.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/goggles/GogglesItem.java
rename to src/main/java/com/simibubi/create/content/equipment/goggles/GogglesItem.java
index 19063c4d6..22d59c6bd 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/goggles/GogglesItem.java
+++ b/src/main/java/com/simibubi/create/content/equipment/goggles/GogglesItem.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.goggles;
+package com.simibubi.create.content.equipment.goggles;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/goggles/GogglesModel.java b/src/main/java/com/simibubi/create/content/equipment/goggles/GogglesModel.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/goggles/GogglesModel.java
rename to src/main/java/com/simibubi/create/content/equipment/goggles/GogglesModel.java
index f6e335eb4..0dec2de7b 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/goggles/GogglesModel.java
+++ b/src/main/java/com/simibubi/create/content/equipment/goggles/GogglesModel.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.goggles;
+package com.simibubi.create.content.equipment.goggles;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllPartialModels;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/goggles/IHaveGoggleInformation.java b/src/main/java/com/simibubi/create/content/equipment/goggles/IHaveGoggleInformation.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/goggles/IHaveGoggleInformation.java
rename to src/main/java/com/simibubi/create/content/equipment/goggles/IHaveGoggleInformation.java
index ba46a7180..97085d1ed 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/goggles/IHaveGoggleInformation.java
+++ b/src/main/java/com/simibubi/create/content/equipment/goggles/IHaveGoggleInformation.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.goggles;
+package com.simibubi.create.content.equipment.goggles;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/goggles/IHaveHoveringInformation.java b/src/main/java/com/simibubi/create/content/equipment/goggles/IHaveHoveringInformation.java
similarity index 84%
rename from src/main/java/com/simibubi/create/content/contraptions/goggles/IHaveHoveringInformation.java
rename to src/main/java/com/simibubi/create/content/equipment/goggles/IHaveHoveringInformation.java
index 49d887ad8..ea97e262a 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/goggles/IHaveHoveringInformation.java
+++ b/src/main/java/com/simibubi/create/content/equipment/goggles/IHaveHoveringInformation.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.goggles;
+package com.simibubi.create.content.equipment.goggles;
 
 import java.util.List;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/goggles/IProxyHoveringInformation.java b/src/main/java/com/simibubi/create/content/equipment/goggles/IProxyHoveringInformation.java
similarity index 82%
rename from src/main/java/com/simibubi/create/content/contraptions/goggles/IProxyHoveringInformation.java
rename to src/main/java/com/simibubi/create/content/equipment/goggles/IProxyHoveringInformation.java
index dc8351b39..dad2d3051 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/goggles/IProxyHoveringInformation.java
+++ b/src/main/java/com/simibubi/create/content/equipment/goggles/IProxyHoveringInformation.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.goggles;
+package com.simibubi.create.content.equipment.goggles;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/weapons/BuiltinPotatoProjectileTypes.java b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/BuiltinPotatoProjectileTypes.java
similarity index 99%
rename from src/main/java/com/simibubi/create/content/curiosities/weapons/BuiltinPotatoProjectileTypes.java
rename to src/main/java/com/simibubi/create/content/equipment/potatoCannon/BuiltinPotatoProjectileTypes.java
index fbe0f5396..4bebe12f3 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/weapons/BuiltinPotatoProjectileTypes.java
+++ b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/BuiltinPotatoProjectileTypes.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.weapons;
+package com.simibubi.create.content.equipment.potatoCannon;
 
 import java.util.UUID;
 import java.util.function.BiPredicate;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonItem.java b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonItem.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonItem.java
rename to src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonItem.java
index f21bbb555..1e56bfae6 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonItem.java
+++ b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonItem.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.weapons;
+package com.simibubi.create.content.equipment.potatoCannon;
 
 import java.util.List;
 import java.util.Optional;
@@ -11,15 +11,15 @@ import com.simibubi.create.AllEnchantments;
 import com.simibubi.create.AllEntityTypes;
 import com.simibubi.create.Create;
 import com.simibubi.create.CreateClient;
-import com.simibubi.create.content.curiosities.armor.BacktankUtil;
-import com.simibubi.create.content.curiosities.zapper.ShootableGadgetItemMethods;
-import com.simibubi.create.foundation.config.AllConfigs;
+import com.simibubi.create.content.equipment.armor.BacktankUtil;
+import com.simibubi.create.content.equipment.zapper.ShootableGadgetItemMethods;
 import com.simibubi.create.foundation.item.CustomArmPoseItem;
 import com.simibubi.create.foundation.item.render.SimpleCustomRenderer;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.VecHelper;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
@@ -100,7 +100,7 @@ public class PotatoCannonItem extends ProjectileWeaponItem implements CustomArmP
 	}
 
 	private int maxUses() {
-		return AllConfigs.server().curiosities.maxPotatoCannonShots.get();
+		return AllConfigs.server().equipment.maxPotatoCannonShots.get();
 	}
 
 	public boolean isCannon(ItemStack stack) {
diff --git a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonItemRenderer.java b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonItemRenderer.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonItemRenderer.java
rename to src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonItemRenderer.java
index 19e320d60..558bb1420 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonItemRenderer.java
+++ b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonItemRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.weapons;
+package com.simibubi.create.content.equipment.potatoCannon;
 
 import com.jozufozu.flywheel.core.PartialModel;
 import com.jozufozu.flywheel.util.transform.TransformStack;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonPacket.java b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonPacket.java
similarity index 87%
rename from src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonPacket.java
rename to src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonPacket.java
index 04df8d3ba..2aa8ac951 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonPacket.java
+++ b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonPacket.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.curiosities.weapons;
+package com.simibubi.create.content.equipment.potatoCannon;
 
 import com.simibubi.create.CreateClient;
-import com.simibubi.create.content.curiosities.zapper.ShootGadgetPacket;
-import com.simibubi.create.content.curiosities.zapper.ShootableGadgetRenderHandler;
+import com.simibubi.create.content.equipment.zapper.ShootGadgetPacket;
+import com.simibubi.create.content.equipment.zapper.ShootableGadgetRenderHandler;
 
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.world.InteractionHand;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonProjectileType.java b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonProjectileType.java
similarity index 99%
rename from src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonProjectileType.java
rename to src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonProjectileType.java
index 48c35e29a..fbbd7f1f9 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonProjectileType.java
+++ b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonProjectileType.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.weapons;
+package com.simibubi.create.content.equipment.potatoCannon;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonRenderHandler.java b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonRenderHandler.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonRenderHandler.java
rename to src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonRenderHandler.java
index 0b0cfa4b8..4e437fdab 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonRenderHandler.java
+++ b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonRenderHandler.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.curiosities.weapons;
+package com.simibubi.create.content.equipment.potatoCannon;
 
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.contraptions.particle.AirParticleData;
-import com.simibubi.create.content.curiosities.zapper.ShootableGadgetRenderHandler;
+import com.simibubi.create.content.equipment.zapper.ShootableGadgetRenderHandler;
+import com.simibubi.create.foundation.particle.AirParticleData;
 import com.simibubi.create.foundation.utility.VecHelper;
 
 import net.minecraft.client.Minecraft;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoProjectileEntity.java b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoProjectileEntity.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoProjectileEntity.java
rename to src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoProjectileEntity.java
index e5da6d7a4..7afb0414e 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoProjectileEntity.java
+++ b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoProjectileEntity.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.curiosities.weapons;
+package com.simibubi.create.content.equipment.potatoCannon;
 
 import javax.annotation.Nullable;
 
 import com.simibubi.create.AllEnchantments;
 import com.simibubi.create.AllSoundEvents;
-import com.simibubi.create.content.contraptions.particle.AirParticleData;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
+import com.simibubi.create.foundation.particle.AirParticleData;
 import com.simibubi.create.foundation.utility.VecHelper;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoProjectileRenderMode.java b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoProjectileRenderMode.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoProjectileRenderMode.java
rename to src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoProjectileRenderMode.java
index 46c96baab..99d301c53 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoProjectileRenderMode.java
+++ b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoProjectileRenderMode.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.curiosities.weapons;
+package com.simibubi.create.content.equipment.potatoCannon;
 
-import static com.simibubi.create.content.curiosities.weapons.PotatoProjectileRenderMode.entityRandom;
+import static com.simibubi.create.content.equipment.potatoCannon.PotatoProjectileRenderMode.entityRandom;
 
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoProjectileRenderer.java b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoProjectileRenderer.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoProjectileRenderer.java
rename to src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoProjectileRenderer.java
index 643fa4004..94cb36917 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoProjectileRenderer.java
+++ b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoProjectileRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.weapons;
+package com.simibubi.create.content.equipment.potatoCannon;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 
diff --git a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoProjectileTypeManager.java b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoProjectileTypeManager.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoProjectileTypeManager.java
rename to src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoProjectileTypeManager.java
index cc4537a1a..09d8674bc 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoProjectileTypeManager.java
+++ b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoProjectileTypeManager.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.weapons;
+package com.simibubi.create.content.equipment.potatoCannon;
 
 import java.util.HashMap;
 import java.util.IdentityHashMap;
@@ -10,7 +10,7 @@ import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.simibubi.create.AllItems;
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 
 import net.minecraft.network.FriendlyByteBuf;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoRecoveryEnchantment.java b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoRecoveryEnchantment.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoRecoveryEnchantment.java
rename to src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoRecoveryEnchantment.java
index 2f8a2f063..47e767fff 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoRecoveryEnchantment.java
+++ b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoRecoveryEnchantment.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.weapons;
+package com.simibubi.create.content.equipment.potatoCannon;
 
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.item.ItemStack;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/tools/SandPaperItem.java b/src/main/java/com/simibubi/create/content/equipment/sandPaper/SandPaperItem.java
similarity index 99%
rename from src/main/java/com/simibubi/create/content/curiosities/tools/SandPaperItem.java
rename to src/main/java/com/simibubi/create/content/equipment/sandPaper/SandPaperItem.java
index 3e007d31f..df54f3b29 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/tools/SandPaperItem.java
+++ b/src/main/java/com/simibubi/create/content/equipment/sandPaper/SandPaperItem.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.tools;
+package com.simibubi.create.content.equipment.sandPaper;
 
 import java.util.function.Consumer;
 
diff --git a/src/main/java/com/simibubi/create/content/curiosities/tools/SandPaperItemRenderer.java b/src/main/java/com/simibubi/create/content/equipment/sandPaper/SandPaperItemRenderer.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/curiosities/tools/SandPaperItemRenderer.java
rename to src/main/java/com/simibubi/create/content/equipment/sandPaper/SandPaperItemRenderer.java
index 1aff3285c..01aef90a0 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/tools/SandPaperItemRenderer.java
+++ b/src/main/java/com/simibubi/create/content/equipment/sandPaper/SandPaperItemRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.tools;
+package com.simibubi.create.content.equipment.sandPaper;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Vector3f;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/tools/SandPaperPolishingRecipe.java b/src/main/java/com/simibubi/create/content/equipment/sandPaper/SandPaperPolishingRecipe.java
similarity index 84%
rename from src/main/java/com/simibubi/create/content/curiosities/tools/SandPaperPolishingRecipe.java
rename to src/main/java/com/simibubi/create/content/equipment/sandPaper/SandPaperPolishingRecipe.java
index b526606db..adb80b44f 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/tools/SandPaperPolishingRecipe.java
+++ b/src/main/java/com/simibubi/create/content/equipment/sandPaper/SandPaperPolishingRecipe.java
@@ -1,13 +1,13 @@
-package com.simibubi.create.content.curiosities.tools;
+package com.simibubi.create.content.equipment.sandPaper;
 
 import java.util.List;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
 import com.simibubi.create.AllRecipeTypes;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipe;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipeBuilder.ProcessingRecipeParams;
-import com.simibubi.create.content.curiosities.tools.SandPaperPolishingRecipe.SandPaperInv;
+import com.simibubi.create.content.equipment.sandPaper.SandPaperPolishingRecipe.SandPaperInv;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipe;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder.ProcessingRecipeParams;
 
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.Recipe;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/symmetry/ConfigureSymmetryWandPacket.java b/src/main/java/com/simibubi/create/content/equipment/symmetryWand/ConfigureSymmetryWandPacket.java
similarity index 89%
rename from src/main/java/com/simibubi/create/content/curiosities/symmetry/ConfigureSymmetryWandPacket.java
rename to src/main/java/com/simibubi/create/content/equipment/symmetryWand/ConfigureSymmetryWandPacket.java
index 0f80ca5a9..068011bd7 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/symmetry/ConfigureSymmetryWandPacket.java
+++ b/src/main/java/com/simibubi/create/content/equipment/symmetryWand/ConfigureSymmetryWandPacket.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.curiosities.symmetry;
+package com.simibubi.create.content.equipment.symmetryWand;
 
-import com.simibubi.create.content.curiosities.symmetry.mirror.SymmetryMirror;
+import com.simibubi.create.content.equipment.symmetryWand.mirror.SymmetryMirror;
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 
 import net.minecraft.network.FriendlyByteBuf;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryEffectPacket.java b/src/main/java/com/simibubi/create/content/equipment/symmetryWand/SymmetryEffectPacket.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryEffectPacket.java
rename to src/main/java/com/simibubi/create/content/equipment/symmetryWand/SymmetryEffectPacket.java
index 9551c31d4..c7572c4cb 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryEffectPacket.java
+++ b/src/main/java/com/simibubi/create/content/equipment/symmetryWand/SymmetryEffectPacket.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.symmetry;
+package com.simibubi.create.content.equipment.symmetryWand;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryHandler.java b/src/main/java/com/simibubi/create/content/equipment/symmetryWand/SymmetryHandler.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryHandler.java
rename to src/main/java/com/simibubi/create/content/equipment/symmetryWand/SymmetryHandler.java
index 3ec71b6d4..ec5c54521 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryHandler.java
+++ b/src/main/java/com/simibubi/create/content/equipment/symmetryWand/SymmetryHandler.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.symmetry;
+package com.simibubi.create.content.equipment.symmetryWand;
 
 import java.util.Random;
 
@@ -6,8 +6,8 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.mojang.math.Vector3f;
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.curiosities.symmetry.mirror.EmptyMirror;
-import com.simibubi.create.content.curiosities.symmetry.mirror.SymmetryMirror;
+import com.simibubi.create.content.equipment.symmetryWand.mirror.EmptyMirror;
+import com.simibubi.create.content.equipment.symmetryWand.mirror.SymmetryMirror;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 
 import net.minecraft.client.Camera;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryWandItem.java b/src/main/java/com/simibubi/create/content/equipment/symmetryWand/SymmetryWandItem.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryWandItem.java
rename to src/main/java/com/simibubi/create/content/equipment/symmetryWand/SymmetryWandItem.java
index cb12d8b76..ac201192e 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryWandItem.java
+++ b/src/main/java/com/simibubi/create/content/equipment/symmetryWand/SymmetryWandItem.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.symmetry;
+package com.simibubi.create.content.equipment.symmetryWand;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -9,18 +9,17 @@ import java.util.function.Consumer;
 import javax.annotation.Nonnull;
 
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.components.structureMovement.mounted.CartAssemblerBlock;
-import com.simibubi.create.content.curiosities.symmetry.client.SymmetryWandItemRenderer;
-import com.simibubi.create.content.curiosities.symmetry.mirror.CrossPlaneMirror;
-import com.simibubi.create.content.curiosities.symmetry.mirror.EmptyMirror;
-import com.simibubi.create.content.curiosities.symmetry.mirror.PlaneMirror;
-import com.simibubi.create.content.curiosities.symmetry.mirror.SymmetryMirror;
-import com.simibubi.create.foundation.config.AllConfigs;
+import com.simibubi.create.AllPackets;
+import com.simibubi.create.content.contraptions.mounted.CartAssemblerBlock;
+import com.simibubi.create.content.equipment.symmetryWand.mirror.CrossPlaneMirror;
+import com.simibubi.create.content.equipment.symmetryWand.mirror.EmptyMirror;
+import com.simibubi.create.content.equipment.symmetryWand.mirror.PlaneMirror;
+import com.simibubi.create.content.equipment.symmetryWand.mirror.SymmetryMirror;
 import com.simibubi.create.foundation.gui.ScreenOpener;
 import com.simibubi.create.foundation.item.render.SimpleCustomRenderer;
-import com.simibubi.create.foundation.networking.AllPackets;
 import com.simibubi.create.foundation.utility.BlockHelper;
 import com.simibubi.create.foundation.utility.Iterate;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -204,7 +203,7 @@ public class SymmetryWandItem extends Item {
 			.getCompound(SYMMETRY));
 
 		Vec3 mirrorPos = symmetry.getPosition();
-		if (mirrorPos.distanceTo(Vec3.atLowerCornerOf(pos)) > AllConfigs.server().curiosities.maxSymmetryWandRange.get())
+		if (mirrorPos.distanceTo(Vec3.atLowerCornerOf(pos)) > AllConfigs.server().equipment.maxSymmetryWandRange.get())
 			return;
 		if (!player.isCreative() && isHoldingBlock(player, block)
 			&& BlockHelper.findAndRemoveInInventory(block, player, 1) == 0)
@@ -292,7 +291,7 @@ public class SymmetryWandItem extends Item {
 			.getCompound(SYMMETRY));
 
 		Vec3 mirrorPos = symmetry.getPosition();
-		if (mirrorPos.distanceTo(Vec3.atLowerCornerOf(pos)) > AllConfigs.server().curiosities.maxSymmetryWandRange.get())
+		if (mirrorPos.distanceTo(Vec3.atLowerCornerOf(pos)) > AllConfigs.server().equipment.maxSymmetryWandRange.get())
 			return;
 
 		symmetry.process(blockSet);
diff --git a/src/main/java/com/simibubi/create/content/curiosities/symmetry/client/SymmetryWandItemRenderer.java b/src/main/java/com/simibubi/create/content/equipment/symmetryWand/SymmetryWandItemRenderer.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/curiosities/symmetry/client/SymmetryWandItemRenderer.java
rename to src/main/java/com/simibubi/create/content/equipment/symmetryWand/SymmetryWandItemRenderer.java
index 3dedc651d..1fc5b9d1a 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/symmetry/client/SymmetryWandItemRenderer.java
+++ b/src/main/java/com/simibubi/create/content/equipment/symmetryWand/SymmetryWandItemRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.symmetry.client;
+package com.simibubi.create.content.equipment.symmetryWand;
 
 import com.jozufozu.flywheel.core.PartialModel;
 import com.mojang.blaze3d.vertex.PoseStack;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryWandScreen.java b/src/main/java/com/simibubi/create/content/equipment/symmetryWand/SymmetryWandScreen.java
similarity index 89%
rename from src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryWandScreen.java
rename to src/main/java/com/simibubi/create/content/equipment/symmetryWand/SymmetryWandScreen.java
index 018b8c49a..6f4662fc3 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryWandScreen.java
+++ b/src/main/java/com/simibubi/create/content/equipment/symmetryWand/SymmetryWandScreen.java
@@ -1,12 +1,13 @@
-package com.simibubi.create.content.curiosities.symmetry;
+package com.simibubi.create.content.equipment.symmetryWand;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Vector3f;
-import com.simibubi.create.content.curiosities.symmetry.mirror.CrossPlaneMirror;
-import com.simibubi.create.content.curiosities.symmetry.mirror.EmptyMirror;
-import com.simibubi.create.content.curiosities.symmetry.mirror.PlaneMirror;
-import com.simibubi.create.content.curiosities.symmetry.mirror.SymmetryMirror;
-import com.simibubi.create.content.curiosities.symmetry.mirror.TriplePlaneMirror;
+import com.simibubi.create.AllPackets;
+import com.simibubi.create.content.equipment.symmetryWand.mirror.CrossPlaneMirror;
+import com.simibubi.create.content.equipment.symmetryWand.mirror.EmptyMirror;
+import com.simibubi.create.content.equipment.symmetryWand.mirror.PlaneMirror;
+import com.simibubi.create.content.equipment.symmetryWand.mirror.SymmetryMirror;
+import com.simibubi.create.content.equipment.symmetryWand.mirror.TriplePlaneMirror;
 import com.simibubi.create.foundation.gui.AbstractSimiScreen;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
 import com.simibubi.create.foundation.gui.AllIcons;
@@ -15,7 +16,6 @@ import com.simibubi.create.foundation.gui.widget.IconButton;
 import com.simibubi.create.foundation.gui.widget.Label;
 import com.simibubi.create.foundation.gui.widget.ScrollInput;
 import com.simibubi.create.foundation.gui.widget.SelectionScrollInput;
-import com.simibubi.create.foundation.networking.AllPackets;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Lang;
 
diff --git a/src/main/java/com/simibubi/create/content/curiosities/symmetry/mirror/CrossPlaneMirror.java b/src/main/java/com/simibubi/create/content/equipment/symmetryWand/mirror/CrossPlaneMirror.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/curiosities/symmetry/mirror/CrossPlaneMirror.java
rename to src/main/java/com/simibubi/create/content/equipment/symmetryWand/mirror/CrossPlaneMirror.java
index 9af86bebf..9a9172cca 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/symmetry/mirror/CrossPlaneMirror.java
+++ b/src/main/java/com/simibubi/create/content/equipment/symmetryWand/mirror/CrossPlaneMirror.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.symmetry.mirror;
+package com.simibubi.create.content.equipment.symmetryWand.mirror;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/symmetry/mirror/EmptyMirror.java b/src/main/java/com/simibubi/create/content/equipment/symmetryWand/mirror/EmptyMirror.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/curiosities/symmetry/mirror/EmptyMirror.java
rename to src/main/java/com/simibubi/create/content/equipment/symmetryWand/mirror/EmptyMirror.java
index 56103a1ee..cf30a04fd 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/symmetry/mirror/EmptyMirror.java
+++ b/src/main/java/com/simibubi/create/content/equipment/symmetryWand/mirror/EmptyMirror.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.symmetry.mirror;
+package com.simibubi.create.content.equipment.symmetryWand.mirror;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/symmetry/mirror/PlaneMirror.java b/src/main/java/com/simibubi/create/content/equipment/symmetryWand/mirror/PlaneMirror.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/curiosities/symmetry/mirror/PlaneMirror.java
rename to src/main/java/com/simibubi/create/content/equipment/symmetryWand/mirror/PlaneMirror.java
index 973891a32..b68cda9e7 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/symmetry/mirror/PlaneMirror.java
+++ b/src/main/java/com/simibubi/create/content/equipment/symmetryWand/mirror/PlaneMirror.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.symmetry.mirror;
+package com.simibubi.create.content.equipment.symmetryWand.mirror;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/symmetry/mirror/SymmetryMirror.java b/src/main/java/com/simibubi/create/content/equipment/symmetryWand/mirror/SymmetryMirror.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/curiosities/symmetry/mirror/SymmetryMirror.java
rename to src/main/java/com/simibubi/create/content/equipment/symmetryWand/mirror/SymmetryMirror.java
index 0ad3e979e..a61430c79 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/symmetry/mirror/SymmetryMirror.java
+++ b/src/main/java/com/simibubi/create/content/equipment/symmetryWand/mirror/SymmetryMirror.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.symmetry.mirror;
+package com.simibubi.create.content.equipment.symmetryWand.mirror;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/symmetry/mirror/TriplePlaneMirror.java b/src/main/java/com/simibubi/create/content/equipment/symmetryWand/mirror/TriplePlaneMirror.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/curiosities/symmetry/mirror/TriplePlaneMirror.java
rename to src/main/java/com/simibubi/create/content/equipment/symmetryWand/mirror/TriplePlaneMirror.java
index 6932d7c0f..73ea306f4 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/symmetry/mirror/TriplePlaneMirror.java
+++ b/src/main/java/com/simibubi/create/content/equipment/symmetryWand/mirror/TriplePlaneMirror.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.symmetry.mirror;
+package com.simibubi.create.content.equipment.symmetryWand.mirror;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/toolbox/ItemReturnInvWrapper.java b/src/main/java/com/simibubi/create/content/equipment/toolbox/ItemReturnInvWrapper.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/curiosities/toolbox/ItemReturnInvWrapper.java
rename to src/main/java/com/simibubi/create/content/equipment/toolbox/ItemReturnInvWrapper.java
index 24346ff20..24bcc11fd 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/toolbox/ItemReturnInvWrapper.java
+++ b/src/main/java/com/simibubi/create/content/equipment/toolbox/ItemReturnInvWrapper.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.toolbox;
+package com.simibubi.create.content.equipment.toolbox;
 
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.item.ItemStack;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/toolbox/RadialToolboxMenu.java b/src/main/java/com/simibubi/create/content/equipment/toolbox/RadialToolboxMenu.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/curiosities/toolbox/RadialToolboxMenu.java
rename to src/main/java/com/simibubi/create/content/equipment/toolbox/RadialToolboxMenu.java
index b1fd3e971..196145444 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/toolbox/RadialToolboxMenu.java
+++ b/src/main/java/com/simibubi/create/content/equipment/toolbox/RadialToolboxMenu.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.curiosities.toolbox;
+package com.simibubi.create.content.equipment.toolbox;
 
-import static com.simibubi.create.content.curiosities.toolbox.ToolboxInventory.STACKS_PER_COMPARTMENT;
+import static com.simibubi.create.content.equipment.toolbox.ToolboxInventory.STACKS_PER_COMPARTMENT;
 
 import java.util.List;
 
@@ -13,11 +13,11 @@ import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllKeys;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.foundation.gui.AbstractSimiScreen;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
 import com.simibubi.create.foundation.gui.AllIcons;
 import com.simibubi.create.foundation.gui.element.GuiGameElement;
-import com.simibubi.create.foundation.networking.AllPackets;
 import com.simibubi.create.foundation.utility.AngleHelper;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 import com.simibubi.create.foundation.utility.Lang;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolBoxInstance.java b/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolBoxInstance.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolBoxInstance.java
rename to src/main/java/com/simibubi/create/content/equipment/toolbox/ToolBoxInstance.java
index 850c03a39..375c63cf0 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolBoxInstance.java
+++ b/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolBoxInstance.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.toolbox;
+package com.simibubi.create.content.equipment.toolbox;
 
 import com.jozufozu.flywheel.api.Instancer;
 import com.jozufozu.flywheel.api.MaterialManager;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxBlock.java b/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxBlock.java
similarity index 99%
rename from src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxBlock.java
rename to src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxBlock.java
index c719acab2..a3283d327 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxBlock.java
+++ b/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.toolbox;
+package com.simibubi.create.content.equipment.toolbox;
 
 import static net.minecraft.world.level.block.state.properties.BlockStateProperties.WATERLOGGED;
 
diff --git a/src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxBlockEntity.java b/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxBlockEntity.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxBlockEntity.java
rename to src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxBlockEntity.java
index d45224747..ee397eea1 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxBlockEntity.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.toolbox;
+package com.simibubi.create.content.equipment.toolbox;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -11,8 +11,8 @@ import java.util.UUID;
 import java.util.WeakHashMap;
 
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.ResetableLazy;
 import com.simibubi.create.foundation.utility.VecHelper;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxDisposeAllPacket.java b/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxDisposeAllPacket.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxDisposeAllPacket.java
rename to src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxDisposeAllPacket.java
index 6e2664a8c..e9a6fb2ff 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxDisposeAllPacket.java
+++ b/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxDisposeAllPacket.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.toolbox;
+package com.simibubi.create.content.equipment.toolbox;
 
 import org.apache.commons.lang3.mutable.MutableBoolean;
 
diff --git a/src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxDyeingRecipe.java b/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxDyeingRecipe.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxDyeingRecipe.java
rename to src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxDyeingRecipe.java
index df2498433..50b5171e7 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxDyeingRecipe.java
+++ b/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxDyeingRecipe.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.toolbox;
+package com.simibubi.create.content.equipment.toolbox;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllRecipeTypes;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxEquipPacket.java b/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxEquipPacket.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxEquipPacket.java
rename to src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxEquipPacket.java
index c4fe28d1e..13c8c3284 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxEquipPacket.java
+++ b/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxEquipPacket.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.toolbox;
+package com.simibubi.create.content.equipment.toolbox;
 
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 
diff --git a/src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxHandler.java b/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxHandler.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxHandler.java
rename to src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxHandler.java
index 3ffbe0062..8a799f183 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxHandler.java
+++ b/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxHandler.java
@@ -1,13 +1,13 @@
-package com.simibubi.create.content.curiosities.toolbox;
+package com.simibubi.create.content.equipment.toolbox;
 
 import java.util.List;
 import java.util.WeakHashMap;
 import java.util.stream.Collectors;
 
-import com.simibubi.create.foundation.config.AllConfigs;
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.foundation.networking.ISyncPersistentData.PersistentDataPacket;
 import com.simibubi.create.foundation.utility.WorldAttached;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
@@ -147,7 +147,7 @@ public class ToolboxHandler {
 	}
 
 	public static double getMaxRange(Player player) {
-		return AllConfigs.server().curiosities.toolboxRange.get()
+		return AllConfigs.server().equipment.toolboxRange.get()
 			.doubleValue();
 	}
 
diff --git a/src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxHandlerClient.java b/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxHandlerClient.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxHandlerClient.java
rename to src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxHandlerClient.java
index 67fc52673..21505db29 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxHandlerClient.java
+++ b/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxHandlerClient.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.toolbox;
+package com.simibubi.create.content.equipment.toolbox;
 
 import static com.simibubi.create.foundation.gui.AllGuiTextures.TOOLBELT_HOTBAR_OFF;
 import static com.simibubi.create.foundation.gui.AllGuiTextures.TOOLBELT_HOTBAR_ON;
@@ -12,9 +12,9 @@ import com.google.common.collect.ImmutableList;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllKeys;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
 import com.simibubi.create.foundation.gui.ScreenOpener;
-import com.simibubi.create.foundation.networking.AllPackets;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.player.LocalPlayer;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxInventory.java b/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxInventory.java
similarity index 99%
rename from src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxInventory.java
rename to src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxInventory.java
index 5d6ed7110..a9d69e9ca 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxInventory.java
+++ b/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxInventory.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.toolbox;
+package com.simibubi.create.content.equipment.toolbox;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxMenu.java b/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxMenu.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxMenu.java
rename to src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxMenu.java
index 173287255..8dacb716f 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxMenu.java
+++ b/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxMenu.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.curiosities.toolbox;
+package com.simibubi.create.content.equipment.toolbox;
 
-import static com.simibubi.create.content.curiosities.toolbox.ToolboxInventory.STACKS_PER_COMPARTMENT;
+import static com.simibubi.create.content.equipment.toolbox.ToolboxInventory.STACKS_PER_COMPARTMENT;
 
 import com.simibubi.create.AllMenuTypes;
 import com.simibubi.create.foundation.gui.menu.MenuBase;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxRenderer.java b/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxRenderer.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxRenderer.java
rename to src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxRenderer.java
index 79ccc607a..df2a4cf68 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxRenderer.java
+++ b/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.toolbox;
+package com.simibubi.create.content.equipment.toolbox;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxScreen.java b/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxScreen.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxScreen.java
rename to src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxScreen.java
index fb43ef25f..71c7fe500 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxScreen.java
+++ b/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxScreen.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.toolbox;
+package com.simibubi.create.content.equipment.toolbox;
 
 import java.util.Collections;
 import java.util.List;
@@ -8,13 +8,13 @@ import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllBlocks;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.AllPartialModels;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
 import com.simibubi.create.foundation.gui.AllIcons;
 import com.simibubi.create.foundation.gui.element.GuiGameElement;
 import com.simibubi.create.foundation.gui.menu.AbstractSimiContainerScreen;
 import com.simibubi.create.foundation.gui.widget.IconButton;
-import com.simibubi.create.foundation.networking.AllPackets;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.Lang;
 
diff --git a/src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxSlot.java b/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxSlot.java
similarity index 89%
rename from src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxSlot.java
rename to src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxSlot.java
index e3954eb34..a87c21594 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxSlot.java
+++ b/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxSlot.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.toolbox;
+package com.simibubi.create.content.equipment.toolbox;
 
 import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.SlotItemHandler;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/wrench/IWrenchable.java b/src/main/java/com/simibubi/create/content/equipment/wrench/IWrenchable.java
similarity index 89%
rename from src/main/java/com/simibubi/create/content/contraptions/wrench/IWrenchable.java
rename to src/main/java/com/simibubi/create/content/equipment/wrench/IWrenchable.java
index 5bb4132cb..c55d5059d 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/wrench/IWrenchable.java
+++ b/src/main/java/com/simibubi/create/content/equipment/wrench/IWrenchable.java
@@ -1,14 +1,14 @@
-package com.simibubi.create.content.contraptions.wrench;
+package com.simibubi.create.content.equipment.wrench;
 
 import com.simibubi.create.AllSoundEvents;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.contraptions.base.DirectionalAxisKineticBlock;
-import com.simibubi.create.content.contraptions.base.DirectionalKineticBlock;
-import com.simibubi.create.content.contraptions.base.GeneratingKineticBlockEntity;
-import com.simibubi.create.content.contraptions.base.HorizontalAxisKineticBlock;
-import com.simibubi.create.content.contraptions.base.HorizontalKineticBlock;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.base.RotatedPillarKineticBlock;
+import com.simibubi.create.content.kinetics.base.DirectionalAxisKineticBlock;
+import com.simibubi.create.content.kinetics.base.DirectionalKineticBlock;
+import com.simibubi.create.content.kinetics.base.GeneratingKineticBlockEntity;
+import com.simibubi.create.content.kinetics.base.HorizontalAxisKineticBlock;
+import com.simibubi.create.content.kinetics.base.HorizontalKineticBlock;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.base.RotatedPillarKineticBlock;
 import com.simibubi.create.foundation.utility.VoxelShaper;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/wrench/IWrenchableWithBracket.java b/src/main/java/com/simibubi/create/content/equipment/wrench/IWrenchableWithBracket.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/wrench/IWrenchableWithBracket.java
rename to src/main/java/com/simibubi/create/content/equipment/wrench/IWrenchableWithBracket.java
index 14bf177e1..dd7f115fd 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/wrench/IWrenchableWithBracket.java
+++ b/src/main/java/com/simibubi/create/content/equipment/wrench/IWrenchableWithBracket.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.contraptions.wrench;
+package com.simibubi.create.content.equipment.wrench;
 
 import java.util.Optional;
 
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.fluids.FluidPropagator;
+import com.simibubi.create.content.fluids.FluidPropagator;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/wrench/WrenchEventHandler.java b/src/main/java/com/simibubi/create/content/equipment/wrench/WrenchEventHandler.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/wrench/WrenchEventHandler.java
rename to src/main/java/com/simibubi/create/content/equipment/wrench/WrenchEventHandler.java
index ab4954df2..b9d6bb3bb 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/wrench/WrenchEventHandler.java
+++ b/src/main/java/com/simibubi/create/content/equipment/wrench/WrenchEventHandler.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.wrench;
+package com.simibubi.create.content.equipment.wrench;
 
 import com.simibubi.create.AllItems;
 import com.simibubi.create.AllTags.AllItemTags;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/wrench/WrenchItem.java b/src/main/java/com/simibubi/create/content/equipment/wrench/WrenchItem.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/contraptions/wrench/WrenchItem.java
rename to src/main/java/com/simibubi/create/content/equipment/wrench/WrenchItem.java
index 9b4f63d58..832c3c232 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/wrench/WrenchItem.java
+++ b/src/main/java/com/simibubi/create/content/equipment/wrench/WrenchItem.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.wrench;
+package com.simibubi.create.content.equipment.wrench;
 
 import java.util.function.Consumer;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/wrench/WrenchItemRenderer.java b/src/main/java/com/simibubi/create/content/equipment/wrench/WrenchItemRenderer.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/wrench/WrenchItemRenderer.java
rename to src/main/java/com/simibubi/create/content/equipment/wrench/WrenchItemRenderer.java
index bf626deb8..477ce8101 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/wrench/WrenchItemRenderer.java
+++ b/src/main/java/com/simibubi/create/content/equipment/wrench/WrenchItemRenderer.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.contraptions.wrench;
+package com.simibubi.create.content.equipment.wrench;
 
 import com.jozufozu.flywheel.core.PartialModel;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Vector3f;
 import com.simibubi.create.Create;
-import com.simibubi.create.foundation.blockEntity.behaviour.scrollvalue.ScrollValueHandler;
+import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollValueHandler;
 import com.simibubi.create.foundation.item.render.CustomRenderedItemModel;
 import com.simibubi.create.foundation.item.render.CustomRenderedItemModelRenderer;
 import com.simibubi.create.foundation.item.render.PartialItemModelRenderer;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/ConfigureZapperPacket.java b/src/main/java/com/simibubi/create/content/equipment/zapper/ConfigureZapperPacket.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/curiosities/zapper/ConfigureZapperPacket.java
rename to src/main/java/com/simibubi/create/content/equipment/zapper/ConfigureZapperPacket.java
index e6a030407..6b90d8b2c 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/zapper/ConfigureZapperPacket.java
+++ b/src/main/java/com/simibubi/create/content/equipment/zapper/ConfigureZapperPacket.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.zapper;
+package com.simibubi.create.content.equipment.zapper;
 
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 
diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/PlacementPatterns.java b/src/main/java/com/simibubi/create/content/equipment/zapper/PlacementPatterns.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/curiosities/zapper/PlacementPatterns.java
rename to src/main/java/com/simibubi/create/content/equipment/zapper/PlacementPatterns.java
index e50492867..4391b0769 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/zapper/PlacementPatterns.java
+++ b/src/main/java/com/simibubi/create/content/equipment/zapper/PlacementPatterns.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.zapper;
+package com.simibubi.create.content.equipment.zapper;
 
 import java.util.List;
 import java.util.Random;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/ShootGadgetPacket.java b/src/main/java/com/simibubi/create/content/equipment/zapper/ShootGadgetPacket.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/curiosities/zapper/ShootGadgetPacket.java
rename to src/main/java/com/simibubi/create/content/equipment/zapper/ShootGadgetPacket.java
index 098433e49..8b624b98a 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/zapper/ShootGadgetPacket.java
+++ b/src/main/java/com/simibubi/create/content/equipment/zapper/ShootGadgetPacket.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.zapper;
+package com.simibubi.create.content.equipment.zapper;
 
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 
diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/ShootableGadgetItemMethods.java b/src/main/java/com/simibubi/create/content/equipment/zapper/ShootableGadgetItemMethods.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/curiosities/zapper/ShootableGadgetItemMethods.java
rename to src/main/java/com/simibubi/create/content/equipment/zapper/ShootableGadgetItemMethods.java
index 8549c6d53..d03ff7a43 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/zapper/ShootableGadgetItemMethods.java
+++ b/src/main/java/com/simibubi/create/content/equipment/zapper/ShootableGadgetItemMethods.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.curiosities.zapper;
+package com.simibubi.create.content.equipment.zapper;
 
 import java.util.function.Function;
 import java.util.function.Predicate;
 
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.AllPackets;
 
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.InteractionHand;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/ShootableGadgetRenderHandler.java b/src/main/java/com/simibubi/create/content/equipment/zapper/ShootableGadgetRenderHandler.java
similarity index 99%
rename from src/main/java/com/simibubi/create/content/curiosities/zapper/ShootableGadgetRenderHandler.java
rename to src/main/java/com/simibubi/create/content/equipment/zapper/ShootableGadgetRenderHandler.java
index 0337cd5eb..e0017510e 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/zapper/ShootableGadgetRenderHandler.java
+++ b/src/main/java/com/simibubi/create/content/equipment/zapper/ShootableGadgetRenderHandler.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.zapper;
+package com.simibubi.create.content.equipment.zapper;
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperBeamPacket.java b/src/main/java/com/simibubi/create/content/equipment/zapper/ZapperBeamPacket.java
similarity index 89%
rename from src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperBeamPacket.java
rename to src/main/java/com/simibubi/create/content/equipment/zapper/ZapperBeamPacket.java
index 352728857..e4b79c0f0 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperBeamPacket.java
+++ b/src/main/java/com/simibubi/create/content/equipment/zapper/ZapperBeamPacket.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.content.curiosities.zapper;
+package com.simibubi.create.content.equipment.zapper;
 
 import com.simibubi.create.CreateClient;
-import com.simibubi.create.content.curiosities.zapper.ZapperRenderHandler.LaserBeam;
+import com.simibubi.create.content.equipment.zapper.ZapperRenderHandler.LaserBeam;
 
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.world.InteractionHand;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperInteractionHandler.java b/src/main/java/com/simibubi/create/content/equipment/zapper/ZapperInteractionHandler.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperInteractionHandler.java
rename to src/main/java/com/simibubi/create/content/equipment/zapper/ZapperInteractionHandler.java
index 368d11692..24715f5df 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperInteractionHandler.java
+++ b/src/main/java/com/simibubi/create/content/equipment/zapper/ZapperInteractionHandler.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.zapper;
+package com.simibubi.create.content.equipment.zapper;
 
 import java.util.Objects;
 
diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperItem.java b/src/main/java/com/simibubi/create/content/equipment/zapper/ZapperItem.java
similarity index 99%
rename from src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperItem.java
rename to src/main/java/com/simibubi/create/content/equipment/zapper/ZapperItem.java
index a9d98e15a..cfff5ebed 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperItem.java
+++ b/src/main/java/com/simibubi/create/content/equipment/zapper/ZapperItem.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.zapper;
+package com.simibubi.create.content.equipment.zapper;
 
 import java.util.List;
 
diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperItemRenderer.java b/src/main/java/com/simibubi/create/content/equipment/zapper/ZapperItemRenderer.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperItemRenderer.java
rename to src/main/java/com/simibubi/create/content/equipment/zapper/ZapperItemRenderer.java
index 7ae438dff..ebbf7d414 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperItemRenderer.java
+++ b/src/main/java/com/simibubi/create/content/equipment/zapper/ZapperItemRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.zapper;
+package com.simibubi.create.content.equipment.zapper;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.CreateClient;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperLog.java b/src/main/java/com/simibubi/create/content/equipment/zapper/ZapperLog.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperLog.java
rename to src/main/java/com/simibubi/create/content/equipment/zapper/ZapperLog.java
index 14660f0e3..d5d5fa88c 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperLog.java
+++ b/src/main/java/com/simibubi/create/content/equipment/zapper/ZapperLog.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.zapper;
+package com.simibubi.create.content.equipment.zapper;
 
 import java.util.LinkedList;
 import java.util.List;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperRenderHandler.java b/src/main/java/com/simibubi/create/content/equipment/zapper/ZapperRenderHandler.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperRenderHandler.java
rename to src/main/java/com/simibubi/create/content/equipment/zapper/ZapperRenderHandler.java
index 7d25a0443..64c4cac7e 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperRenderHandler.java
+++ b/src/main/java/com/simibubi/create/content/equipment/zapper/ZapperRenderHandler.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.zapper;
+package com.simibubi.create.content.equipment.zapper;
 
 import java.util.LinkedList;
 import java.util.List;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperScreen.java b/src/main/java/com/simibubi/create/content/equipment/zapper/ZapperScreen.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperScreen.java
rename to src/main/java/com/simibubi/create/content/equipment/zapper/ZapperScreen.java
index 2bf16e77c..8a4fb7032 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperScreen.java
+++ b/src/main/java/com/simibubi/create/content/equipment/zapper/ZapperScreen.java
@@ -1,15 +1,15 @@
-package com.simibubi.create.content.curiosities.zapper;
+package com.simibubi.create.content.equipment.zapper;
 
 import java.util.Vector;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Vector3f;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.foundation.gui.AbstractSimiScreen;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
 import com.simibubi.create.foundation.gui.AllIcons;
 import com.simibubi.create.foundation.gui.element.GuiGameElement;
 import com.simibubi.create.foundation.gui.widget.IconButton;
-import com.simibubi.create.foundation.networking.AllPackets;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.NBTHelper;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/Brush.java b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/Brush.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/Brush.java
rename to src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/Brush.java
index 4b1123d17..a015a02b5 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/Brush.java
+++ b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/Brush.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.zapper.terrainzapper;
+package com.simibubi.create.content.equipment.zapper.terrainzapper;
 
 import java.util.Collection;
 
diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/ConfigureWorldshaperPacket.java b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/ConfigureWorldshaperPacket.java
similarity index 87%
rename from src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/ConfigureWorldshaperPacket.java
rename to src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/ConfigureWorldshaperPacket.java
index 43931770d..4830a0ee5 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/ConfigureWorldshaperPacket.java
+++ b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/ConfigureWorldshaperPacket.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.content.curiosities.zapper.terrainzapper;
+package com.simibubi.create.content.equipment.zapper.terrainzapper;
 
-import com.simibubi.create.content.curiosities.zapper.ConfigureZapperPacket;
-import com.simibubi.create.content.curiosities.zapper.PlacementPatterns;
+import com.simibubi.create.content.equipment.zapper.ConfigureZapperPacket;
+import com.simibubi.create.content.equipment.zapper.PlacementPatterns;
 
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.world.InteractionHand;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/CuboidBrush.java b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/CuboidBrush.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/CuboidBrush.java
rename to src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/CuboidBrush.java
index eb9b246bc..9374530cf 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/CuboidBrush.java
+++ b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/CuboidBrush.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.zapper.terrainzapper;
+package com.simibubi.create.content.equipment.zapper.terrainzapper;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/CylinderBrush.java b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/CylinderBrush.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/CylinderBrush.java
rename to src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/CylinderBrush.java
index e468a11f5..8afb01d7a 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/CylinderBrush.java
+++ b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/CylinderBrush.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.zapper.terrainzapper;
+package com.simibubi.create.content.equipment.zapper.terrainzapper;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/DynamicBrush.java b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/DynamicBrush.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/DynamicBrush.java
rename to src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/DynamicBrush.java
index 976376488..a2f81cab5 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/DynamicBrush.java
+++ b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/DynamicBrush.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.zapper.terrainzapper;
+package com.simibubi.create.content.equipment.zapper.terrainzapper;
 
 import java.util.Collection;
 import java.util.HashSet;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/FlattenTool.java b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/FlattenTool.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/FlattenTool.java
rename to src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/FlattenTool.java
index 1c16a03f9..fb2243f0a 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/FlattenTool.java
+++ b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/FlattenTool.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.zapper.terrainzapper;
+package com.simibubi.create.content.equipment.zapper.terrainzapper;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/PlacementOptions.java b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/PlacementOptions.java
similarity index 85%
rename from src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/PlacementOptions.java
rename to src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/PlacementOptions.java
index 9861b2505..840327a95 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/PlacementOptions.java
+++ b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/PlacementOptions.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.zapper.terrainzapper;
+package com.simibubi.create.content.equipment.zapper.terrainzapper;
 
 import com.simibubi.create.foundation.gui.AllIcons;
 import com.simibubi.create.foundation.utility.Lang;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/ShapedBrush.java b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/ShapedBrush.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/ShapedBrush.java
rename to src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/ShapedBrush.java
index f26117ef7..4e6b074ac 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/ShapedBrush.java
+++ b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/ShapedBrush.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.zapper.terrainzapper;
+package com.simibubi.create.content.equipment.zapper.terrainzapper;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/SphereBrush.java b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/SphereBrush.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/SphereBrush.java
rename to src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/SphereBrush.java
index 4fcfa3b9e..91b859a16 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/SphereBrush.java
+++ b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/SphereBrush.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.zapper.terrainzapper;
+package com.simibubi.create.content.equipment.zapper.terrainzapper;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/TerrainBrushes.java b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/TerrainBrushes.java
similarity index 82%
rename from src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/TerrainBrushes.java
rename to src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/TerrainBrushes.java
index fa11468b6..11b4a1719 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/TerrainBrushes.java
+++ b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/TerrainBrushes.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.zapper.terrainzapper;
+package com.simibubi.create.content.equipment.zapper.terrainzapper;
 
 public enum TerrainBrushes {
 	
diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/TerrainTools.java b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/TerrainTools.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/TerrainTools.java
rename to src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/TerrainTools.java
index 1e9614ae6..b8014073d 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/TerrainTools.java
+++ b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/TerrainTools.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.curiosities.zapper.terrainzapper;
+package com.simibubi.create.content.equipment.zapper.terrainzapper;
 
 import java.util.List;
 
 import javax.annotation.Nullable;
 
-import com.simibubi.create.content.curiosities.zapper.ZapperItem;
+import com.simibubi.create.content.equipment.zapper.ZapperItem;
 import com.simibubi.create.foundation.gui.AllIcons;
 import com.simibubi.create.foundation.utility.Lang;
 
diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/WorldshaperItem.java b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/WorldshaperItem.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/WorldshaperItem.java
rename to src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/WorldshaperItem.java
index 067839b23..57442b3fe 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/WorldshaperItem.java
+++ b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/WorldshaperItem.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.curiosities.zapper.terrainzapper;
+package com.simibubi.create.content.equipment.zapper.terrainzapper;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;
 
-import com.simibubi.create.content.curiosities.zapper.PlacementPatterns;
-import com.simibubi.create.content.curiosities.zapper.ZapperItem;
+import com.simibubi.create.content.equipment.zapper.PlacementPatterns;
+import com.simibubi.create.content.equipment.zapper.ZapperItem;
 import com.simibubi.create.foundation.gui.ScreenOpener;
 import com.simibubi.create.foundation.item.render.SimpleCustomRenderer;
 import com.simibubi.create.foundation.utility.Lang;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/WorldshaperItemRenderer.java b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/WorldshaperItemRenderer.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/WorldshaperItemRenderer.java
rename to src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/WorldshaperItemRenderer.java
index 05855609b..604a52e6f 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/WorldshaperItemRenderer.java
+++ b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/WorldshaperItemRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.zapper.terrainzapper;
+package com.simibubi.create.content.equipment.zapper.terrainzapper;
 
 import static java.lang.Math.max;
 
@@ -6,7 +6,7 @@ import com.jozufozu.flywheel.core.PartialModel;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Vector3f;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.curiosities.zapper.ZapperItemRenderer;
+import com.simibubi.create.content.equipment.zapper.ZapperItemRenderer;
 import com.simibubi.create.foundation.item.render.CustomRenderedItemModel;
 import com.simibubi.create.foundation.item.render.PartialItemModelRenderer;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/WorldshaperRenderHandler.java b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/WorldshaperRenderHandler.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/WorldshaperRenderHandler.java
rename to src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/WorldshaperRenderHandler.java
index 888a706b5..8d8ef054d 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/WorldshaperRenderHandler.java
+++ b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/WorldshaperRenderHandler.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities.zapper.terrainzapper;
+package com.simibubi.create.content.equipment.zapper.terrainzapper;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/WorldshaperScreen.java b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/WorldshaperScreen.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/WorldshaperScreen.java
rename to src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/WorldshaperScreen.java
index 860f7d274..493338dec 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/WorldshaperScreen.java
+++ b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/WorldshaperScreen.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.curiosities.zapper.terrainzapper;
+package com.simibubi.create.content.equipment.zapper.terrainzapper;
 
 import java.util.List;
 import java.util.Vector;
 
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.simibubi.create.content.curiosities.zapper.ConfigureZapperPacket;
-import com.simibubi.create.content.curiosities.zapper.ZapperScreen;
+import com.simibubi.create.content.equipment.zapper.ConfigureZapperPacket;
+import com.simibubi.create.content.equipment.zapper.ZapperScreen;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
 import com.simibubi.create.foundation.gui.AllIcons;
 import com.simibubi.create.foundation.gui.widget.IconButton;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/FlowSource.java b/src/main/java/com/simibubi/create/content/fluids/FlowSource.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/FlowSource.java
rename to src/main/java/com/simibubi/create/content/fluids/FlowSource.java
index 64d1586de..5f3e94212 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/FlowSource.java
+++ b/src/main/java/com/simibubi/create/content/fluids/FlowSource.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.contraptions.fluids;
+package com.simibubi.create.content.fluids;
 
 import java.lang.ref.WeakReference;
 import java.util.function.Predicate;
 
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.BlockFace;
 
 import net.minecraft.world.level.Level;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidBottleItemHook.java b/src/main/java/com/simibubi/create/content/fluids/FluidBottleItemHook.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/FluidBottleItemHook.java
rename to src/main/java/com/simibubi/create/content/fluids/FluidBottleItemHook.java
index 035b715bc..c6074eccd 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidBottleItemHook.java
+++ b/src/main/java/com/simibubi/create/content/fluids/FluidBottleItemHook.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.fluids;
+package com.simibubi.create.content.fluids;
 
 import com.simibubi.create.Create;
 import com.simibubi.create.foundation.utility.RegisteredObjects;
@@ -22,8 +22,8 @@ import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
 @EventBusSubscriber
 public class FluidBottleItemHook extends Item {
 
-	public FluidBottleItemHook(Properties p_i48487_1_) {
-		super(p_i48487_1_);
+	private FluidBottleItemHook(Properties p) {
+		super(p);
 	}
 
 	@SubscribeEvent
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidFX.java b/src/main/java/com/simibubi/create/content/fluids/FluidFX.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/FluidFX.java
rename to src/main/java/com/simibubi/create/content/fluids/FluidFX.java
index e58f0ad1a..f91f54b14 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidFX.java
+++ b/src/main/java/com/simibubi/create/content/fluids/FluidFX.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.content.contraptions.fluids;
+package com.simibubi.create.content.fluids;
 
 import com.simibubi.create.AllParticleTypes;
-import com.simibubi.create.content.contraptions.fluids.particle.FluidParticleData;
+import com.simibubi.create.content.fluids.particle.FluidParticleData;
 import com.simibubi.create.foundation.fluid.FluidHelper;
 import com.simibubi.create.foundation.utility.VecHelper;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidNetwork.java b/src/main/java/com/simibubi/create/content/fluids/FluidNetwork.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/FluidNetwork.java
rename to src/main/java/com/simibubi/create/content/fluids/FluidNetwork.java
index 58f2365b8..e012b8119 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidNetwork.java
+++ b/src/main/java/com/simibubi/create/content/fluids/FluidNetwork.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.fluids;
+package com.simibubi.create.content.fluids;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
@@ -13,9 +13,9 @@ import java.util.function.Supplier;
 
 import javax.annotation.Nullable;
 
-import com.simibubi.create.content.contraptions.components.actors.PortableFluidInterfaceBlockEntity.InterfaceFluidHandler;
-import com.simibubi.create.content.contraptions.fluids.PipeConnection.Flow;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.contraptions.actors.psi.PortableFluidInterfaceBlockEntity.InterfaceFluidHandler;
+import com.simibubi.create.content.fluids.PipeConnection.Flow;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.fluid.FluidHelper;
 import com.simibubi.create.foundation.utility.BlockFace;
 import com.simibubi.create.foundation.utility.Iterate;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidPropagator.java b/src/main/java/com/simibubi/create/content/fluids/FluidPropagator.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/FluidPropagator.java
rename to src/main/java/com/simibubi/create/content/fluids/FluidPropagator.java
index f7b8b3ef2..bad5e0007 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidPropagator.java
+++ b/src/main/java/com/simibubi/create/content/fluids/FluidPropagator.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.fluids;
+package com.simibubi.create.content.fluids;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -9,17 +9,19 @@ import javax.annotation.Nullable;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllTags.AllBlockTags;
-import com.simibubi.create.content.contraptions.fluids.PipeConnection.Flow;
-import com.simibubi.create.content.contraptions.fluids.pipes.AxisPipeBlock;
-import com.simibubi.create.content.contraptions.fluids.pipes.FluidPipeBlock;
-import com.simibubi.create.content.contraptions.fluids.pipes.VanillaFluidTargets;
+import com.simibubi.create.content.fluids.PipeConnection.Flow;
+import com.simibubi.create.content.fluids.pipes.AxisPipeBlock;
+import com.simibubi.create.content.fluids.pipes.FluidPipeBlock;
+import com.simibubi.create.content.fluids.pipes.VanillaFluidTargets;
+import com.simibubi.create.content.fluids.pump.PumpBlock;
+import com.simibubi.create.content.fluids.pump.PumpBlockEntity;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
 import com.simibubi.create.foundation.advancement.CreateAdvancement;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
-import com.simibubi.create.foundation.config.AllConfigs;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.BlockHelper;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.Pair;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidReactions.java b/src/main/java/com/simibubi/create/content/fluids/FluidReactions.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/FluidReactions.java
rename to src/main/java/com/simibubi/create/content/fluids/FluidReactions.java
index 60f93a592..254e3476d 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidReactions.java
+++ b/src/main/java/com/simibubi/create/content/fluids/FluidReactions.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.fluids;
+package com.simibubi.create.content.fluids;
 
 import com.simibubi.create.AllFluids;
 import com.simibubi.create.foundation.advancement.AdvancementBehaviour;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidTransportBehaviour.java b/src/main/java/com/simibubi/create/content/fluids/FluidTransportBehaviour.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/FluidTransportBehaviour.java
rename to src/main/java/com/simibubi/create/content/fluids/FluidTransportBehaviour.java
index 273476afb..bcd2f64df 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidTransportBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/fluids/FluidTransportBehaviour.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.fluids;
+package com.simibubi.create.content.fluids;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -9,10 +9,11 @@ import java.util.function.Predicate;
 import javax.annotation.Nullable;
 
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.fluids.pipes.EncasedPipeBlock;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.fluids.pipes.EncasedPipeBlock;
+import com.simibubi.create.content.fluids.pump.PumpBlock;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
 import com.simibubi.create.foundation.blockEntity.behaviour.BehaviourType;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.WorldAttached;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/OpenEndedPipe.java b/src/main/java/com/simibubi/create/content/fluids/OpenEndedPipe.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/OpenEndedPipe.java
rename to src/main/java/com/simibubi/create/content/fluids/OpenEndedPipe.java
index 5d541ad75..d2bea4eb2 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/OpenEndedPipe.java
+++ b/src/main/java/com/simibubi/create/content/fluids/OpenEndedPipe.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.fluids;
+package com.simibubi.create.content.fluids;
 
 import static net.minecraft.world.level.block.state.properties.BlockStateProperties.WATERLOGGED;
 
@@ -8,13 +8,13 @@ import java.util.List;
 import javax.annotation.Nullable;
 
 import com.simibubi.create.AllFluids;
-import com.simibubi.create.content.contraptions.fluids.pipes.VanillaFluidTargets;
-import com.simibubi.create.content.contraptions.fluids.potion.PotionFluidHandler;
+import com.simibubi.create.content.fluids.pipes.VanillaFluidTargets;
+import com.simibubi.create.content.fluids.potion.PotionFluidHandler;
 import com.simibubi.create.foundation.advancement.AdvancementBehaviour;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
-import com.simibubi.create.foundation.config.AllConfigs;
 import com.simibubi.create.foundation.fluid.FluidHelper;
 import com.simibubi.create.foundation.utility.BlockFace;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -40,7 +40,6 @@ import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.phys.AABB;
-import net.minecraftforge.common.ForgeConfig;
 import net.minecraftforge.common.Tags;
 import net.minecraftforge.common.util.LazyOptional;
 import net.minecraftforge.fluids.FluidStack;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/PipeAttachmentModel.java b/src/main/java/com/simibubi/create/content/fluids/PipeAttachmentModel.java
similarity index 89%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/PipeAttachmentModel.java
rename to src/main/java/com/simibubi/create/content/fluids/PipeAttachmentModel.java
index 6b00f0c66..b2da9549f 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/PipeAttachmentModel.java
+++ b/src/main/java/com/simibubi/create/content/fluids/PipeAttachmentModel.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.fluids;
+package com.simibubi.create.content.fluids;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -7,11 +7,11 @@ import java.util.List;
 import org.jetbrains.annotations.NotNull;
 
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.fluids.FluidTransportBehaviour.AttachmentTypes;
-import com.simibubi.create.content.contraptions.fluids.FluidTransportBehaviour.AttachmentTypes.ComponentPartials;
-import com.simibubi.create.content.contraptions.fluids.pipes.FluidPipeBlock;
-import com.simibubi.create.content.contraptions.relays.elementary.BracketedBlockEntityBehaviour;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.decoration.bracket.BracketedBlockEntityBehaviour;
+import com.simibubi.create.content.fluids.FluidTransportBehaviour.AttachmentTypes;
+import com.simibubi.create.content.fluids.FluidTransportBehaviour.AttachmentTypes.ComponentPartials;
+import com.simibubi.create.content.fluids.pipes.FluidPipeBlock;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.model.BakedModelWrapperWithData;
 import com.simibubi.create.foundation.utility.Iterate;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/PipeConnection.java b/src/main/java/com/simibubi/create/content/fluids/PipeConnection.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/PipeConnection.java
rename to src/main/java/com/simibubi/create/content/fluids/PipeConnection.java
index 1b6d3461f..309547aa0 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/PipeConnection.java
+++ b/src/main/java/com/simibubi/create/content/fluids/PipeConnection.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.contraptions.fluids;
+package com.simibubi.create.content.fluids;
 
 import java.util.Optional;
 import java.util.Random;
 import java.util.function.Predicate;
 
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.BlockFace;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.Iterate;
@@ -308,6 +308,10 @@ public class PipeConnection {
 		this.pressure = this.pressure.mapWithContext((f, in) -> in == inbound ? f + pressure : f);
 	}
 
+	public Couple<Float> getPressure() {
+		return pressure;
+	}
+
 	public boolean hasPressure() {
 		return getInboundPressure() != 0 || getOutwardPressure() != 0;
 	}
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/VirtualFluid.java b/src/main/java/com/simibubi/create/content/fluids/VirtualFluid.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/VirtualFluid.java
rename to src/main/java/com/simibubi/create/content/fluids/VirtualFluid.java
index 890fd9071..d7c086f11 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/VirtualFluid.java
+++ b/src/main/java/com/simibubi/create/content/fluids/VirtualFluid.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.fluids;
+package com.simibubi.create.content.fluids;
 
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.Items;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/ItemDrainBlock.java b/src/main/java/com/simibubi/create/content/fluids/drain/ItemDrainBlock.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/actors/ItemDrainBlock.java
rename to src/main/java/com/simibubi/create/content/fluids/drain/ItemDrainBlock.java
index 5688b4f90..3ca89cfc2 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/ItemDrainBlock.java
+++ b/src/main/java/com/simibubi/create/content/fluids/drain/ItemDrainBlock.java
@@ -1,14 +1,14 @@
-package com.simibubi.create.content.contraptions.fluids.actors;
+package com.simibubi.create.content.fluids.drain;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.processing.EmptyingByBasin;
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
+import com.simibubi.create.content.fluids.transfer.GenericItemEmptying;
+import com.simibubi.create.content.kinetics.belt.behaviour.DirectBeltInputBehaviour;
 import com.simibubi.create.foundation.advancement.AdvancementBehaviour;
 import com.simibubi.create.foundation.block.IBE;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.ComparatorUtil;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.DirectBeltInputBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.fluid.FluidHelper;
 
 import net.minecraft.core.BlockPos;
@@ -97,9 +97,9 @@ public class ItemDrainBlock extends Block implements IWrenchable, IBE<ItemDrainB
 
 	protected InteractionResult tryExchange(Level worldIn, Player player, InteractionHand handIn, ItemStack heldItem,
 		ItemDrainBlockEntity be) {
-		if (FluidHelper.tryEmptyItemIntoTE(worldIn, player, handIn, heldItem, be))
+		if (FluidHelper.tryEmptyItemIntoBE(worldIn, player, handIn, heldItem, be))
 			return InteractionResult.SUCCESS;
-		if (EmptyingByBasin.canItemBeEmptied(worldIn, heldItem))
+		if (GenericItemEmptying.canItemBeEmptied(worldIn, heldItem))
 			return InteractionResult.SUCCESS;
 		return InteractionResult.PASS;
 	}
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/ItemDrainBlockEntity.java b/src/main/java/com/simibubi/create/content/fluids/drain/ItemDrainBlockEntity.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/actors/ItemDrainBlockEntity.java
rename to src/main/java/com/simibubi/create/content/fluids/drain/ItemDrainBlockEntity.java
index 3919f4b9c..59fee211f 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/ItemDrainBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/fluids/drain/ItemDrainBlockEntity.java
@@ -1,16 +1,16 @@
-package com.simibubi.create.content.contraptions.fluids.actors;
+package com.simibubi.create.content.fluids.drain;
 
 import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.simibubi.create.content.contraptions.goggles.IHaveGoggleInformation;
-import com.simibubi.create.content.contraptions.processing.EmptyingByBasin;
-import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack;
+import com.simibubi.create.content.equipment.goggles.IHaveGoggleInformation;
+import com.simibubi.create.content.fluids.transfer.GenericItemEmptying;
+import com.simibubi.create.content.kinetics.belt.behaviour.DirectBeltInputBehaviour;
+import com.simibubi.create.content.kinetics.belt.transport.TransportedItemStack;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.DirectBeltInputBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour;
 import com.simibubi.create.foundation.utility.BlockHelper;
 import com.simibubi.create.foundation.utility.Iterate;
@@ -68,7 +68,7 @@ public class ItemDrainBlockEntity extends SmartBlockEntity implements IHaveGoggl
 		if (!getHeldItemStack().isEmpty())
 			return inserted;
 
-		if (inserted.getCount() > 1 && EmptyingByBasin.canItemBeEmptied(level, inserted)) {
+		if (inserted.getCount() > 1 && GenericItemEmptying.canItemBeEmptied(level, inserted)) {
 			returned = ItemHandlerHelper.copyStackWithSize(inserted, inserted.getCount() - 1);
 			inserted = ItemHandlerHelper.copyStackWithSize(inserted, 1);
 		}
@@ -196,7 +196,7 @@ public class ItemDrainBlockEntity extends SmartBlockEntity implements IHaveGoggl
 		}
 
 		if (heldItem.prevBeltPosition < .5f && heldItem.beltPosition >= .5f) {
-			if (!EmptyingByBasin.canItemBeEmptied(level, heldItem.stack))
+			if (!GenericItemEmptying.canItemBeEmptied(level, heldItem.stack))
 				return;
 			heldItem.beltPosition = .5f;
 			if (onClient)
@@ -212,10 +212,10 @@ public class ItemDrainBlockEntity extends SmartBlockEntity implements IHaveGoggl
 			return true;
 		if (processingTicks < 5)
 			return true;
-		if (!EmptyingByBasin.canItemBeEmptied(level, heldItem.stack))
+		if (!GenericItemEmptying.canItemBeEmptied(level, heldItem.stack))
 			return false;
 
-		Pair<FluidStack, ItemStack> emptyItem = EmptyingByBasin.emptyItem(level, heldItem.stack, true);
+		Pair<FluidStack, ItemStack> emptyItem = GenericItemEmptying.emptyItem(level, heldItem.stack, true);
 		FluidStack fluidFromItem = emptyItem.getFirst();
 
 		if (processingTicks > 5) {
@@ -230,7 +230,7 @@ public class ItemDrainBlockEntity extends SmartBlockEntity implements IHaveGoggl
 			return true;
 		}
 
-		emptyItem = EmptyingByBasin.emptyItem(level, heldItem.stack.copy(), false);
+		emptyItem = GenericItemEmptying.emptyItem(level, heldItem.stack.copy(), false);
 		award(AllAdvancements.DRAIN);
 
 		// Process finished
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/ItemDrainItemHandler.java b/src/main/java/com/simibubi/create/content/fluids/drain/ItemDrainItemHandler.java
similarity index 84%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/actors/ItemDrainItemHandler.java
rename to src/main/java/com/simibubi/create/content/fluids/drain/ItemDrainItemHandler.java
index 42a2017d8..d69e16c55 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/ItemDrainItemHandler.java
+++ b/src/main/java/com/simibubi/create/content/fluids/drain/ItemDrainItemHandler.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.content.contraptions.fluids.actors;
+package com.simibubi.create.content.fluids.drain;
 
-import com.simibubi.create.content.contraptions.processing.EmptyingByBasin;
-import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack;
+import com.simibubi.create.content.fluids.transfer.GenericItemEmptying;
+import com.simibubi.create.content.kinetics.belt.transport.TransportedItemStack;
 
 import net.minecraft.core.Direction;
 import net.minecraft.world.item.ItemStack;
@@ -35,7 +35,7 @@ public class ItemDrainItemHandler implements IItemHandler {
 			return stack;
 		
 		ItemStack returned = ItemStack.EMPTY;
-		if (stack.getCount() > 1 && EmptyingByBasin.canItemBeEmptied(blockEntity.getLevel(), stack)) {
+		if (stack.getCount() > 1 && GenericItemEmptying.canItemBeEmptied(blockEntity.getLevel(), stack)) {
 			returned = ItemHandlerHelper.copyStackWithSize(stack, stack.getCount() - 1);
 			stack = ItemHandlerHelper.copyStackWithSize(stack, 1);
 		}
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/ItemDrainRenderer.java b/src/main/java/com/simibubi/create/content/fluids/drain/ItemDrainRenderer.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/actors/ItemDrainRenderer.java
rename to src/main/java/com/simibubi/create/content/fluids/drain/ItemDrainRenderer.java
index eb6340f9a..d803e31dc 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/ItemDrainRenderer.java
+++ b/src/main/java/com/simibubi/create/content/fluids/drain/ItemDrainRenderer.java
@@ -1,13 +1,13 @@
-package com.simibubi.create.content.contraptions.fluids.actors;
+package com.simibubi.create.content.fluids.drain;
 
 import java.util.Random;
 
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Vector3f;
-import com.simibubi.create.content.contraptions.processing.EmptyingByBasin;
-import com.simibubi.create.content.contraptions.relays.belt.BeltHelper;
-import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack;
+import com.simibubi.create.content.fluids.transfer.GenericItemEmptying;
+import com.simibubi.create.content.kinetics.belt.BeltHelper;
+import com.simibubi.create.content.kinetics.belt.transport.TransportedItemStack;
 import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour.TankSegment;
 import com.simibubi.create.foundation.blockEntity.renderer.SmartBlockEntityRenderer;
@@ -157,7 +157,7 @@ public class ItemDrainRenderer extends SmartBlockEntityRenderer<ItemDrainBlockEn
 		ItemStack heldItemStack = be.getHeldItemStack();
 		if (heldItemStack.isEmpty())
 			return;
-		FluidStack fluidStack2 = EmptyingByBasin.emptyItem(be.getLevel(), heldItemStack, true)
+		FluidStack fluidStack2 = GenericItemEmptying.emptyItem(be.getLevel(), heldItemStack, true)
 			.getFirst();
 		if (fluidStack2.isEmpty()) {
 			if (fluidStack.isEmpty())
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/HosePulleyBlock.java b/src/main/java/com/simibubi/create/content/fluids/hosePulley/HosePulleyBlock.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/actors/HosePulleyBlock.java
rename to src/main/java/com/simibubi/create/content/fluids/hosePulley/HosePulleyBlock.java
index 629e55d89..7e83ac273 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/HosePulleyBlock.java
+++ b/src/main/java/com/simibubi/create/content/fluids/hosePulley/HosePulleyBlock.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.contraptions.fluids.actors;
+package com.simibubi.create.content.fluids.hosePulley;
 
 import com.simibubi.create.AllBlockEntityTypes;
-import com.simibubi.create.content.contraptions.base.HorizontalKineticBlock;
-import com.simibubi.create.content.contraptions.fluids.pipes.FluidPipeBlock;
+import com.simibubi.create.content.fluids.pipes.FluidPipeBlock;
+import com.simibubi.create.content.kinetics.base.HorizontalKineticBlock;
 import com.simibubi.create.foundation.block.IBE;
 import com.simibubi.create.foundation.utility.Iterate;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/HosePulleyBlockEntity.java b/src/main/java/com/simibubi/create/content/fluids/hosePulley/HosePulleyBlockEntity.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/actors/HosePulleyBlockEntity.java
rename to src/main/java/com/simibubi/create/content/fluids/hosePulley/HosePulleyBlockEntity.java
index d6380a9ea..651c087e0 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/HosePulleyBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/fluids/hosePulley/HosePulleyBlockEntity.java
@@ -1,10 +1,12 @@
-package com.simibubi.create.content.contraptions.fluids.actors;
+package com.simibubi.create.content.fluids.hosePulley;
 
 import java.util.List;
 
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
+import com.simibubi.create.content.fluids.transfer.FluidDrainingBehaviour;
+import com.simibubi.create.content.fluids.transfer.FluidFillingBehaviour;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.fluid.SmartFluidTank;
 import com.simibubi.create.foundation.item.TooltipHelper;
 import com.simibubi.create.foundation.utility.ServerSpeedProvider;
@@ -47,7 +49,7 @@ public class HosePulleyBlockEntity extends KineticBlockEntity {
 
 	@Override
 	public void sendData() {
-		infinite = filler.infinite || drainer.infinite;
+		infinite = filler.isInfinite() || drainer.isInfinite();
 		super.sendData();
 	}
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/HosePulleyFluidHandler.java b/src/main/java/com/simibubi/create/content/fluids/hosePulley/HosePulleyFluidHandler.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/actors/HosePulleyFluidHandler.java
rename to src/main/java/com/simibubi/create/content/fluids/hosePulley/HosePulleyFluidHandler.java
index b5883e2d7..5cb60d651 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/HosePulleyFluidHandler.java
+++ b/src/main/java/com/simibubi/create/content/fluids/hosePulley/HosePulleyFluidHandler.java
@@ -1,9 +1,11 @@
-package com.simibubi.create.content.contraptions.fluids.actors;
+package com.simibubi.create.content.fluids.hosePulley;
 
 import java.util.function.Supplier;
 
 import javax.annotation.Nullable;
 
+import com.simibubi.create.content.fluids.transfer.FluidDrainingBehaviour;
+import com.simibubi.create.content.fluids.transfer.FluidFillingBehaviour;
 import com.simibubi.create.foundation.fluid.FluidHelper;
 import com.simibubi.create.foundation.fluid.SmartFluidTank;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/HosePulleyRenderer.java b/src/main/java/com/simibubi/create/content/fluids/hosePulley/HosePulleyRenderer.java
similarity index 89%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/actors/HosePulleyRenderer.java
rename to src/main/java/com/simibubi/create/content/fluids/hosePulley/HosePulleyRenderer.java
index d70575592..77b623ecc 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/HosePulleyRenderer.java
+++ b/src/main/java/com/simibubi/create/content/fluids/hosePulley/HosePulleyRenderer.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.contraptions.fluids.actors;
+package com.simibubi.create.content.fluids.hosePulley;
 
 import com.jozufozu.flywheel.core.PartialModel;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.components.structureMovement.pulley.AbstractPulleyRenderer;
+import com.simibubi.create.content.contraptions.pulley.AbstractPulleyRenderer;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/particle/BasinFluidParticle.java b/src/main/java/com/simibubi/create/content/fluids/particle/BasinFluidParticle.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/particle/BasinFluidParticle.java
rename to src/main/java/com/simibubi/create/content/fluids/particle/BasinFluidParticle.java
index bc4dcef52..4b1fdb456 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/particle/BasinFluidParticle.java
+++ b/src/main/java/com/simibubi/create/content/fluids/particle/BasinFluidParticle.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.contraptions.fluids.particle;
+package com.simibubi.create.content.fluids.particle;
 
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.mojang.math.Quaternion;
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.processing.BasinBlockEntity;
+import com.simibubi.create.content.processing.basin.BasinBlockEntity;
 import com.simibubi.create.foundation.utility.VecHelper;
 
 import net.minecraft.client.Camera;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/particle/FluidParticleData.java b/src/main/java/com/simibubi/create/content/fluids/particle/FluidParticleData.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/particle/FluidParticleData.java
rename to src/main/java/com/simibubi/create/content/fluids/particle/FluidParticleData.java
index 1bd73686a..167458610 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/particle/FluidParticleData.java
+++ b/src/main/java/com/simibubi/create/content/fluids/particle/FluidParticleData.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.contraptions.fluids.particle;
+package com.simibubi.create.content.fluids.particle;
 
 import com.mojang.brigadier.StringReader;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import com.simibubi.create.AllParticleTypes;
-import com.simibubi.create.content.contraptions.particle.ICustomParticleData;
+import com.simibubi.create.foundation.particle.ICustomParticleData;
 import com.simibubi.create.foundation.utility.RegisteredObjects;
 
 import net.minecraft.client.particle.ParticleProvider;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/particle/FluidStackParticle.java b/src/main/java/com/simibubi/create/content/fluids/particle/FluidStackParticle.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/particle/FluidStackParticle.java
rename to src/main/java/com/simibubi/create/content/fluids/particle/FluidStackParticle.java
index b383b9405..cd9de2d49 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/particle/FluidStackParticle.java
+++ b/src/main/java/com/simibubi/create/content/fluids/particle/FluidStackParticle.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.content.contraptions.fluids.particle;
+package com.simibubi.create.content.fluids.particle;
 
 import com.simibubi.create.AllParticleTypes;
-import com.simibubi.create.content.contraptions.fluids.potion.PotionFluid;
+import com.simibubi.create.content.fluids.potion.PotionFluid;
 import com.simibubi.create.foundation.utility.Color;
 
 import net.minecraft.client.Minecraft;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/AxisPipeBlock.java b/src/main/java/com/simibubi/create/content/fluids/pipes/AxisPipeBlock.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/AxisPipeBlock.java
rename to src/main/java/com/simibubi/create/content/fluids/pipes/AxisPipeBlock.java
index cd9eb70db..c98ad13d0 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/AxisPipeBlock.java
+++ b/src/main/java/com/simibubi/create/content/fluids/pipes/AxisPipeBlock.java
@@ -1,16 +1,16 @@
-package com.simibubi.create.content.contraptions.fluids.pipes;
+package com.simibubi.create.content.fluids.pipes;
 
 import java.util.Map;
 import java.util.Optional;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.fluids.FluidPropagator;
-import com.simibubi.create.content.contraptions.fluids.FluidTransportBehaviour;
-import com.simibubi.create.content.contraptions.relays.elementary.BracketedBlockEntityBehaviour;
-import com.simibubi.create.content.contraptions.wrench.IWrenchableWithBracket;
+import com.simibubi.create.content.decoration.bracket.BracketedBlockEntityBehaviour;
+import com.simibubi.create.content.equipment.wrench.IWrenchableWithBracket;
+import com.simibubi.create.content.fluids.FluidPropagator;
+import com.simibubi.create.content.fluids.FluidTransportBehaviour;
 import com.simibubi.create.foundation.advancement.AdvancementBehaviour;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.Iterate;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/EncasedPipeBlock.java b/src/main/java/com/simibubi/create/content/fluids/pipes/EncasedPipeBlock.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/EncasedPipeBlock.java
rename to src/main/java/com/simibubi/create/content/fluids/pipes/EncasedPipeBlock.java
index f2b6a7e90..acf2991bd 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/EncasedPipeBlock.java
+++ b/src/main/java/com/simibubi/create/content/fluids/pipes/EncasedPipeBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.fluids.pipes;
+package com.simibubi.create.content.fluids.pipes;
 
 import static net.minecraft.world.level.block.state.properties.BlockStateProperties.DOWN;
 import static net.minecraft.world.level.block.state.properties.BlockStateProperties.EAST;
@@ -12,14 +12,14 @@ import java.util.function.Supplier;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.components.structureMovement.ITransformableBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.StructureTransform;
-import com.simibubi.create.content.contraptions.fluids.FluidPropagator;
-import com.simibubi.create.content.contraptions.fluids.FluidTransportBehaviour;
-import com.simibubi.create.content.contraptions.relays.elementary.EncasedBlock;
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
-import com.simibubi.create.content.schematics.ISpecialBlockItemRequirement;
-import com.simibubi.create.content.schematics.ItemRequirement;
+import com.simibubi.create.content.contraptions.ITransformableBlock;
+import com.simibubi.create.content.contraptions.StructureTransform;
+import com.simibubi.create.content.decoration.encasing.EncasedBlock;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
+import com.simibubi.create.content.fluids.FluidPropagator;
+import com.simibubi.create.content.fluids.FluidTransportBehaviour;
+import com.simibubi.create.content.schematics.requirement.ISpecialBlockItemRequirement;
+import com.simibubi.create.content.schematics.requirement.ItemRequirement;
 import com.simibubi.create.foundation.advancement.AdvancementBehaviour;
 import com.simibubi.create.foundation.block.IBE;
 import com.simibubi.create.foundation.utility.Iterate;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidPipeBlock.java b/src/main/java/com/simibubi/create/content/fluids/pipes/FluidPipeBlock.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidPipeBlock.java
rename to src/main/java/com/simibubi/create/content/fluids/pipes/FluidPipeBlock.java
index 9ea1f5ef2..a15074c6c 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidPipeBlock.java
+++ b/src/main/java/com/simibubi/create/content/fluids/pipes/FluidPipeBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.fluids.pipes;
+package com.simibubi.create.content.fluids.pipes;
 
 import java.util.Arrays;
 import java.util.Optional;
@@ -7,17 +7,17 @@ import javax.annotation.Nullable;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.components.structureMovement.ITransformableBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.StructureTransform;
-import com.simibubi.create.content.contraptions.fluids.FluidPropagator;
-import com.simibubi.create.content.contraptions.fluids.FluidTransportBehaviour;
-import com.simibubi.create.content.contraptions.relays.elementary.BracketedBlockEntityBehaviour;
-import com.simibubi.create.content.contraptions.relays.elementary.EncasableBlock;
-import com.simibubi.create.content.contraptions.wrench.IWrenchableWithBracket;
+import com.simibubi.create.content.contraptions.ITransformableBlock;
+import com.simibubi.create.content.contraptions.StructureTransform;
+import com.simibubi.create.content.decoration.bracket.BracketedBlockEntityBehaviour;
+import com.simibubi.create.content.decoration.encasing.EncasableBlock;
+import com.simibubi.create.content.equipment.wrench.IWrenchableWithBracket;
+import com.simibubi.create.content.fluids.FluidPropagator;
+import com.simibubi.create.content.fluids.FluidTransportBehaviour;
 import com.simibubi.create.foundation.advancement.AdvancementBehaviour;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
 import com.simibubi.create.foundation.block.IBE;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.Iterate;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidPipeBlockEntity.java b/src/main/java/com/simibubi/create/content/fluids/pipes/FluidPipeBlockEntity.java
similarity index 83%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidPipeBlockEntity.java
rename to src/main/java/com/simibubi/create/content/fluids/pipes/FluidPipeBlockEntity.java
index 2d05a47ea..a7021c604 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidPipeBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/fluids/pipes/FluidPipeBlockEntity.java
@@ -1,15 +1,15 @@
-package com.simibubi.create.content.contraptions.fluids.pipes;
+package com.simibubi.create.content.fluids.pipes;
 
 import java.util.List;
 
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.components.structureMovement.ITransformableBlockEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.StructureTransform;
-import com.simibubi.create.content.contraptions.fluids.FluidPropagator;
-import com.simibubi.create.content.contraptions.fluids.FluidTransportBehaviour;
-import com.simibubi.create.content.contraptions.relays.elementary.BracketedBlockEntityBehaviour;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.contraptions.ITransformableBlockEntity;
+import com.simibubi.create.content.contraptions.StructureTransform;
+import com.simibubi.create.content.decoration.bracket.BracketedBlockEntityBehaviour;
+import com.simibubi.create.content.fluids.FluidPropagator;
+import com.simibubi.create.content.fluids.FluidTransportBehaviour;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidPipeBlockRotation.java b/src/main/java/com/simibubi/create/content/fluids/pipes/FluidPipeBlockRotation.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidPipeBlockRotation.java
rename to src/main/java/com/simibubi/create/content/fluids/pipes/FluidPipeBlockRotation.java
index c60a3a2a7..df559fbf2 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidPipeBlockRotation.java
+++ b/src/main/java/com/simibubi/create/content/fluids/pipes/FluidPipeBlockRotation.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.contraptions.fluids.pipes;
+package com.simibubi.create.content.fluids.pipes;
 
 import java.util.Map;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.StructureTransform;
+import com.simibubi.create.content.contraptions.StructureTransform;
 import com.simibubi.create.foundation.utility.Iterate;
 
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/GlassFluidPipeBlock.java b/src/main/java/com/simibubi/create/content/fluids/pipes/GlassFluidPipeBlock.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/GlassFluidPipeBlock.java
rename to src/main/java/com/simibubi/create/content/fluids/pipes/GlassFluidPipeBlock.java
index acf5586a2..4752f03ae 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/GlassFluidPipeBlock.java
+++ b/src/main/java/com/simibubi/create/content/fluids/pipes/GlassFluidPipeBlock.java
@@ -1,12 +1,12 @@
-package com.simibubi.create.content.contraptions.fluids.pipes;
+package com.simibubi.create.content.fluids.pipes;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.fluids.FluidTransportBehaviour;
-import com.simibubi.create.content.schematics.ISpecialBlockItemRequirement;
-import com.simibubi.create.content.schematics.ItemRequirement;
+import com.simibubi.create.content.fluids.FluidTransportBehaviour;
+import com.simibubi.create.content.schematics.requirement.ISpecialBlockItemRequirement;
+import com.simibubi.create.content.schematics.requirement.ItemRequirement;
 import com.simibubi.create.foundation.block.IBE;
 
 import net.minecraft.MethodsReturnNonnullByDefault;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/IAxisPipe.java b/src/main/java/com/simibubi/create/content/fluids/pipes/IAxisPipe.java
similarity index 86%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/IAxisPipe.java
rename to src/main/java/com/simibubi/create/content/fluids/pipes/IAxisPipe.java
index 8087248e5..f6e32dfc6 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/IAxisPipe.java
+++ b/src/main/java/com/simibubi/create/content/fluids/pipes/IAxisPipe.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.fluids.pipes;
+package com.simibubi.create.content.fluids.pipes;
 
 import javax.annotation.Nullable;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/SmartFluidPipeBlock.java b/src/main/java/com/simibubi/create/content/fluids/pipes/SmartFluidPipeBlock.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/SmartFluidPipeBlock.java
rename to src/main/java/com/simibubi/create/content/fluids/pipes/SmartFluidPipeBlock.java
index 06b6053d6..5b2a17b61 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/SmartFluidPipeBlock.java
+++ b/src/main/java/com/simibubi/create/content/fluids/pipes/SmartFluidPipeBlock.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.contraptions.fluids.pipes;
+package com.simibubi.create.content.fluids.pipes;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.fluids.FluidPropagator;
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
+import com.simibubi.create.content.fluids.FluidPropagator;
 import com.simibubi.create.foundation.advancement.AdvancementBehaviour;
 import com.simibubi.create.foundation.block.IBE;
 import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/SmartFluidPipeBlockEntity.java b/src/main/java/com/simibubi/create/content/fluids/pipes/SmartFluidPipeBlockEntity.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/SmartFluidPipeBlockEntity.java
rename to src/main/java/com/simibubi/create/content/fluids/pipes/SmartFluidPipeBlockEntity.java
index 646bbe90b..3d4aa3b96 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/SmartFluidPipeBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/fluids/pipes/SmartFluidPipeBlockEntity.java
@@ -1,13 +1,13 @@
-package com.simibubi.create.content.contraptions.fluids.pipes;
+package com.simibubi.create.content.fluids.pipes;
 
 import java.util.List;
 
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.simibubi.create.content.contraptions.fluids.FluidPropagator;
-import com.simibubi.create.content.contraptions.fluids.pipes.StraightPipeBlockEntity.StraightPipeFluidTransportBehaviour;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.fluids.FluidPropagator;
+import com.simibubi.create.content.fluids.pipes.StraightPipeBlockEntity.StraightPipeFluidTransportBehaviour;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform;
 import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour;
 import com.simibubi.create.foundation.utility.AngleHelper;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/SmartFluidPipeGenerator.java b/src/main/java/com/simibubi/create/content/fluids/pipes/SmartFluidPipeGenerator.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/SmartFluidPipeGenerator.java
rename to src/main/java/com/simibubi/create/content/fluids/pipes/SmartFluidPipeGenerator.java
index 4e688c80a..30c39a1de 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/SmartFluidPipeGenerator.java
+++ b/src/main/java/com/simibubi/create/content/fluids/pipes/SmartFluidPipeGenerator.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.fluids.pipes;
+package com.simibubi.create.content.fluids.pipes;
 
 import com.simibubi.create.foundation.data.AssetLookup;
 import com.simibubi.create.foundation.data.SpecialBlockStateGen;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/StraightPipeBlockEntity.java b/src/main/java/com/simibubi/create/content/fluids/pipes/StraightPipeBlockEntity.java
similarity index 80%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/StraightPipeBlockEntity.java
rename to src/main/java/com/simibubi/create/content/fluids/pipes/StraightPipeBlockEntity.java
index 03d5fb749..de8a98ca8 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/StraightPipeBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/fluids/pipes/StraightPipeBlockEntity.java
@@ -1,12 +1,13 @@
-package com.simibubi.create.content.contraptions.fluids.pipes;
+package com.simibubi.create.content.fluids.pipes;
 
 import java.util.List;
 
-import com.simibubi.create.content.contraptions.fluids.FluidPropagator;
-import com.simibubi.create.content.contraptions.fluids.FluidTransportBehaviour;
-import com.simibubi.create.content.contraptions.relays.elementary.BracketedBlockEntityBehaviour;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.decoration.bracket.BracketedBlockEntityBehaviour;
+import com.simibubi.create.content.fluids.FluidPropagator;
+import com.simibubi.create.content.fluids.FluidTransportBehaviour;
+import com.simibubi.create.content.fluids.pipes.valve.FluidValveBlock;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -28,7 +29,7 @@ public class StraightPipeBlockEntity extends SmartBlockEntity {
 		registerAwardables(behaviours, FluidPropagator.getSharedTriggers());
 	}
 
-	static class StraightPipeFluidTransportBehaviour extends FluidTransportBehaviour {
+	public static class StraightPipeFluidTransportBehaviour extends FluidTransportBehaviour {
 
 		public StraightPipeFluidTransportBehaviour(SmartBlockEntity be) {
 			super(be);
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/TransparentStraightPipeRenderer.java b/src/main/java/com/simibubi/create/content/fluids/pipes/TransparentStraightPipeRenderer.java
similarity index 87%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/TransparentStraightPipeRenderer.java
rename to src/main/java/com/simibubi/create/content/fluids/pipes/TransparentStraightPipeRenderer.java
index 7e28b732a..8659592cf 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/TransparentStraightPipeRenderer.java
+++ b/src/main/java/com/simibubi/create/content/fluids/pipes/TransparentStraightPipeRenderer.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.contraptions.fluids.pipes;
+package com.simibubi.create.content.fluids.pipes;
 
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.simibubi.create.content.contraptions.fluids.FluidTransportBehaviour;
-import com.simibubi.create.content.contraptions.fluids.PipeConnection.Flow;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.fluids.FluidTransportBehaviour;
+import com.simibubi.create.content.fluids.PipeConnection.Flow;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer;
 import com.simibubi.create.foundation.fluid.FluidRenderer;
 import com.simibubi.create.foundation.utility.Iterate;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/VanillaFluidTargets.java b/src/main/java/com/simibubi/create/content/fluids/pipes/VanillaFluidTargets.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/VanillaFluidTargets.java
rename to src/main/java/com/simibubi/create/content/fluids/pipes/VanillaFluidTargets.java
index 0b761d4e6..d971b9b66 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/VanillaFluidTargets.java
+++ b/src/main/java/com/simibubi/create/content/fluids/pipes/VanillaFluidTargets.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.fluids.pipes;
+package com.simibubi.create.content.fluids.pipes;
 
 import static net.minecraft.world.level.block.state.properties.BlockStateProperties.LEVEL_HONEY;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidValveBlock.java b/src/main/java/com/simibubi/create/content/fluids/pipes/valve/FluidValveBlock.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidValveBlock.java
rename to src/main/java/com/simibubi/create/content/fluids/pipes/valve/FluidValveBlock.java
index 6b89f55ec..1bd5f0538 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidValveBlock.java
+++ b/src/main/java/com/simibubi/create/content/fluids/pipes/valve/FluidValveBlock.java
@@ -1,11 +1,13 @@
-package com.simibubi.create.content.contraptions.fluids.pipes;
+package com.simibubi.create.content.fluids.pipes.valve;
 
 import javax.annotation.Nonnull;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.base.DirectionalAxisKineticBlock;
-import com.simibubi.create.content.contraptions.fluids.FluidPropagator;
+import com.simibubi.create.content.fluids.FluidPropagator;
+import com.simibubi.create.content.fluids.pipes.FluidPipeBlock;
+import com.simibubi.create.content.fluids.pipes.IAxisPipe;
+import com.simibubi.create.content.kinetics.base.DirectionalAxisKineticBlock;
 import com.simibubi.create.foundation.block.IBE;
 import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
 import com.simibubi.create.foundation.utility.Iterate;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidValveBlockEntity.java b/src/main/java/com/simibubi/create/content/fluids/pipes/valve/FluidValveBlockEntity.java
similarity index 87%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidValveBlockEntity.java
rename to src/main/java/com/simibubi/create/content/fluids/pipes/valve/FluidValveBlockEntity.java
index c3bd8a970..33726a4dd 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidValveBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/fluids/pipes/valve/FluidValveBlockEntity.java
@@ -1,12 +1,12 @@
-package com.simibubi.create.content.contraptions.fluids.pipes;
+package com.simibubi.create.content.fluids.pipes.valve;
 
 import java.util.List;
 
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.fluids.FluidPropagator;
-import com.simibubi.create.content.contraptions.fluids.pipes.StraightPipeBlockEntity.StraightPipeFluidTransportBehaviour;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.fluids.FluidPropagator;
+import com.simibubi.create.content.fluids.pipes.StraightPipeBlockEntity.StraightPipeFluidTransportBehaviour;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat.Chaser;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidValveInstance.java b/src/main/java/com/simibubi/create/content/fluids/pipes/valve/FluidValveInstance.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidValveInstance.java
rename to src/main/java/com/simibubi/create/content/fluids/pipes/valve/FluidValveInstance.java
index 16dc666c8..c99af77c3 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidValveInstance.java
+++ b/src/main/java/com/simibubi/create/content/fluids/pipes/valve/FluidValveInstance.java
@@ -1,12 +1,12 @@
-package com.simibubi.create.content.contraptions.fluids.pipes;
+package com.simibubi.create.content.fluids.pipes.valve;
 
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.jozufozu.flywheel.api.instance.DynamicInstance;
 import com.jozufozu.flywheel.core.Materials;
 import com.jozufozu.flywheel.core.materials.model.ModelData;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityRenderer;
-import com.simibubi.create.content.contraptions.relays.encased.ShaftInstance;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
+import com.simibubi.create.content.kinetics.base.ShaftInstance;
 import com.simibubi.create.foundation.utility.AngleHelper;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidValveRenderer.java b/src/main/java/com/simibubi/create/content/fluids/pipes/valve/FluidValveRenderer.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidValveRenderer.java
rename to src/main/java/com/simibubi/create/content/fluids/pipes/valve/FluidValveRenderer.java
index cfbf55b2b..70e073573 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidValveRenderer.java
+++ b/src/main/java/com/simibubi/create/content/fluids/pipes/valve/FluidValveRenderer.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.contraptions.fluids.pipes;
+package com.simibubi.create.content.fluids.pipes.valve;
 
 import com.jozufozu.flywheel.backend.Backend;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityRenderer;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.utility.AngleHelper;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/potion/PotionFluid.java b/src/main/java/com/simibubi/create/content/fluids/potion/PotionFluid.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/potion/PotionFluid.java
rename to src/main/java/com/simibubi/create/content/fluids/potion/PotionFluid.java
index 8b08ba655..fda2b5ea3 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/potion/PotionFluid.java
+++ b/src/main/java/com/simibubi/create/content/fluids/potion/PotionFluid.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.contraptions.fluids.potion;
+package com.simibubi.create.content.fluids.potion;
 
 import java.util.Collection;
 import java.util.List;
 
 import com.simibubi.create.AllFluids;
 import com.simibubi.create.AllFluids.TintedFluidType;
-import com.simibubi.create.content.contraptions.fluids.VirtualFluid;
+import com.simibubi.create.content.fluids.VirtualFluid;
 import com.simibubi.create.foundation.utility.NBTHelper;
 import com.simibubi.create.foundation.utility.RegisteredObjects;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/potion/PotionFluidHandler.java b/src/main/java/com/simibubi/create/content/fluids/potion/PotionFluidHandler.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/potion/PotionFluidHandler.java
rename to src/main/java/com/simibubi/create/content/fluids/potion/PotionFluidHandler.java
index db2552e56..ebe37f05c 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/potion/PotionFluidHandler.java
+++ b/src/main/java/com/simibubi/create/content/fluids/potion/PotionFluidHandler.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.contraptions.fluids.potion;
+package com.simibubi.create.content.fluids.potion;
 
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
 import com.google.common.collect.Lists;
-import com.simibubi.create.content.contraptions.fluids.potion.PotionFluid.BottleType;
+import com.simibubi.create.content.fluids.potion.PotionFluid.BottleType;
 import com.simibubi.create.foundation.fluid.FluidHelper;
 import com.simibubi.create.foundation.fluid.FluidIngredient;
 import com.simibubi.create.foundation.utility.Components;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/recipe/PotionMixingRecipes.java b/src/main/java/com/simibubi/create/content/fluids/potion/PotionMixingRecipes.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/recipe/PotionMixingRecipes.java
rename to src/main/java/com/simibubi/create/content/fluids/potion/PotionMixingRecipes.java
index 4f91335b4..4d3230eba 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/recipe/PotionMixingRecipes.java
+++ b/src/main/java/com/simibubi/create/content/fluids/potion/PotionMixingRecipes.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.fluids.recipe;
+package com.simibubi.create.content.fluids.potion;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -8,11 +8,10 @@ import java.util.Map;
 import java.util.Set;
 
 import com.simibubi.create.Create;
-import com.simibubi.create.content.contraptions.components.mixer.MixingRecipe;
-import com.simibubi.create.content.contraptions.fluids.potion.PotionFluid.BottleType;
-import com.simibubi.create.content.contraptions.fluids.potion.PotionFluidHandler;
-import com.simibubi.create.content.contraptions.processing.HeatCondition;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipeBuilder;
+import com.simibubi.create.content.fluids.potion.PotionFluid.BottleType;
+import com.simibubi.create.content.kinetics.mixer.MixingRecipe;
+import com.simibubi.create.content.processing.recipe.HeatCondition;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder;
 import com.simibubi.create.foundation.fluid.FluidIngredient;
 
 import net.minecraft.world.item.Item;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/PumpBlock.java b/src/main/java/com/simibubi/create/content/fluids/pump/PumpBlock.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/PumpBlock.java
rename to src/main/java/com/simibubi/create/content/fluids/pump/PumpBlock.java
index f01695b21..2cfee03aa 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/PumpBlock.java
+++ b/src/main/java/com/simibubi/create/content/fluids/pump/PumpBlock.java
@@ -1,10 +1,11 @@
-package com.simibubi.create.content.contraptions.fluids;
+package com.simibubi.create.content.fluids.pump;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.base.DirectionalKineticBlock;
-import com.simibubi.create.content.contraptions.fluids.pipes.FluidPipeBlock;
-import com.simibubi.create.content.contraptions.relays.elementary.ICogWheel;
+import com.simibubi.create.content.fluids.FluidPropagator;
+import com.simibubi.create.content.fluids.pipes.FluidPipeBlock;
+import com.simibubi.create.content.kinetics.base.DirectionalKineticBlock;
+import com.simibubi.create.content.kinetics.simpleRelays.ICogWheel;
 import com.simibubi.create.foundation.block.IBE;
 import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
 import com.simibubi.create.foundation.utility.Iterate;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/PumpBlockEntity.java b/src/main/java/com/simibubi/create/content/fluids/pump/PumpBlockEntity.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/PumpBlockEntity.java
rename to src/main/java/com/simibubi/create/content/fluids/pump/PumpBlockEntity.java
index 9bacc5d80..3d7aca5a9 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/PumpBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/fluids/pump/PumpBlockEntity.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.fluids;
+package com.simibubi.create.content.fluids.pump;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -13,10 +13,13 @@ import javax.annotation.Nullable;
 
 import org.apache.commons.lang3.mutable.MutableBoolean;
 
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
+import com.simibubi.create.content.fluids.FluidPropagator;
+import com.simibubi.create.content.fluids.FluidTransportBehaviour;
+import com.simibubi.create.content.fluids.PipeConnection;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.BlockFace;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.Iterate;
@@ -346,7 +349,7 @@ public class PumpBlockEntity extends KineticBlockEntity {
 			super.tick();
 			for (Entry<Direction, PipeConnection> entry : interfaces.entrySet()) {
 				boolean pull = isPullingOnSide(isFront(entry.getKey()));
-				Couple<Float> pressure = entry.getValue().pressure;
+				Couple<Float> pressure = entry.getValue().getPressure();
 				pressure.set(pull, Math.abs(getSpeed()));
 				pressure.set(!pull, 0f);
 			}
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/PumpCogInstance.java b/src/main/java/com/simibubi/create/content/fluids/pump/PumpCogInstance.java
similarity index 82%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/PumpCogInstance.java
rename to src/main/java/com/simibubi/create/content/fluids/pump/PumpCogInstance.java
index 14693ac31..629ec754a 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/PumpCogInstance.java
+++ b/src/main/java/com/simibubi/create/content/fluids/pump/PumpCogInstance.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.contraptions.fluids;
+package com.simibubi.create.content.fluids.pump;
 
 import com.jozufozu.flywheel.api.Instancer;
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.jozufozu.flywheel.api.instance.DynamicInstance;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.base.SingleRotatingInstance;
-import com.simibubi.create.content.contraptions.base.flwdata.RotatingData;
+import com.simibubi.create.content.kinetics.base.SingleRotatingInstance;
+import com.simibubi.create.content.kinetics.base.flwdata.RotatingData;
 
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/PumpRenderer.java b/src/main/java/com/simibubi/create/content/fluids/pump/PumpRenderer.java
similarity index 82%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/PumpRenderer.java
rename to src/main/java/com/simibubi/create/content/fluids/pump/PumpRenderer.java
index b9ff47060..294e3c6e5 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/PumpRenderer.java
+++ b/src/main/java/com/simibubi/create/content/fluids/pump/PumpRenderer.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.content.contraptions.fluids;
+package com.simibubi.create.content.fluids.pump;
 
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityRenderer;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/FillingBySpout.java b/src/main/java/com/simibubi/create/content/fluids/spout/FillingBySpout.java
similarity index 75%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/actors/FillingBySpout.java
rename to src/main/java/com/simibubi/create/content/fluids/spout/FillingBySpout.java
index e49bea738..2a4652694 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/FillingBySpout.java
+++ b/src/main/java/com/simibubi/create/content/fluids/spout/FillingBySpout.java
@@ -1,10 +1,12 @@
-package com.simibubi.create.content.contraptions.fluids.actors;
+package com.simibubi.create.content.fluids.spout;
 
 import java.util.List;
 import java.util.Optional;
 
 import com.simibubi.create.AllRecipeTypes;
-import com.simibubi.create.content.contraptions.itemAssembly.SequencedAssemblyRecipe;
+import com.simibubi.create.content.fluids.transfer.FillingRecipe;
+import com.simibubi.create.content.fluids.transfer.GenericItemFilling;
+import com.simibubi.create.content.processing.sequenced.SequencedAssemblyRecipe;
 import com.simibubi.create.foundation.fluid.FluidIngredient;
 
 import net.minecraft.world.item.ItemStack;
@@ -16,27 +18,27 @@ import net.minecraftforge.items.wrapper.RecipeWrapper;
 
 public class FillingBySpout {
 
-	static RecipeWrapper wrapper = new RecipeWrapper(new ItemStackHandler(1));
+	private static final RecipeWrapper WRAPPER = new RecipeWrapper(new ItemStackHandler(1));
 
 	public static boolean canItemBeFilled(Level world, ItemStack stack) {
-		wrapper.setItem(0, stack);
+		WRAPPER.setItem(0, stack);
 
 		Optional<FillingRecipe> assemblyRecipe =
-			SequencedAssemblyRecipe.getRecipe(world, wrapper, AllRecipeTypes.FILLING.getType(), FillingRecipe.class);
+			SequencedAssemblyRecipe.getRecipe(world, WRAPPER, AllRecipeTypes.FILLING.getType(), FillingRecipe.class);
 		if (assemblyRecipe.isPresent())
 			return true;
 
-		if (AllRecipeTypes.FILLING.find(wrapper, world)
+		if (AllRecipeTypes.FILLING.find(WRAPPER, world)
 			.isPresent())
 			return true;
 		return GenericItemFilling.canItemBeFilled(world, stack);
 	}
 
 	public static int getRequiredAmountForItem(Level world, ItemStack stack, FluidStack availableFluid) {
-		wrapper.setItem(0, stack);
+		WRAPPER.setItem(0, stack);
 
 		Optional<FillingRecipe> assemblyRecipe =
-			SequencedAssemblyRecipe.getRecipe(world, wrapper, AllRecipeTypes.FILLING.getType(), FillingRecipe.class);
+			SequencedAssemblyRecipe.getRecipe(world, WRAPPER, AllRecipeTypes.FILLING.getType(), FillingRecipe.class);
 		if (assemblyRecipe.isPresent()) {
 			FluidIngredient requiredFluid = assemblyRecipe.get()
 				.getRequiredFluid();
@@ -45,7 +47,7 @@ public class FillingBySpout {
 		}
 
 		for (Recipe<RecipeWrapper> recipe : world.getRecipeManager()
-			.getRecipesFor(AllRecipeTypes.FILLING.getType(), wrapper, world)) {
+			.getRecipesFor(AllRecipeTypes.FILLING.getType(), WRAPPER, world)) {
 			FillingRecipe fillingRecipe = (FillingRecipe) recipe;
 			FluidIngredient requiredFluid = fillingRecipe.getRequiredFluid();
 			if (requiredFluid.test(availableFluid))
@@ -58,15 +60,15 @@ public class FillingBySpout {
 		FluidStack toFill = availableFluid.copy();
 		toFill.setAmount(requiredAmount);
 
-		wrapper.setItem(0, stack);
+		WRAPPER.setItem(0, stack);
 
 		FillingRecipe fillingRecipe =
-			SequencedAssemblyRecipe.getRecipe(world, wrapper, AllRecipeTypes.FILLING.getType(), FillingRecipe.class)
+			SequencedAssemblyRecipe.getRecipe(world, WRAPPER, AllRecipeTypes.FILLING.getType(), FillingRecipe.class)
 				.filter(fr -> fr.getRequiredFluid()
 					.test(toFill))
 				.orElseGet(() -> {
 					for (Recipe<RecipeWrapper> recipe : world.getRecipeManager()
-						.getRecipesFor(AllRecipeTypes.FILLING.getType(), wrapper, world)) {
+						.getRecipesFor(AllRecipeTypes.FILLING.getType(), WRAPPER, world)) {
 						FillingRecipe fr = (FillingRecipe) recipe;
 						FluidIngredient requiredFluid = fr.getRequiredFluid();
 						if (requiredFluid.test(toFill))
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/SpoutBlock.java b/src/main/java/com/simibubi/create/content/fluids/spout/SpoutBlock.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/actors/SpoutBlock.java
rename to src/main/java/com/simibubi/create/content/fluids/spout/SpoutBlock.java
index 94155c02e..b861fbdb1 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/SpoutBlock.java
+++ b/src/main/java/com/simibubi/create/content/fluids/spout/SpoutBlock.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.contraptions.fluids.actors;
+package com.simibubi.create.content.fluids.spout;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
 import com.simibubi.create.foundation.advancement.AdvancementBehaviour;
 import com.simibubi.create.foundation.block.IBE;
 import com.simibubi.create.foundation.blockEntity.ComparatorUtil;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/SpoutBlockEntity.java b/src/main/java/com/simibubi/create/content/fluids/spout/SpoutBlockEntity.java
similarity index 88%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/actors/SpoutBlockEntity.java
rename to src/main/java/com/simibubi/create/content/fluids/spout/SpoutBlockEntity.java
index d2a85ff60..56af6c4e8 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/SpoutBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/fluids/spout/SpoutBlockEntity.java
@@ -1,24 +1,24 @@
-package com.simibubi.create.content.contraptions.fluids.actors;
+package com.simibubi.create.content.fluids.spout;
 
-import static com.simibubi.create.foundation.blockEntity.behaviour.belt.BeltProcessingBehaviour.ProcessingResult.HOLD;
-import static com.simibubi.create.foundation.blockEntity.behaviour.belt.BeltProcessingBehaviour.ProcessingResult.PASS;
+import static com.simibubi.create.content.kinetics.belt.behaviour.BeltProcessingBehaviour.ProcessingResult.HOLD;
+import static com.simibubi.create.content.kinetics.belt.behaviour.BeltProcessingBehaviour.ProcessingResult.PASS;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import com.simibubi.create.AllItems;
 import com.simibubi.create.api.behaviour.BlockSpoutingBehaviour;
-import com.simibubi.create.content.contraptions.fluids.FluidFX;
-import com.simibubi.create.content.contraptions.goggles.IHaveGoggleInformation;
-import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack;
+import com.simibubi.create.content.equipment.goggles.IHaveGoggleInformation;
+import com.simibubi.create.content.fluids.FluidFX;
+import com.simibubi.create.content.kinetics.belt.behaviour.BeltProcessingBehaviour;
+import com.simibubi.create.content.kinetics.belt.behaviour.BeltProcessingBehaviour.ProcessingResult;
+import com.simibubi.create.content.kinetics.belt.behaviour.TransportedItemStackHandlerBehaviour;
+import com.simibubi.create.content.kinetics.belt.behaviour.TransportedItemStackHandlerBehaviour.TransportedResult;
+import com.simibubi.create.content.kinetics.belt.transport.TransportedItemStack;
 import com.simibubi.create.foundation.advancement.AdvancementBehaviour;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.BeltProcessingBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.BeltProcessingBehaviour.ProcessingResult;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.TransportedItemStackHandlerBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.TransportedItemStackHandlerBehaviour.TransportedResult;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour;
 import com.simibubi.create.foundation.fluid.FluidHelper;
 import com.simibubi.create.foundation.utility.NBTHelper;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/SpoutRenderer.java b/src/main/java/com/simibubi/create/content/fluids/spout/SpoutRenderer.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/actors/SpoutRenderer.java
rename to src/main/java/com/simibubi/create/content/fluids/spout/SpoutRenderer.java
index 26d8e655a..9c103dd94 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/SpoutRenderer.java
+++ b/src/main/java/com/simibubi/create/content/fluids/spout/SpoutRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.fluids.actors;
+package com.simibubi.create.content.fluids.spout;
 
 import com.jozufozu.flywheel.core.PartialModel;
 import com.mojang.blaze3d.vertex.PoseStack;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/BoilerData.java b/src/main/java/com/simibubi/create/content/fluids/tank/BoilerData.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/tank/BoilerData.java
rename to src/main/java/com/simibubi/create/content/fluids/tank/BoilerData.java
index 26cfc74dd..6d29979b1 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/BoilerData.java
+++ b/src/main/java/com/simibubi/create/content/fluids/tank/BoilerData.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.fluids.tank;
+package com.simibubi.create.content.fluids.tank;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -9,13 +9,13 @@ import org.jetbrains.annotations.NotNull;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.contraptions.components.steam.SteamEngineBlock;
-import com.simibubi.create.content.contraptions.components.steam.whistle.WhistleBlock;
-import com.simibubi.create.content.contraptions.components.steam.whistle.WhistleBlockEntity;
-import com.simibubi.create.content.contraptions.goggles.IHaveGoggleInformation;
+import com.simibubi.create.content.decoration.steamWhistle.WhistleBlock;
+import com.simibubi.create.content.decoration.steamWhistle.WhistleBlockEntity;
+import com.simibubi.create.content.equipment.goggles.IHaveGoggleInformation;
+import com.simibubi.create.content.kinetics.BlockStressValues;
+import com.simibubi.create.content.kinetics.steamEngine.SteamEngineBlock;
 import com.simibubi.create.foundation.advancement.AdvancementBehaviour;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
-import com.simibubi.create.foundation.block.BlockStressValues;
 import com.simibubi.create.foundation.fluid.FluidHelper;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Iterate;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/BoilerHeaters.java b/src/main/java/com/simibubi/create/content/fluids/tank/BoilerHeaters.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/tank/BoilerHeaters.java
rename to src/main/java/com/simibubi/create/content/fluids/tank/BoilerHeaters.java
index e042d0e65..7e5458425 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/BoilerHeaters.java
+++ b/src/main/java/com/simibubi/create/content/fluids/tank/BoilerHeaters.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.fluids.tank;
+package com.simibubi.create.content.fluids.tank;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -7,8 +7,8 @@ import org.jetbrains.annotations.Nullable;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllTags.AllBlockTags;
-import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock;
-import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock.HeatLevel;
+import com.simibubi.create.content.processing.burner.BlazeBurnerBlock;
+import com.simibubi.create.content.processing.burner.BlazeBurnerBlock.HeatLevel;
 import com.simibubi.create.foundation.utility.AttachedRegistry;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/CreativeFluidTankBlockEntity.java b/src/main/java/com/simibubi/create/content/fluids/tank/CreativeFluidTankBlockEntity.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/tank/CreativeFluidTankBlockEntity.java
rename to src/main/java/com/simibubi/create/content/fluids/tank/CreativeFluidTankBlockEntity.java
index 459448cc4..e0c5a55dc 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/CreativeFluidTankBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/fluids/tank/CreativeFluidTankBlockEntity.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.fluids.tank;
+package com.simibubi.create.content.fluids.tank;
 
 import java.util.List;
 import java.util.function.Consumer;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankBlock.java b/src/main/java/com/simibubi/create/content/fluids/tank/FluidTankBlock.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankBlock.java
rename to src/main/java/com/simibubi/create/content/fluids/tank/FluidTankBlock.java
index c056b6ceb..203f80496 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankBlock.java
+++ b/src/main/java/com/simibubi/create/content/fluids/tank/FluidTankBlock.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.contraptions.fluids.tank;
+package com.simibubi.create.content.fluids.tank;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.api.connectivity.ConnectivityHandler;
-import com.simibubi.create.content.contraptions.fluids.actors.GenericItemFilling;
-import com.simibubi.create.content.contraptions.fluids.tank.CreativeFluidTankBlockEntity.CreativeSmartFluidTank;
-import com.simibubi.create.content.contraptions.processing.EmptyingByBasin;
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
+import com.simibubi.create.content.fluids.tank.CreativeFluidTankBlockEntity.CreativeSmartFluidTank;
+import com.simibubi.create.content.fluids.transfer.GenericItemEmptying;
+import com.simibubi.create.content.fluids.transfer.GenericItemFilling;
 import com.simibubi.create.foundation.advancement.AdvancementBehaviour;
 import com.simibubi.create.foundation.block.IBE;
 import com.simibubi.create.foundation.blockEntity.ComparatorUtil;
@@ -166,13 +166,13 @@ public class FluidTankBlock extends Block implements IWrenchable, IBE<FluidTankB
 		FluidStack prevFluidInTank = fluidTank.getFluidInTank(0)
 			.copy();
 
-		if (FluidHelper.tryEmptyItemIntoTE(world, player, hand, heldItem, be))
+		if (FluidHelper.tryEmptyItemIntoBE(world, player, hand, heldItem, be))
 			exchange = FluidExchange.ITEM_TO_TANK;
-		else if (FluidHelper.tryFillItemFromTE(world, player, hand, heldItem, be))
+		else if (FluidHelper.tryFillItemFromBE(world, player, hand, heldItem, be))
 			exchange = FluidExchange.TANK_TO_ITEM;
 
 		if (exchange == null) {
-			if (EmptyingByBasin.canItemBeEmptied(world, heldItem)
+			if (GenericItemEmptying.canItemBeEmptied(world, heldItem)
 				|| GenericItemFilling.canItemBeFilled(world, heldItem))
 				return InteractionResult.SUCCESS;
 			return InteractionResult.PASS;
@@ -185,7 +185,7 @@ public class FluidTankBlock extends Block implements IWrenchable, IBE<FluidTankB
 
 		if (exchange == FluidExchange.ITEM_TO_TANK) {
 			if (creative && !onClient) {
-				FluidStack fluidInItem = EmptyingByBasin.emptyItem(world, heldItem, true)
+				FluidStack fluidInItem = GenericItemEmptying.emptyItem(world, heldItem, true)
 					.getFirst();
 				if (!fluidInItem.isEmpty() && fluidTank instanceof CreativeSmartFluidTank)
 					((CreativeSmartFluidTank) fluidTank).setContainedFluid(fluidInItem);
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankBlockEntity.java b/src/main/java/com/simibubi/create/content/fluids/tank/FluidTankBlockEntity.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankBlockEntity.java
rename to src/main/java/com/simibubi/create/content/fluids/tank/FluidTankBlockEntity.java
index 978b1145a..78f25587a 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/fluids/tank/FluidTankBlockEntity.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.fluids.tank;
+package com.simibubi.create.content.fluids.tank;
 
 import static java.lang.Math.abs;
 
@@ -8,16 +8,16 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import com.simibubi.create.api.connectivity.ConnectivityHandler;
-import com.simibubi.create.content.contraptions.fluids.tank.FluidTankBlock.Shape;
-import com.simibubi.create.content.contraptions.goggles.IHaveGoggleInformation;
+import com.simibubi.create.content.equipment.goggles.IHaveGoggleInformation;
+import com.simibubi.create.content.fluids.tank.FluidTankBlock.Shape;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.IMultiBlockEntityContainer;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
-import com.simibubi.create.foundation.config.AllConfigs;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.fluid.SmartFluidTank;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat.Chaser;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankCTBehaviour.java b/src/main/java/com/simibubi/create/content/fluids/tank/FluidTankCTBehaviour.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankCTBehaviour.java
rename to src/main/java/com/simibubi/create/content/fluids/tank/FluidTankCTBehaviour.java
index 845fecb94..d197b6c97 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankCTBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/fluids/tank/FluidTankCTBehaviour.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.fluids.tank;
+package com.simibubi.create.content.fluids.tank;
 
 import org.jetbrains.annotations.Nullable;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankGenerator.java b/src/main/java/com/simibubi/create/content/fluids/tank/FluidTankGenerator.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankGenerator.java
rename to src/main/java/com/simibubi/create/content/fluids/tank/FluidTankGenerator.java
index fb366a8e9..183dff0de 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankGenerator.java
+++ b/src/main/java/com/simibubi/create/content/fluids/tank/FluidTankGenerator.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.contraptions.fluids.tank;
+package com.simibubi.create.content.fluids.tank;
 
-import com.simibubi.create.content.contraptions.fluids.tank.FluidTankBlock.Shape;
+import com.simibubi.create.content.fluids.tank.FluidTankBlock.Shape;
 import com.simibubi.create.foundation.data.AssetLookup;
 import com.simibubi.create.foundation.data.SpecialBlockStateGen;
 import com.tterrag.registrate.providers.DataGenContext;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankItem.java b/src/main/java/com/simibubi/create/content/fluids/tank/FluidTankItem.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankItem.java
rename to src/main/java/com/simibubi/create/content/fluids/tank/FluidTankItem.java
index b2924e4b0..b5df74db5 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankItem.java
+++ b/src/main/java/com/simibubi/create/content/fluids/tank/FluidTankItem.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.fluids.tank;
+package com.simibubi.create.content.fluids.tank;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankModel.java b/src/main/java/com/simibubi/create/content/fluids/tank/FluidTankModel.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankModel.java
rename to src/main/java/com/simibubi/create/content/fluids/tank/FluidTankModel.java
index 42797f688..475263e3d 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankModel.java
+++ b/src/main/java/com/simibubi/create/content/fluids/tank/FluidTankModel.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.fluids.tank;
+package com.simibubi.create.content.fluids.tank;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankRenderer.java b/src/main/java/com/simibubi/create/content/fluids/tank/FluidTankRenderer.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankRenderer.java
rename to src/main/java/com/simibubi/create/content/fluids/tank/FluidTankRenderer.java
index db54d471a..e1acc93ad 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankRenderer.java
+++ b/src/main/java/com/simibubi/create/content/fluids/tank/FluidTankRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.fluids.tank;
+package com.simibubi.create.content.fluids.tank;
 
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/EmptyingRecipe.java b/src/main/java/com/simibubi/create/content/fluids/transfer/EmptyingRecipe.java
similarity index 79%
rename from src/main/java/com/simibubi/create/content/contraptions/processing/EmptyingRecipe.java
rename to src/main/java/com/simibubi/create/content/fluids/transfer/EmptyingRecipe.java
index 848d75fde..dbd492fd5 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/processing/EmptyingRecipe.java
+++ b/src/main/java/com/simibubi/create/content/fluids/transfer/EmptyingRecipe.java
@@ -1,7 +1,8 @@
-package com.simibubi.create.content.contraptions.processing;
+package com.simibubi.create.content.fluids.transfer;
 
 import com.simibubi.create.AllRecipeTypes;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipeBuilder.ProcessingRecipeParams;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipe;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder.ProcessingRecipeParams;
 
 import net.minecraft.world.level.Level;
 import net.minecraftforge.fluids.FluidStack;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/FillingRecipe.java b/src/main/java/com/simibubi/create/content/fluids/transfer/FillingRecipe.java
similarity index 88%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/actors/FillingRecipe.java
rename to src/main/java/com/simibubi/create/content/fluids/transfer/FillingRecipe.java
index 4b1c31c78..54d8b3695 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/FillingRecipe.java
+++ b/src/main/java/com/simibubi/create/content/fluids/transfer/FillingRecipe.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.fluids.actors;
+package com.simibubi.create.content.fluids.transfer;
 
 import java.util.List;
 import java.util.Set;
@@ -7,9 +7,9 @@ import java.util.function.Supplier;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllRecipeTypes;
 import com.simibubi.create.compat.jei.category.sequencedAssembly.SequencedAssemblySubCategory;
-import com.simibubi.create.content.contraptions.itemAssembly.IAssemblyRecipe;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipe;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipeBuilder.ProcessingRecipeParams;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipe;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder.ProcessingRecipeParams;
+import com.simibubi.create.content.processing.sequenced.IAssemblyRecipe;
 import com.simibubi.create.foundation.fluid.FluidIngredient;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Lang;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/FluidDrainingBehaviour.java b/src/main/java/com/simibubi/create/content/fluids/transfer/FluidDrainingBehaviour.java
similarity index 99%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/actors/FluidDrainingBehaviour.java
rename to src/main/java/com/simibubi/create/content/fluids/transfer/FluidDrainingBehaviour.java
index 9de3aae43..6354642fa 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/FluidDrainingBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/fluids/transfer/FluidDrainingBehaviour.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.fluids.actors;
+package com.simibubi.create.content.fluids.transfer;
 
 import java.util.ArrayList;
 import java.util.HashSet;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/FluidFillingBehaviour.java b/src/main/java/com/simibubi/create/content/fluids/transfer/FluidFillingBehaviour.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/actors/FluidFillingBehaviour.java
rename to src/main/java/com/simibubi/create/content/fluids/transfer/FluidFillingBehaviour.java
index c704c49af..398619387 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/FluidFillingBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/fluids/transfer/FluidFillingBehaviour.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.fluids.actors;
+package com.simibubi.create.content.fluids.transfer;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -9,10 +9,10 @@ import java.util.Set;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
 import com.simibubi.create.foundation.blockEntity.behaviour.BehaviourType;
-import com.simibubi.create.foundation.config.AllConfigs;
 import com.simibubi.create.foundation.fluid.FluidHelper;
 import com.simibubi.create.foundation.utility.BBHelper;
 import com.simibubi.create.foundation.utility.Iterate;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import it.unimi.dsi.fastutil.PriorityQueue;
 import it.unimi.dsi.fastutil.objects.ObjectHeapPriorityQueue;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/FluidManipulationBehaviour.java b/src/main/java/com/simibubi/create/content/fluids/transfer/FluidManipulationBehaviour.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/actors/FluidManipulationBehaviour.java
rename to src/main/java/com/simibubi/create/content/fluids/transfer/FluidManipulationBehaviour.java
index 667f973f4..b245a6530 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/FluidManipulationBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/fluids/transfer/FluidManipulationBehaviour.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.fluids.actors;
+package com.simibubi.create.content.fluids.transfer;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -7,15 +7,15 @@ import java.util.Set;
 import java.util.function.BiConsumer;
 import java.util.function.Predicate;
 
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.AllTags.AllFluidTags;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
-import com.simibubi.create.foundation.config.AllConfigs;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.fluid.FluidHelper;
-import com.simibubi.create.foundation.networking.AllPackets;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.NBTHelper;
 import com.simibubi.create.foundation.utility.VecHelper;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -62,6 +62,10 @@ public abstract class FluidManipulationBehaviour extends BlockEntityBehaviour {
 		frontier = new ArrayList<>();
 	}
 
+	public boolean isInfinite() {
+		return infinite;
+	}
+
 	public void counterpartActed() {
 		counterpartActed = true;
 	}
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/FluidSplashPacket.java b/src/main/java/com/simibubi/create/content/fluids/transfer/FluidSplashPacket.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/actors/FluidSplashPacket.java
rename to src/main/java/com/simibubi/create/content/fluids/transfer/FluidSplashPacket.java
index a5314d4ff..d4cd72945 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/FluidSplashPacket.java
+++ b/src/main/java/com/simibubi/create/content/fluids/transfer/FluidSplashPacket.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.contraptions.fluids.actors;
+package com.simibubi.create.content.fluids.transfer;
 
-import com.simibubi.create.content.contraptions.fluids.FluidFX;
+import com.simibubi.create.content.fluids.FluidFX;
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 
 import net.minecraft.client.Minecraft;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/EmptyingByBasin.java b/src/main/java/com/simibubi/create/content/fluids/transfer/GenericItemEmptying.java
similarity index 86%
rename from src/main/java/com/simibubi/create/content/contraptions/processing/EmptyingByBasin.java
rename to src/main/java/com/simibubi/create/content/fluids/transfer/GenericItemEmptying.java
index 1a29725af..d9e3d9aa4 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/processing/EmptyingByBasin.java
+++ b/src/main/java/com/simibubi/create/content/fluids/transfer/GenericItemEmptying.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.contraptions.processing;
+package com.simibubi.create.content.fluids.transfer;
 
 import java.util.List;
 import java.util.Optional;
 
 import com.simibubi.create.AllRecipeTypes;
-import com.simibubi.create.content.contraptions.fluids.potion.PotionFluidHandler;
+import com.simibubi.create.content.fluids.potion.PotionFluidHandler;
 import com.simibubi.create.foundation.utility.Pair;
 
 import net.minecraft.world.item.ItemStack;
@@ -19,16 +19,16 @@ import net.minecraftforge.fluids.capability.IFluidHandlerItem;
 import net.minecraftforge.items.ItemStackHandler;
 import net.minecraftforge.items.wrapper.RecipeWrapper;
 
-public class EmptyingByBasin {
+public class GenericItemEmptying {
 
-	static RecipeWrapper wrapper = new RecipeWrapper(new ItemStackHandler(1));
+	private static final RecipeWrapper WRAPPER = new RecipeWrapper(new ItemStackHandler(1));
 
 	public static boolean canItemBeEmptied(Level world, ItemStack stack) {
 		if (stack.getItem() instanceof PotionItem)
 			return true;
 		
-		wrapper.setItem(0, stack);
-		if (AllRecipeTypes.EMPTYING.find(wrapper, world)
+		WRAPPER.setItem(0, stack);
+		if (AllRecipeTypes.EMPTYING.find(WRAPPER, world)
 			.isPresent())
 			return true;
 
@@ -52,8 +52,8 @@ public class EmptyingByBasin {
 		if (stack.getItem() instanceof PotionItem)
 			return PotionFluidHandler.emptyPotion(stack, simulate);
 		
-		wrapper.setItem(0, stack);
-		Optional<Recipe<RecipeWrapper>> recipe = AllRecipeTypes.EMPTYING.find(wrapper, world);
+		WRAPPER.setItem(0, stack);
+		Optional<Recipe<RecipeWrapper>> recipe = AllRecipeTypes.EMPTYING.find(WRAPPER, world);
 		if (recipe.isPresent()) {
 			EmptyingRecipe emptyingRecipe = (EmptyingRecipe) recipe.get();
 			List<ItemStack> results = emptyingRecipe.rollResults();
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/GenericItemFilling.java b/src/main/java/com/simibubi/create/content/fluids/transfer/GenericItemFilling.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/fluids/actors/GenericItemFilling.java
rename to src/main/java/com/simibubi/create/content/fluids/transfer/GenericItemFilling.java
index e6ce73c75..4a7ad0580 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/GenericItemFilling.java
+++ b/src/main/java/com/simibubi/create/content/fluids/transfer/GenericItemFilling.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.contraptions.fluids.actors;
+package com.simibubi.create.content.fluids.transfer;
 
 import com.simibubi.create.AllFluids;
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.contraptions.fluids.potion.PotionFluidHandler;
+import com.simibubi.create.content.fluids.potion.PotionFluidHandler;
 import com.simibubi.create.foundation.fluid.FluidHelper;
 
 import net.minecraft.world.item.BucketItem;
diff --git a/src/main/java/com/simibubi/create/foundation/block/BlockStressDefaults.java b/src/main/java/com/simibubi/create/content/kinetics/BlockStressDefaults.java
similarity index 97%
rename from src/main/java/com/simibubi/create/foundation/block/BlockStressDefaults.java
rename to src/main/java/com/simibubi/create/content/kinetics/BlockStressDefaults.java
index 1ea374b1b..16fb0cd2e 100644
--- a/src/main/java/com/simibubi/create/foundation/block/BlockStressDefaults.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/BlockStressDefaults.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.block;
+package com.simibubi.create.content.kinetics;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/com/simibubi/create/foundation/block/BlockStressValues.java b/src/main/java/com/simibubi/create/content/kinetics/BlockStressValues.java
similarity index 98%
rename from src/main/java/com/simibubi/create/foundation/block/BlockStressValues.java
rename to src/main/java/com/simibubi/create/content/kinetics/BlockStressValues.java
index 24974a783..7225fbfa6 100644
--- a/src/main/java/com/simibubi/create/foundation/block/BlockStressValues.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/BlockStressValues.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.block;
+package com.simibubi.create.content.kinetics;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/KineticDebugger.java b/src/main/java/com/simibubi/create/content/kinetics/KineticDebugger.java
similarity index 89%
rename from src/main/java/com/simibubi/create/content/contraptions/KineticDebugger.java
rename to src/main/java/com/simibubi/create/content/kinetics/KineticDebugger.java
index 566b0876a..90c5a4ee5 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/KineticDebugger.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/KineticDebugger.java
@@ -1,12 +1,12 @@
-package com.simibubi.create.content.contraptions;
+package com.simibubi.create.content.kinetics;
 
 import com.simibubi.create.CreateClient;
-import com.simibubi.create.content.contraptions.base.IRotate;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityRenderer;
-import com.simibubi.create.foundation.config.AllConfigs;
+import com.simibubi.create.content.kinetics.base.IRotate;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
 import com.simibubi.create.foundation.utility.Color;
 import com.simibubi.create.foundation.utility.VecHelper;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ClientLevel;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/KineticNetwork.java b/src/main/java/com/simibubi/create/content/kinetics/KineticNetwork.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/KineticNetwork.java
rename to src/main/java/com/simibubi/create/content/kinetics/KineticNetwork.java
index 392af43be..b1d154607 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/KineticNetwork.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/KineticNetwork.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.contraptions;
+package com.simibubi.create.content.kinetics;
 
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
 
 public class KineticNetwork {
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/RotationPropagator.java b/src/main/java/com/simibubi/create/content/kinetics/RotationPropagator.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/RotationPropagator.java
rename to src/main/java/com/simibubi/create/content/kinetics/RotationPropagator.java
index 0cbe0c8ed..0399ba808 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/RotationPropagator.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/RotationPropagator.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions;
+package com.simibubi.create.content.kinetics;
 
 import static net.minecraft.world.level.block.state.properties.BlockStateProperties.AXIS;
 
@@ -6,18 +6,18 @@ import java.util.LinkedList;
 import java.util.List;
 
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.base.IRotate;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.relays.advanced.SpeedControllerBlock;
-import com.simibubi.create.content.contraptions.relays.advanced.SpeedControllerBlockEntity;
-import com.simibubi.create.content.contraptions.relays.elementary.CogWheelBlock;
-import com.simibubi.create.content.contraptions.relays.elementary.ICogWheel;
-import com.simibubi.create.content.contraptions.relays.encased.DirectionalShaftHalvesBlockEntity;
-import com.simibubi.create.content.contraptions.relays.encased.EncasedBeltBlock;
-import com.simibubi.create.content.contraptions.relays.encased.SplitShaftBlockEntity;
-import com.simibubi.create.content.contraptions.relays.gearbox.GearboxBlockEntity;
-import com.simibubi.create.foundation.config.AllConfigs;
+import com.simibubi.create.content.kinetics.base.DirectionalShaftHalvesBlockEntity;
+import com.simibubi.create.content.kinetics.base.IRotate;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.chainDrive.ChainDriveBlock;
+import com.simibubi.create.content.kinetics.gearbox.GearboxBlockEntity;
+import com.simibubi.create.content.kinetics.simpleRelays.CogWheelBlock;
+import com.simibubi.create.content.kinetics.simpleRelays.ICogWheel;
+import com.simibubi.create.content.kinetics.speedController.SpeedControllerBlock;
+import com.simibubi.create.content.kinetics.speedController.SpeedControllerBlockEntity;
+import com.simibubi.create.content.kinetics.transmission.SplitShaftBlockEntity;
 import com.simibubi.create.foundation.utility.Iterate;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -83,9 +83,9 @@ public class RotationPropagator {
 		}
 
 		// Attached Encased Belts
-		if (fromBlock instanceof EncasedBeltBlock && toBlock instanceof EncasedBeltBlock) {
-			boolean connected = EncasedBeltBlock.areBlocksConnected(stateFrom, stateTo, direction);
-			return connected ? EncasedBeltBlock.getRotationSpeedModifier(from, to) : 0;
+		if (fromBlock instanceof ChainDriveBlock && toBlock instanceof ChainDriveBlock) {
+			boolean connected = ChainDriveBlock.areBlocksConnected(stateFrom, stateTo, direction);
+			return connected ? ChainDriveBlock.getRotationSpeedModifier(from, to) : 0;
 		}
 
 		// Large Gear <-> Large Gear
diff --git a/src/main/java/com/simibubi/create/content/contraptions/TorquePropagator.java b/src/main/java/com/simibubi/create/content/kinetics/TorquePropagator.java
similarity index 89%
rename from src/main/java/com/simibubi/create/content/contraptions/TorquePropagator.java
rename to src/main/java/com/simibubi/create/content/kinetics/TorquePropagator.java
index d9ba562ef..5f6c64f51 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/TorquePropagator.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/TorquePropagator.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.contraptions;
+package com.simibubi.create.content.kinetics;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import com.simibubi.create.Create;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
 import com.simibubi.create.foundation.utility.WorldHelper;
 
 import net.minecraft.world.level.LevelAccessor;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/AbstractEncasedShaftBlock.java b/src/main/java/com/simibubi/create/content/kinetics/base/AbstractEncasedShaftBlock.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/encased/AbstractEncasedShaftBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/base/AbstractEncasedShaftBlock.java
index 229d20097..362cdbbb2 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/AbstractEncasedShaftBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/base/AbstractEncasedShaftBlock.java
@@ -1,9 +1,7 @@
-package com.simibubi.create.content.contraptions.relays.encased;
+package com.simibubi.create.content.kinetics.base;
 
 import javax.annotation.Nullable;
 
-import com.simibubi.create.content.contraptions.base.RotatedPillarKineticBlock;
-
 import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/BackHalfShaftInstance.java b/src/main/java/com/simibubi/create/content/kinetics/base/BackHalfShaftInstance.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/contraptions/base/BackHalfShaftInstance.java
rename to src/main/java/com/simibubi/create/content/kinetics/base/BackHalfShaftInstance.java
index 917634f7c..c530c8c86 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/base/BackHalfShaftInstance.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/base/BackHalfShaftInstance.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.base;
+package com.simibubi.create.content.kinetics.base;
 
 import com.jozufozu.flywheel.api.MaterialManager;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/BlockBreakingKineticBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/base/BlockBreakingKineticBlockEntity.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/BlockBreakingKineticBlockEntity.java
rename to src/main/java/com/simibubi/create/content/kinetics/base/BlockBreakingKineticBlockEntity.java
index 29d7ef8ef..b2159fd7b 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/BlockBreakingKineticBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/base/BlockBreakingKineticBlockEntity.java
@@ -1,8 +1,7 @@
-package com.simibubi.create.content.contraptions.components.actors;
+package com.simibubi.create.content.kinetics.base;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
 import com.simibubi.create.foundation.utility.BlockHelper;
 import com.simibubi.create.foundation.utility.VecHelper;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/BlockBreakingMovementBehaviour.java b/src/main/java/com/simibubi/create/content/kinetics/base/BlockBreakingMovementBehaviour.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/BlockBreakingMovementBehaviour.java
rename to src/main/java/com/simibubi/create/content/kinetics/base/BlockBreakingMovementBehaviour.java
index c1f33f03f..72b6bd20c 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/BlockBreakingMovementBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/base/BlockBreakingMovementBehaviour.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.contraptions.components.actors;
+package com.simibubi.create.content.kinetics.base;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
-import com.simibubi.create.content.contraptions.components.structureMovement.OrientedContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.mounted.MountedContraption;
-import com.simibubi.create.content.logistics.trains.entity.CarriageContraption;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.OrientedContraptionEntity;
+import com.simibubi.create.content.contraptions.behaviour.MovementBehaviour;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
+import com.simibubi.create.content.contraptions.mounted.MountedContraption;
+import com.simibubi.create.content.trains.entity.CarriageContraption;
 import com.simibubi.create.foundation.utility.BlockHelper;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/CutoutRotatingInstance.java b/src/main/java/com/simibubi/create/content/kinetics/base/CutoutRotatingInstance.java
similarity index 80%
rename from src/main/java/com/simibubi/create/content/contraptions/base/CutoutRotatingInstance.java
rename to src/main/java/com/simibubi/create/content/kinetics/base/CutoutRotatingInstance.java
index 7f7017f5f..72b3767be 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/base/CutoutRotatingInstance.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/base/CutoutRotatingInstance.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.contraptions.base;
+package com.simibubi.create.content.kinetics.base;
 
 import com.jozufozu.flywheel.api.Material;
 import com.jozufozu.flywheel.api.MaterialManager;
-import com.simibubi.create.content.contraptions.base.flwdata.RotatingData;
+import com.simibubi.create.content.kinetics.base.flwdata.RotatingData;
 import com.simibubi.create.foundation.render.AllMaterialSpecs;
 
 public class CutoutRotatingInstance<T extends KineticBlockEntity> extends SingleRotatingInstance<T> {
diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/DirectionalAxisKineticBlock.java b/src/main/java/com/simibubi/create/content/kinetics/base/DirectionalAxisKineticBlock.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/base/DirectionalAxisKineticBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/base/DirectionalAxisKineticBlock.java
index de3f0345d..f94b67d2b 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/base/DirectionalAxisKineticBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/base/DirectionalAxisKineticBlock.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.content.contraptions.base;
+package com.simibubi.create.content.kinetics.base;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.ITransformableBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.StructureTransform;
+import com.simibubi.create.content.contraptions.ITransformableBlock;
+import com.simibubi.create.content.contraptions.StructureTransform;
 import com.simibubi.create.foundation.utility.Iterate;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/DirectionalKineticBlock.java b/src/main/java/com/simibubi/create/content/kinetics/base/DirectionalKineticBlock.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/base/DirectionalKineticBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/base/DirectionalKineticBlock.java
index 219643025..9e9669755 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/base/DirectionalKineticBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/base/DirectionalKineticBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.base;
+package com.simibubi.create.content.kinetics.base;
 
 import com.simibubi.create.foundation.utility.Iterate;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/DirectionalShaftHalvesBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/base/DirectionalShaftHalvesBlockEntity.java
similarity index 81%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/encased/DirectionalShaftHalvesBlockEntity.java
rename to src/main/java/com/simibubi/create/content/kinetics/base/DirectionalShaftHalvesBlockEntity.java
index e84854a1e..aa6735987 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/DirectionalShaftHalvesBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/base/DirectionalShaftHalvesBlockEntity.java
@@ -1,6 +1,4 @@
-package com.simibubi.create.content.contraptions.relays.encased;
-
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
+package com.simibubi.create.content.kinetics.base;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/GeneratingKineticBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/base/GeneratingKineticBlockEntity.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/base/GeneratingKineticBlockEntity.java
rename to src/main/java/com/simibubi/create/content/kinetics/base/GeneratingKineticBlockEntity.java
index fb8604dc4..b11625687 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/base/GeneratingKineticBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/base/GeneratingKineticBlockEntity.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.contraptions.base;
+package com.simibubi.create.content.kinetics.base;
 
 import java.util.List;
 
-import com.simibubi.create.content.contraptions.KineticNetwork;
-import com.simibubi.create.content.contraptions.base.IRotate.SpeedLevel;
-import com.simibubi.create.content.contraptions.base.IRotate.StressImpact;
+import com.simibubi.create.content.kinetics.KineticNetwork;
+import com.simibubi.create.content.kinetics.base.IRotate.SpeedLevel;
+import com.simibubi.create.content.kinetics.base.IRotate.StressImpact;
 import com.simibubi.create.foundation.utility.Lang;
 
 import net.minecraft.ChatFormatting;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/HalfShaftInstance.java b/src/main/java/com/simibubi/create/content/kinetics/base/HalfShaftInstance.java
similarity index 86%
rename from src/main/java/com/simibubi/create/content/contraptions/base/HalfShaftInstance.java
rename to src/main/java/com/simibubi/create/content/kinetics/base/HalfShaftInstance.java
index 353c9407f..ce0b1f33d 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/base/HalfShaftInstance.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/base/HalfShaftInstance.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.contraptions.base;
+package com.simibubi.create.content.kinetics.base;
 
 import com.jozufozu.flywheel.api.Instancer;
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.base.flwdata.RotatingData;
+import com.simibubi.create.content.kinetics.base.flwdata.RotatingData;
 
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/HorizontalAxisKineticBlock.java b/src/main/java/com/simibubi/create/content/kinetics/base/HorizontalAxisKineticBlock.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/contraptions/base/HorizontalAxisKineticBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/base/HorizontalAxisKineticBlock.java
index a9c674ac9..5b12fc4bd 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/base/HorizontalAxisKineticBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/base/HorizontalAxisKineticBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.base;
+package com.simibubi.create.content.kinetics.base;
 
 import com.simibubi.create.foundation.utility.Iterate;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/HorizontalHalfShaftInstance.java b/src/main/java/com/simibubi/create/content/kinetics/base/HorizontalHalfShaftInstance.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/base/HorizontalHalfShaftInstance.java
rename to src/main/java/com/simibubi/create/content/kinetics/base/HorizontalHalfShaftInstance.java
index 594ed744f..297807d33 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/base/HorizontalHalfShaftInstance.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/base/HorizontalHalfShaftInstance.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.base;
+package com.simibubi.create.content.kinetics.base;
 
 import com.jozufozu.flywheel.api.MaterialManager;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/HorizontalKineticBlock.java b/src/main/java/com/simibubi/create/content/kinetics/base/HorizontalKineticBlock.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/base/HorizontalKineticBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/base/HorizontalKineticBlock.java
index 85cfc7e95..027ba89eb 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/base/HorizontalKineticBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/base/HorizontalKineticBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.base;
+package com.simibubi.create.content.kinetics.base;
 
 import com.simibubi.create.foundation.utility.Iterate;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/IRotate.java b/src/main/java/com/simibubi/create/content/kinetics/base/IRotate.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/base/IRotate.java
rename to src/main/java/com/simibubi/create/content/kinetics/base/IRotate.java
index ced263792..73afc24b9 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/base/IRotate.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/base/IRotate.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.contraptions.base;
+package com.simibubi.create.content.kinetics.base;
 
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
-import com.simibubi.create.foundation.config.AllConfigs;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
 import com.simibubi.create.foundation.item.TooltipHelper;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.LangBuilder;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.ChatFormatting;
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/KineticBlock.java b/src/main/java/com/simibubi/create/content/kinetics/base/KineticBlock.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/contraptions/base/KineticBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/base/KineticBlock.java
index 8bc4c0236..40882f34f 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/base/KineticBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/base/KineticBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.base;
+package com.simibubi.create.content.kinetics.base;
 
 import com.simibubi.create.foundation.advancement.AdvancementBehaviour;
 import com.simibubi.create.foundation.block.IBE;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/KineticBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/base/KineticBlockEntity.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/base/KineticBlockEntity.java
rename to src/main/java/com/simibubi/create/content/kinetics/base/KineticBlockEntity.java
index c637f7867..09fe0c834 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/base/KineticBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/base/KineticBlockEntity.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.base;
+package com.simibubi.create.content.kinetics.base;
 
 import static net.minecraft.ChatFormatting.GOLD;
 import static net.minecraft.ChatFormatting.GRAY;
@@ -9,24 +9,24 @@ import javax.annotation.Nullable;
 
 import com.jozufozu.flywheel.backend.instancing.InstancedRenderDispatcher;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.contraptions.KineticNetwork;
-import com.simibubi.create.content.contraptions.RotationPropagator;
-import com.simibubi.create.content.contraptions.base.IRotate.SpeedLevel;
-import com.simibubi.create.content.contraptions.base.IRotate.StressImpact;
-import com.simibubi.create.content.contraptions.goggles.IHaveGoggleInformation;
-import com.simibubi.create.content.contraptions.goggles.IHaveHoveringInformation;
-import com.simibubi.create.content.contraptions.relays.advanced.sequencer.SequencedGearshiftBlockEntity.SequenceContext;
-import com.simibubi.create.content.contraptions.relays.elementary.ICogWheel;
-import com.simibubi.create.content.contraptions.relays.gearbox.GearboxBlock;
-import com.simibubi.create.foundation.block.BlockStressValues;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.equipment.goggles.IHaveGoggleInformation;
+import com.simibubi.create.content.equipment.goggles.IHaveHoveringInformation;
+import com.simibubi.create.content.kinetics.BlockStressValues;
+import com.simibubi.create.content.kinetics.KineticNetwork;
+import com.simibubi.create.content.kinetics.RotationPropagator;
+import com.simibubi.create.content.kinetics.base.IRotate.SpeedLevel;
+import com.simibubi.create.content.kinetics.base.IRotate.StressImpact;
+import com.simibubi.create.content.kinetics.gearbox.GearboxBlock;
+import com.simibubi.create.content.kinetics.simpleRelays.ICogWheel;
+import com.simibubi.create.content.kinetics.transmission.sequencer.SequencedGearshiftBlockEntity.SequenceContext;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
-import com.simibubi.create.foundation.config.AllConfigs;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.item.TooltipHelper;
 import com.simibubi.create.foundation.item.TooltipHelper.Palette;
 import com.simibubi.create.foundation.sound.SoundScapes;
 import com.simibubi.create.foundation.sound.SoundScapes.AmbienceGroup;
 import com.simibubi.create.foundation.utility.Lang;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.resources.language.I18n;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/KineticBlockEntityInstance.java b/src/main/java/com/simibubi/create/content/kinetics/base/KineticBlockEntityInstance.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/base/KineticBlockEntityInstance.java
rename to src/main/java/com/simibubi/create/content/kinetics/base/KineticBlockEntityInstance.java
index 21a877739..0cec4b1ec 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/base/KineticBlockEntityInstance.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/base/KineticBlockEntityInstance.java
@@ -1,12 +1,12 @@
-package com.simibubi.create.content.contraptions.base;
+package com.simibubi.create.content.kinetics.base;
 
 import com.jozufozu.flywheel.api.Material;
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.jozufozu.flywheel.backend.instancing.blockentity.BlockEntityInstance;
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.base.flwdata.RotatingData;
-import com.simibubi.create.content.contraptions.relays.elementary.ICogWheel;
-import com.simibubi.create.content.contraptions.relays.elementary.ShaftBlock;
+import com.simibubi.create.content.kinetics.base.flwdata.RotatingData;
+import com.simibubi.create.content.kinetics.simpleRelays.ICogWheel;
+import com.simibubi.create.content.kinetics.simpleRelays.ShaftBlock;
 import com.simibubi.create.foundation.render.AllMaterialSpecs;
 
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/KineticBlockEntityRenderer.java b/src/main/java/com/simibubi/create/content/kinetics/base/KineticBlockEntityRenderer.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/base/KineticBlockEntityRenderer.java
rename to src/main/java/com/simibubi/create/content/kinetics/base/KineticBlockEntityRenderer.java
index 03a65a9c1..b5d8b9196 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/base/KineticBlockEntityRenderer.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/base/KineticBlockEntityRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.base;
+package com.simibubi.create.content.kinetics.base;
 
 import org.apache.commons.lang3.ArrayUtils;
 
@@ -6,8 +6,8 @@ import com.jozufozu.flywheel.backend.Backend;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.KineticDebugger;
-import com.simibubi.create.content.contraptions.relays.elementary.ICogWheel;
+import com.simibubi.create.content.kinetics.KineticDebugger;
+import com.simibubi.create.content.kinetics.simpleRelays.ICogWheel;
 import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/KineticEffectHandler.java b/src/main/java/com/simibubi/create/content/kinetics/base/KineticEffectHandler.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/base/KineticEffectHandler.java
rename to src/main/java/com/simibubi/create/content/kinetics/base/KineticEffectHandler.java
index 85dc2ff04..b80763459 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/base/KineticEffectHandler.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/base/KineticEffectHandler.java
@@ -1,7 +1,6 @@
-package com.simibubi.create.content.contraptions.base;
+package com.simibubi.create.content.kinetics.base;
 
-import com.simibubi.create.content.contraptions.base.IRotate.SpeedLevel;
-import com.simibubi.create.content.contraptions.particle.RotationIndicatorParticleData;
+import com.simibubi.create.content.kinetics.base.IRotate.SpeedLevel;
 import com.simibubi.create.foundation.utility.VecHelper;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/RotatedPillarKineticBlock.java b/src/main/java/com/simibubi/create/content/kinetics/base/RotatedPillarKineticBlock.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/base/RotatedPillarKineticBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/base/RotatedPillarKineticBlock.java
index 2b199c07a..9c97e6b34 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/base/RotatedPillarKineticBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/base/RotatedPillarKineticBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.base;
+package com.simibubi.create.content.kinetics.base;
 
 import com.simibubi.create.foundation.utility.Iterate;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/particle/RotationIndicatorParticle.java b/src/main/java/com/simibubi/create/content/kinetics/base/RotationIndicatorParticle.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/particle/RotationIndicatorParticle.java
rename to src/main/java/com/simibubi/create/content/kinetics/base/RotationIndicatorParticle.java
index 593940293..70aa4b028 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/particle/RotationIndicatorParticle.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/base/RotationIndicatorParticle.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.content.contraptions.particle;
+package com.simibubi.create.content.kinetics.base;
 
 import com.mojang.blaze3d.vertex.VertexConsumer;
-import com.simibubi.create.content.contraptions.goggles.GogglesItem;
+import com.simibubi.create.content.equipment.goggles.GogglesItem;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 import com.simibubi.create.foundation.utility.Color;
 import com.simibubi.create.foundation.utility.VecHelper;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/particle/RotationIndicatorParticleData.java b/src/main/java/com/simibubi/create/content/kinetics/base/RotationIndicatorParticleData.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/particle/RotationIndicatorParticleData.java
rename to src/main/java/com/simibubi/create/content/kinetics/base/RotationIndicatorParticleData.java
index 02502d5cd..7a249f698 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/particle/RotationIndicatorParticleData.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/base/RotationIndicatorParticleData.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.particle;
+package com.simibubi.create.content.kinetics.base;
 
 import java.util.Locale;
 
@@ -10,6 +10,7 @@ import com.mojang.serialization.DynamicOps;
 import com.mojang.serialization.codecs.PrimitiveCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import com.simibubi.create.AllParticleTypes;
+import com.simibubi.create.foundation.particle.ICustomParticleDataWithSprite;
 
 import net.minecraft.client.particle.ParticleEngine.SpriteParticleRegistration;
 import net.minecraft.core.Direction.Axis;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/ShaftInstance.java b/src/main/java/com/simibubi/create/content/kinetics/base/ShaftInstance.java
similarity index 65%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/encased/ShaftInstance.java
rename to src/main/java/com/simibubi/create/content/kinetics/base/ShaftInstance.java
index 9002a14a0..6649249bb 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/ShaftInstance.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/base/ShaftInstance.java
@@ -1,8 +1,6 @@
-package com.simibubi.create.content.contraptions.relays.encased;
+package com.simibubi.create.content.kinetics.base;
 
 import com.jozufozu.flywheel.api.MaterialManager;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.base.SingleRotatingInstance;
 
 import net.minecraft.world.level.block.state.BlockState;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/ShaftRenderer.java b/src/main/java/com/simibubi/create/content/kinetics/base/ShaftRenderer.java
similarity index 67%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/encased/ShaftRenderer.java
rename to src/main/java/com/simibubi/create/content/kinetics/base/ShaftRenderer.java
index f24aee62f..a0c722edf 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/ShaftRenderer.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/base/ShaftRenderer.java
@@ -1,7 +1,4 @@
-package com.simibubi.create.content.contraptions.relays.encased;
-
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityRenderer;
+package com.simibubi.create.content.kinetics.base;
 
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
 import net.minecraft.world.level.block.state.BlockState;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/SingleRotatingInstance.java b/src/main/java/com/simibubi/create/content/kinetics/base/SingleRotatingInstance.java
similarity index 87%
rename from src/main/java/com/simibubi/create/content/contraptions/base/SingleRotatingInstance.java
rename to src/main/java/com/simibubi/create/content/kinetics/base/SingleRotatingInstance.java
index b0c290572..1a38e762a 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/base/SingleRotatingInstance.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/base/SingleRotatingInstance.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.contraptions.base;
+package com.simibubi.create.content.kinetics.base;
 
 import com.jozufozu.flywheel.api.Instancer;
 import com.jozufozu.flywheel.api.MaterialManager;
-import com.simibubi.create.content.contraptions.base.flwdata.RotatingData;
+import com.simibubi.create.content.kinetics.base.flwdata.RotatingData;
 
 import net.minecraft.world.level.block.state.BlockState;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/flwdata/BeltData.java b/src/main/java/com/simibubi/create/content/kinetics/base/flwdata/BeltData.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/base/flwdata/BeltData.java
rename to src/main/java/com/simibubi/create/content/kinetics/base/flwdata/BeltData.java
index 5b89864f9..2af24bc33 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/base/flwdata/BeltData.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/base/flwdata/BeltData.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.base.flwdata;
+package com.simibubi.create.content.kinetics.base.flwdata;
 
 import com.mojang.math.Quaternion;
 import com.simibubi.create.foundation.block.render.SpriteShiftEntry;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/flwdata/BeltType.java b/src/main/java/com/simibubi/create/content/kinetics/base/flwdata/BeltType.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/base/flwdata/BeltType.java
rename to src/main/java/com/simibubi/create/content/kinetics/base/flwdata/BeltType.java
index b7ab909ce..1da07a2e6 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/base/flwdata/BeltType.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/base/flwdata/BeltType.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.base.flwdata;
+package com.simibubi.create.content.kinetics.base.flwdata;
 
 import com.jozufozu.flywheel.api.struct.Batched;
 import com.jozufozu.flywheel.api.struct.Instanced;
@@ -8,7 +8,7 @@ import com.jozufozu.flywheel.core.layout.BufferLayout;
 import com.jozufozu.flywheel.core.model.ModelTransformer;
 import com.jozufozu.flywheel.util.RenderMath;
 import com.mojang.math.Quaternion;
-import com.simibubi.create.content.contraptions.KineticDebugger;
+import com.simibubi.create.content.kinetics.KineticDebugger;
 import com.simibubi.create.foundation.render.AllInstanceFormats;
 import com.simibubi.create.foundation.render.AllProgramSpecs;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/flwdata/BeltWriterUnsafe.java b/src/main/java/com/simibubi/create/content/kinetics/base/flwdata/BeltWriterUnsafe.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/base/flwdata/BeltWriterUnsafe.java
rename to src/main/java/com/simibubi/create/content/kinetics/base/flwdata/BeltWriterUnsafe.java
index 1cf570be5..002e25e3a 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/base/flwdata/BeltWriterUnsafe.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/base/flwdata/BeltWriterUnsafe.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.base.flwdata;
+package com.simibubi.create.content.kinetics.base.flwdata;
 
 import org.lwjgl.system.MemoryUtil;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/flwdata/KineticData.java b/src/main/java/com/simibubi/create/content/kinetics/base/flwdata/KineticData.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/base/flwdata/KineticData.java
rename to src/main/java/com/simibubi/create/content/kinetics/base/flwdata/KineticData.java
index 323e48dac..fd6dd5786 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/base/flwdata/KineticData.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/base/flwdata/KineticData.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.contraptions.base.flwdata;
+package com.simibubi.create.content.kinetics.base.flwdata;
 
 import com.jozufozu.flywheel.core.materials.BasicData;
 import com.mojang.math.Vector3f;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
 import com.simibubi.create.foundation.utility.Color;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/flwdata/KineticWriterUnsafe.java b/src/main/java/com/simibubi/create/content/kinetics/base/flwdata/KineticWriterUnsafe.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/base/flwdata/KineticWriterUnsafe.java
rename to src/main/java/com/simibubi/create/content/kinetics/base/flwdata/KineticWriterUnsafe.java
index d450b1d6a..3787e73d7 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/base/flwdata/KineticWriterUnsafe.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/base/flwdata/KineticWriterUnsafe.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.base.flwdata;
+package com.simibubi.create.content.kinetics.base.flwdata;
 
 import org.lwjgl.system.MemoryUtil;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/flwdata/RotatingData.java b/src/main/java/com/simibubi/create/content/kinetics/base/flwdata/RotatingData.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/base/flwdata/RotatingData.java
rename to src/main/java/com/simibubi/create/content/kinetics/base/flwdata/RotatingData.java
index 2431f86b5..5d66aebbc 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/base/flwdata/RotatingData.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/base/flwdata/RotatingData.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.base.flwdata;
+package com.simibubi.create.content.kinetics.base.flwdata;
 
 import com.mojang.math.Vector3f;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/flwdata/RotatingType.java b/src/main/java/com/simibubi/create/content/kinetics/base/flwdata/RotatingType.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/base/flwdata/RotatingType.java
rename to src/main/java/com/simibubi/create/content/kinetics/base/flwdata/RotatingType.java
index bef2e4722..1a61cf6de 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/base/flwdata/RotatingType.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/base/flwdata/RotatingType.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.base.flwdata;
+package com.simibubi.create.content.kinetics.base.flwdata;
 
 import com.jozufozu.flywheel.api.struct.Batched;
 import com.jozufozu.flywheel.api.struct.Instanced;
@@ -8,7 +8,7 @@ import com.jozufozu.flywheel.core.layout.BufferLayout;
 import com.jozufozu.flywheel.core.model.ModelTransformer;
 import com.jozufozu.flywheel.util.RenderMath;
 import com.mojang.math.Vector3f;
-import com.simibubi.create.content.contraptions.KineticDebugger;
+import com.simibubi.create.content.kinetics.KineticDebugger;
 import com.simibubi.create.foundation.render.AllInstanceFormats;
 import com.simibubi.create.foundation.render.AllProgramSpecs;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/flwdata/RotatingWriterUnsafe.java b/src/main/java/com/simibubi/create/content/kinetics/base/flwdata/RotatingWriterUnsafe.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/base/flwdata/RotatingWriterUnsafe.java
rename to src/main/java/com/simibubi/create/content/kinetics/base/flwdata/RotatingWriterUnsafe.java
index b57e21d2a..8b043be7a 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/base/flwdata/RotatingWriterUnsafe.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/base/flwdata/RotatingWriterUnsafe.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.base.flwdata;
+package com.simibubi.create.content.kinetics.base.flwdata;
 
 import org.lwjgl.system.MemoryUtil;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/flwdata/package-info.java b/src/main/java/com/simibubi/create/content/kinetics/base/flwdata/package-info.java
similarity index 73%
rename from src/main/java/com/simibubi/create/content/contraptions/base/flwdata/package-info.java
rename to src/main/java/com/simibubi/create/content/kinetics/base/flwdata/package-info.java
index 5eed85946..9e9a5554f 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/base/flwdata/package-info.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/base/flwdata/package-info.java
@@ -1,5 +1,5 @@
 @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault
-package com.simibubi.create.content.contraptions.base.flwdata;
+package com.simibubi.create.content.kinetics.base.flwdata;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlock.java b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltBlock.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/belt/BeltBlock.java
index a8d857d65..92656133a 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.relays.belt;
+package com.simibubi.create.content.kinetics.belt;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -13,26 +13,26 @@ import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.contraptions.base.HorizontalKineticBlock;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.ITransformableBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.StructureTransform;
-import com.simibubi.create.content.contraptions.processing.EmptyingByBasin;
-import com.simibubi.create.content.contraptions.relays.belt.BeltBlockEntity.CasingType;
-import com.simibubi.create.content.contraptions.relays.belt.BeltSlicer.Feedback;
-import com.simibubi.create.content.contraptions.relays.belt.transport.BeltMovementHandler.TransportedEntityInfo;
-import com.simibubi.create.content.contraptions.relays.belt.transport.BeltTunnelInteractionHandler;
-import com.simibubi.create.content.curiosities.armor.DivingBootsItem;
-import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelBlock;
-import com.simibubi.create.content.logistics.block.funnel.FunnelBlock;
-import com.simibubi.create.content.schematics.ISpecialBlockItemRequirement;
-import com.simibubi.create.content.schematics.ItemRequirement;
-import com.simibubi.create.content.schematics.ItemRequirement.ItemUseType;
+import com.simibubi.create.content.contraptions.ITransformableBlock;
+import com.simibubi.create.content.contraptions.StructureTransform;
+import com.simibubi.create.content.equipment.armor.DivingBootsItem;
+import com.simibubi.create.content.fluids.transfer.GenericItemEmptying;
+import com.simibubi.create.content.kinetics.base.HorizontalKineticBlock;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.belt.BeltBlockEntity.CasingType;
+import com.simibubi.create.content.kinetics.belt.BeltSlicer.Feedback;
+import com.simibubi.create.content.kinetics.belt.behaviour.TransportedItemStackHandlerBehaviour.TransportedResult;
+import com.simibubi.create.content.kinetics.belt.transport.BeltMovementHandler.TransportedEntityInfo;
+import com.simibubi.create.content.kinetics.belt.transport.BeltTunnelInteractionHandler;
+import com.simibubi.create.content.logistics.funnel.FunnelBlock;
+import com.simibubi.create.content.logistics.tunnel.BeltTunnelBlock;
+import com.simibubi.create.content.schematics.requirement.ISpecialBlockItemRequirement;
+import com.simibubi.create.content.schematics.requirement.ItemRequirement;
+import com.simibubi.create.content.schematics.requirement.ItemRequirement.ItemUseType;
 import com.simibubi.create.foundation.block.IBE;
 import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
 import com.simibubi.create.foundation.block.render.MultiPosDestructionHandler;
 import com.simibubi.create.foundation.block.render.ReducedDestroyEffects;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.TransportedItemStackHandlerBehaviour.TransportedResult;
 import com.simibubi.create.foundation.utility.Iterate;
 
 import net.minecraft.client.multiplayer.ClientLevel;
@@ -252,7 +252,7 @@ public class BeltBlock extends HorizontalKineticBlock
 		boolean isConnector = AllItems.BELT_CONNECTOR.isIn(heldItem);
 		boolean isShaft = AllBlocks.SHAFT.isIn(heldItem);
 		boolean isDye = heldItem.is(Tags.Items.DYES);
-		boolean hasWater = EmptyingByBasin.emptyItem(world, heldItem, true)
+		boolean hasWater = GenericItemEmptying.emptyItem(world, heldItem, true)
 			.getFirst()
 			.getFluid()
 			.isSame(Fluids.WATER);
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltBlockEntity.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlockEntity.java
rename to src/main/java/com/simibubi/create/content/kinetics/belt/BeltBlockEntity.java
index 07831e262..5cea7e684 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltBlockEntity.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.content.contraptions.relays.belt;
+package com.simibubi.create.content.kinetics.belt;
 
-import static com.simibubi.create.content.contraptions.relays.belt.BeltPart.MIDDLE;
-import static com.simibubi.create.content.contraptions.relays.belt.BeltSlope.HORIZONTAL;
+import static com.simibubi.create.content.kinetics.belt.BeltPart.MIDDLE;
+import static com.simibubi.create.content.kinetics.belt.BeltSlope.HORIZONTAL;
 import static net.minecraft.core.Direction.AxisDirection.NEGATIVE;
 import static net.minecraft.core.Direction.AxisDirection.POSITIVE;
 
@@ -17,19 +17,19 @@ import com.jozufozu.flywheel.light.LightUpdater;
 import com.jozufozu.flywheel.util.box.GridAlignedBB;
 import com.jozufozu.flywheel.util.box.ImmutableBox;
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.base.IRotate;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.relays.belt.transport.BeltInventory;
-import com.simibubi.create.content.contraptions.relays.belt.transport.BeltMovementHandler;
-import com.simibubi.create.content.contraptions.relays.belt.transport.BeltMovementHandler.TransportedEntityInfo;
-import com.simibubi.create.content.contraptions.relays.belt.transport.BeltTunnelInteractionHandler;
-import com.simibubi.create.content.contraptions.relays.belt.transport.ItemHandlerBeltSegment;
-import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack;
-import com.simibubi.create.content.logistics.block.belts.tunnel.BrassTunnelBlockEntity;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.DirectBeltInputBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.TransportedItemStackHandlerBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.TransportedItemStackHandlerBehaviour.TransportedResult;
+import com.simibubi.create.content.kinetics.base.IRotate;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.belt.behaviour.DirectBeltInputBehaviour;
+import com.simibubi.create.content.kinetics.belt.behaviour.TransportedItemStackHandlerBehaviour;
+import com.simibubi.create.content.kinetics.belt.behaviour.TransportedItemStackHandlerBehaviour.TransportedResult;
+import com.simibubi.create.content.kinetics.belt.transport.BeltInventory;
+import com.simibubi.create.content.kinetics.belt.transport.BeltMovementHandler;
+import com.simibubi.create.content.kinetics.belt.transport.BeltMovementHandler.TransportedEntityInfo;
+import com.simibubi.create.content.kinetics.belt.transport.BeltTunnelInteractionHandler;
+import com.simibubi.create.content.kinetics.belt.transport.ItemHandlerBeltSegment;
+import com.simibubi.create.content.kinetics.belt.transport.TransportedItemStack;
+import com.simibubi.create.content.logistics.tunnel.BrassTunnelBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.NBTHelper;
 
 import net.minecraft.client.renderer.LightTexture;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltGenerator.java b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltGenerator.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltGenerator.java
rename to src/main/java/com/simibubi/create/content/kinetics/belt/BeltGenerator.java
index d190e6e30..633c59bc4 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltGenerator.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltGenerator.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.relays.belt;
+package com.simibubi.create.content.kinetics.belt;
 
 import com.simibubi.create.foundation.data.SpecialBlockStateGen;
 import com.tterrag.registrate.providers.DataGenContext;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltHelper.java b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltHelper.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltHelper.java
rename to src/main/java/com/simibubi/create/content/kinetics/belt/BeltHelper.java
index 3e5f92378..07430e5e7 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltHelper.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltHelper.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.relays.belt;
+package com.simibubi.create.content.kinetics.belt;
 
 import com.simibubi.create.AllTags.AllItemTags;
 import com.simibubi.create.foundation.utility.VecHelper;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltInstance.java b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltInstance.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltInstance.java
rename to src/main/java/com/simibubi/create/content/kinetics/belt/BeltInstance.java
index 3b9f1f920..c040ae377 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltInstance.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltInstance.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.relays.belt;
+package com.simibubi.create.content.kinetics.belt;
 
 import java.util.ArrayList;
 import java.util.function.Supplier;
@@ -12,9 +12,9 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Quaternion;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityInstance;
-import com.simibubi.create.content.contraptions.base.flwdata.BeltData;
-import com.simibubi.create.content.contraptions.base.flwdata.RotatingData;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityInstance;
+import com.simibubi.create.content.kinetics.base.flwdata.BeltData;
+import com.simibubi.create.content.kinetics.base.flwdata.RotatingData;
 import com.simibubi.create.foundation.block.render.SpriteShiftEntry;
 import com.simibubi.create.foundation.render.AllMaterialSpecs;
 import com.simibubi.create.foundation.utility.Iterate;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltModel.java b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltModel.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltModel.java
rename to src/main/java/com/simibubi/create/content/kinetics/belt/BeltModel.java
index 7d17393d2..e80256677 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltModel.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltModel.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.contraptions.relays.belt;
+package com.simibubi.create.content.kinetics.belt;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import com.simibubi.create.AllPartialModels;
 import com.simibubi.create.AllSpriteShifts;
-import com.simibubi.create.content.contraptions.relays.belt.BeltBlockEntity.CasingType;
+import com.simibubi.create.content.kinetics.belt.BeltBlockEntity.CasingType;
 import com.simibubi.create.foundation.block.render.SpriteShiftEntry;
 import com.simibubi.create.foundation.model.BakedQuadHelper;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltPart.java b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltPart.java
similarity index 81%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltPart.java
rename to src/main/java/com/simibubi/create/content/kinetics/belt/BeltPart.java
index 852c07c97..537e4e2cd 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltPart.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltPart.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.relays.belt;
+package com.simibubi.create.content.kinetics.belt;
 
 import com.simibubi.create.foundation.utility.Lang;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltRenderer.java b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltRenderer.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltRenderer.java
rename to src/main/java/com/simibubi/create/content/kinetics/belt/BeltRenderer.java
index da64d0d9e..c7241ed53 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltRenderer.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.relays.belt;
+package com.simibubi.create.content.kinetics.belt;
 
 import java.util.Random;
 import java.util.function.Supplier;
@@ -12,8 +12,8 @@ import com.mojang.math.Vector3f;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllPartialModels;
 import com.simibubi.create.AllSpriteShifts;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityRenderer;
-import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
+import com.simibubi.create.content.kinetics.belt.transport.TransportedItemStack;
 import com.simibubi.create.foundation.block.render.SpriteShiftEntry;
 import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer;
 import com.simibubi.create.foundation.render.CachedBufferer;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltShapes.java b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltShapes.java
similarity index 99%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltShapes.java
rename to src/main/java/com/simibubi/create/content/kinetics/belt/BeltShapes.java
index 2cd553b0d..c3129ee19 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltShapes.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltShapes.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.relays.belt;
+package com.simibubi.create.content.kinetics.belt;
 
 import static net.minecraft.world.level.block.Block.box;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltSlicer.java b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltSlicer.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltSlicer.java
rename to src/main/java/com/simibubi/create/content/kinetics/belt/BeltSlicer.java
index 7aaca4f17..f2f59e6a7 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltSlicer.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltSlicer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.relays.belt;
+package com.simibubi.create.content.kinetics.belt;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -8,11 +8,11 @@ import java.util.Optional;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
 import com.simibubi.create.CreateClient;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.relays.belt.BeltBlockEntity.CasingType;
-import com.simibubi.create.content.contraptions.relays.belt.item.BeltConnectorItem;
-import com.simibubi.create.content.contraptions.relays.belt.transport.BeltInventory;
-import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.belt.BeltBlockEntity.CasingType;
+import com.simibubi.create.content.kinetics.belt.item.BeltConnectorItem;
+import com.simibubi.create.content.kinetics.belt.transport.BeltInventory;
+import com.simibubi.create.content.kinetics.belt.transport.TransportedItemStack;
 import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Lang;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltSlope.java b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltSlope.java
similarity index 85%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltSlope.java
rename to src/main/java/com/simibubi/create/content/kinetics/belt/BeltSlope.java
index 0001fb187..5e1f38908 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltSlope.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltSlope.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.relays.belt;
+package com.simibubi.create.content.kinetics.belt;
 
 import com.simibubi.create.foundation.utility.Lang;
 
diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/belt/BeltProcessingBehaviour.java b/src/main/java/com/simibubi/create/content/kinetics/belt/behaviour/BeltProcessingBehaviour.java
similarity index 87%
rename from src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/belt/BeltProcessingBehaviour.java
rename to src/main/java/com/simibubi/create/content/kinetics/belt/behaviour/BeltProcessingBehaviour.java
index 9b1ee9d58..adfb35e39 100644
--- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/belt/BeltProcessingBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/belt/behaviour/BeltProcessingBehaviour.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.foundation.blockEntity.behaviour.belt;
+package com.simibubi.create.content.kinetics.belt.behaviour;
 
-import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack;
-import com.simibubi.create.content.logistics.block.funnel.AbstractFunnelBlock;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.kinetics.belt.transport.TransportedItemStack;
+import com.simibubi.create.content.logistics.funnel.AbstractFunnelBlock;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
 import com.simibubi.create.foundation.blockEntity.behaviour.BehaviourType;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/belt/DirectBeltInputBehaviour.java b/src/main/java/com/simibubi/create/content/kinetics/belt/behaviour/DirectBeltInputBehaviour.java
similarity index 88%
rename from src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/belt/DirectBeltInputBehaviour.java
rename to src/main/java/com/simibubi/create/content/kinetics/belt/behaviour/DirectBeltInputBehaviour.java
index 1801ead61..f48f69cf0 100644
--- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/belt/DirectBeltInputBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/belt/behaviour/DirectBeltInputBehaviour.java
@@ -1,17 +1,17 @@
-package com.simibubi.create.foundation.blockEntity.behaviour.belt;
+package com.simibubi.create.content.kinetics.belt.behaviour;
 
 import java.util.function.Supplier;
 
 import javax.annotation.Nullable;
 
-import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack;
-import com.simibubi.create.content.logistics.block.funnel.BeltFunnelBlock;
-import com.simibubi.create.content.logistics.block.funnel.BeltFunnelBlock.Shape;
-import com.simibubi.create.content.logistics.block.funnel.FunnelBlock;
-import com.simibubi.create.content.logistics.block.funnel.FunnelBlockEntity;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.kinetics.belt.transport.TransportedItemStack;
+import com.simibubi.create.content.logistics.funnel.BeltFunnelBlock;
+import com.simibubi.create.content.logistics.funnel.BeltFunnelBlock.Shape;
+import com.simibubi.create.content.logistics.funnel.FunnelBlock;
+import com.simibubi.create.content.logistics.funnel.FunnelBlockEntity;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
 import com.simibubi.create.foundation.blockEntity.behaviour.BehaviourType;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/belt/TransportedItemStackHandlerBehaviour.java b/src/main/java/com/simibubi/create/content/kinetics/belt/behaviour/TransportedItemStackHandlerBehaviour.java
similarity index 94%
rename from src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/belt/TransportedItemStackHandlerBehaviour.java
rename to src/main/java/com/simibubi/create/content/kinetics/belt/behaviour/TransportedItemStackHandlerBehaviour.java
index 35dd6ae41..a492180a9 100644
--- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/belt/TransportedItemStackHandlerBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/belt/behaviour/TransportedItemStackHandlerBehaviour.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.blockEntity.behaviour.belt;
+package com.simibubi.create.content.kinetics.belt.behaviour;
 
 import java.util.List;
 import java.util.function.Function;
@@ -6,10 +6,10 @@ import java.util.function.Function;
 import javax.annotation.Nullable;
 
 import com.google.common.collect.ImmutableList;
-import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.kinetics.belt.transport.TransportedItemStack;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
 import com.simibubi.create.foundation.blockEntity.behaviour.BehaviourType;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.VecHelper;
 
 import net.minecraft.world.item.ItemStack;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/item/BeltConnectorHandler.java b/src/main/java/com/simibubi/create/content/kinetics/belt/item/BeltConnectorHandler.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/belt/item/BeltConnectorHandler.java
rename to src/main/java/com/simibubi/create/content/kinetics/belt/item/BeltConnectorHandler.java
index 732dc446b..5bd56d536 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/item/BeltConnectorHandler.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/belt/item/BeltConnectorHandler.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.relays.belt.item;
+package com.simibubi.create.content.kinetics.belt.item;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -6,8 +6,8 @@ import java.util.Random;
 
 import com.mojang.math.Vector3f;
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.contraptions.relays.elementary.ShaftBlock;
-import com.simibubi.create.foundation.config.AllConfigs;
+import com.simibubi.create.content.kinetics.simpleRelays.ShaftBlock;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/item/BeltConnectorItem.java b/src/main/java/com/simibubi/create/content/kinetics/belt/item/BeltConnectorItem.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/belt/item/BeltConnectorItem.java
rename to src/main/java/com/simibubi/create/content/kinetics/belt/item/BeltConnectorItem.java
index c35bbffd5..4a955100c 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/item/BeltConnectorItem.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/belt/item/BeltConnectorItem.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.relays.belt.item;
+package com.simibubi.create.content.kinetics.belt.item;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -7,16 +7,16 @@ import javax.annotation.Nonnull;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllCreativeModeTabs;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.relays.belt.BeltBlock;
-import com.simibubi.create.content.contraptions.relays.belt.BeltPart;
-import com.simibubi.create.content.contraptions.relays.belt.BeltSlope;
-import com.simibubi.create.content.contraptions.relays.elementary.AbstractSimpleShaftBlock;
-import com.simibubi.create.content.contraptions.relays.elementary.ShaftBlock;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.belt.BeltBlock;
+import com.simibubi.create.content.kinetics.belt.BeltPart;
+import com.simibubi.create.content.kinetics.belt.BeltSlope;
+import com.simibubi.create.content.kinetics.simpleRelays.AbstractSimpleShaftBlock;
+import com.simibubi.create.content.kinetics.simpleRelays.ShaftBlock;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
 import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
-import com.simibubi.create.foundation.config.AllConfigs;
 import com.simibubi.create.foundation.utility.VecHelper;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltCrusherInteractionHandler.java b/src/main/java/com/simibubi/create/content/kinetics/belt/transport/BeltCrusherInteractionHandler.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltCrusherInteractionHandler.java
rename to src/main/java/com/simibubi/create/content/kinetics/belt/transport/BeltCrusherInteractionHandler.java
index 2aadd65cd..a710973de 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltCrusherInteractionHandler.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/belt/transport/BeltCrusherInteractionHandler.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.contraptions.relays.belt.transport;
+package com.simibubi.create.content.kinetics.belt.transport;
 
-import com.simibubi.create.content.contraptions.components.crusher.CrushingWheelControllerBlock;
-import com.simibubi.create.content.contraptions.components.crusher.CrushingWheelControllerBlockEntity;
-import com.simibubi.create.content.contraptions.relays.belt.BeltHelper;
+import com.simibubi.create.content.kinetics.belt.BeltHelper;
+import com.simibubi.create.content.kinetics.crusher.CrushingWheelControllerBlock;
+import com.simibubi.create.content.kinetics.crusher.CrushingWheelControllerBlockEntity;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltFunnelInteractionHandler.java b/src/main/java/com/simibubi/create/content/kinetics/belt/transport/BeltFunnelInteractionHandler.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltFunnelInteractionHandler.java
rename to src/main/java/com/simibubi/create/content/kinetics/belt/transport/BeltFunnelInteractionHandler.java
index 8238574af..db37e8afb 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltFunnelInteractionHandler.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/belt/transport/BeltFunnelInteractionHandler.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.contraptions.relays.belt.transport;
+package com.simibubi.create.content.kinetics.belt.transport;
 
-import com.simibubi.create.content.contraptions.relays.belt.BeltHelper;
-import com.simibubi.create.content.logistics.block.funnel.BeltFunnelBlock;
-import com.simibubi.create.content.logistics.block.funnel.BeltFunnelBlock.Shape;
-import com.simibubi.create.content.logistics.block.funnel.FunnelBlockEntity;
+import com.simibubi.create.content.kinetics.belt.BeltHelper;
+import com.simibubi.create.content.logistics.funnel.BeltFunnelBlock;
+import com.simibubi.create.content.logistics.funnel.BeltFunnelBlock.Shape;
+import com.simibubi.create.content.logistics.funnel.FunnelBlockEntity;
 import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.inventory.InvManipulationBehaviour;
 import com.simibubi.create.foundation.item.ItemHelper.ExtractionCountMode;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltInventory.java b/src/main/java/com/simibubi/create/content/kinetics/belt/transport/BeltInventory.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltInventory.java
rename to src/main/java/com/simibubi/create/content/kinetics/belt/transport/BeltInventory.java
index 23351a0b6..42b0939f6 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltInventory.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/belt/transport/BeltInventory.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.contraptions.relays.belt.transport;
+package com.simibubi.create.content.kinetics.belt.transport;
 
-import static com.simibubi.create.content.contraptions.relays.belt.transport.BeltTunnelInteractionHandler.flapTunnel;
+import static com.simibubi.create.content.kinetics.belt.transport.BeltTunnelInteractionHandler.flapTunnel;
 
 import java.util.Collections;
 import java.util.Iterator;
@@ -8,16 +8,16 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.function.Function;
 
-import com.simibubi.create.content.contraptions.relays.belt.BeltBlock;
-import com.simibubi.create.content.contraptions.relays.belt.BeltBlockEntity;
-import com.simibubi.create.content.contraptions.relays.belt.BeltHelper;
-import com.simibubi.create.content.contraptions.relays.belt.BeltSlope;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.BeltProcessingBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.BeltProcessingBehaviour.ProcessingResult;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.DirectBeltInputBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.TransportedItemStackHandlerBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.TransportedItemStackHandlerBehaviour.TransportedResult;
+import com.simibubi.create.content.kinetics.belt.BeltBlock;
+import com.simibubi.create.content.kinetics.belt.BeltBlockEntity;
+import com.simibubi.create.content.kinetics.belt.BeltHelper;
+import com.simibubi.create.content.kinetics.belt.BeltSlope;
+import com.simibubi.create.content.kinetics.belt.behaviour.BeltProcessingBehaviour;
+import com.simibubi.create.content.kinetics.belt.behaviour.BeltProcessingBehaviour.ProcessingResult;
+import com.simibubi.create.content.kinetics.belt.behaviour.DirectBeltInputBehaviour;
+import com.simibubi.create.content.kinetics.belt.behaviour.TransportedItemStackHandlerBehaviour;
+import com.simibubi.create.content.kinetics.belt.behaviour.TransportedItemStackHandlerBehaviour.TransportedResult;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.BlockHelper;
 import com.simibubi.create.foundation.utility.ServerSpeedProvider;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltMovementHandler.java b/src/main/java/com/simibubi/create/content/kinetics/belt/transport/BeltMovementHandler.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltMovementHandler.java
rename to src/main/java/com/simibubi/create/content/kinetics/belt/transport/BeltMovementHandler.java
index f47ad0367..059975478 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltMovementHandler.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/belt/transport/BeltMovementHandler.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.relays.belt.transport;
+package com.simibubi.create.content.kinetics.belt.transport;
 
 import static net.minecraft.core.Direction.AxisDirection.NEGATIVE;
 import static net.minecraft.core.Direction.AxisDirection.POSITIVE;
@@ -7,10 +7,10 @@ import static net.minecraft.world.entity.MoverType.SELF;
 import java.util.List;
 
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.relays.belt.BeltBlock;
-import com.simibubi.create.content.contraptions.relays.belt.BeltBlockEntity;
-import com.simibubi.create.content.contraptions.relays.belt.BeltPart;
-import com.simibubi.create.content.contraptions.relays.belt.BeltSlope;
+import com.simibubi.create.content.kinetics.belt.BeltBlock;
+import com.simibubi.create.content.kinetics.belt.BeltBlockEntity;
+import com.simibubi.create.content.kinetics.belt.BeltPart;
+import com.simibubi.create.content.kinetics.belt.BeltSlope;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltTunnelInteractionHandler.java b/src/main/java/com/simibubi/create/content/kinetics/belt/transport/BeltTunnelInteractionHandler.java
similarity index 83%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltTunnelInteractionHandler.java
rename to src/main/java/com/simibubi/create/content/kinetics/belt/transport/BeltTunnelInteractionHandler.java
index 6f158e7d3..2c96df858 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltTunnelInteractionHandler.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/belt/transport/BeltTunnelInteractionHandler.java
@@ -1,18 +1,18 @@
-package com.simibubi.create.content.contraptions.relays.belt.transport;
+package com.simibubi.create.content.kinetics.belt.transport;
 
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.relays.belt.BeltBlock;
-import com.simibubi.create.content.contraptions.relays.belt.BeltBlockEntity;
-import com.simibubi.create.content.contraptions.relays.belt.BeltHelper;
-import com.simibubi.create.content.contraptions.relays.belt.BeltSlope;
-import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelBlock;
-import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelBlockEntity;
-import com.simibubi.create.content.logistics.block.belts.tunnel.BrassTunnelBlock;
-import com.simibubi.create.content.logistics.block.belts.tunnel.BrassTunnelBlockEntity;
-import com.simibubi.create.content.logistics.block.display.DisplayLinkBlock;
-import com.simibubi.create.content.logistics.block.display.source.AccumulatedItemCountDisplaySource;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.DirectBeltInputBehaviour;
+import com.simibubi.create.content.kinetics.belt.BeltBlock;
+import com.simibubi.create.content.kinetics.belt.BeltBlockEntity;
+import com.simibubi.create.content.kinetics.belt.BeltHelper;
+import com.simibubi.create.content.kinetics.belt.BeltSlope;
+import com.simibubi.create.content.kinetics.belt.behaviour.DirectBeltInputBehaviour;
+import com.simibubi.create.content.logistics.tunnel.BeltTunnelBlock;
+import com.simibubi.create.content.logistics.tunnel.BeltTunnelBlockEntity;
+import com.simibubi.create.content.logistics.tunnel.BrassTunnelBlock;
+import com.simibubi.create.content.logistics.tunnel.BrassTunnelBlockEntity;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkBlock;
+import com.simibubi.create.content.redstone.displayLink.source.AccumulatedItemCountDisplaySource;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.Iterate;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/ItemHandlerBeltSegment.java b/src/main/java/com/simibubi/create/content/kinetics/belt/transport/ItemHandlerBeltSegment.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/ItemHandlerBeltSegment.java
rename to src/main/java/com/simibubi/create/content/kinetics/belt/transport/ItemHandlerBeltSegment.java
index 5cd73adb7..3395f9393 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/ItemHandlerBeltSegment.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/belt/transport/ItemHandlerBeltSegment.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.relays.belt.transport;
+package com.simibubi.create.content.kinetics.belt.transport;
 
 import net.minecraft.world.item.ItemStack;
 import net.minecraftforge.items.IItemHandler;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/TransportedItemStack.java b/src/main/java/com/simibubi/create/content/kinetics/belt/transport/TransportedItemStack.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/TransportedItemStack.java
rename to src/main/java/com/simibubi/create/content/kinetics/belt/transport/TransportedItemStack.java
index becba0f91..aec7c61f8 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/TransportedItemStack.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/belt/transport/TransportedItemStack.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.contraptions.relays.belt.transport;
+package com.simibubi.create.content.kinetics.belt.transport;
 
 import java.util.Random;
 
-import com.simibubi.create.content.contraptions.processing.InWorldProcessing;
-import com.simibubi.create.content.contraptions.relays.belt.BeltHelper;
+import com.simibubi.create.content.kinetics.belt.BeltHelper;
+import com.simibubi.create.content.kinetics.fan.FanProcessing;
 
 import net.minecraft.core.Direction;
 import net.minecraft.nbt.CompoundTag;
@@ -25,7 +25,7 @@ public class TransportedItemStack implements Comparable<TransportedItemStack> {
 	public float prevBeltPosition;
 	public float prevSideOffset;
 
-	public InWorldProcessing.Type processedBy;
+	public FanProcessing.Type processedBy;
 	public int processingTime;
 
 	public TransportedItemStack(ItemStack stack) {
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedBeltBlock.java b/src/main/java/com/simibubi/create/content/kinetics/chainDrive/ChainDriveBlock.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedBeltBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/chainDrive/ChainDriveBlock.java
index ca1fe7e57..bf92d0a4c 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedBeltBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/chainDrive/ChainDriveBlock.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.contraptions.relays.encased;
+package com.simibubi.create.content.kinetics.chainDrive;
 
 import com.simibubi.create.AllBlockEntityTypes;
-import com.simibubi.create.content.contraptions.base.DirectionalAxisKineticBlock;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.base.RotatedPillarKineticBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.ITransformableBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.StructureTransform;
+import com.simibubi.create.content.contraptions.ITransformableBlock;
+import com.simibubi.create.content.contraptions.StructureTransform;
+import com.simibubi.create.content.kinetics.base.DirectionalAxisKineticBlock;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.base.RotatedPillarKineticBlock;
 import com.simibubi.create.foundation.block.IBE;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.Lang;
@@ -31,14 +31,14 @@ import net.minecraft.world.level.block.state.properties.EnumProperty;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.material.PushReaction;
 
-public class EncasedBeltBlock extends RotatedPillarKineticBlock
+public class ChainDriveBlock extends RotatedPillarKineticBlock
 	implements IBE<KineticBlockEntity>, ITransformableBlock {
 
 	public static final Property<Part> PART = EnumProperty.create("part", Part.class);
 	public static final BooleanProperty CONNECTED_ALONG_FIRST_COORDINATE =
 		DirectionalAxisKineticBlock.AXIS_ALONG_FIRST_COORDINATE;
 
-	public EncasedBeltBlock(Properties properties) {
+	public ChainDriveBlock(Properties properties) {
 		super(properties);
 		registerDefaultState(defaultBlockState().setValue(PART, Part.NONE));
 	}
@@ -95,7 +95,7 @@ public class EncasedBeltBlock extends RotatedPillarKineticBlock
 		if (axis == faceAxis)
 			return stateIn;
 
-		if (!(neighbour.getBlock() instanceof EncasedBeltBlock)) {
+		if (!(neighbour.getBlock() instanceof ChainDriveBlock)) {
 			if (facingAlongFirst != connectionAlongFirst || part == Part.NONE)
 				return stateIn;
 			if (part == Part.MIDDLE)
@@ -197,10 +197,10 @@ public class EncasedBeltBlock extends RotatedPillarKineticBlock
 	public static float getRotationSpeedModifier(KineticBlockEntity from, KineticBlockEntity to) {
 		float fromMod = 1;
 		float toMod = 1;
-		if (from instanceof AdjustablePulleyBlockEntity)
-			fromMod = ((AdjustablePulleyBlockEntity) from).getModifier();
-		if (to instanceof AdjustablePulleyBlockEntity)
-			toMod = ((AdjustablePulleyBlockEntity) to).getModifier();
+		if (from instanceof ChainGearshiftBlockEntity)
+			fromMod = ((ChainGearshiftBlockEntity) from).getModifier();
+		if (to instanceof ChainGearshiftBlockEntity)
+			toMod = ((ChainGearshiftBlockEntity) to).getModifier();
 		return fromMod / toMod;
 	}
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedBeltGenerator.java b/src/main/java/com/simibubi/create/content/kinetics/chainDrive/ChainDriveGenerator.java
similarity index 66%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedBeltGenerator.java
rename to src/main/java/com/simibubi/create/content/kinetics/chainDrive/ChainDriveGenerator.java
index 933f2dd9d..8518ef0cc 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedBeltGenerator.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/chainDrive/ChainDriveGenerator.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.contraptions.relays.encased;
+package com.simibubi.create.content.kinetics.chainDrive;
 
 import java.util.function.BiFunction;
 
-import com.simibubi.create.content.contraptions.relays.encased.EncasedBeltBlock.Part;
+import com.simibubi.create.content.kinetics.chainDrive.ChainDriveBlock.Part;
 import com.simibubi.create.foundation.data.SpecialBlockStateGen;
 import com.tterrag.registrate.providers.DataGenContext;
 import com.tterrag.registrate.providers.RegistrateBlockstateProvider;
@@ -12,19 +12,19 @@ import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraftforge.client.model.generators.ModelFile;
 
-public class EncasedBeltGenerator extends SpecialBlockStateGen {
+public class ChainDriveGenerator extends SpecialBlockStateGen {
 
 	private BiFunction<BlockState, String, ModelFile> modelFunc;
 
-	public EncasedBeltGenerator(BiFunction<BlockState, String, ModelFile> modelFunc) {
+	public ChainDriveGenerator(BiFunction<BlockState, String, ModelFile> modelFunc) {
 		this.modelFunc = modelFunc;
 	}
 
 	@Override
 	protected int getXRotation(BlockState state) {
-		EncasedBeltBlock.Part part = state.getValue(EncasedBeltBlock.PART);
-		boolean connectedAlongFirst = state.getValue(EncasedBeltBlock.CONNECTED_ALONG_FIRST_COORDINATE);
-		Axis axis = state.getValue(EncasedBeltBlock.AXIS);
+		ChainDriveBlock.Part part = state.getValue(ChainDriveBlock.PART);
+		boolean connectedAlongFirst = state.getValue(ChainDriveBlock.CONNECTED_ALONG_FIRST_COORDINATE);
+		Axis axis = state.getValue(ChainDriveBlock.AXIS);
 
 		if (part == Part.NONE)
 			return axis == Axis.Y ? 90 : 0;
@@ -37,9 +37,9 @@ public class EncasedBeltGenerator extends SpecialBlockStateGen {
 
 	@Override
 	protected int getYRotation(BlockState state) {
-		EncasedBeltBlock.Part part = state.getValue(EncasedBeltBlock.PART);
-		boolean connectedAlongFirst = state.getValue(EncasedBeltBlock.CONNECTED_ALONG_FIRST_COORDINATE);
-		Axis axis = state.getValue(EncasedBeltBlock.AXIS);
+		ChainDriveBlock.Part part = state.getValue(ChainDriveBlock.PART);
+		boolean connectedAlongFirst = state.getValue(ChainDriveBlock.CONNECTED_ALONG_FIRST_COORDINATE);
+		Axis axis = state.getValue(ChainDriveBlock.AXIS);
 
 		if (part == Part.NONE)
 			return axis == Axis.X ? 90 : 0;
@@ -58,8 +58,8 @@ public class EncasedBeltGenerator extends SpecialBlockStateGen {
 	}
 
 	protected String getModelSuffix(BlockState state) {
-		EncasedBeltBlock.Part part = state.getValue(EncasedBeltBlock.PART);
-		Axis axis = state.getValue(EncasedBeltBlock.AXIS);
+		ChainDriveBlock.Part part = state.getValue(ChainDriveBlock.PART);
+		Axis axis = state.getValue(ChainDriveBlock.AXIS);
 
 		if (part == Part.NONE)
 			return "single";
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/AdjustablePulleyBlock.java b/src/main/java/com/simibubi/create/content/kinetics/chainDrive/ChainGearshiftBlock.java
similarity index 77%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/encased/AdjustablePulleyBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/chainDrive/ChainGearshiftBlock.java
index 6504a477f..ea6550ab8 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/AdjustablePulleyBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/chainDrive/ChainGearshiftBlock.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.content.contraptions.relays.encased;
+package com.simibubi.create.content.kinetics.chainDrive;
 
 import com.simibubi.create.AllBlockEntityTypes;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.item.context.BlockPlaceContext;
@@ -13,11 +13,11 @@ import net.minecraft.world.level.block.state.StateDefinition.Builder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 
-public class AdjustablePulleyBlock extends EncasedBeltBlock {
+public class ChainGearshiftBlock extends ChainDriveBlock {
 
-	public static BooleanProperty POWERED = BlockStateProperties.POWERED;
+	public static final BooleanProperty POWERED = BlockStateProperties.POWERED;
 
-	public AdjustablePulleyBlock(Properties properties) {
+	public ChainGearshiftBlock(Properties properties) {
 		super(properties);
 		registerDefaultState(defaultBlockState().setValue(POWERED, false));
 	}
@@ -32,7 +32,7 @@ public class AdjustablePulleyBlock extends EncasedBeltBlock {
 		super.onPlace(state, worldIn, pos, oldState, isMoving);
 		if (oldState.getBlock() == state.getBlock())
 			return;
-		withBlockEntityDo(worldIn, pos, kte -> ((AdjustablePulleyBlockEntity) kte).neighbourChanged());
+		withBlockEntityDo(worldIn, pos, kbe -> ((ChainGearshiftBlockEntity) kbe).neighbourChanged());
 	}
 
 	@Override
@@ -53,7 +53,7 @@ public class AdjustablePulleyBlock extends EncasedBeltBlock {
 		if (worldIn.isClientSide)
 			return;
 
-		withBlockEntityDo(worldIn, pos, kte -> ((AdjustablePulleyBlockEntity) kte).neighbourChanged());
+		withBlockEntityDo(worldIn, pos, kbe -> ((ChainGearshiftBlockEntity) kbe).neighbourChanged());
 
 		boolean previouslyPowered = state.getValue(POWERED);
 		if (previouslyPowered != worldIn.hasNeighborSignal(pos))
@@ -62,7 +62,7 @@ public class AdjustablePulleyBlock extends EncasedBeltBlock {
 
 	@Override
 	public BlockEntityType<? extends KineticBlockEntity> getBlockEntityType() {
-		return AllBlockEntityTypes.ADJUSTABLE_PULLEY.get();
+		return AllBlockEntityTypes.ADJUSTABLE_CHAIN_GEARSHIFT.get();
 	}
 
 }
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/AdjustablePulleyBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/chainDrive/ChainGearshiftBlockEntity.java
similarity index 82%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/encased/AdjustablePulleyBlockEntity.java
rename to src/main/java/com/simibubi/create/content/kinetics/chainDrive/ChainGearshiftBlockEntity.java
index 0bb145539..8470887da 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/AdjustablePulleyBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/chainDrive/ChainGearshiftBlockEntity.java
@@ -1,18 +1,18 @@
-package com.simibubi.create.content.contraptions.relays.encased;
+package com.simibubi.create.content.kinetics.chainDrive;
 
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
 
-public class AdjustablePulleyBlockEntity extends KineticBlockEntity {
+public class ChainGearshiftBlockEntity extends KineticBlockEntity {
 
 	int signal;
 	boolean signalChanged;
 
-	public AdjustablePulleyBlockEntity(BlockEntityType<?> type, BlockPos pos, BlockState state) {
+	public ChainGearshiftBlockEntity(BlockEntityType<?> type, BlockPos pos, BlockState state) {
 		super(type, pos, state);
 		signal = 0;
 		setLazyTickRate(40);
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/clock/CuckooClockBlock.java b/src/main/java/com/simibubi/create/content/kinetics/clock/CuckooClockBlock.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/components/clock/CuckooClockBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/clock/CuckooClockBlock.java
index aaba43dea..8b1bf74fd 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/clock/CuckooClockBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/clock/CuckooClockBlock.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.contraptions.components.clock;
+package com.simibubi.create.content.kinetics.clock;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.base.HorizontalKineticBlock;
+import com.simibubi.create.content.kinetics.base.HorizontalKineticBlock;
 import com.simibubi.create.foundation.block.IBE;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/clock/CuckooClockBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/clock/CuckooClockBlockEntity.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/components/clock/CuckooClockBlockEntity.java
rename to src/main/java/com/simibubi/create/content/kinetics/clock/CuckooClockBlockEntity.java
index 5645a090c..fe6a66295 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/clock/CuckooClockBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/clock/CuckooClockBlockEntity.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.contraptions.components.clock;
+package com.simibubi.create.content.kinetics.clock;
 
 import java.util.List;
 
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 import com.simibubi.create.foundation.utility.NBTHelper;
 import com.simibubi.create.foundation.utility.VecHelper;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/clock/CuckooClockRenderer.java b/src/main/java/com/simibubi/create/content/kinetics/clock/CuckooClockRenderer.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/components/clock/CuckooClockRenderer.java
rename to src/main/java/com/simibubi/create/content/kinetics/clock/CuckooClockRenderer.java
index 33d88fcd3..65dbffb31 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/clock/CuckooClockRenderer.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/clock/CuckooClockRenderer.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.contraptions.components.clock;
+package com.simibubi.create.content.kinetics.clock;
 
 import com.jozufozu.flywheel.core.PartialModel;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityRenderer;
-import com.simibubi.create.content.contraptions.components.clock.CuckooClockBlockEntity.Animation;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
+import com.simibubi.create.content.kinetics.clock.CuckooClockBlockEntity.Animation;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.utility.AngleHelper;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/ConnectedInputHandler.java b/src/main/java/com/simibubi/create/content/kinetics/crafter/ConnectedInputHandler.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/components/crafter/ConnectedInputHandler.java
rename to src/main/java/com/simibubi/create/content/kinetics/crafter/ConnectedInputHandler.java
index 69f5a45fa..9f21379fb 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/ConnectedInputHandler.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/crafter/ConnectedInputHandler.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.contraptions.components.crafter;
+package com.simibubi.create.content.kinetics.crafter;
 
-import static com.simibubi.create.content.contraptions.base.HorizontalKineticBlock.HORIZONTAL_FACING;
+import static com.simibubi.create.content.kinetics.base.HorizontalKineticBlock.HORIZONTAL_FACING;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/CrafterCTBehaviour.java b/src/main/java/com/simibubi/create/content/kinetics/crafter/CrafterCTBehaviour.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/components/crafter/CrafterCTBehaviour.java
rename to src/main/java/com/simibubi/create/content/kinetics/crafter/CrafterCTBehaviour.java
index 024b9146f..b6a7758ca 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/CrafterCTBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/crafter/CrafterCTBehaviour.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.contraptions.components.crafter;
+package com.simibubi.create.content.kinetics.crafter;
 
-import static com.simibubi.create.content.contraptions.base.HorizontalKineticBlock.HORIZONTAL_FACING;
+import static com.simibubi.create.content.kinetics.base.HorizontalKineticBlock.HORIZONTAL_FACING;
 
 import org.jetbrains.annotations.Nullable;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/CrafterHelper.java b/src/main/java/com/simibubi/create/content/kinetics/crafter/CrafterHelper.java
similarity index 88%
rename from src/main/java/com/simibubi/create/content/contraptions/components/crafter/CrafterHelper.java
rename to src/main/java/com/simibubi/create/content/kinetics/crafter/CrafterHelper.java
index d537adac0..54c417661 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/CrafterHelper.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/crafter/CrafterHelper.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.contraptions.components.crafter;
+package com.simibubi.create.content.kinetics.crafter;
 
-import com.simibubi.create.content.contraptions.components.crafter.ConnectedInputHandler.ConnectedInput;
+import com.simibubi.create.content.kinetics.crafter.ConnectedInputHandler.ConnectedInput;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockAndTintGetter;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterBlock.java b/src/main/java/com/simibubi/create/content/kinetics/crafter/MechanicalCrafterBlock.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/crafter/MechanicalCrafterBlock.java
index 4c2913d8a..34e6f4814 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/crafter/MechanicalCrafterBlock.java
@@ -1,15 +1,15 @@
-package com.simibubi.create.content.contraptions.components.crafter;
+package com.simibubi.create.content.kinetics.crafter;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.contraptions.base.HorizontalKineticBlock;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.components.crafter.ConnectedInputHandler.ConnectedInput;
-import com.simibubi.create.content.contraptions.components.crafter.MechanicalCrafterBlockEntity.Phase;
-import com.simibubi.create.content.contraptions.relays.elementary.ICogWheel;
+import com.simibubi.create.content.kinetics.base.HorizontalKineticBlock;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.crafter.ConnectedInputHandler.ConnectedInput;
+import com.simibubi.create.content.kinetics.crafter.MechanicalCrafterBlockEntity.Phase;
+import com.simibubi.create.content.kinetics.simpleRelays.ICogWheel;
 import com.simibubi.create.foundation.block.IBE;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.inventory.InvManipulationBehaviour;
 import com.simibubi.create.foundation.utility.AngleHelper;
 import com.simibubi.create.foundation.utility.Iterate;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/crafter/MechanicalCrafterBlockEntity.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterBlockEntity.java
rename to src/main/java/com/simibubi/create/content/kinetics/crafter/MechanicalCrafterBlockEntity.java
index b333a2809..4dc940a64 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/crafter/MechanicalCrafterBlockEntity.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.contraptions.components.crafter;
+package com.simibubi.create.content.kinetics.crafter;
 
-import static com.simibubi.create.content.contraptions.base.HorizontalKineticBlock.HORIZONTAL_FACING;
+import static com.simibubi.create.content.kinetics.base.HorizontalKineticBlock.HORIZONTAL_FACING;
 
 import java.util.ArrayList;
 import java.util.LinkedList;
@@ -12,12 +12,12 @@ import org.apache.commons.lang3.tuple.Pair;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
 import com.simibubi.create.AllSoundEvents;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.components.crafter.ConnectedInputHandler.ConnectedInput;
-import com.simibubi.create.content.contraptions.components.crafter.RecipeGridHandler.GroupedItems;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.belt.behaviour.DirectBeltInputBehaviour;
+import com.simibubi.create.content.kinetics.crafter.ConnectedInputHandler.ConnectedInput;
+import com.simibubi.create.content.kinetics.crafter.RecipeGridHandler.GroupedItems;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.DirectBeltInputBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.edgeInteraction.EdgeInteractionBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.inventory.InvManipulationBehaviour;
 import com.simibubi.create.foundation.item.SmartInventory;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterRenderer.java b/src/main/java/com/simibubi/create/content/kinetics/crafter/MechanicalCrafterRenderer.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterRenderer.java
rename to src/main/java/com/simibubi/create/content/kinetics/crafter/MechanicalCrafterRenderer.java
index 4648da4c6..30c083921 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterRenderer.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/crafter/MechanicalCrafterRenderer.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.content.contraptions.components.crafter;
+package com.simibubi.create.content.kinetics.crafter;
 
-import static com.simibubi.create.content.contraptions.base.HorizontalKineticBlock.HORIZONTAL_FACING;
-import static com.simibubi.create.content.contraptions.base.KineticBlockEntityRenderer.standardKineticRotationTransform;
+import static com.simibubi.create.content.kinetics.base.HorizontalKineticBlock.HORIZONTAL_FACING;
+import static com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer.standardKineticRotationTransform;
 
 import com.jozufozu.flywheel.backend.Backend;
 import com.jozufozu.flywheel.core.PartialModel;
@@ -11,8 +11,8 @@ import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.mojang.math.Vector3f;
 import com.simibubi.create.AllPartialModels;
 import com.simibubi.create.AllSpriteShifts;
-import com.simibubi.create.content.contraptions.components.crafter.MechanicalCrafterBlockEntity.Phase;
-import com.simibubi.create.content.contraptions.components.crafter.RecipeGridHandler.GroupedItems;
+import com.simibubi.create.content.kinetics.crafter.MechanicalCrafterBlockEntity.Phase;
+import com.simibubi.create.content.kinetics.crafter.RecipeGridHandler.GroupedItems;
 import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCraftingInventory.java b/src/main/java/com/simibubi/create/content/kinetics/crafter/MechanicalCraftingInventory.java
similarity index 85%
rename from src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCraftingInventory.java
rename to src/main/java/com/simibubi/create/content/kinetics/crafter/MechanicalCraftingInventory.java
index 7e228de1e..bb9808fce 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCraftingInventory.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/crafter/MechanicalCraftingInventory.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.contraptions.components.crafter;
+package com.simibubi.create.content.kinetics.crafter;
 
 import org.apache.commons.lang3.tuple.Pair;
 
-import com.simibubi.create.content.contraptions.components.crafter.RecipeGridHandler.GroupedItems;
+import com.simibubi.create.content.kinetics.crafter.RecipeGridHandler.GroupedItems;
 
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.AbstractContainerMenu;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCraftingRecipe.java b/src/main/java/com/simibubi/create/content/kinetics/crafter/MechanicalCraftingRecipe.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCraftingRecipe.java
rename to src/main/java/com/simibubi/create/content/kinetics/crafter/MechanicalCraftingRecipe.java
index 4c29e9f83..2550ebbb7 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCraftingRecipe.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/crafter/MechanicalCraftingRecipe.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.crafter;
+package com.simibubi.create.content.kinetics.crafter;
 
 import com.google.gson.JsonObject;
 import com.simibubi.create.AllRecipeTypes;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/RecipeGridHandler.java b/src/main/java/com/simibubi/create/content/kinetics/crafter/RecipeGridHandler.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/components/crafter/RecipeGridHandler.java
rename to src/main/java/com/simibubi/create/content/kinetics/crafter/RecipeGridHandler.java
index f6c674910..45c387b5a 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/RecipeGridHandler.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/crafter/RecipeGridHandler.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.contraptions.components.crafter;
+package com.simibubi.create.content.kinetics.crafter;
 
-import static com.simibubi.create.content.contraptions.base.HorizontalKineticBlock.HORIZONTAL_FACING;
+import static com.simibubi.create.content.kinetics.base.HorizontalKineticBlock.HORIZONTAL_FACING;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -15,9 +15,9 @@ import org.apache.commons.lang3.tuple.Pair;
 import com.google.common.base.Predicates;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllRecipeTypes;
-import com.simibubi.create.foundation.config.AllConfigs;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.Pointing;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/ShaftlessCogwheelInstance.java b/src/main/java/com/simibubi/create/content/kinetics/crafter/ShaftlessCogwheelInstance.java
similarity index 80%
rename from src/main/java/com/simibubi/create/content/contraptions/components/crafter/ShaftlessCogwheelInstance.java
rename to src/main/java/com/simibubi/create/content/kinetics/crafter/ShaftlessCogwheelInstance.java
index f1b532632..4b7e70c45 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/ShaftlessCogwheelInstance.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/crafter/ShaftlessCogwheelInstance.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.crafter;
+package com.simibubi.create.content.kinetics.crafter;
 
 import java.util.function.Supplier;
 
@@ -7,9 +7,9 @@ import com.jozufozu.flywheel.api.MaterialManager;
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.base.SingleRotatingInstance;
-import com.simibubi.create.content.contraptions.base.flwdata.RotatingData;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.base.SingleRotatingInstance;
+import com.simibubi.create.content.kinetics.base.flwdata.RotatingData;
 
 import net.minecraft.core.Direction;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankBlock.java b/src/main/java/com/simibubi/create/content/kinetics/crank/HandCrankBlock.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/crank/HandCrankBlock.java
index e5c0658c6..ab8dd5da4 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/crank/HandCrankBlock.java
@@ -1,14 +1,14 @@
-package com.simibubi.create.content.contraptions.components.crank;
+package com.simibubi.create.content.kinetics.crank;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllItems;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.base.DirectionalKineticBlock;
+import com.simibubi.create.content.kinetics.base.DirectionalKineticBlock;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
 import com.simibubi.create.foundation.block.IBE;
 import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
-import com.simibubi.create.foundation.config.AllConfigs;
 import com.simibubi.create.foundation.utility.Couple;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/crank/HandCrankBlockEntity.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankBlockEntity.java
rename to src/main/java/com/simibubi/create/content/kinetics/crank/HandCrankBlockEntity.java
index d3ef95efd..e4c3f902a 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/crank/HandCrankBlockEntity.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.crank;
+package com.simibubi.create.content.kinetics.crank;
 
 import com.jozufozu.flywheel.api.Instancer;
 import com.jozufozu.flywheel.api.Material;
@@ -6,7 +6,7 @@ import com.jozufozu.flywheel.core.materials.model.ModelData;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllPartialModels;
 import com.simibubi.create.AllSoundEvents;
-import com.simibubi.create.content.contraptions.base.GeneratingKineticBlockEntity;
+import com.simibubi.create.content.kinetics.base.GeneratingKineticBlockEntity;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankInstance.java b/src/main/java/com/simibubi/create/content/kinetics/crank/HandCrankInstance.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankInstance.java
rename to src/main/java/com/simibubi/create/content/kinetics/crank/HandCrankInstance.java
index be645ad87..93b9c83ae 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankInstance.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/crank/HandCrankInstance.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.contraptions.components.crank;
+package com.simibubi.create.content.kinetics.crank;
 
 import com.jozufozu.flywheel.api.Instancer;
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.jozufozu.flywheel.api.instance.DynamicInstance;
 import com.jozufozu.flywheel.core.materials.model.ModelData;
-import com.simibubi.create.content.contraptions.base.SingleRotatingInstance;
+import com.simibubi.create.content.kinetics.base.SingleRotatingInstance;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankRenderer.java b/src/main/java/com/simibubi/create/content/kinetics/crank/HandCrankRenderer.java
similarity index 88%
rename from src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankRenderer.java
rename to src/main/java/com/simibubi/create/content/kinetics/crank/HandCrankRenderer.java
index ab6eeb187..bfea5c3c2 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankRenderer.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/crank/HandCrankRenderer.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.contraptions.components.crank;
+package com.simibubi.create.content.kinetics.crank;
 
 import static net.minecraft.world.level.block.state.properties.BlockStateProperties.FACING;
 
 import com.jozufozu.flywheel.backend.Backend;
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityRenderer;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
 
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crank/ValveHandleBlock.java b/src/main/java/com/simibubi/create/content/kinetics/crank/ValveHandleBlock.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/contraptions/components/crank/ValveHandleBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/crank/ValveHandleBlock.java
index 332db822b..e0caaec1a 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/crank/ValveHandleBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/crank/ValveHandleBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.crank;
+package com.simibubi.create.content.kinetics.crank;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crank/ValveHandleBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/crank/ValveHandleBlockEntity.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/components/crank/ValveHandleBlockEntity.java
rename to src/main/java/com/simibubi/create/content/kinetics/crank/ValveHandleBlockEntity.java
index 03de0e9c8..f504471a0 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/crank/ValveHandleBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/crank/ValveHandleBlockEntity.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.crank;
+package com.simibubi.create.content.kinetics.crank;
 
 import java.util.List;
 
@@ -7,16 +7,16 @@ import com.jozufozu.flywheel.api.Instancer;
 import com.jozufozu.flywheel.api.Material;
 import com.jozufozu.flywheel.core.materials.model.ModelData;
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityRenderer;
-import com.simibubi.create.content.contraptions.relays.advanced.sequencer.SequencedGearshiftBlockEntity.SequenceContext;
-import com.simibubi.create.content.contraptions.relays.advanced.sequencer.SequencerInstructions;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
+import com.simibubi.create.content.kinetics.transmission.sequencer.SequencedGearshiftBlockEntity.SequenceContext;
+import com.simibubi.create.content.kinetics.transmission.sequencer.SequencerInstructions;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsBoard;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsFormatter;
-import com.simibubi.create.foundation.blockEntity.behaviour.scrollvalue.ScrollValueBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollValueBehaviour;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.utility.Components;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crusher/AbstractCrushingRecipe.java b/src/main/java/com/simibubi/create/content/kinetics/crusher/AbstractCrushingRecipe.java
similarity index 50%
rename from src/main/java/com/simibubi/create/content/contraptions/components/crusher/AbstractCrushingRecipe.java
rename to src/main/java/com/simibubi/create/content/kinetics/crusher/AbstractCrushingRecipe.java
index ec8c290d4..effcf39bc 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/crusher/AbstractCrushingRecipe.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/crusher/AbstractCrushingRecipe.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.contraptions.components.crusher;
+package com.simibubi.create.content.kinetics.crusher;
 
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipe;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipeBuilder.ProcessingRecipeParams;
-import com.simibubi.create.foundation.utility.recipe.IRecipeTypeInfo;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipe;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder.ProcessingRecipeParams;
+import com.simibubi.create.foundation.recipe.IRecipeTypeInfo;
 
 import net.minecraftforge.items.wrapper.RecipeWrapper;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingRecipe.java b/src/main/java/com/simibubi/create/content/kinetics/crusher/CrushingRecipe.java
similarity index 78%
rename from src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingRecipe.java
rename to src/main/java/com/simibubi/create/content/kinetics/crusher/CrushingRecipe.java
index 5833d160b..73a6c2b22 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingRecipe.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/crusher/CrushingRecipe.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.contraptions.components.crusher;
+package com.simibubi.create.content.kinetics.crusher;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
 import com.simibubi.create.AllRecipeTypes;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipeBuilder.ProcessingRecipeParams;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder.ProcessingRecipeParams;
 
 import net.minecraft.world.level.Level;
 import net.minecraftforge.items.wrapper.RecipeWrapper;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingWheelBlock.java b/src/main/java/com/simibubi/create/content/kinetics/crusher/CrushingWheelBlock.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingWheelBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/crusher/CrushingWheelBlock.java
index 1bf3ddff3..2fae8c212 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingWheelBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/crusher/CrushingWheelBlock.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.contraptions.components.crusher;
+package com.simibubi.create.content.kinetics.crusher;
 
-import static com.simibubi.create.content.contraptions.components.crusher.CrushingWheelControllerBlock.VALID;
+import static com.simibubi.create.content.kinetics.crusher.CrushingWheelControllerBlock.VALID;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.base.RotatedPillarKineticBlock;
+import com.simibubi.create.content.kinetics.base.RotatedPillarKineticBlock;
 import com.simibubi.create.foundation.block.IBE;
 import com.simibubi.create.foundation.utility.Iterate;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingWheelBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/crusher/CrushingWheelBlockEntity.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingWheelBlockEntity.java
rename to src/main/java/com/simibubi/create/content/kinetics/crusher/CrushingWheelBlockEntity.java
index 93688cd3b..01f17e2ce 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingWheelBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/crusher/CrushingWheelBlockEntity.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.contraptions.components.crusher;
+package com.simibubi.create.content.kinetics.crusher;
 
 import java.util.List;
 
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.Iterate;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingWheelControllerBlock.java b/src/main/java/com/simibubi/create/content/kinetics/crusher/CrushingWheelControllerBlock.java
similarity index 99%
rename from src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingWheelControllerBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/crusher/CrushingWheelControllerBlock.java
index f33cf7acf..eb1a5a0a5 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingWheelControllerBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/crusher/CrushingWheelControllerBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.crusher;
+package com.simibubi.create.content.kinetics.crusher;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingWheelControllerBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/crusher/CrushingWheelControllerBlockEntity.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingWheelControllerBlockEntity.java
rename to src/main/java/com/simibubi/create/content/kinetics/crusher/CrushingWheelControllerBlockEntity.java
index edec62a82..a7d15a1e1 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingWheelControllerBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/crusher/CrushingWheelControllerBlockEntity.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.crusher;
+package com.simibubi.create.content.kinetics.crusher;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -6,17 +6,17 @@ import java.util.Optional;
 import java.util.UUID;
 
 import com.simibubi.create.AllRecipeTypes;
-import com.simibubi.create.content.contraptions.processing.ProcessingInventory;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipe;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.kinetics.belt.behaviour.DirectBeltInputBehaviour;
+import com.simibubi.create.content.processing.recipe.ProcessingInventory;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipe;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.DirectBeltInputBehaviour;
-import com.simibubi.create.foundation.config.AllConfigs;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.item.ItemHelper;
 import com.simibubi.create.foundation.sound.SoundScapes;
 import com.simibubi.create.foundation.sound.SoundScapes.AmbienceGroup;
 import com.simibubi.create.foundation.utility.NBTHelper;
 import com.simibubi.create.foundation.utility.VecHelper;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/BeltDeployerCallbacks.java b/src/main/java/com/simibubi/create/content/kinetics/deployer/BeltDeployerCallbacks.java
similarity index 82%
rename from src/main/java/com/simibubi/create/content/contraptions/components/deployer/BeltDeployerCallbacks.java
rename to src/main/java/com/simibubi/create/content/kinetics/deployer/BeltDeployerCallbacks.java
index 7bc2f6c96..d86d05294 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/BeltDeployerCallbacks.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/deployer/BeltDeployerCallbacks.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.contraptions.components.deployer;
+package com.simibubi.create.content.kinetics.deployer;
 
-import static com.simibubi.create.content.contraptions.base.DirectionalKineticBlock.FACING;
+import static com.simibubi.create.content.kinetics.base.DirectionalKineticBlock.FACING;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -8,18 +8,17 @@ import java.util.stream.Collectors;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllSoundEvents;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.contraptions.components.deployer.DeployerBlockEntity.Mode;
-import com.simibubi.create.content.contraptions.components.deployer.DeployerBlockEntity.State;
-import com.simibubi.create.content.contraptions.processing.InWorldProcessing;
-import com.simibubi.create.content.contraptions.processing.ItemApplicationRecipe;
-import com.simibubi.create.content.contraptions.relays.belt.BeltHelper;
-import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack;
-import com.simibubi.create.content.curiosities.tools.SandPaperPolishingRecipe;
+import com.simibubi.create.content.equipment.sandPaper.SandPaperPolishingRecipe;
+import com.simibubi.create.content.kinetics.belt.BeltHelper;
+import com.simibubi.create.content.kinetics.belt.behaviour.BeltProcessingBehaviour.ProcessingResult;
+import com.simibubi.create.content.kinetics.belt.behaviour.TransportedItemStackHandlerBehaviour;
+import com.simibubi.create.content.kinetics.belt.behaviour.TransportedItemStackHandlerBehaviour.TransportedResult;
+import com.simibubi.create.content.kinetics.belt.transport.TransportedItemStack;
+import com.simibubi.create.content.kinetics.deployer.DeployerBlockEntity.Mode;
+import com.simibubi.create.content.kinetics.deployer.DeployerBlockEntity.State;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
 import com.simibubi.create.foundation.advancement.CreateAdvancement;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.BeltProcessingBehaviour.ProcessingResult;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.TransportedItemStackHandlerBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.TransportedItemStackHandlerBehaviour.TransportedResult;
+import com.simibubi.create.foundation.recipe.RecipeApplier;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -97,7 +96,7 @@ public class BeltDeployerCallbacks {
 		DeployerBlockEntity blockEntity, Recipe<?> recipe) {
 		
 		List<TransportedItemStack> collect =
-			InWorldProcessing.applyRecipeOn(ItemHandlerHelper.copyStackWithSize(transported.stack, 1), recipe)
+			RecipeApplier.applyRecipeOn(ItemHandlerHelper.copyStackWithSize(transported.stack, 1), recipe)
 				.stream()
 				.map(stack -> {
 					TransportedItemStack copy = transported.copy();
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerActorInstance.java b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerActorInstance.java
similarity index 86%
rename from src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerActorInstance.java
rename to src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerActorInstance.java
index 75be2b4af..7ec5e1a2b 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerActorInstance.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerActorInstance.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.content.contraptions.components.deployer;
+package com.simibubi.create.content.kinetics.deployer;
 
-import static com.simibubi.create.content.contraptions.base.DirectionalAxisKineticBlock.AXIS_ALONG_FIRST_COORDINATE;
-import static com.simibubi.create.content.contraptions.base.DirectionalKineticBlock.FACING;
+import static com.simibubi.create.content.kinetics.base.DirectionalAxisKineticBlock.AXIS_ALONG_FIRST_COORDINATE;
+import static com.simibubi.create.content.kinetics.base.DirectionalKineticBlock.FACING;
 
 import com.jozufozu.flywheel.api.Material;
 import com.jozufozu.flywheel.api.MaterialManager;
@@ -12,11 +12,11 @@ import com.jozufozu.flywheel.core.virtual.VirtualRenderWorld;
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.base.IRotate;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityInstance;
-import com.simibubi.create.content.contraptions.base.flwdata.RotatingData;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ActorInstance;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
+import com.simibubi.create.content.contraptions.render.ActorInstance;
+import com.simibubi.create.content.kinetics.base.IRotate;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityInstance;
+import com.simibubi.create.content.kinetics.base.flwdata.RotatingData;
 import com.simibubi.create.foundation.render.AllMaterialSpecs;
 import com.simibubi.create.foundation.utility.AngleHelper;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerApplicationRecipe.java b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerApplicationRecipe.java
similarity index 84%
rename from src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerApplicationRecipe.java
rename to src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerApplicationRecipe.java
index 66fba5e27..7aa694345 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerApplicationRecipe.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerApplicationRecipe.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.deployer;
+package com.simibubi.create.content.kinetics.deployer;
 
 import java.util.List;
 import java.util.Set;
@@ -8,10 +8,9 @@ import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllRecipeTypes;
 import com.simibubi.create.AllTags.AllItemTags;
 import com.simibubi.create.compat.jei.category.sequencedAssembly.SequencedAssemblySubCategory;
-import com.simibubi.create.content.contraptions.itemAssembly.IAssemblyRecipe;
-import com.simibubi.create.content.contraptions.processing.ItemApplicationRecipe;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipeBuilder;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipeBuilder.ProcessingRecipeParams;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder.ProcessingRecipeParams;
+import com.simibubi.create.content.processing.sequenced.IAssemblyRecipe;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Lang;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerBlock.java b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerBlock.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerBlock.java
index c94a8b49d..3b0195743 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.deployer;
+package com.simibubi.create.content.kinetics.deployer;
 
 import java.util.List;
 import java.util.function.Predicate;
@@ -9,12 +9,12 @@ import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.base.DirectionalAxisKineticBlock;
-import com.simibubi.create.content.contraptions.components.AssemblyOperatorUseContext;
+import com.simibubi.create.content.kinetics.base.DirectionalAxisKineticBlock;
+import com.simibubi.create.content.processing.AssemblyOperatorUseContext;
 import com.simibubi.create.foundation.block.IBE;
-import com.simibubi.create.foundation.utility.placement.IPlacementHelper;
-import com.simibubi.create.foundation.utility.placement.PlacementHelpers;
-import com.simibubi.create.foundation.utility.placement.PlacementOffset;
+import com.simibubi.create.foundation.placement.IPlacementHelper;
+import com.simibubi.create.foundation.placement.PlacementHelpers;
+import com.simibubi.create.foundation.placement.PlacementOffset;
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerBlockEntity.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerBlockEntity.java
rename to src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerBlockEntity.java
index 56f95723c..26363adb3 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerBlockEntity.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.contraptions.components.deployer;
+package com.simibubi.create.content.kinetics.deployer;
 
-import static com.simibubi.create.content.contraptions.base.DirectionalKineticBlock.FACING;
+import static com.simibubi.create.content.kinetics.base.DirectionalKineticBlock.FACING;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -13,15 +13,15 @@ import com.jozufozu.flywheel.core.PartialModel;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllPartialModels;
 import com.simibubi.create.AllRecipeTypes;
-import com.simibubi.create.content.contraptions.base.IRotate.StressImpact;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.itemAssembly.SequencedAssemblyRecipe;
-import com.simibubi.create.content.curiosities.tools.SandPaperItem;
-import com.simibubi.create.content.curiosities.tools.SandPaperPolishingRecipe.SandPaperInv;
+import com.simibubi.create.content.equipment.sandPaper.SandPaperItem;
+import com.simibubi.create.content.equipment.sandPaper.SandPaperPolishingRecipe.SandPaperInv;
+import com.simibubi.create.content.kinetics.base.IRotate.StressImpact;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.belt.behaviour.BeltProcessingBehaviour;
+import com.simibubi.create.content.kinetics.belt.behaviour.TransportedItemStackHandlerBehaviour;
+import com.simibubi.create.content.processing.sequenced.SequencedAssemblyRecipe;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.BeltProcessingBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.TransportedItemStackHandlerBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour;
 import com.simibubi.create.foundation.item.TooltipHelper;
 import com.simibubi.create.foundation.utility.Components;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerFakePlayer.java b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerFakePlayer.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerFakePlayer.java
rename to src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerFakePlayer.java
index 9280be6c0..a1242ce8b 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerFakePlayer.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerFakePlayer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.deployer;
+package com.simibubi.create.content.kinetics.deployer;
 
 import java.util.Objects;
 import java.util.OptionalInt;
@@ -9,9 +9,9 @@ import javax.annotation.Nullable;
 import org.apache.commons.lang3.tuple.Pair;
 
 import com.mojang.authlib.GameProfile;
-import com.simibubi.create.foundation.config.AllConfigs;
-import com.simibubi.create.foundation.config.CKinetics;
 import com.simibubi.create.foundation.utility.Lang;
+import com.simibubi.create.infrastructure.config.AllConfigs;
+import com.simibubi.create.infrastructure.config.CKinetics;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.Connection;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerFilterSlot.java b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerFilterSlot.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerFilterSlot.java
rename to src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerFilterSlot.java
index 96da5a956..758d14d8a 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerFilterSlot.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerFilterSlot.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.deployer;
+package com.simibubi.create.content.kinetics.deployer;
 
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerHandler.java b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerHandler.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerHandler.java
rename to src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerHandler.java
index 92567fd8d..c6f8a6d8d 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerHandler.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerHandler.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.deployer;
+package com.simibubi.create.content.kinetics.deployer;
 
 import static net.minecraftforge.eventbus.api.Event.Result.DEFAULT;
 import static net.minecraftforge.eventbus.api.Event.Result.DENY;
@@ -14,13 +14,13 @@ import org.apache.commons.lang3.tuple.Pair;
 import com.google.common.collect.Multimap;
 import com.simibubi.create.AllSoundEvents;
 import com.simibubi.create.AllTags.AllItemTags;
-import com.simibubi.create.content.contraptions.components.deployer.DeployerBlockEntity.Mode;
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.mounted.CartAssemblerBlockItem;
-import com.simibubi.create.content.curiosities.tools.SandPaperItem;
-import com.simibubi.create.content.logistics.trains.ITrackBlock;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.TransportedItemStackHandlerBehaviour;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.mounted.CartAssemblerBlockItem;
+import com.simibubi.create.content.equipment.sandPaper.SandPaperItem;
+import com.simibubi.create.content.kinetics.belt.behaviour.TransportedItemStackHandlerBehaviour;
+import com.simibubi.create.content.kinetics.deployer.DeployerBlockEntity.Mode;
+import com.simibubi.create.content.trains.track.ITrackBlock;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.BlockHelper;
 import com.simibubi.create.foundation.utility.worldWrappers.WrappedWorld;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerInstance.java b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerInstance.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerInstance.java
rename to src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerInstance.java
index 394a0534f..62e040c53 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerInstance.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerInstance.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.content.contraptions.components.deployer;
+package com.simibubi.create.content.kinetics.deployer;
 
-import static com.simibubi.create.content.contraptions.base.DirectionalAxisKineticBlock.AXIS_ALONG_FIRST_COORDINATE;
-import static com.simibubi.create.content.contraptions.base.DirectionalKineticBlock.FACING;
+import static com.simibubi.create.content.kinetics.base.DirectionalAxisKineticBlock.AXIS_ALONG_FIRST_COORDINATE;
+import static com.simibubi.create.content.kinetics.base.DirectionalKineticBlock.FACING;
 
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.jozufozu.flywheel.api.instance.DynamicInstance;
@@ -10,7 +10,7 @@ import com.jozufozu.flywheel.core.PartialModel;
 import com.jozufozu.flywheel.core.materials.oriented.OrientedData;
 import com.mojang.math.Quaternion;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.relays.encased.ShaftInstance;
+import com.simibubi.create.content.kinetics.base.ShaftInstance;
 import com.simibubi.create.foundation.utility.AngleHelper;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerItemHandler.java b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerItemHandler.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerItemHandler.java
rename to src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerItemHandler.java
index 15d163545..ecabcf2ed 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerItemHandler.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerItemHandler.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.deployer;
+package com.simibubi.create.content.kinetics.deployer;
 
 import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerMovementBehaviour.java b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerMovementBehaviour.java
similarity index 88%
rename from src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerMovementBehaviour.java
rename to src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerMovementBehaviour.java
index 7482d3b23..cfceefd2b 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerMovementBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerMovementBehaviour.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.deployer;
+package com.simibubi.create.content.kinetics.deployer;
 
 import java.util.Arrays;
 import java.util.List;
@@ -13,21 +13,21 @@ import com.jozufozu.flywheel.core.virtual.VirtualRenderWorld;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
 import com.simibubi.create.AllTags.AllBlockTags;
-import com.simibubi.create.content.contraptions.components.deployer.DeployerBlockEntity.Mode;
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
-import com.simibubi.create.content.contraptions.components.structureMovement.OrientedContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.mounted.MountedContraption;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ActorInstance;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionMatrices;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionRenderDispatcher;
-import com.simibubi.create.content.logistics.item.filter.FilterItem;
-import com.simibubi.create.content.logistics.trains.entity.CarriageContraption;
-import com.simibubi.create.content.logistics.trains.entity.CarriageContraptionEntity;
-import com.simibubi.create.content.schematics.ItemRequirement;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.OrientedContraptionEntity;
+import com.simibubi.create.content.contraptions.behaviour.MovementBehaviour;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
+import com.simibubi.create.content.contraptions.mounted.MountedContraption;
+import com.simibubi.create.content.contraptions.render.ActorInstance;
+import com.simibubi.create.content.contraptions.render.ContraptionMatrices;
+import com.simibubi.create.content.contraptions.render.ContraptionRenderDispatcher;
+import com.simibubi.create.content.kinetics.deployer.DeployerBlockEntity.Mode;
+import com.simibubi.create.content.logistics.filter.FilterItem;
+import com.simibubi.create.content.schematics.SchematicInstances;
 import com.simibubi.create.content.schematics.SchematicWorld;
-import com.simibubi.create.content.schematics.filtering.SchematicInstances;
+import com.simibubi.create.content.schematics.requirement.ItemRequirement;
+import com.simibubi.create.content.trains.entity.CarriageContraption;
+import com.simibubi.create.content.trains.entity.CarriageContraptionEntity;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
 import com.simibubi.create.foundation.item.ItemHelper;
 import com.simibubi.create.foundation.item.ItemHelper.ExtractionCountMode;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerMovingInteraction.java b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerMovingInteraction.java
similarity index 84%
rename from src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerMovingInteraction.java
rename to src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerMovingInteraction.java
index d4a4ccb55..1c07c4972 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerMovingInteraction.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerMovingInteraction.java
@@ -1,14 +1,14 @@
-package com.simibubi.create.content.contraptions.components.deployer;
+package com.simibubi.create.content.kinetics.deployer;
 
 import java.util.UUID;
 
 import org.apache.commons.lang3.tuple.MutablePair;
 
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovingInteractionBehaviour;
-import com.simibubi.create.content.contraptions.components.structureMovement.mounted.MountedContraption;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
+import com.simibubi.create.content.contraptions.behaviour.MovingInteractionBehaviour;
+import com.simibubi.create.content.contraptions.mounted.MountedContraption;
 import com.simibubi.create.foundation.utility.NBTHelper;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerRecipeSearchEvent.java b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerRecipeSearchEvent.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerRecipeSearchEvent.java
rename to src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerRecipeSearchEvent.java
index 7462c48e7..42f1dfd47 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerRecipeSearchEvent.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerRecipeSearchEvent.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.deployer;
+package com.simibubi.create.content.kinetics.deployer;
 
 import java.util.Optional;
 import java.util.function.Supplier;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerRenderer.java b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerRenderer.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerRenderer.java
rename to src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerRenderer.java
index 9105bb959..3ce20684f 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerRenderer.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerRenderer.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.content.contraptions.components.deployer;
+package com.simibubi.create.content.kinetics.deployer;
 
-import static com.simibubi.create.content.contraptions.base.DirectionalAxisKineticBlock.AXIS_ALONG_FIRST_COORDINATE;
-import static com.simibubi.create.content.contraptions.base.DirectionalKineticBlock.FACING;
+import static com.simibubi.create.content.kinetics.base.DirectionalAxisKineticBlock.AXIS_ALONG_FIRST_COORDINATE;
+import static com.simibubi.create.content.kinetics.base.DirectionalKineticBlock.FACING;
 
 import com.jozufozu.flywheel.backend.Backend;
 import com.jozufozu.flywheel.core.PartialModel;
@@ -12,13 +12,13 @@ import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.mojang.math.Vector3f;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.base.IRotate;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityRenderer;
-import com.simibubi.create.content.contraptions.components.deployer.DeployerBlockEntity.Mode;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionMatrices;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionRenderDispatcher;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
+import com.simibubi.create.content.contraptions.render.ContraptionMatrices;
+import com.simibubi.create.content.contraptions.render.ContraptionRenderDispatcher;
+import com.simibubi.create.content.kinetics.base.IRotate;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
+import com.simibubi.create.content.kinetics.deployer.DeployerBlockEntity.Mode;
 import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringRenderer;
 import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer;
 import com.simibubi.create.foundation.render.CachedBufferer;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/ItemApplicationRecipe.java b/src/main/java/com/simibubi/create/content/kinetics/deployer/ItemApplicationRecipe.java
similarity index 89%
rename from src/main/java/com/simibubi/create/content/contraptions/processing/ItemApplicationRecipe.java
rename to src/main/java/com/simibubi/create/content/kinetics/deployer/ItemApplicationRecipe.java
index caee145e4..a57cb1374 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/processing/ItemApplicationRecipe.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/deployer/ItemApplicationRecipe.java
@@ -1,8 +1,9 @@
-package com.simibubi.create.content.contraptions.processing;
+package com.simibubi.create.content.kinetics.deployer;
 
 import com.google.gson.JsonObject;
 import com.simibubi.create.AllRecipeTypes;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipeBuilder.ProcessingRecipeParams;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipe;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder.ProcessingRecipeParams;
 
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.util.GsonHelper;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/ManualApplicationRecipe.java b/src/main/java/com/simibubi/create/content/kinetics/deployer/ManualApplicationRecipe.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/components/deployer/ManualApplicationRecipe.java
rename to src/main/java/com/simibubi/create/content/kinetics/deployer/ManualApplicationRecipe.java
index d8f6dfd2a..b95ea094e 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/ManualApplicationRecipe.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/deployer/ManualApplicationRecipe.java
@@ -1,14 +1,13 @@
-package com.simibubi.create.content.contraptions.components.deployer;
+package com.simibubi.create.content.kinetics.deployer;
 
 import java.util.List;
 import java.util.Optional;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllRecipeTypes;
-import com.simibubi.create.content.contraptions.processing.ItemApplicationRecipe;
-import com.simibubi.create.content.contraptions.processing.ProcessingOutput;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipeBuilder;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipeBuilder.ProcessingRecipeParams;
+import com.simibubi.create.content.processing.recipe.ProcessingOutput;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder.ProcessingRecipeParams;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
 import com.simibubi.create.foundation.advancement.CreateAdvancement;
 import com.simibubi.create.foundation.utility.BlockHelper;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillActorInstance.java b/src/main/java/com/simibubi/create/content/kinetics/drill/DrillActorInstance.java
similarity index 85%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillActorInstance.java
rename to src/main/java/com/simibubi/create/content/kinetics/drill/DrillActorInstance.java
index 9f62f47cf..a2026f514 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillActorInstance.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/drill/DrillActorInstance.java
@@ -1,13 +1,13 @@
-package com.simibubi.create.content.contraptions.components.actors;
+package com.simibubi.create.content.kinetics.drill;
 
 import com.jozufozu.flywheel.api.Material;
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.jozufozu.flywheel.core.virtual.VirtualRenderWorld;
 import com.mojang.math.Quaternion;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.components.actors.flwdata.ActorData;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ActorInstance;
+import com.simibubi.create.content.contraptions.actors.flwdata.ActorData;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
+import com.simibubi.create.content.contraptions.render.ActorInstance;
 import com.simibubi.create.foundation.render.AllMaterialSpecs;
 import com.simibubi.create.foundation.utility.AngleHelper;
 import com.simibubi.create.foundation.utility.VecHelper;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillBlock.java b/src/main/java/com/simibubi/create/content/kinetics/drill/DrillBlock.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/drill/DrillBlock.java
index 452e0b4eb..16b3c97f8 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/drill/DrillBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.actors;
+package com.simibubi.create.content.kinetics.drill;
 
 import java.util.List;
 import java.util.function.Predicate;
@@ -8,11 +8,11 @@ import javax.annotation.ParametersAreNonnullByDefault;
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.base.DirectionalKineticBlock;
+import com.simibubi.create.content.kinetics.base.DirectionalKineticBlock;
 import com.simibubi.create.foundation.block.IBE;
-import com.simibubi.create.foundation.utility.placement.IPlacementHelper;
-import com.simibubi.create.foundation.utility.placement.PlacementHelpers;
-import com.simibubi.create.foundation.utility.placement.PlacementOffset;
+import com.simibubi.create.foundation.placement.IPlacementHelper;
+import com.simibubi.create.foundation.placement.PlacementHelpers;
+import com.simibubi.create.foundation.placement.PlacementOffset;
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/drill/DrillBlockEntity.java
similarity index 78%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillBlockEntity.java
rename to src/main/java/com/simibubi/create/content/kinetics/drill/DrillBlockEntity.java
index f095f06c6..e8b3ffb5f 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/drill/DrillBlockEntity.java
@@ -1,4 +1,6 @@
-package com.simibubi.create.content.contraptions.components.actors;
+package com.simibubi.create.content.kinetics.drill;
+
+import com.simibubi.create.content.kinetics.base.BlockBreakingKineticBlockEntity;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.entity.BlockEntityType;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillInstance.java b/src/main/java/com/simibubi/create/content/kinetics/drill/DrillInstance.java
similarity index 79%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillInstance.java
rename to src/main/java/com/simibubi/create/content/kinetics/drill/DrillInstance.java
index 80ade3ff3..8112622bf 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillInstance.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/drill/DrillInstance.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.contraptions.components.actors;
+package com.simibubi.create.content.kinetics.drill;
 
 import com.jozufozu.flywheel.api.Instancer;
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.base.SingleRotatingInstance;
-import com.simibubi.create.content.contraptions.base.flwdata.RotatingData;
+import com.simibubi.create.content.kinetics.base.SingleRotatingInstance;
+import com.simibubi.create.content.kinetics.base.flwdata.RotatingData;
 
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillMovementBehaviour.java b/src/main/java/com/simibubi/create/content/kinetics/drill/DrillMovementBehaviour.java
similarity index 81%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillMovementBehaviour.java
rename to src/main/java/com/simibubi/create/content/kinetics/drill/DrillMovementBehaviour.java
index 9e1408373..4962c7b1f 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillMovementBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/drill/DrillMovementBehaviour.java
@@ -1,14 +1,15 @@
-package com.simibubi.create.content.contraptions.components.actors;
+package com.simibubi.create.content.kinetics.drill;
 
 import javax.annotation.Nullable;
 
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.jozufozu.flywheel.core.virtual.VirtualRenderWorld;
 import com.simibubi.create.AllTags;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ActorInstance;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionMatrices;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionRenderDispatcher;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
+import com.simibubi.create.content.contraptions.render.ActorInstance;
+import com.simibubi.create.content.contraptions.render.ContraptionMatrices;
+import com.simibubi.create.content.contraptions.render.ContraptionRenderDispatcher;
+import com.simibubi.create.content.kinetics.base.BlockBreakingMovementBehaviour;
 import com.simibubi.create.foundation.utility.VecHelper;
 
 import net.minecraft.client.renderer.MultiBufferSource;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillRenderer.java b/src/main/java/com/simibubi/create/content/kinetics/drill/DrillRenderer.java
similarity index 81%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillRenderer.java
rename to src/main/java/com/simibubi/create/content/kinetics/drill/DrillRenderer.java
index 3aad43ce8..d3efdbe6e 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillRenderer.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/drill/DrillRenderer.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.contraptions.components.actors;
+package com.simibubi.create.content.kinetics.drill;
 
 import com.jozufozu.flywheel.core.virtual.VirtualRenderWorld;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityRenderer;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionMatrices;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionRenderDispatcher;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
+import com.simibubi.create.content.contraptions.render.ContraptionMatrices;
+import com.simibubi.create.content.contraptions.render.ContraptionRenderDispatcher;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.utility.AngleHelper;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/fan/AirCurrent.java b/src/main/java/com/simibubi/create/content/kinetics/fan/AirCurrent.java
similarity index 88%
rename from src/main/java/com/simibubi/create/content/contraptions/components/fan/AirCurrent.java
rename to src/main/java/com/simibubi/create/content/kinetics/fan/AirCurrent.java
index bed00e48f..4a422d99c 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/fan/AirCurrent.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/fan/AirCurrent.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.fan;
+package com.simibubi.create.content.kinetics.fan;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -7,17 +7,15 @@ import java.util.List;
 import org.apache.commons.lang3.tuple.Pair;
 
 import com.simibubi.create.AllTags;
-import com.simibubi.create.content.contraptions.particle.AirFlowParticleData;
-import com.simibubi.create.content.contraptions.processing.InWorldProcessing;
-import com.simibubi.create.content.contraptions.processing.InWorldProcessing.Type;
-import com.simibubi.create.content.curiosities.frames.CopycatBlock;
+import com.simibubi.create.content.decoration.copycat.CopycatBlock;
+import com.simibubi.create.content.kinetics.belt.behaviour.TransportedItemStackHandlerBehaviour;
+import com.simibubi.create.content.kinetics.belt.behaviour.TransportedItemStackHandlerBehaviour.TransportedResult;
+import com.simibubi.create.content.kinetics.fan.FanProcessing.Type;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.TransportedItemStackHandlerBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.TransportedItemStackHandlerBehaviour.TransportedResult;
-import com.simibubi.create.foundation.config.AllConfigs;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.VecHelper;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;
@@ -50,7 +48,7 @@ public class AirCurrent {
 	public boolean pushing;
 	public float maxDistance;
 
-	protected List<Pair<TransportedItemStackHandlerBehaviour, InWorldProcessing.Type>> affectedItemHandlers =
+	protected List<Pair<TransportedItemStackHandlerBehaviour, FanProcessing.Type>> affectedItemHandlers =
 		new ArrayList<>();
 	protected List<Entity> caughtEntities = new ArrayList<>();
 
@@ -111,7 +109,7 @@ public class AirCurrent {
 				((ServerPlayer) entity).connection.aboveGroundTickCount = 0;
 
 			entityDistance -= .5f;
-			InWorldProcessing.Type processingType = getSegmentAt((float) entityDistance);
+			FanProcessing.Type processingType = getSegmentAt((float) entityDistance);
 
 			if (processingType == null || processingType == Type.NONE)
 				continue;
@@ -121,8 +119,8 @@ public class AirCurrent {
 					processingType.spawnParticlesForProcessing(world, entity.position());
 					continue;
 				}
-				if (InWorldProcessing.canProcess(itemEntity, processingType))
-					if (InWorldProcessing.applyProcessing(itemEntity, processingType)
+				if (FanProcessing.canProcess(itemEntity, processingType))
+					if (FanProcessing.applyProcessing(itemEntity, processingType)
 						&& source instanceof EncasedFanBlockEntity fan)
 						fan.award(AllAdvancements.FAN_PROCESSING);
 				continue;
@@ -156,7 +154,7 @@ public class AirCurrent {
 		AirCurrentSegment currentSegment = new AirCurrentSegment();
 		segments.clear();
 		currentSegment.startOffset = 0;
-		InWorldProcessing.Type type = Type.NONE;
+		FanProcessing.Type type = Type.NONE;
 
 		int limit = (int) (maxDistance + .5f);
 		int searchStart = pushing ? 0 : limit;
@@ -165,7 +163,7 @@ public class AirCurrent {
 
 		for (int i = searchStart; i * searchStep <= searchEnd * searchStep; i += searchStep) {
 			BlockPos currentPos = start.relative(direction, i);
-			InWorldProcessing.Type newType = InWorldProcessing.Type.byBlock(world, currentPos);
+			FanProcessing.Type newType = FanProcessing.Type.byBlock(world, currentPos);
 			if (newType != Type.NONE)
 				type = newType;
 			if (currentSegment.type != type || currentSegment.startOffset == 0) {
@@ -281,7 +279,7 @@ public class AirCurrent {
 		for (Pair<TransportedItemStackHandlerBehaviour, Type> pair : affectedItemHandlers) {
 			TransportedItemStackHandlerBehaviour handler = pair.getKey();
 			Level world = handler.getWorld();
-			InWorldProcessing.Type processingType = pair.getRight();
+			FanProcessing.Type processingType = pair.getRight();
 
 			handler.handleProcessingOnAllItems((transported) -> {
 				if (world.isClientSide) {
@@ -289,7 +287,7 @@ public class AirCurrent {
 						processingType.spawnParticlesForProcessing(world, handler.getWorldPositionOf(transported));
 					return TransportedResult.doNothing();
 				}
-				TransportedResult applyProcessing = InWorldProcessing.applyProcessing(transported, world, processingType);
+				TransportedResult applyProcessing = FanProcessing.applyProcessing(transported, world, processingType);
 				if (!applyProcessing.doesNothing() && source instanceof EncasedFanBlockEntity fan)
 					fan.award(AllAdvancements.FAN_PROCESSING);
 				return applyProcessing;
@@ -301,7 +299,7 @@ public class AirCurrent {
 		return AllTags.AllBlockTags.FAN_TRANSPARENT.matches(state);
 	}
 
-	public InWorldProcessing.Type getSegmentAt(float offset) {
+	public FanProcessing.Type getSegmentAt(float offset) {
 		for (AirCurrentSegment airCurrentSegment : segments) {
 			if (offset > airCurrentSegment.endOffset && pushing)
 				continue;
@@ -309,11 +307,11 @@ public class AirCurrent {
 				continue;
 			return airCurrentSegment.type;
 		}
-		return InWorldProcessing.Type.NONE;
+		return FanProcessing.Type.NONE;
 	}
 
 	public static class AirCurrentSegment {
-		InWorldProcessing.Type type;
+		FanProcessing.Type type;
 		int startOffset;
 		int endOffset;
 	}
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/fan/AirCurrentSound.java b/src/main/java/com/simibubi/create/content/kinetics/fan/AirCurrentSound.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/components/fan/AirCurrentSound.java
rename to src/main/java/com/simibubi/create/content/kinetics/fan/AirCurrentSound.java
index dd74b1244..872780063 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/fan/AirCurrentSound.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/fan/AirCurrentSound.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.fan;
+package com.simibubi.create.content.kinetics.fan;
 
 import net.minecraft.client.resources.sounds.AbstractTickableSoundInstance;
 import net.minecraft.client.resources.sounds.SoundInstance;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/particle/AirFlowParticle.java b/src/main/java/com/simibubi/create/content/kinetics/fan/AirFlowParticle.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/particle/AirFlowParticle.java
rename to src/main/java/com/simibubi/create/content/kinetics/fan/AirFlowParticle.java
index 6145ab1ea..5ea39e902 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/particle/AirFlowParticle.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/fan/AirFlowParticle.java
@@ -1,9 +1,7 @@
-package com.simibubi.create.content.contraptions.particle;
+package com.simibubi.create.content.kinetics.fan;
 
 import javax.annotation.Nonnull;
 
-import com.simibubi.create.content.contraptions.components.fan.IAirCurrentSource;
-import com.simibubi.create.content.contraptions.processing.InWorldProcessing;
 import com.simibubi.create.foundation.utility.Color;
 import com.simibubi.create.foundation.utility.VecHelper;
 
@@ -98,9 +96,9 @@ public class AirFlowParticle extends SimpleAnimatedParticle {
 	public void morphType(double distance) {
 		if (source.getAirCurrent() == null)
 			return;
-		InWorldProcessing.Type type = source.getAirCurrent().getSegmentAt((float) distance);
+		FanProcessing.Type type = source.getAirCurrent().getSegmentAt((float) distance);
 
-		if (type == InWorldProcessing.Type.SPLASHING) {
+		if (type == FanProcessing.Type.SPLASHING) {
 			setColor(Color.mixColors(0x4499FF, 0x2277FF, level.random.nextFloat()));
 			setAlpha(1f);
 			selectSprite(level.random.nextInt(3));
@@ -112,7 +110,7 @@ public class AirFlowParticle extends SimpleAnimatedParticle {
 						zd * .125f);
 		}
 
-		if (type == InWorldProcessing.Type.SMOKING) {
+		if (type == FanProcessing.Type.SMOKING) {
 			setColor(Color.mixColors(0x0, 0x555555, level.random.nextFloat()));
 			setAlpha(1f);
 			selectSprite(level.random.nextInt(3));
@@ -124,7 +122,7 @@ public class AirFlowParticle extends SimpleAnimatedParticle {
 						zd * .125f);
 		}
 
-		if (type == InWorldProcessing.Type.HAUNTING) {
+		if (type == FanProcessing.Type.HAUNTING) {
 			setColor(Color.mixColors(0x0, 0x126568, level.random.nextFloat()));
 			setAlpha(1f);
 			selectSprite(level.random.nextInt(3));
@@ -136,7 +134,7 @@ public class AirFlowParticle extends SimpleAnimatedParticle {
 						zd * .125f);
 		}
 
-		if (type == InWorldProcessing.Type.BLASTING) {
+		if (type == FanProcessing.Type.BLASTING) {
 			setColor(Color.mixColors(0xFF4400, 0xFF8855, level.random.nextFloat()));
 			setAlpha(.5f);
 			selectSprite(level.random.nextInt(3));
diff --git a/src/main/java/com/simibubi/create/content/contraptions/particle/AirFlowParticleData.java b/src/main/java/com/simibubi/create/content/kinetics/fan/AirFlowParticleData.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/particle/AirFlowParticleData.java
rename to src/main/java/com/simibubi/create/content/kinetics/fan/AirFlowParticleData.java
index fa0954bee..9655950b9 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/particle/AirFlowParticleData.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/fan/AirFlowParticleData.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.particle;
+package com.simibubi.create.content.kinetics.fan;
 
 import java.util.Locale;
 
@@ -7,6 +7,7 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import com.simibubi.create.AllParticleTypes;
+import com.simibubi.create.foundation.particle.ICustomParticleDataWithSprite;
 
 import net.minecraft.client.particle.ParticleEngine.SpriteParticleRegistration;
 import net.minecraft.core.Vec3i;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/fan/EncasedFanBlock.java b/src/main/java/com/simibubi/create/content/kinetics/fan/EncasedFanBlock.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/components/fan/EncasedFanBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/fan/EncasedFanBlock.java
index 7c7d33b02..1f670a1e0 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/fan/EncasedFanBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/fan/EncasedFanBlock.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.contraptions.components.fan;
+package com.simibubi.create.content.kinetics.fan;
 
 import com.simibubi.create.AllBlockEntityTypes;
-import com.simibubi.create.content.contraptions.base.DirectionalKineticBlock;
-import com.simibubi.create.content.logistics.block.chute.AbstractChuteBlock;
+import com.simibubi.create.content.kinetics.base.DirectionalKineticBlock;
+import com.simibubi.create.content.logistics.chute.AbstractChuteBlock;
 import com.simibubi.create.foundation.block.IBE;
 import com.simibubi.create.foundation.utility.worldWrappers.WrappedWorld;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/fan/EncasedFanBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/fan/EncasedFanBlockEntity.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/components/fan/EncasedFanBlockEntity.java
rename to src/main/java/com/simibubi/create/content/kinetics/fan/EncasedFanBlockEntity.java
index bc43723d0..836b14a15 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/fan/EncasedFanBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/fan/EncasedFanBlockEntity.java
@@ -1,14 +1,14 @@
-package com.simibubi.create.content.contraptions.components.fan;
+package com.simibubi.create.content.kinetics.fan;
 
 import java.util.List;
 
 import javax.annotation.Nullable;
 
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.logistics.block.chute.ChuteBlockEntity;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.content.logistics.chute.ChuteBlockEntity;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
-import com.simibubi.create.foundation.config.AllConfigs;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/fan/EncasedFanRenderer.java b/src/main/java/com/simibubi/create/content/kinetics/fan/EncasedFanRenderer.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/components/fan/EncasedFanRenderer.java
rename to src/main/java/com/simibubi/create/content/kinetics/fan/EncasedFanRenderer.java
index f14063440..ca0c31d99 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/fan/EncasedFanRenderer.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/fan/EncasedFanRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.fan;
+package com.simibubi.create.content.kinetics.fan;
 
 import static net.minecraft.world.level.block.state.properties.BlockStateProperties.FACING;
 
@@ -6,7 +6,7 @@ import com.jozufozu.flywheel.backend.Backend;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityRenderer;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/fan/FanInstance.java b/src/main/java/com/simibubi/create/content/kinetics/fan/FanInstance.java
similarity index 89%
rename from src/main/java/com/simibubi/create/content/contraptions/components/fan/FanInstance.java
rename to src/main/java/com/simibubi/create/content/kinetics/fan/FanInstance.java
index c98593153..d509f08b3 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/fan/FanInstance.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/fan/FanInstance.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.contraptions.components.fan;
+package com.simibubi.create.content.kinetics.fan;
 
 import static net.minecraft.world.level.block.state.properties.BlockStateProperties.FACING;
 
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityInstance;
-import com.simibubi.create.content.contraptions.base.flwdata.RotatingData;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityInstance;
+import com.simibubi.create.content.kinetics.base.flwdata.RotatingData;
 import com.simibubi.create.foundation.render.AllMaterialSpecs;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/InWorldProcessing.java b/src/main/java/com/simibubi/create/content/kinetics/fan/FanProcessing.java
similarity index 83%
rename from src/main/java/com/simibubi/create/content/contraptions/processing/InWorldProcessing.java
rename to src/main/java/com/simibubi/create/content/kinetics/fan/FanProcessing.java
index 2e3cb3417..0c02646d2 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/processing/InWorldProcessing.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/fan/FanProcessing.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.contraptions.processing;
+package com.simibubi.create.content.kinetics.fan;
 
-import static com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock.getHeatLevelOf;
+import static com.simibubi.create.content.processing.burner.BlazeBurnerBlock.getHeatLevelOf;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -10,17 +10,14 @@ import java.util.Optional;
 import com.mojang.math.Vector3f;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllRecipeTypes;
-import com.simibubi.create.content.contraptions.components.deployer.ManualApplicationRecipe;
-import com.simibubi.create.content.contraptions.components.fan.HauntingRecipe;
-import com.simibubi.create.content.contraptions.components.fan.SplashingRecipe;
-import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock;
-import com.simibubi.create.content.contraptions.processing.burner.LitBlazeBurnerBlock;
-import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.TransportedItemStackHandlerBehaviour.TransportedResult;
-import com.simibubi.create.foundation.config.AllConfigs;
-import com.simibubi.create.foundation.item.ItemHelper;
+import com.simibubi.create.content.kinetics.belt.behaviour.TransportedItemStackHandlerBehaviour.TransportedResult;
+import com.simibubi.create.content.kinetics.belt.transport.TransportedItemStack;
+import com.simibubi.create.content.processing.burner.BlazeBurnerBlock;
+import com.simibubi.create.content.processing.burner.LitBlazeBurnerBlock;
+import com.simibubi.create.foundation.recipe.RecipeApplier;
 import com.simibubi.create.foundation.utility.Color;
 import com.simibubi.create.foundation.utility.VecHelper;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.particles.DustParticleOptions;
@@ -42,7 +39,6 @@ import net.minecraft.world.entity.monster.EnderMan;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.AbstractCookingRecipe;
 import net.minecraft.world.item.crafting.BlastingRecipe;
-import net.minecraft.world.item.crafting.Recipe;
 import net.minecraft.world.item.crafting.RecipeType;
 import net.minecraft.world.item.crafting.SmeltingRecipe;
 import net.minecraft.world.item.crafting.SmokingRecipe;
@@ -55,11 +51,10 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.phys.Vec3;
-import net.minecraftforge.items.ItemHandlerHelper;
 import net.minecraftforge.items.ItemStackHandler;
 import net.minecraftforge.items.wrapper.RecipeWrapper;
 
-public class InWorldProcessing {
+public class FanProcessing {
 
 	private static final DamageSource FIRE_DAMAGE_SOURCE = new DamageSource("create.fan_fire").setScalesWithDifficulty()
 		.setIsFire();
@@ -126,7 +121,7 @@ public class InWorldProcessing {
 			transported.processedBy = type;
 			int timeModifierForStackSize = ((transported.stack.getCount() - 1) / 16) + 1;
 			int processingTime =
-				(int) (AllConfigs.server().kinetics.inWorldProcessingTime.get() * timeModifierForStackSize) + 1;
+				(int) (AllConfigs.server().kinetics.fanProcessingTime.get() * timeModifierForStackSize) + 1;
 			transported.processingTime = processingTime;
 			if (!type.canProcess(transported.stack, world))
 				transported.processingTime = -1;
@@ -155,14 +150,14 @@ public class InWorldProcessing {
 			SPLASHING_WRAPPER.setItem(0, stack);
 			Optional<SplashingRecipe> recipe = AllRecipeTypes.SPLASHING.find(SPLASHING_WRAPPER, world);
 			if (recipe.isPresent())
-				return applyRecipeOn(stack, recipe.get());
+				return RecipeApplier.applyRecipeOn(stack, recipe.get());
 			return null;
 		}
 		if (type == Type.HAUNTING) {
 			HAUNTING_WRAPPER.setItem(0, stack);
 			Optional<HauntingRecipe> recipe = AllRecipeTypes.HAUNTING.find(HAUNTING_WRAPPER, world);
 			if (recipe.isPresent())
-				return applyRecipeOn(stack, recipe.get());
+				return RecipeApplier.applyRecipeOn(stack, recipe.get());
 			return null;
 		}
 
@@ -185,7 +180,7 @@ public class InWorldProcessing {
 					.getResultItem(),
 					smeltingRecipe.get()
 						.getResultItem())) {
-					return applyRecipeOn(stack, smeltingRecipe.get());
+					return RecipeApplier.applyRecipeOn(stack, smeltingRecipe.get());
 				}
 			}
 
@@ -193,7 +188,7 @@ public class InWorldProcessing {
 		}
 
 		if (type == Type.SMOKING && smokingRecipe.isPresent())
-			return applyRecipeOn(stack, smokingRecipe.get());
+			return RecipeApplier.applyRecipeOn(stack, smokingRecipe.get());
 
 		return null;
 	}
@@ -214,7 +209,7 @@ public class InWorldProcessing {
 			int timeModifierForStackSize = ((entity.getItem()
 				.getCount() - 1) / 16) + 1;
 			int processingTime =
-				(int) (AllConfigs.server().kinetics.inWorldProcessingTime.get() * timeModifierForStackSize) + 1;
+				(int) (AllConfigs.server().kinetics.fanProcessingTime.get() * timeModifierForStackSize) + 1;
 			processing.putInt("Time", processingTime);
 		}
 
@@ -223,57 +218,6 @@ public class InWorldProcessing {
 		return value;
 	}
 
-	public static void applyRecipeOn(ItemEntity entity, Recipe<?> recipe) {
-		List<ItemStack> stacks = applyRecipeOn(entity.getItem(), recipe);
-		if (stacks == null)
-			return;
-		if (stacks.isEmpty()) {
-			entity.discard();
-			return;
-		}
-		entity.setItem(stacks.remove(0));
-		for (ItemStack additional : stacks) {
-			ItemEntity entityIn = new ItemEntity(entity.level, entity.getX(), entity.getY(), entity.getZ(), additional);
-			entityIn.setDeltaMovement(entity.getDeltaMovement());
-			entity.level.addFreshEntity(entityIn);
-		}
-	}
-
-	public static List<ItemStack> applyRecipeOn(ItemStack stackIn, Recipe<?> recipe) {
-		List<ItemStack> stacks;
-
-		if (recipe instanceof ProcessingRecipe<?> pr) {
-			stacks = new ArrayList<>();
-			for (int i = 0; i < stackIn.getCount(); i++) {
-				List<ProcessingOutput> outputs =
-					pr instanceof ManualApplicationRecipe mar ? mar.getRollableResults() : pr.getRollableResults();
-				for (ItemStack stack : pr.rollResults(outputs)) {
-					for (ItemStack previouslyRolled : stacks) {
-						if (stack.isEmpty())
-							continue;
-						if (!ItemHandlerHelper.canItemStacksStack(stack, previouslyRolled))
-							continue;
-						int amount = Math.min(previouslyRolled.getMaxStackSize() - previouslyRolled.getCount(),
-							stack.getCount());
-						previouslyRolled.grow(amount);
-						stack.shrink(amount);
-					}
-
-					if (stack.isEmpty())
-						continue;
-
-					stacks.add(stack);
-				}
-			}
-		} else {
-			ItemStack out = recipe.getResultItem()
-				.copy();
-			stacks = ItemHelper.multipliedOutput(stackIn, out);
-		}
-
-		return stacks;
-	}
-
 	public enum Type {
 		SPLASHING {
 			@Override
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/fan/HauntingRecipe.java b/src/main/java/com/simibubi/create/content/kinetics/fan/HauntingRecipe.java
similarity index 50%
rename from src/main/java/com/simibubi/create/content/contraptions/components/fan/HauntingRecipe.java
rename to src/main/java/com/simibubi/create/content/kinetics/fan/HauntingRecipe.java
index 443642a5d..43dbc81d0 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/fan/HauntingRecipe.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/fan/HauntingRecipe.java
@@ -1,23 +1,22 @@
-package com.simibubi.create.content.contraptions.components.fan;
+package com.simibubi.create.content.kinetics.fan;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
 import com.simibubi.create.AllRecipeTypes;
-import com.simibubi.create.content.contraptions.processing.InWorldProcessing;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipe;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipeBuilder.ProcessingRecipeParams;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipe;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder.ProcessingRecipeParams;
 
 import net.minecraft.world.level.Level;
 
 @ParametersAreNonnullByDefault
-public class HauntingRecipe extends ProcessingRecipe<InWorldProcessing.HauntingWrapper> {
+public class HauntingRecipe extends ProcessingRecipe<FanProcessing.HauntingWrapper> {
 
 	public HauntingRecipe(ProcessingRecipeParams params) {
 		super(AllRecipeTypes.HAUNTING, params);
 	}
 
 	@Override
-	public boolean matches(InWorldProcessing.HauntingWrapper inv, Level worldIn) {
+	public boolean matches(FanProcessing.HauntingWrapper inv, Level worldIn) {
 		if (inv.isEmpty())
 			return false;
 		return ingredients.get(0)
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/fan/IAirCurrentSource.java b/src/main/java/com/simibubi/create/content/kinetics/fan/IAirCurrentSource.java
similarity index 84%
rename from src/main/java/com/simibubi/create/content/contraptions/components/fan/IAirCurrentSource.java
rename to src/main/java/com/simibubi/create/content/kinetics/fan/IAirCurrentSource.java
index bb185fccf..0f232411b 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/fan/IAirCurrentSource.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/fan/IAirCurrentSource.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.contraptions.components.fan;
+package com.simibubi.create.content.kinetics.fan;
 
 import javax.annotation.Nullable;
 
-import com.simibubi.create.foundation.config.AllConfigs;
-import com.simibubi.create.foundation.config.CKinetics;
+import com.simibubi.create.infrastructure.config.AllConfigs;
+import com.simibubi.create.infrastructure.config.CKinetics;
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/fan/NozzleBlock.java b/src/main/java/com/simibubi/create/content/kinetics/fan/NozzleBlock.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/components/fan/NozzleBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/fan/NozzleBlock.java
index 52dab43a1..d64f14dd8 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/fan/NozzleBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/fan/NozzleBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.fan;
+package com.simibubi.create.content.kinetics.fan;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/fan/NozzleBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/fan/NozzleBlockEntity.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/components/fan/NozzleBlockEntity.java
rename to src/main/java/com/simibubi/create/content/kinetics/fan/NozzleBlockEntity.java
index 28ca80620..6a1aa69dc 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/fan/NozzleBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/fan/NozzleBlockEntity.java
@@ -1,13 +1,13 @@
-package com.simibubi.create.content.contraptions.components.fan;
+package com.simibubi.create.content.kinetics.fan;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
-import com.simibubi.create.foundation.config.AllConfigs;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.VecHelper;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.particles.ParticleTypes;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/fan/SplashingRecipe.java b/src/main/java/com/simibubi/create/content/kinetics/fan/SplashingRecipe.java
similarity index 52%
rename from src/main/java/com/simibubi/create/content/contraptions/components/fan/SplashingRecipe.java
rename to src/main/java/com/simibubi/create/content/kinetics/fan/SplashingRecipe.java
index 4918ddb82..b8734ae53 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/fan/SplashingRecipe.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/fan/SplashingRecipe.java
@@ -1,17 +1,16 @@
-package com.simibubi.create.content.contraptions.components.fan;
+package com.simibubi.create.content.kinetics.fan;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
 import com.simibubi.create.AllRecipeTypes;
-import com.simibubi.create.content.contraptions.processing.InWorldProcessing;
-import com.simibubi.create.content.contraptions.processing.InWorldProcessing.SplashingWrapper;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipe;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipeBuilder.ProcessingRecipeParams;
+import com.simibubi.create.content.kinetics.fan.FanProcessing.SplashingWrapper;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipe;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder.ProcessingRecipeParams;
 
 import net.minecraft.world.level.Level;
 
 @ParametersAreNonnullByDefault
-public class SplashingRecipe extends ProcessingRecipe<InWorldProcessing.SplashingWrapper> {
+public class SplashingRecipe extends ProcessingRecipe<FanProcessing.SplashingWrapper> {
 
 	public SplashingRecipe(ProcessingRecipeParams params) {
 		super(AllRecipeTypes.SPLASHING, params);
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlywheelBlock.java b/src/main/java/com/simibubi/create/content/kinetics/flywheel/FlywheelBlock.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlywheelBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/flywheel/FlywheelBlock.java
index b5d23782a..6cff991ce 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlywheelBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/flywheel/FlywheelBlock.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.contraptions.components.flywheel;
+package com.simibubi.create.content.kinetics.flywheel;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.base.RotatedPillarKineticBlock;
+import com.simibubi.create.content.kinetics.base.RotatedPillarKineticBlock;
 import com.simibubi.create.foundation.block.IBE;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlywheelBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/flywheel/FlywheelBlockEntity.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlywheelBlockEntity.java
rename to src/main/java/com/simibubi/create/content/kinetics/flywheel/FlywheelBlockEntity.java
index b92d9b646..63afa38e6 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlywheelBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/flywheel/FlywheelBlockEntity.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.contraptions.components.flywheel;
+package com.simibubi.create.content.kinetics.flywheel;
 
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat.Chaser;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlywheelInstance.java b/src/main/java/com/simibubi/create/content/kinetics/flywheel/FlywheelInstance.java
similarity index 89%
rename from src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlywheelInstance.java
rename to src/main/java/com/simibubi/create/content/kinetics/flywheel/FlywheelInstance.java
index e3bde94dc..4f97923d9 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlywheelInstance.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/flywheel/FlywheelInstance.java
@@ -1,12 +1,12 @@
-package com.simibubi.create.content.contraptions.components.flywheel;
+package com.simibubi.create.content.kinetics.flywheel;
 
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.jozufozu.flywheel.api.instance.DynamicInstance;
 import com.jozufozu.flywheel.core.materials.model.ModelData;
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityInstance;
-import com.simibubi.create.content.contraptions.base.flwdata.RotatingData;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityInstance;
+import com.simibubi.create.content.kinetics.base.flwdata.RotatingData;
 import com.simibubi.create.foundation.utility.AngleHelper;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlywheelRenderer.java b/src/main/java/com/simibubi/create/content/kinetics/flywheel/FlywheelRenderer.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlywheelRenderer.java
rename to src/main/java/com/simibubi/create/content/kinetics/flywheel/FlywheelRenderer.java
index 8d6c3d271..f563916f3 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlywheelRenderer.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/flywheel/FlywheelRenderer.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.contraptions.components.flywheel;
+package com.simibubi.create.content.kinetics.flywheel;
 
 import com.jozufozu.flywheel.backend.Backend;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityRenderer;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.utility.AngleHelper;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/GantryShaftBlock.java b/src/main/java/com/simibubi/create/content/kinetics/gantry/GantryShaftBlock.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/advanced/GantryShaftBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/gantry/GantryShaftBlock.java
index a0cd59f16..5f894b2c4 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/GantryShaftBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/gantry/GantryShaftBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.relays.advanced;
+package com.simibubi.create.content.kinetics.gantry;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -7,15 +7,15 @@ import java.util.function.Predicate;
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.base.DirectionalKineticBlock;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.base.DirectionalKineticBlock;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
 import com.simibubi.create.foundation.block.IBE;
+import com.simibubi.create.foundation.placement.IPlacementHelper;
+import com.simibubi.create.foundation.placement.PlacementHelpers;
+import com.simibubi.create.foundation.placement.PlacementOffset;
+import com.simibubi.create.foundation.placement.PoleHelper;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.Lang;
-import com.simibubi.create.foundation.utility.placement.IPlacementHelper;
-import com.simibubi.create.foundation.utility.placement.PlacementHelpers;
-import com.simibubi.create.foundation.utility.placement.PlacementOffset;
-import com.simibubi.create.foundation.utility.placement.util.PoleHelper;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/GantryShaftBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/gantry/GantryShaftBlockEntity.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/advanced/GantryShaftBlockEntity.java
rename to src/main/java/com/simibubi/create/content/kinetics/gantry/GantryShaftBlockEntity.java
index ae9fd10ce..14c20af4a 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/GantryShaftBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/gantry/GantryShaftBlockEntity.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.contraptions.relays.advanced;
+package com.simibubi.create.content.kinetics.gantry;
 
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.gantry.GantryCarriageBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.gantry.GantryCarriageBlockEntity;
+import com.simibubi.create.content.contraptions.gantry.GantryCarriageBlock;
+import com.simibubi.create.content.contraptions.gantry.GantryCarriageBlockEntity;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
 import com.simibubi.create.foundation.utility.Iterate;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeBlock.java b/src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeBlock.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeBlock.java
index 6fba6b746..23cce2f2b 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeBlock.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.contraptions.relays.gauge;
+package com.simibubi.create.content.kinetics.gauge;
 
 import com.mojang.math.Vector3f;
 import com.simibubi.create.AllBlockEntityTypes;
-import com.simibubi.create.content.contraptions.base.DirectionalAxisKineticBlock;
-import com.simibubi.create.content.contraptions.base.IRotate;
+import com.simibubi.create.content.kinetics.base.DirectionalAxisKineticBlock;
+import com.simibubi.create.content.kinetics.base.IRotate;
 import com.simibubi.create.foundation.block.IBE;
 import com.simibubi.create.foundation.utility.Color;
 import com.simibubi.create.foundation.utility.Iterate;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeBlockEntity.java
similarity index 87%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeBlockEntity.java
rename to src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeBlockEntity.java
index 682052bdc..ced8abf12 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeBlockEntity.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.contraptions.relays.gauge;
+package com.simibubi.create.content.kinetics.gauge;
 
 import java.util.List;
 
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.goggles.IHaveGoggleInformation;
+import com.simibubi.create.content.equipment.goggles.IHaveGoggleInformation;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
 import com.simibubi.create.foundation.utility.Lang;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeGenerator.java b/src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeGenerator.java
similarity index 89%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeGenerator.java
rename to src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeGenerator.java
index 1d319e6e0..079e033a4 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeGenerator.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeGenerator.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.relays.gauge;
+package com.simibubi.create.content.kinetics.gauge;
 
 import com.simibubi.create.foundation.data.DirectionalAxisBlockStateGen;
 import com.tterrag.registrate.providers.DataGenContext;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeInstance.java b/src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeInstance.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeInstance.java
rename to src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeInstance.java
index cc4b01c71..03d9b9dfc 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeInstance.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeInstance.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.relays.gauge;
+package com.simibubi.create.content.kinetics.gauge;
 
 import java.util.ArrayList;
 
@@ -9,7 +9,7 @@ import com.jozufozu.flywheel.core.materials.model.ModelData;
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.relays.encased.ShaftInstance;
+import com.simibubi.create.content.kinetics.base.ShaftInstance;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.Iterate;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeObservedPacket.java b/src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeObservedPacket.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeObservedPacket.java
rename to src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeObservedPacket.java
index 0ed578c9c..bfcb0b6ff 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeObservedPacket.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeObservedPacket.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.relays.gauge;
+package com.simibubi.create.content.kinetics.gauge;
 
 import com.simibubi.create.foundation.networking.BlockEntityConfigurationPacket;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeRenderer.java b/src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeRenderer.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeRenderer.java
rename to src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeRenderer.java
index 3945f9e51..404454fe8 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeRenderer.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeRenderer.java
@@ -1,12 +1,12 @@
-package com.simibubi.create.content.contraptions.relays.gauge;
+package com.simibubi.create.content.kinetics.gauge;
 
 import com.jozufozu.flywheel.backend.Backend;
 import com.jozufozu.flywheel.core.PartialModel;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.relays.encased.ShaftRenderer;
-import com.simibubi.create.content.contraptions.relays.gauge.GaugeBlock.Type;
+import com.simibubi.create.content.kinetics.base.ShaftRenderer;
+import com.simibubi.create.content.kinetics.gauge.GaugeBlock.Type;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.utility.Iterate;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeShaper.java b/src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeShaper.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeShaper.java
rename to src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeShaper.java
index b21d42d34..e149f1125 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeShaper.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeShaper.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.relays.gauge;
+package com.simibubi.create.content.kinetics.gauge;
 
 import java.util.Arrays;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/SpeedGaugeBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/gauge/SpeedGaugeBlockEntity.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/gauge/SpeedGaugeBlockEntity.java
rename to src/main/java/com/simibubi/create/content/kinetics/gauge/SpeedGaugeBlockEntity.java
index 2ae2188fd..0a59523a3 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/SpeedGaugeBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/gauge/SpeedGaugeBlockEntity.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.relays.gauge;
+package com.simibubi.create.content.kinetics.gauge;
 
 import java.util.List;
 
@@ -7,11 +7,11 @@ import org.jetbrains.annotations.Nullable;
 
 import com.simibubi.create.compat.computercraft.AbstractComputerBehaviour;
 import com.simibubi.create.compat.computercraft.ComputerCraftProxy;
-import com.simibubi.create.content.contraptions.base.IRotate.SpeedLevel;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
-import com.simibubi.create.foundation.config.AllConfigs;
+import com.simibubi.create.content.kinetics.base.IRotate.SpeedLevel;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.Color;
 import com.simibubi.create.foundation.utility.Lang;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.ChatFormatting;
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/StressGaugeBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/gauge/StressGaugeBlockEntity.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/gauge/StressGaugeBlockEntity.java
rename to src/main/java/com/simibubi/create/content/kinetics/gauge/StressGaugeBlockEntity.java
index fb7dc9941..b0251d058 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/StressGaugeBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/gauge/StressGaugeBlockEntity.java
@@ -1,17 +1,17 @@
-package com.simibubi.create.content.contraptions.relays.gauge;
+package com.simibubi.create.content.kinetics.gauge;
 
 import java.util.List;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.compat.computercraft.AbstractComputerBehaviour;
 import com.simibubi.create.compat.computercraft.ComputerCraftProxy;
-import com.simibubi.create.content.contraptions.base.IRotate.StressImpact;
+import com.simibubi.create.content.kinetics.base.IRotate.StressImpact;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.item.TooltipHelper;
-import com.simibubi.create.foundation.networking.AllPackets;
 import com.simibubi.create.foundation.utility.Color;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.LangBuilder;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/gearbox/GearboxBlock.java b/src/main/java/com/simibubi/create/content/kinetics/gearbox/GearboxBlock.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/gearbox/GearboxBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/gearbox/GearboxBlock.java
index 23b68a2f8..05df62eb3 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/gearbox/GearboxBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/gearbox/GearboxBlock.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.contraptions.relays.gearbox;
+package com.simibubi.create.content.kinetics.gearbox;
 
 import java.util.Arrays;
 import java.util.List;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.contraptions.base.RotatedPillarKineticBlock;
+import com.simibubi.create.content.kinetics.base.RotatedPillarKineticBlock;
 import com.simibubi.create.foundation.block.IBE;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/gearbox/GearboxBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/gearbox/GearboxBlockEntity.java
similarity index 71%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/gearbox/GearboxBlockEntity.java
rename to src/main/java/com/simibubi/create/content/kinetics/gearbox/GearboxBlockEntity.java
index 9d907c11e..ee7537cda 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/gearbox/GearboxBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/gearbox/GearboxBlockEntity.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.contraptions.relays.gearbox;
+package com.simibubi.create.content.kinetics.gearbox;
 
-import com.simibubi.create.content.contraptions.relays.encased.DirectionalShaftHalvesBlockEntity;
+import com.simibubi.create.content.kinetics.base.DirectionalShaftHalvesBlockEntity;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.entity.BlockEntityType;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/gearbox/GearboxInstance.java b/src/main/java/com/simibubi/create/content/kinetics/gearbox/GearboxInstance.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/gearbox/GearboxInstance.java
rename to src/main/java/com/simibubi/create/content/kinetics/gearbox/GearboxInstance.java
index a9e9b9f45..03ce8bd04 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/gearbox/GearboxInstance.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/gearbox/GearboxInstance.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.relays.gearbox;
+package com.simibubi.create.content.kinetics.gearbox;
 
 import java.util.EnumMap;
 import java.util.Map;
@@ -8,8 +8,8 @@ import com.jozufozu.flywheel.api.Instancer;
 import com.jozufozu.flywheel.api.Material;
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityInstance;
-import com.simibubi.create.content.contraptions.base.flwdata.RotatingData;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityInstance;
+import com.simibubi.create.content.kinetics.base.flwdata.RotatingData;
 import com.simibubi.create.foundation.utility.Iterate;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/gearbox/GearboxRenderer.java b/src/main/java/com/simibubi/create/content/kinetics/gearbox/GearboxRenderer.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/gearbox/GearboxRenderer.java
rename to src/main/java/com/simibubi/create/content/kinetics/gearbox/GearboxRenderer.java
index 85cb02016..7a1260830 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/gearbox/GearboxRenderer.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/gearbox/GearboxRenderer.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.contraptions.relays.gearbox;
+package com.simibubi.create.content.kinetics.gearbox;
 
 import com.jozufozu.flywheel.backend.Backend;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityRenderer;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/gearbox/VerticalGearboxItem.java b/src/main/java/com/simibubi/create/content/kinetics/gearbox/VerticalGearboxItem.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/gearbox/VerticalGearboxItem.java
rename to src/main/java/com/simibubi/create/content/kinetics/gearbox/VerticalGearboxItem.java
index 5b5a4761a..06eed6a23 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/gearbox/VerticalGearboxItem.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/gearbox/VerticalGearboxItem.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.contraptions.relays.gearbox;
+package com.simibubi.create.content.kinetics.gearbox;
 
 import java.util.Map;
 
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.base.IRotate;
+import com.simibubi.create.content.kinetics.base.IRotate;
 import com.simibubi.create.foundation.utility.Iterate;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/AllArmInteractionPointTypes.java b/src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/AllArmInteractionPointTypes.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/AllArmInteractionPointTypes.java
rename to src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/AllArmInteractionPointTypes.java
index c4a2d6179..3578a2c3e 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/AllArmInteractionPointTypes.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/AllArmInteractionPointTypes.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.mechanicalArm;
+package com.simibubi.create.content.kinetics.mechanicalArm;
 
 import java.util.Optional;
 import java.util.function.Function;
@@ -9,24 +9,24 @@ import org.apache.commons.lang3.mutable.MutableBoolean;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.components.crafter.MechanicalCrafterBlock;
-import com.simibubi.create.content.contraptions.components.crafter.MechanicalCrafterBlockEntity;
-import com.simibubi.create.content.contraptions.components.deployer.DeployerBlock;
-import com.simibubi.create.content.contraptions.components.saw.SawBlock;
-import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock;
-import com.simibubi.create.content.contraptions.relays.belt.BeltBlockEntity;
-import com.simibubi.create.content.contraptions.relays.belt.BeltHelper;
-import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelBlock;
-import com.simibubi.create.content.logistics.block.chute.AbstractChuteBlock;
-import com.simibubi.create.content.logistics.block.funnel.AbstractFunnelBlock;
-import com.simibubi.create.content.logistics.block.funnel.BeltFunnelBlock;
-import com.simibubi.create.content.logistics.block.funnel.BeltFunnelBlock.Shape;
-import com.simibubi.create.content.logistics.block.funnel.FunnelBlock;
-import com.simibubi.create.content.logistics.block.funnel.FunnelBlockEntity;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.TransportedItemStackHandlerBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.TransportedItemStackHandlerBehaviour.TransportedResult;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.belt.BeltBlockEntity;
+import com.simibubi.create.content.kinetics.belt.BeltHelper;
+import com.simibubi.create.content.kinetics.belt.behaviour.TransportedItemStackHandlerBehaviour;
+import com.simibubi.create.content.kinetics.belt.behaviour.TransportedItemStackHandlerBehaviour.TransportedResult;
+import com.simibubi.create.content.kinetics.crafter.MechanicalCrafterBlock;
+import com.simibubi.create.content.kinetics.crafter.MechanicalCrafterBlockEntity;
+import com.simibubi.create.content.kinetics.deployer.DeployerBlock;
+import com.simibubi.create.content.kinetics.saw.SawBlock;
+import com.simibubi.create.content.logistics.chute.AbstractChuteBlock;
+import com.simibubi.create.content.logistics.funnel.AbstractFunnelBlock;
+import com.simibubi.create.content.logistics.funnel.BeltFunnelBlock;
+import com.simibubi.create.content.logistics.funnel.BeltFunnelBlock.Shape;
+import com.simibubi.create.content.logistics.funnel.FunnelBlock;
+import com.simibubi.create.content.logistics.funnel.FunnelBlockEntity;
+import com.simibubi.create.content.logistics.tunnel.BeltTunnelBlock;
+import com.simibubi.create.content.processing.burner.BlazeBurnerBlock;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.inventory.InvManipulationBehaviour;
 import com.simibubi.create.foundation.item.SmartInventory;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmAngleTarget.java b/src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmAngleTarget.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmAngleTarget.java
rename to src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmAngleTarget.java
index db9483cfc..59bc62aa2 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmAngleTarget.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmAngleTarget.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.mechanicalArm;
+package com.simibubi.create.content.kinetics.mechanicalArm;
 
 import com.simibubi.create.foundation.utility.AngleHelper;
 import com.simibubi.create.foundation.utility.VecHelper;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmBlock.java b/src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmBlock.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmBlock.java
index 6cf310091..ea4c24eca 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmBlock.java
@@ -1,13 +1,13 @@
-package com.simibubi.create.content.logistics.block.mechanicalArm;
+package com.simibubi.create.content.kinetics.mechanicalArm;
 
 import org.apache.commons.lang3.mutable.MutableBoolean;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllItems;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.base.KineticBlock;
-import com.simibubi.create.content.contraptions.relays.elementary.ICogWheel;
-import com.simibubi.create.content.logistics.block.mechanicalArm.ArmBlockEntity.Phase;
+import com.simibubi.create.content.kinetics.base.KineticBlock;
+import com.simibubi.create.content.kinetics.mechanicalArm.ArmBlockEntity.Phase;
+import com.simibubi.create.content.kinetics.simpleRelays.ICogWheel;
 import com.simibubi.create.foundation.block.IBE;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmBlockEntity.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmBlockEntity.java
rename to src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmBlockEntity.java
index 20ae1f212..c7f68656b 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmBlockEntity.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.mechanicalArm;
+package com.simibubi.create.content.kinetics.mechanicalArm;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -7,17 +7,16 @@ import javax.annotation.Nullable;
 
 import com.jozufozu.flywheel.backend.instancing.InstancedRenderDispatcher;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.ITransformableBlockEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.StructureTransform;
-import com.simibubi.create.content.logistics.block.mechanicalArm.AllArmInteractionPointTypes.JukeboxPoint;
-import com.simibubi.create.content.logistics.block.mechanicalArm.ArmInteractionPoint.Mode;
+import com.simibubi.create.content.contraptions.ITransformableBlockEntity;
+import com.simibubi.create.content.contraptions.StructureTransform;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.mechanicalArm.AllArmInteractionPointTypes.JukeboxPoint;
+import com.simibubi.create.content.kinetics.mechanicalArm.ArmInteractionPoint.Mode;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.CenteredSideValueBoxTransform;
-import com.simibubi.create.foundation.blockEntity.behaviour.scrollvalue.INamedIconOptions;
-import com.simibubi.create.foundation.blockEntity.behaviour.scrollvalue.ScrollOptionBehaviour;
-import com.simibubi.create.foundation.config.AllConfigs;
+import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.INamedIconOptions;
+import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollOptionBehaviour;
 import com.simibubi.create.foundation.gui.AllIcons;
 import com.simibubi.create.foundation.item.TooltipHelper;
 import com.simibubi.create.foundation.utility.AngleHelper;
@@ -25,6 +24,7 @@ import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.NBTHelper;
 import com.simibubi.create.foundation.utility.VecHelper;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInstance.java b/src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmInstance.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInstance.java
rename to src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmInstance.java
index eba55c301..889620fe8 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInstance.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmInstance.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.mechanicalArm;
+package com.simibubi.create.content.kinetics.mechanicalArm;
 
 import java.util.ArrayList;
 
@@ -12,8 +12,8 @@ import com.jozufozu.flywheel.core.materials.model.ModelData;
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.base.SingleRotatingInstance;
-import com.simibubi.create.content.contraptions.base.flwdata.RotatingData;
+import com.simibubi.create.content.kinetics.base.SingleRotatingInstance;
+import com.simibubi.create.content.kinetics.base.flwdata.RotatingData;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 import com.simibubi.create.foundation.utility.Color;
 import com.simibubi.create.foundation.utility.Iterate;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPoint.java b/src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmInteractionPoint.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPoint.java
rename to src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmInteractionPoint.java
index 0f30dd1ad..562c59606 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPoint.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmInteractionPoint.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.logistics.block.mechanicalArm;
+package com.simibubi.create.content.kinetics.mechanicalArm;
 
 import javax.annotation.Nullable;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.StructureTransform;
+import com.simibubi.create.content.contraptions.StructureTransform;
 import com.simibubi.create.foundation.utility.NBTHelper;
 import com.simibubi.create.foundation.utility.VecHelper;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPointHandler.java b/src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmInteractionPointHandler.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPointHandler.java
rename to src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmInteractionPointHandler.java
index 36b446700..24cf515be 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPointHandler.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmInteractionPointHandler.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.mechanicalArm;
+package com.simibubi.create.content.kinetics.mechanicalArm;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -7,9 +7,9 @@ import java.util.List;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.CreateClient;
-import com.simibubi.create.content.logistics.block.mechanicalArm.ArmInteractionPoint.Mode;
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.content.kinetics.mechanicalArm.ArmInteractionPoint.Mode;
 import com.simibubi.create.foundation.utility.Lang;
 
 import net.minecraft.ChatFormatting;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPointType.java b/src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmInteractionPointType.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPointType.java
rename to src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmInteractionPointType.java
index 05a7fa3db..6e345f4c4 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPointType.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmInteractionPointType.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.mechanicalArm;
+package com.simibubi.create.content.kinetics.mechanicalArm;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmItem.java b/src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmItem.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmItem.java
rename to src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmItem.java
index 4a4043a5f..4754113e0 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmItem.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmItem.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.mechanicalArm;
+package com.simibubi.create.content.kinetics.mechanicalArm;
 
 import com.simibubi.create.foundation.networking.AllPackets;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmPlacementPacket.java b/src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmPlacementPacket.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmPlacementPacket.java
rename to src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmPlacementPacket.java
index 7a69c3009..d5c053b80 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmPlacementPacket.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmPlacementPacket.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.mechanicalArm;
+package com.simibubi.create.content.kinetics.mechanicalArm;
 
 import java.util.Collection;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmRenderer.java b/src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmRenderer.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmRenderer.java
rename to src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmRenderer.java
index a7f19ce46..429cefa25 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmRenderer.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmRenderer.java
@@ -1,12 +1,12 @@
-package com.simibubi.create.content.logistics.block.mechanicalArm;
+package com.simibubi.create.content.kinetics.mechanicalArm;
 
 import com.jozufozu.flywheel.backend.Backend;
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityRenderer;
-import com.simibubi.create.content.logistics.block.mechanicalArm.ArmBlockEntity.Phase;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
+import com.simibubi.create.content.kinetics.mechanicalArm.ArmBlockEntity.Phase;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/millstone/MillingRecipe.java b/src/main/java/com/simibubi/create/content/kinetics/millstone/MillingRecipe.java
similarity index 69%
rename from src/main/java/com/simibubi/create/content/contraptions/components/millstone/MillingRecipe.java
rename to src/main/java/com/simibubi/create/content/kinetics/millstone/MillingRecipe.java
index 849154b04..9c3f836f1 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/millstone/MillingRecipe.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/millstone/MillingRecipe.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.contraptions.components.millstone;
+package com.simibubi.create.content.kinetics.millstone;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
 import com.simibubi.create.AllRecipeTypes;
-import com.simibubi.create.content.contraptions.components.crusher.AbstractCrushingRecipe;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipeBuilder.ProcessingRecipeParams;
+import com.simibubi.create.content.kinetics.crusher.AbstractCrushingRecipe;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder.ProcessingRecipeParams;
 
 import net.minecraft.world.level.Level;
 import net.minecraftforge.items.wrapper.RecipeWrapper;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/millstone/MillstoneBlock.java b/src/main/java/com/simibubi/create/content/kinetics/millstone/MillstoneBlock.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/components/millstone/MillstoneBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/millstone/MillstoneBlock.java
index c096398f9..9d28f3124 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/millstone/MillstoneBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/millstone/MillstoneBlock.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.contraptions.components.millstone;
+package com.simibubi.create.content.kinetics.millstone;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.base.KineticBlock;
-import com.simibubi.create.content.contraptions.relays.elementary.ICogWheel;
+import com.simibubi.create.content.kinetics.base.KineticBlock;
+import com.simibubi.create.content.kinetics.simpleRelays.ICogWheel;
 import com.simibubi.create.foundation.block.IBE;
 import com.simibubi.create.foundation.utility.Iterate;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/millstone/MillstoneBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/millstone/MillstoneBlockEntity.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/components/millstone/MillstoneBlockEntity.java
rename to src/main/java/com/simibubi/create/content/kinetics/millstone/MillstoneBlockEntity.java
index cc7daff40..2b3e5bcaa 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/millstone/MillstoneBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/millstone/MillstoneBlockEntity.java
@@ -1,13 +1,13 @@
-package com.simibubi.create.content.contraptions.components.millstone;
+package com.simibubi.create.content.kinetics.millstone;
 
 import java.util.List;
 import java.util.Optional;
 
 import com.simibubi.create.AllRecipeTypes;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.belt.behaviour.DirectBeltInputBehaviour;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.DirectBeltInputBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.item.ItemHelper;
 import com.simibubi.create.foundation.sound.SoundScapes;
 import com.simibubi.create.foundation.sound.SoundScapes.AmbienceGroup;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/millstone/MillstoneCogInstance.java b/src/main/java/com/simibubi/create/content/kinetics/millstone/MillstoneCogInstance.java
similarity index 71%
rename from src/main/java/com/simibubi/create/content/contraptions/components/millstone/MillstoneCogInstance.java
rename to src/main/java/com/simibubi/create/content/kinetics/millstone/MillstoneCogInstance.java
index f7068defd..545ebe8d2 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/millstone/MillstoneCogInstance.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/millstone/MillstoneCogInstance.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.contraptions.components.millstone;
+package com.simibubi.create.content.kinetics.millstone;
 
 import com.jozufozu.flywheel.api.Instancer;
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.base.SingleRotatingInstance;
-import com.simibubi.create.content.contraptions.base.flwdata.RotatingData;
+import com.simibubi.create.content.kinetics.base.SingleRotatingInstance;
+import com.simibubi.create.content.kinetics.base.flwdata.RotatingData;
 
 public class MillstoneCogInstance extends SingleRotatingInstance<MillstoneBlockEntity> {
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/millstone/MillstoneRenderer.java b/src/main/java/com/simibubi/create/content/kinetics/millstone/MillstoneRenderer.java
similarity index 81%
rename from src/main/java/com/simibubi/create/content/contraptions/components/millstone/MillstoneRenderer.java
rename to src/main/java/com/simibubi/create/content/kinetics/millstone/MillstoneRenderer.java
index 76fdf0c03..5f3f344da 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/millstone/MillstoneRenderer.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/millstone/MillstoneRenderer.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.content.contraptions.components.millstone;
+package com.simibubi.create.content.kinetics.millstone;
 
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityRenderer;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 
diff --git a/src/main/java/com/simibubi/create/content/kinetics/mixer/CompactingRecipe.java b/src/main/java/com/simibubi/create/content/kinetics/mixer/CompactingRecipe.java
new file mode 100644
index 000000000..b099bab9a
--- /dev/null
+++ b/src/main/java/com/simibubi/create/content/kinetics/mixer/CompactingRecipe.java
@@ -0,0 +1,13 @@
+package com.simibubi.create.content.kinetics.mixer;
+
+import com.simibubi.create.AllRecipeTypes;
+import com.simibubi.create.content.processing.basin.BasinRecipe;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder.ProcessingRecipeParams;
+
+public class CompactingRecipe extends BasinRecipe {
+
+	public CompactingRecipe(ProcessingRecipeParams params) {
+		super(AllRecipeTypes.COMPACTING, params);
+	}
+
+}
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/mixer/MechanicalMixerBlock.java b/src/main/java/com/simibubi/create/content/kinetics/mixer/MechanicalMixerBlock.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/components/mixer/MechanicalMixerBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/mixer/MechanicalMixerBlock.java
index adee81414..62d987084 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/mixer/MechanicalMixerBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/mixer/MechanicalMixerBlock.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.contraptions.components.mixer;
+package com.simibubi.create.content.kinetics.mixer;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.base.KineticBlock;
-import com.simibubi.create.content.contraptions.relays.elementary.ICogWheel;
+import com.simibubi.create.content.kinetics.base.KineticBlock;
+import com.simibubi.create.content.kinetics.simpleRelays.ICogWheel;
 import com.simibubi.create.foundation.block.IBE;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/mixer/MechanicalMixerBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/mixer/MechanicalMixerBlockEntity.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/components/mixer/MechanicalMixerBlockEntity.java
rename to src/main/java/com/simibubi/create/content/kinetics/mixer/MechanicalMixerBlockEntity.java
index f609ba6c9..b5f6454ad 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/mixer/MechanicalMixerBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/mixer/MechanicalMixerBlockEntity.java
@@ -1,26 +1,26 @@
-package com.simibubi.create.content.contraptions.components.mixer;
+package com.simibubi.create.content.kinetics.mixer;
 
 import java.util.List;
 import java.util.Optional;
 
 import com.simibubi.create.AllRecipeTypes;
 import com.simibubi.create.AllSoundEvents;
-import com.simibubi.create.content.contraptions.components.press.MechanicalPressBlockEntity;
-import com.simibubi.create.content.contraptions.fluids.FluidFX;
-import com.simibubi.create.content.contraptions.fluids.recipe.PotionMixingRecipes;
-import com.simibubi.create.content.contraptions.processing.BasinBlockEntity;
-import com.simibubi.create.content.contraptions.processing.BasinOperatingBlockEntity;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipe;
+import com.simibubi.create.content.fluids.FluidFX;
+import com.simibubi.create.content.fluids.potion.PotionMixingRecipes;
+import com.simibubi.create.content.kinetics.press.MechanicalPressBlockEntity;
+import com.simibubi.create.content.processing.basin.BasinBlockEntity;
+import com.simibubi.create.content.processing.basin.BasinOperatingBlockEntity;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipe;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
 import com.simibubi.create.foundation.advancement.CreateAdvancement;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour.TankSegment;
-import com.simibubi.create.foundation.config.AllConfigs;
 import com.simibubi.create.foundation.item.SmartInventory;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.VecHelper;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction.Axis;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/mixer/MechanicalMixerRenderer.java b/src/main/java/com/simibubi/create/content/kinetics/mixer/MechanicalMixerRenderer.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/components/mixer/MechanicalMixerRenderer.java
rename to src/main/java/com/simibubi/create/content/kinetics/mixer/MechanicalMixerRenderer.java
index 4eddd1678..c5ebf0c3d 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/mixer/MechanicalMixerRenderer.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/mixer/MechanicalMixerRenderer.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.contraptions.components.mixer;
+package com.simibubi.create.content.kinetics.mixer;
 
 import com.jozufozu.flywheel.backend.Backend;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityRenderer;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/mixer/MixerInstance.java b/src/main/java/com/simibubi/create/content/kinetics/mixer/MixerInstance.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/components/mixer/MixerInstance.java
rename to src/main/java/com/simibubi/create/content/kinetics/mixer/MixerInstance.java
index d08938f5e..fae937070 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/mixer/MixerInstance.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/mixer/MixerInstance.java
@@ -1,12 +1,12 @@
-package com.simibubi.create.content.contraptions.components.mixer;
+package com.simibubi.create.content.kinetics.mixer;
 
 import com.jozufozu.flywheel.api.Instancer;
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.jozufozu.flywheel.api.instance.DynamicInstance;
 import com.jozufozu.flywheel.core.materials.oriented.OrientedData;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.base.flwdata.RotatingData;
-import com.simibubi.create.content.contraptions.relays.encased.EncasedCogInstance;
+import com.simibubi.create.content.kinetics.base.flwdata.RotatingData;
+import com.simibubi.create.content.kinetics.simpleRelays.encased.EncasedCogInstance;
 import com.simibubi.create.foundation.render.AllMaterialSpecs;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 
diff --git a/src/main/java/com/simibubi/create/content/kinetics/mixer/MixingRecipe.java b/src/main/java/com/simibubi/create/content/kinetics/mixer/MixingRecipe.java
new file mode 100644
index 000000000..b7fcdd799
--- /dev/null
+++ b/src/main/java/com/simibubi/create/content/kinetics/mixer/MixingRecipe.java
@@ -0,0 +1,13 @@
+package com.simibubi.create.content.kinetics.mixer;
+
+import com.simibubi.create.AllRecipeTypes;
+import com.simibubi.create.content.processing.basin.BasinRecipe;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder.ProcessingRecipeParams;
+
+public class MixingRecipe extends BasinRecipe {
+
+	public MixingRecipe(ProcessingRecipeParams params) {
+		super(AllRecipeTypes.MIXING, params);
+	}
+
+}
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/motor/CreativeMotorBlock.java b/src/main/java/com/simibubi/create/content/kinetics/motor/CreativeMotorBlock.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/components/motor/CreativeMotorBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/motor/CreativeMotorBlock.java
index cff2125e4..caa6dcfb5 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/motor/CreativeMotorBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/motor/CreativeMotorBlock.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.contraptions.components.motor;
+package com.simibubi.create.content.kinetics.motor;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.base.DirectionalKineticBlock;
+import com.simibubi.create.content.kinetics.base.DirectionalKineticBlock;
 import com.simibubi.create.foundation.block.IBE;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/motor/CreativeMotorBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/motor/CreativeMotorBlockEntity.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/components/motor/CreativeMotorBlockEntity.java
rename to src/main/java/com/simibubi/create/content/kinetics/motor/CreativeMotorBlockEntity.java
index a352dfae5..b18cf5257 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/motor/CreativeMotorBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/motor/CreativeMotorBlockEntity.java
@@ -1,14 +1,14 @@
-package com.simibubi.create.content.contraptions.components.motor;
+package com.simibubi.create.content.kinetics.motor;
 
 import java.util.List;
 
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.base.GeneratingKineticBlockEntity;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.kinetics.base.GeneratingKineticBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform;
-import com.simibubi.create.foundation.blockEntity.behaviour.scrollvalue.ScrollValueBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollValueBehaviour;
 import com.simibubi.create.foundation.utility.AngleHelper;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.VecHelper;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/motor/CreativeMotorGenerator.java b/src/main/java/com/simibubi/create/content/kinetics/motor/CreativeMotorGenerator.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/components/motor/CreativeMotorGenerator.java
rename to src/main/java/com/simibubi/create/content/kinetics/motor/CreativeMotorGenerator.java
index f774f4035..d62a2bbbe 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/motor/CreativeMotorGenerator.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/motor/CreativeMotorGenerator.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.motor;
+package com.simibubi.create.content.kinetics.motor;
 
 import com.simibubi.create.foundation.data.AssetLookup;
 import com.simibubi.create.foundation.data.SpecialBlockStateGen;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/motor/CreativeMotorRenderer.java b/src/main/java/com/simibubi/create/content/kinetics/motor/CreativeMotorRenderer.java
similarity index 82%
rename from src/main/java/com/simibubi/create/content/contraptions/components/motor/CreativeMotorRenderer.java
rename to src/main/java/com/simibubi/create/content/kinetics/motor/CreativeMotorRenderer.java
index e230eb55d..452d088ef 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/motor/CreativeMotorRenderer.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/motor/CreativeMotorRenderer.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.content.contraptions.components.motor;
+package com.simibubi.create.content.kinetics.motor;
 
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityRenderer;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/motor/KineticScrollValueBehaviour.java b/src/main/java/com/simibubi/create/content/kinetics/motor/KineticScrollValueBehaviour.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/components/motor/KineticScrollValueBehaviour.java
rename to src/main/java/com/simibubi/create/content/kinetics/motor/KineticScrollValueBehaviour.java
index 9befe0640..bced99bc8 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/motor/KineticScrollValueBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/motor/KineticScrollValueBehaviour.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.contraptions.components.motor;
+package com.simibubi.create.content.kinetics.motor;
 
 import com.google.common.collect.ImmutableList;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsBoard;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsFormatter;
-import com.simibubi.create.foundation.blockEntity.behaviour.scrollvalue.ScrollValueBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollValueBehaviour;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Lang;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/press/BeltPressingCallbacks.java b/src/main/java/com/simibubi/create/content/kinetics/press/BeltPressingCallbacks.java
similarity index 70%
rename from src/main/java/com/simibubi/create/content/contraptions/components/press/BeltPressingCallbacks.java
rename to src/main/java/com/simibubi/create/content/kinetics/press/BeltPressingCallbacks.java
index 6ea621e91..900aab84b 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/press/BeltPressingCallbacks.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/press/BeltPressingCallbacks.java
@@ -1,19 +1,19 @@
-package com.simibubi.create.content.contraptions.components.press;
+package com.simibubi.create.content.kinetics.press;
 
-import static com.simibubi.create.foundation.blockEntity.behaviour.belt.BeltProcessingBehaviour.ProcessingResult.HOLD;
-import static com.simibubi.create.foundation.blockEntity.behaviour.belt.BeltProcessingBehaviour.ProcessingResult.PASS;
+import static com.simibubi.create.content.kinetics.belt.behaviour.BeltProcessingBehaviour.ProcessingResult.HOLD;
+import static com.simibubi.create.content.kinetics.belt.behaviour.BeltProcessingBehaviour.ProcessingResult.PASS;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
 import com.simibubi.create.Create;
-import com.simibubi.create.content.contraptions.components.press.PressingBehaviour.Mode;
-import com.simibubi.create.content.contraptions.relays.belt.BeltHelper;
-import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.BeltProcessingBehaviour.ProcessingResult;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.TransportedItemStackHandlerBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.TransportedItemStackHandlerBehaviour.TransportedResult;
+import com.simibubi.create.content.kinetics.belt.BeltHelper;
+import com.simibubi.create.content.kinetics.belt.behaviour.BeltProcessingBehaviour.ProcessingResult;
+import com.simibubi.create.content.kinetics.belt.behaviour.TransportedItemStackHandlerBehaviour;
+import com.simibubi.create.content.kinetics.belt.behaviour.TransportedItemStackHandlerBehaviour.TransportedResult;
+import com.simibubi.create.content.kinetics.belt.transport.TransportedItemStack;
+import com.simibubi.create.content.kinetics.press.PressingBehaviour.Mode;
 
 import net.minecraft.world.item.ItemStack;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/press/MechanicalPressBlock.java b/src/main/java/com/simibubi/create/content/kinetics/press/MechanicalPressBlock.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/components/press/MechanicalPressBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/press/MechanicalPressBlock.java
index 5b1bfeb03..a95142162 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/press/MechanicalPressBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/press/MechanicalPressBlock.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.contraptions.components.press;
+package com.simibubi.create.content.kinetics.press;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.base.HorizontalKineticBlock;
+import com.simibubi.create.content.kinetics.base.HorizontalKineticBlock;
 import com.simibubi.create.foundation.block.IBE;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/press/MechanicalPressBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/press/MechanicalPressBlockEntity.java
similarity index 86%
rename from src/main/java/com/simibubi/create/content/contraptions/components/press/MechanicalPressBlockEntity.java
rename to src/main/java/com/simibubi/create/content/kinetics/press/MechanicalPressBlockEntity.java
index 3e38d233d..45fda1df0 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/press/MechanicalPressBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/press/MechanicalPressBlockEntity.java
@@ -1,26 +1,26 @@
-package com.simibubi.create.content.contraptions.components.press;
+package com.simibubi.create.content.kinetics.press;
 
 import java.util.List;
 import java.util.Optional;
 
 import com.simibubi.create.AllRecipeTypes;
 import com.simibubi.create.AllTags;
-import com.simibubi.create.content.contraptions.components.crafter.MechanicalCraftingRecipe;
-import com.simibubi.create.content.contraptions.components.press.PressingBehaviour.Mode;
-import com.simibubi.create.content.contraptions.components.press.PressingBehaviour.PressingBehaviourSpecifics;
-import com.simibubi.create.content.contraptions.itemAssembly.SequencedAssemblyRecipe;
-import com.simibubi.create.content.contraptions.processing.BasinBlockEntity;
-import com.simibubi.create.content.contraptions.processing.BasinOperatingBlockEntity;
-import com.simibubi.create.content.contraptions.processing.InWorldProcessing;
-import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack;
+import com.simibubi.create.content.kinetics.belt.transport.TransportedItemStack;
+import com.simibubi.create.content.kinetics.crafter.MechanicalCraftingRecipe;
+import com.simibubi.create.content.kinetics.press.PressingBehaviour.Mode;
+import com.simibubi.create.content.kinetics.press.PressingBehaviour.PressingBehaviourSpecifics;
+import com.simibubi.create.content.processing.basin.BasinBlockEntity;
+import com.simibubi.create.content.processing.basin.BasinOperatingBlockEntity;
+import com.simibubi.create.content.processing.sequenced.SequencedAssemblyRecipe;
 import com.simibubi.create.foundation.advancement.AdvancementBehaviour;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
 import com.simibubi.create.foundation.advancement.CreateAdvancement;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
-import com.simibubi.create.foundation.config.AllConfigs;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.item.ItemHelper;
 import com.simibubi.create.foundation.item.SmartInventory;
+import com.simibubi.create.foundation.recipe.RecipeApplier;
 import com.simibubi.create.foundation.utility.VecHelper;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.NonNullList;
@@ -124,11 +124,11 @@ public class MechanicalPressBlockEntity extends BasinOperatingBlockEntity implem
 		ItemStack itemCreated = ItemStack.EMPTY;
 		pressingBehaviour.particleItems.add(item);
 		if (canProcessInBulk() || item.getCount() == 1) {
-			InWorldProcessing.applyRecipeOn(itemEntity, recipe.get());
+			RecipeApplier.applyRecipeOn(itemEntity, recipe.get());
 			itemCreated = itemEntity.getItem()
 				.copy();
 		} else {
-			for (ItemStack result : InWorldProcessing.applyRecipeOn(ItemHandlerHelper.copyStackWithSize(item, 1),
+			for (ItemStack result : RecipeApplier.applyRecipeOn(ItemHandlerHelper.copyStackWithSize(item, 1),
 				recipe.get())) {
 				if (itemCreated.isEmpty())
 					itemCreated = result.copy();
@@ -154,7 +154,7 @@ public class MechanicalPressBlockEntity extends BasinOperatingBlockEntity implem
 		if (simulate)
 			return true;
 		pressingBehaviour.particleItems.add(input.stack);
-		List<ItemStack> outputs = InWorldProcessing.applyRecipeOn(
+		List<ItemStack> outputs = RecipeApplier.applyRecipeOn(
 			canProcessInBulk() ? input.stack : ItemHandlerHelper.copyStackWithSize(input.stack, 1), recipe.get());
 
 		for (ItemStack created : outputs) {
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/press/MechanicalPressRenderer.java b/src/main/java/com/simibubi/create/content/kinetics/press/MechanicalPressRenderer.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/components/press/MechanicalPressRenderer.java
rename to src/main/java/com/simibubi/create/content/kinetics/press/MechanicalPressRenderer.java
index 57bfad923..e6f1ef4ab 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/press/MechanicalPressRenderer.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/press/MechanicalPressRenderer.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.contraptions.components.press;
+package com.simibubi.create.content.kinetics.press;
 
 import static net.minecraft.world.level.block.state.properties.BlockStateProperties.HORIZONTAL_FACING;
 
 import com.jozufozu.flywheel.backend.Backend;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityRenderer;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/press/PressInstance.java b/src/main/java/com/simibubi/create/content/kinetics/press/PressInstance.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/components/press/PressInstance.java
rename to src/main/java/com/simibubi/create/content/kinetics/press/PressInstance.java
index 05f025f39..3bdc659af 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/press/PressInstance.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/press/PressInstance.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.press;
+package com.simibubi.create.content.kinetics.press;
 
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.jozufozu.flywheel.api.instance.DynamicInstance;
@@ -7,7 +7,7 @@ import com.jozufozu.flywheel.core.materials.oriented.OrientedData;
 import com.mojang.math.Quaternion;
 import com.mojang.math.Vector3f;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.relays.encased.ShaftInstance;
+import com.simibubi.create.content.kinetics.base.ShaftInstance;
 import com.simibubi.create.foundation.utility.AngleHelper;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/press/PressingBehaviour.java b/src/main/java/com/simibubi/create/content/kinetics/press/PressingBehaviour.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/components/press/PressingBehaviour.java
rename to src/main/java/com/simibubi/create/content/kinetics/press/PressingBehaviour.java
index 55e5a133e..38200d4d4 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/press/PressingBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/press/PressingBehaviour.java
@@ -1,15 +1,15 @@
-package com.simibubi.create.content.contraptions.components.press;
+package com.simibubi.create.content.kinetics.press;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllSoundEvents;
-import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.kinetics.belt.behaviour.BeltProcessingBehaviour;
+import com.simibubi.create.content.kinetics.belt.behaviour.TransportedItemStackHandlerBehaviour;
+import com.simibubi.create.content.kinetics.belt.transport.TransportedItemStack;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.BeltProcessingBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.TransportedItemStackHandlerBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.NBTHelper;
 import com.simibubi.create.foundation.utility.VecHelper;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/press/PressingRecipe.java b/src/main/java/com/simibubi/create/content/kinetics/press/PressingRecipe.java
similarity index 83%
rename from src/main/java/com/simibubi/create/content/contraptions/components/press/PressingRecipe.java
rename to src/main/java/com/simibubi/create/content/kinetics/press/PressingRecipe.java
index 4ecff8535..5c6f8c521 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/press/PressingRecipe.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/press/PressingRecipe.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.press;
+package com.simibubi.create.content.kinetics.press;
 
 import java.util.List;
 import java.util.Set;
@@ -9,9 +9,9 @@ import javax.annotation.ParametersAreNonnullByDefault;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllRecipeTypes;
 import com.simibubi.create.compat.jei.category.sequencedAssembly.SequencedAssemblySubCategory;
-import com.simibubi.create.content.contraptions.itemAssembly.IAssemblyRecipe;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipe;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipeBuilder.ProcessingRecipeParams;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipe;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder.ProcessingRecipeParams;
+import com.simibubi.create.content.processing.sequenced.IAssemblyRecipe;
 import com.simibubi.create.foundation.utility.Lang;
 
 import net.minecraft.network.chat.Component;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/saw/CuttingRecipe.java b/src/main/java/com/simibubi/create/content/kinetics/saw/CuttingRecipe.java
similarity index 84%
rename from src/main/java/com/simibubi/create/content/contraptions/components/saw/CuttingRecipe.java
rename to src/main/java/com/simibubi/create/content/kinetics/saw/CuttingRecipe.java
index 2c6c50c6d..11280224f 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/saw/CuttingRecipe.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/saw/CuttingRecipe.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.saw;
+package com.simibubi.create.content.kinetics.saw;
 
 import java.util.List;
 import java.util.Set;
@@ -9,9 +9,9 @@ import javax.annotation.ParametersAreNonnullByDefault;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllRecipeTypes;
 import com.simibubi.create.compat.jei.category.sequencedAssembly.SequencedAssemblySubCategory;
-import com.simibubi.create.content.contraptions.itemAssembly.IAssemblyRecipe;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipe;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipeBuilder.ProcessingRecipeParams;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipe;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder.ProcessingRecipeParams;
+import com.simibubi.create.content.processing.sequenced.IAssemblyRecipe;
 import com.simibubi.create.foundation.utility.Lang;
 
 import net.minecraft.network.chat.Component;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawBlock.java b/src/main/java/com/simibubi/create/content/kinetics/saw/SawBlock.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/components/saw/SawBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/saw/SawBlock.java
index 99a321ee7..d7bcabb60 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/saw/SawBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.saw;
+package com.simibubi.create.content.kinetics.saw;
 
 import java.util.List;
 import java.util.function.Predicate;
@@ -8,12 +8,12 @@ import javax.annotation.ParametersAreNonnullByDefault;
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.base.DirectionalAxisKineticBlock;
-import com.simibubi.create.content.contraptions.components.actors.DrillBlock;
+import com.simibubi.create.content.kinetics.base.DirectionalAxisKineticBlock;
+import com.simibubi.create.content.kinetics.drill.DrillBlock;
 import com.simibubi.create.foundation.block.IBE;
-import com.simibubi.create.foundation.utility.placement.IPlacementHelper;
-import com.simibubi.create.foundation.utility.placement.PlacementHelpers;
-import com.simibubi.create.foundation.utility.placement.PlacementOffset;
+import com.simibubi.create.foundation.placement.IPlacementHelper;
+import com.simibubi.create.foundation.placement.PlacementHelpers;
+import com.simibubi.create.foundation.placement.PlacementOffset;
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/saw/SawBlockEntity.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/components/saw/SawBlockEntity.java
rename to src/main/java/com/simibubi/create/content/kinetics/saw/SawBlockEntity.java
index 57bca8c82..05cde3dea 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/saw/SawBlockEntity.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.saw;
+package com.simibubi.create.content.kinetics.saw;
 
 import java.util.ArrayList;
 import java.util.LinkedList;
@@ -14,20 +14,20 @@ import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableList;
 import com.simibubi.create.AllRecipeTypes;
 import com.simibubi.create.AllSoundEvents;
-import com.simibubi.create.content.contraptions.components.actors.BlockBreakingKineticBlockEntity;
-import com.simibubi.create.content.contraptions.itemAssembly.SequencedAssemblyRecipe;
-import com.simibubi.create.content.contraptions.processing.ProcessingInventory;
+import com.simibubi.create.content.kinetics.base.BlockBreakingKineticBlockEntity;
+import com.simibubi.create.content.kinetics.belt.behaviour.DirectBeltInputBehaviour;
+import com.simibubi.create.content.processing.recipe.ProcessingInventory;
+import com.simibubi.create.content.processing.sequenced.SequencedAssemblyRecipe;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.DirectBeltInputBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour;
-import com.simibubi.create.foundation.config.AllConfigs;
 import com.simibubi.create.foundation.item.ItemHelper;
+import com.simibubi.create.foundation.recipe.RecipeConditions;
+import com.simibubi.create.foundation.recipe.RecipeFinder;
 import com.simibubi.create.foundation.utility.AbstractBlockBreakQueue;
 import com.simibubi.create.foundation.utility.TreeCutter;
 import com.simibubi.create.foundation.utility.VecHelper;
-import com.simibubi.create.foundation.utility.recipe.RecipeConditions;
-import com.simibubi.create.foundation.utility.recipe.RecipeFinder;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawFilterSlot.java b/src/main/java/com/simibubi/create/content/kinetics/saw/SawFilterSlot.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/components/saw/SawFilterSlot.java
rename to src/main/java/com/simibubi/create/content/kinetics/saw/SawFilterSlot.java
index 17420b93b..ceb9495d3 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawFilterSlot.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/saw/SawFilterSlot.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.saw;
+package com.simibubi.create.content.kinetics.saw;
 
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawGenerator.java b/src/main/java/com/simibubi/create/content/kinetics/saw/SawGenerator.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/components/saw/SawGenerator.java
rename to src/main/java/com/simibubi/create/content/kinetics/saw/SawGenerator.java
index ac61dbb9b..90e90dfb1 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawGenerator.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/saw/SawGenerator.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.saw;
+package com.simibubi.create.content.kinetics.saw;
 
 import com.simibubi.create.foundation.data.SpecialBlockStateGen;
 import com.tterrag.registrate.providers.DataGenContext;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawInstance.java b/src/main/java/com/simibubi/create/content/kinetics/saw/SawInstance.java
similarity index 83%
rename from src/main/java/com/simibubi/create/content/contraptions/components/saw/SawInstance.java
rename to src/main/java/com/simibubi/create/content/kinetics/saw/SawInstance.java
index ec9436296..9f0662d19 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawInstance.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/saw/SawInstance.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.contraptions.components.saw;
+package com.simibubi.create.content.kinetics.saw;
 
 import com.jozufozu.flywheel.api.Instancer;
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.base.SingleRotatingInstance;
-import com.simibubi.create.content.contraptions.base.flwdata.RotatingData;
+import com.simibubi.create.content.kinetics.base.SingleRotatingInstance;
+import com.simibubi.create.content.kinetics.base.flwdata.RotatingData;
 
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.Rotation;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/SawMovementBehaviour.java b/src/main/java/com/simibubi/create/content/kinetics/saw/SawMovementBehaviour.java
similarity index 88%
rename from src/main/java/com/simibubi/create/content/contraptions/components/actors/SawMovementBehaviour.java
rename to src/main/java/com/simibubi/create/content/kinetics/saw/SawMovementBehaviour.java
index 563042854..77dee7634 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/SawMovementBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/saw/SawMovementBehaviour.java
@@ -1,13 +1,11 @@
-package com.simibubi.create.content.contraptions.components.actors;
+package com.simibubi.create.content.kinetics.saw;
 
 import java.util.Optional;
 
 import com.jozufozu.flywheel.core.virtual.VirtualRenderWorld;
-import com.simibubi.create.content.contraptions.components.saw.SawBlock;
-import com.simibubi.create.content.contraptions.components.saw.SawBlockEntity;
-import com.simibubi.create.content.contraptions.components.saw.SawRenderer;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionMatrices;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
+import com.simibubi.create.content.contraptions.render.ContraptionMatrices;
+import com.simibubi.create.content.kinetics.base.BlockBreakingMovementBehaviour;
 import com.simibubi.create.foundation.utility.AbstractBlockBreakQueue;
 import com.simibubi.create.foundation.utility.TreeCutter;
 import com.simibubi.create.foundation.utility.VecHelper;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawRenderer.java b/src/main/java/com/simibubi/create/content/kinetics/saw/SawRenderer.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/components/saw/SawRenderer.java
rename to src/main/java/com/simibubi/create/content/kinetics/saw/SawRenderer.java
index 1c309c875..926b7332a 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawRenderer.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/saw/SawRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.saw;
+package com.simibubi.create.content.kinetics.saw;
 
 import static net.minecraft.world.level.block.state.properties.BlockStateProperties.FACING;
 
@@ -8,11 +8,11 @@ import com.jozufozu.flywheel.core.virtual.VirtualRenderWorld;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Vector3f;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityRenderer;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionMatrices;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionRenderDispatcher;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
+import com.simibubi.create.content.contraptions.render.ContraptionMatrices;
+import com.simibubi.create.content.contraptions.render.ContraptionRenderDispatcher;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
 import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringRenderer;
 import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer;
 import com.simibubi.create.foundation.render.CachedBufferer;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/AbstractShaftBlock.java b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/AbstractShaftBlock.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/elementary/AbstractShaftBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/simpleRelays/AbstractShaftBlock.java
index ec83a6015..cca9ba71c 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/AbstractShaftBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/AbstractShaftBlock.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.content.contraptions.relays.elementary;
+package com.simibubi.create.content.kinetics.simpleRelays;
 
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.base.RotatedPillarKineticBlock;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.base.RotatedPillarKineticBlock;
 import com.simibubi.create.foundation.block.IBE;
 import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/AbstractSimpleShaftBlock.java b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/AbstractSimpleShaftBlock.java
similarity index 84%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/elementary/AbstractSimpleShaftBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/simpleRelays/AbstractSimpleShaftBlock.java
index f22ebaad2..d4ad89d44 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/AbstractSimpleShaftBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/AbstractSimpleShaftBlock.java
@@ -1,11 +1,12 @@
-package com.simibubi.create.content.contraptions.relays.elementary;
+package com.simibubi.create.content.kinetics.simpleRelays;
 
 import java.util.Optional;
 
 import com.simibubi.create.AllBlockEntityTypes;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.wrench.IWrenchableWithBracket;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.decoration.bracket.BracketedBlockEntityBehaviour;
+import com.simibubi.create.content.equipment.wrench.IWrenchableWithBracket;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.InteractionResult;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/BracketedKineticBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/BracketedKineticBlockEntity.java
similarity index 71%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/elementary/BracketedKineticBlockEntity.java
rename to src/main/java/com/simibubi/create/content/kinetics/simpleRelays/BracketedKineticBlockEntity.java
index 44a0f33fe..ad1191d6d 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/BracketedKineticBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/BracketedKineticBlockEntity.java
@@ -1,10 +1,11 @@
-package com.simibubi.create.content.contraptions.relays.elementary;
+package com.simibubi.create.content.kinetics.simpleRelays;
 
 import java.util.List;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.ITransformableBlockEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.StructureTransform;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.contraptions.ITransformableBlockEntity;
+import com.simibubi.create.content.contraptions.StructureTransform;
+import com.simibubi.create.content.decoration.bracket.BracketedBlockEntityBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.entity.BlockEntityType;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/BracketedKineticBlockEntityInstance.java b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/BracketedKineticBlockEntityInstance.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/elementary/BracketedKineticBlockEntityInstance.java
rename to src/main/java/com/simibubi/create/content/kinetics/simpleRelays/BracketedKineticBlockEntityInstance.java
index af29e64d6..1a7da7d63 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/BracketedKineticBlockEntityInstance.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/BracketedKineticBlockEntityInstance.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.relays.elementary;
+package com.simibubi.create.content.kinetics.simpleRelays;
 
 import com.jozufozu.flywheel.api.Instancer;
 import com.jozufozu.flywheel.api.MaterialManager;
@@ -6,9 +6,9 @@ import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Vector3f;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityRenderer;
-import com.simibubi.create.content.contraptions.base.SingleRotatingInstance;
-import com.simibubi.create.content.contraptions.base.flwdata.RotatingData;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
+import com.simibubi.create.content.kinetics.base.SingleRotatingInstance;
+import com.simibubi.create.content.kinetics.base.flwdata.RotatingData;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/BracketedKineticBlockEntityRenderer.java b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/BracketedKineticBlockEntityRenderer.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/elementary/BracketedKineticBlockEntityRenderer.java
rename to src/main/java/com/simibubi/create/content/kinetics/simpleRelays/BracketedKineticBlockEntityRenderer.java
index 5084a0bce..cf6763950 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/BracketedKineticBlockEntityRenderer.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/BracketedKineticBlockEntityRenderer.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.contraptions.relays.elementary;
+package com.simibubi.create.content.kinetics.simpleRelays;
 
 import com.jozufozu.flywheel.backend.Backend;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityRenderer;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/BracketedKineticBlockModel.java b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/BracketedKineticBlockModel.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/elementary/BracketedKineticBlockModel.java
rename to src/main/java/com/simibubi/create/content/kinetics/simpleRelays/BracketedKineticBlockModel.java
index dc6b4c5a6..3716bc865 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/BracketedKineticBlockModel.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/BracketedKineticBlockModel.java
@@ -1,10 +1,11 @@
-package com.simibubi.create.content.contraptions.relays.elementary;
+package com.simibubi.create.content.kinetics.simpleRelays;
 
 import java.util.Collections;
 import java.util.List;
 
 import com.jozufozu.flywheel.core.model.ModelUtil;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.decoration.bracket.BracketedBlockEntityBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.RenderType;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/CogWheelBlock.java b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/CogWheelBlock.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/elementary/CogWheelBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/simpleRelays/CogWheelBlock.java
index 9a148dbca..7d13314af 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/CogWheelBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/CogWheelBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.relays.elementary;
+package com.simibubi.create.content.kinetics.simpleRelays;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
@@ -6,8 +6,9 @@ import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllCreativeModeTabs;
 import com.simibubi.create.AllItems;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.base.IRotate;
-import com.simibubi.create.content.contraptions.relays.advanced.SpeedControllerBlock;
+import com.simibubi.create.content.decoration.encasing.EncasableBlock;
+import com.simibubi.create.content.kinetics.base.IRotate;
+import com.simibubi.create.content.kinetics.speedController.SpeedControllerBlock;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
 import com.simibubi.create.foundation.utility.Iterate;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/CogwheelBlockItem.java b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/CogwheelBlockItem.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/elementary/CogwheelBlockItem.java
rename to src/main/java/com/simibubi/create/content/kinetics/simpleRelays/CogwheelBlockItem.java
index caabc7551..921d95748 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/CogwheelBlockItem.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/CogwheelBlockItem.java
@@ -1,19 +1,19 @@
-package com.simibubi.create.content.contraptions.relays.elementary;
+package com.simibubi.create.content.kinetics.simpleRelays;
 
-import static com.simibubi.create.content.contraptions.base.RotatedPillarKineticBlock.AXIS;
+import static com.simibubi.create.content.kinetics.base.RotatedPillarKineticBlock.AXIS;
 
 import java.util.List;
 import java.util.function.Predicate;
 
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.base.DirectionalKineticBlock;
-import com.simibubi.create.content.contraptions.base.HorizontalKineticBlock;
-import com.simibubi.create.content.contraptions.base.IRotate;
-import com.simibubi.create.content.contraptions.base.RotatedPillarKineticBlock;
+import com.simibubi.create.content.kinetics.base.DirectionalKineticBlock;
+import com.simibubi.create.content.kinetics.base.HorizontalKineticBlock;
+import com.simibubi.create.content.kinetics.base.IRotate;
+import com.simibubi.create.content.kinetics.base.RotatedPillarKineticBlock;
+import com.simibubi.create.foundation.placement.IPlacementHelper;
+import com.simibubi.create.foundation.placement.PlacementHelpers;
+import com.simibubi.create.foundation.placement.PlacementOffset;
 import com.simibubi.create.foundation.utility.Iterate;
-import com.simibubi.create.foundation.utility.placement.IPlacementHelper;
-import com.simibubi.create.foundation.utility.placement.PlacementHelpers;
-import com.simibubi.create.foundation.utility.placement.PlacementOffset;
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/ICogWheel.java b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/ICogWheel.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/elementary/ICogWheel.java
rename to src/main/java/com/simibubi/create/content/kinetics/simpleRelays/ICogWheel.java
index 619dbb390..b62373f6d 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/ICogWheel.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/ICogWheel.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.contraptions.relays.elementary;
+package com.simibubi.create.content.kinetics.simpleRelays;
 
-import com.simibubi.create.content.contraptions.base.IRotate;
+import com.simibubi.create.content.kinetics.base.IRotate;
 
 import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.item.Item;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/ShaftBlock.java b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/ShaftBlock.java
similarity index 88%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/elementary/ShaftBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/simpleRelays/ShaftBlock.java
index a0869d2a3..4a5686f49 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/ShaftBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/ShaftBlock.java
@@ -1,17 +1,18 @@
-package com.simibubi.create.content.contraptions.relays.elementary;
+package com.simibubi.create.content.kinetics.simpleRelays;
 
 import java.util.function.Predicate;
 
 import com.google.common.base.Predicates;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.components.steam.PoweredShaftBlock;
-import com.simibubi.create.content.curiosities.girder.GirderEncasedShaftBlock;
-import com.simibubi.create.foundation.utility.placement.IPlacementHelper;
-import com.simibubi.create.foundation.utility.placement.PlacementHelpers;
-import com.simibubi.create.foundation.utility.placement.PlacementOffset;
-import com.simibubi.create.foundation.utility.placement.util.PoleHelper;
+import com.simibubi.create.content.decoration.encasing.EncasableBlock;
+import com.simibubi.create.content.decoration.girder.GirderEncasedShaftBlock;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.steamEngine.PoweredShaftBlock;
+import com.simibubi.create.foundation.placement.IPlacementHelper;
+import com.simibubi.create.foundation.placement.PlacementHelpers;
+import com.simibubi.create.foundation.placement.PlacementOffset;
+import com.simibubi.create.foundation.placement.PoleHelper;
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/SimpleKineticBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/SimpleKineticBlockEntity.java
similarity index 83%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/elementary/SimpleKineticBlockEntity.java
rename to src/main/java/com/simibubi/create/content/kinetics/simpleRelays/SimpleKineticBlockEntity.java
index db53478a7..493b0f227 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/SimpleKineticBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/SimpleKineticBlockEntity.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.contraptions.relays.elementary;
+package com.simibubi.create.content.kinetics.simpleRelays;
 
 import java.util.List;
 
-import com.simibubi.create.content.contraptions.base.IRotate;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.base.IRotate;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.entity.BlockEntityType;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedCogCTBehaviour.java b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/encased/EncasedCogCTBehaviour.java
similarity index 89%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedCogCTBehaviour.java
rename to src/main/java/com/simibubi/create/content/kinetics/simpleRelays/encased/EncasedCogCTBehaviour.java
index bebb607d5..69ca1253b 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedCogCTBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/encased/EncasedCogCTBehaviour.java
@@ -1,11 +1,12 @@
-package com.simibubi.create.content.contraptions.relays.encased;
+package com.simibubi.create.content.kinetics.simpleRelays.encased;
 
-import static com.simibubi.create.content.contraptions.base.RotatedPillarKineticBlock.AXIS;
+import static com.simibubi.create.content.kinetics.base.RotatedPillarKineticBlock.AXIS;
 
 import org.jetbrains.annotations.Nullable;
 
-import com.simibubi.create.content.contraptions.base.IRotate;
-import com.simibubi.create.content.contraptions.relays.elementary.ICogWheel;
+import com.simibubi.create.content.decoration.encasing.EncasedCTBehaviour;
+import com.simibubi.create.content.kinetics.base.IRotate;
+import com.simibubi.create.content.kinetics.simpleRelays.ICogWheel;
 import com.simibubi.create.foundation.block.connected.CTSpriteShiftEntry;
 import com.simibubi.create.foundation.utility.Couple;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedCogInstance.java b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/encased/EncasedCogInstance.java
similarity index 88%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedCogInstance.java
rename to src/main/java/com/simibubi/create/content/kinetics/simpleRelays/encased/EncasedCogInstance.java
index f02553fc8..29d202d8c 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedCogInstance.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/encased/EncasedCogInstance.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.relays.encased;
+package com.simibubi.create.content.kinetics.simpleRelays.encased;
 
 import java.util.Optional;
 
@@ -10,11 +10,11 @@ import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Vector3f;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.base.IRotate;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityInstance;
-import com.simibubi.create.content.contraptions.base.flwdata.RotatingData;
-import com.simibubi.create.content.contraptions.relays.elementary.BracketedKineticBlockEntityRenderer;
+import com.simibubi.create.content.kinetics.base.IRotate;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityInstance;
+import com.simibubi.create.content.kinetics.base.flwdata.RotatingData;
+import com.simibubi.create.content.kinetics.simpleRelays.BracketedKineticBlockEntityRenderer;
 import com.simibubi.create.foundation.utility.Iterate;
 
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedCogRenderer.java b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/encased/EncasedCogRenderer.java
similarity index 87%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedCogRenderer.java
rename to src/main/java/com/simibubi/create/content/kinetics/simpleRelays/encased/EncasedCogRenderer.java
index 912c30024..8a03236a8 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedCogRenderer.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/encased/EncasedCogRenderer.java
@@ -1,12 +1,12 @@
-package com.simibubi.create.content.contraptions.relays.encased;
+package com.simibubi.create.content.kinetics.simpleRelays.encased;
 
 import com.jozufozu.flywheel.backend.Backend;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.base.IRotate;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityRenderer;
-import com.simibubi.create.content.contraptions.relays.elementary.BracketedKineticBlockEntityRenderer;
-import com.simibubi.create.content.contraptions.relays.elementary.SimpleKineticBlockEntity;
+import com.simibubi.create.content.kinetics.base.IRotate;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
+import com.simibubi.create.content.kinetics.simpleRelays.BracketedKineticBlockEntityRenderer;
+import com.simibubi.create.content.kinetics.simpleRelays.SimpleKineticBlockEntity;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.utility.Iterate;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedCogwheelBlock.java b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/encased/EncasedCogwheelBlock.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedCogwheelBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/simpleRelays/encased/EncasedCogwheelBlock.java
index 41561d4a4..ca350296d 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedCogwheelBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/encased/EncasedCogwheelBlock.java
@@ -1,20 +1,20 @@
-package com.simibubi.create.content.contraptions.relays.encased;
+package com.simibubi.create.content.kinetics.simpleRelays.encased;
 
 import java.util.function.Supplier;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.base.IRotate;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.base.RotatedPillarKineticBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.ITransformableBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.StructureTransform;
-import com.simibubi.create.content.contraptions.relays.elementary.CogWheelBlock;
-import com.simibubi.create.content.contraptions.relays.elementary.EncasedBlock;
-import com.simibubi.create.content.contraptions.relays.elementary.ICogWheel;
-import com.simibubi.create.content.contraptions.relays.elementary.SimpleKineticBlockEntity;
-import com.simibubi.create.content.schematics.ISpecialBlockItemRequirement;
-import com.simibubi.create.content.schematics.ItemRequirement;
+import com.simibubi.create.content.contraptions.ITransformableBlock;
+import com.simibubi.create.content.contraptions.StructureTransform;
+import com.simibubi.create.content.decoration.encasing.EncasedBlock;
+import com.simibubi.create.content.kinetics.base.IRotate;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.base.RotatedPillarKineticBlock;
+import com.simibubi.create.content.kinetics.simpleRelays.CogWheelBlock;
+import com.simibubi.create.content.kinetics.simpleRelays.ICogWheel;
+import com.simibubi.create.content.kinetics.simpleRelays.SimpleKineticBlockEntity;
+import com.simibubi.create.content.schematics.requirement.ISpecialBlockItemRequirement;
+import com.simibubi.create.content.schematics.requirement.ItemRequirement;
 import com.simibubi.create.foundation.block.IBE;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.VoxelShaper;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedShaftBlock.java b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/encased/EncasedShaftBlock.java
similarity index 85%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedShaftBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/simpleRelays/encased/EncasedShaftBlock.java
index 65457ac8b..26f7f65d1 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedShaftBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/encased/EncasedShaftBlock.java
@@ -1,14 +1,15 @@
-package com.simibubi.create.content.contraptions.relays.encased;
+package com.simibubi.create.content.kinetics.simpleRelays.encased;
 
 import java.util.function.Supplier;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.base.RotatedPillarKineticBlock;
-import com.simibubi.create.content.contraptions.relays.elementary.EncasedBlock;
-import com.simibubi.create.content.schematics.ISpecialBlockItemRequirement;
-import com.simibubi.create.content.schematics.ItemRequirement;
+import com.simibubi.create.content.decoration.encasing.EncasedBlock;
+import com.simibubi.create.content.kinetics.base.AbstractEncasedShaftBlock;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.base.RotatedPillarKineticBlock;
+import com.simibubi.create.content.schematics.requirement.ISpecialBlockItemRequirement;
+import com.simibubi.create.content.schematics.requirement.ItemRequirement;
 import com.simibubi.create.foundation.block.IBE;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerBlock.java b/src/main/java/com/simibubi/create/content/kinetics/speedController/SpeedControllerBlock.java
similarity index 88%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/speedController/SpeedControllerBlock.java
index 9e13cb44a..911951c6c 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/speedController/SpeedControllerBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.relays.advanced;
+package com.simibubi.create.content.kinetics.speedController;
 
 import java.util.function.Predicate;
 
@@ -7,13 +7,13 @@ import javax.annotation.ParametersAreNonnullByDefault;
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.base.HorizontalAxisKineticBlock;
-import com.simibubi.create.content.contraptions.relays.elementary.CogWheelBlock;
-import com.simibubi.create.content.contraptions.relays.elementary.ICogWheel;
+import com.simibubi.create.content.kinetics.base.HorizontalAxisKineticBlock;
+import com.simibubi.create.content.kinetics.simpleRelays.CogWheelBlock;
+import com.simibubi.create.content.kinetics.simpleRelays.ICogWheel;
 import com.simibubi.create.foundation.block.IBE;
-import com.simibubi.create.foundation.utility.placement.IPlacementHelper;
-import com.simibubi.create.foundation.utility.placement.PlacementHelpers;
-import com.simibubi.create.foundation.utility.placement.PlacementOffset;
+import com.simibubi.create.foundation.placement.IPlacementHelper;
+import com.simibubi.create.foundation.placement.PlacementHelpers;
+import com.simibubi.create.foundation.placement.PlacementOffset;
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/speedController/SpeedControllerBlockEntity.java
similarity index 89%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerBlockEntity.java
rename to src/main/java/com/simibubi/create/content/kinetics/speedController/SpeedControllerBlockEntity.java
index 80dd29b5b..b76ecf974 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/speedController/SpeedControllerBlockEntity.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.relays.advanced;
+package com.simibubi.create.content.kinetics.speedController;
 
 import java.util.List;
 
@@ -7,18 +7,18 @@ import org.jetbrains.annotations.Nullable;
 
 import com.simibubi.create.compat.computercraft.AbstractComputerBehaviour;
 import com.simibubi.create.compat.computercraft.ComputerCraftProxy;
-import com.simibubi.create.content.contraptions.RotationPropagator;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.components.motor.KineticScrollValueBehaviour;
-import com.simibubi.create.content.contraptions.relays.elementary.CogWheelBlock;
-import com.simibubi.create.content.contraptions.relays.elementary.ICogWheel;
+import com.simibubi.create.content.kinetics.RotationPropagator;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.motor.KineticScrollValueBehaviour;
+import com.simibubi.create.content.kinetics.simpleRelays.CogWheelBlock;
+import com.simibubi.create.content.kinetics.simpleRelays.ICogWheel;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform;
-import com.simibubi.create.foundation.blockEntity.behaviour.scrollvalue.ScrollValueBehaviour;
-import com.simibubi.create.foundation.config.AllConfigs;
+import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollValueBehaviour;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.VecHelper;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerRenderer.java b/src/main/java/com/simibubi/create/content/kinetics/speedController/SpeedControllerRenderer.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerRenderer.java
rename to src/main/java/com/simibubi/create/content/kinetics/speedController/SpeedControllerRenderer.java
index c30f9598e..a4a57086d 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerRenderer.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/speedController/SpeedControllerRenderer.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.contraptions.relays.advanced;
+package com.simibubi.create.content.kinetics.speedController;
 
 import com.jozufozu.flywheel.backend.Backend;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityRenderer;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
 import com.simibubi.create.foundation.blockEntity.renderer.SmartBlockEntityRenderer;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/steam/PoweredShaftBlock.java b/src/main/java/com/simibubi/create/content/kinetics/steamEngine/PoweredShaftBlock.java
similarity index 89%
rename from src/main/java/com/simibubi/create/content/contraptions/components/steam/PoweredShaftBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/steamEngine/PoweredShaftBlock.java
index 6eca2ec15..0e59ef17f 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/steam/PoweredShaftBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/steamEngine/PoweredShaftBlock.java
@@ -1,14 +1,14 @@
-package com.simibubi.create.content.contraptions.components.steam;
+package com.simibubi.create.content.kinetics.steamEngine;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.relays.elementary.AbstractShaftBlock;
-import com.simibubi.create.content.contraptions.relays.elementary.ShaftBlock;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.simpleRelays.AbstractShaftBlock;
+import com.simibubi.create.content.kinetics.simpleRelays.ShaftBlock;
+import com.simibubi.create.foundation.placement.IPlacementHelper;
+import com.simibubi.create.foundation.placement.PlacementHelpers;
 import com.simibubi.create.foundation.utility.Iterate;
-import com.simibubi.create.foundation.utility.placement.IPlacementHelper;
-import com.simibubi.create.foundation.utility.placement.PlacementHelpers;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/steam/PoweredShaftBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/steamEngine/PoweredShaftBlockEntity.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/components/steam/PoweredShaftBlockEntity.java
rename to src/main/java/com/simibubi/create/content/kinetics/steamEngine/PoweredShaftBlockEntity.java
index f9e706e54..98685d5e7 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/steam/PoweredShaftBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/steamEngine/PoweredShaftBlockEntity.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.contraptions.components.steam;
+package com.simibubi.create.content.kinetics.steamEngine;
 
 import java.util.List;
 
-import com.simibubi.create.content.contraptions.base.GeneratingKineticBlockEntity;
-import com.simibubi.create.foundation.block.BlockStressValues;
+import com.simibubi.create.content.kinetics.BlockStressValues;
+import com.simibubi.create.content.kinetics.base.GeneratingKineticBlockEntity;
 import com.simibubi.create.foundation.utility.RegisteredObjects;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/steam/SteamEngineBlock.java b/src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamEngineBlock.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/components/steam/SteamEngineBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamEngineBlock.java
index 78f858537..92f8f6d53 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/steam/SteamEngineBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamEngineBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.steam;
+package com.simibubi.create.content.kinetics.steamEngine;
 
 import static net.minecraft.world.level.block.state.properties.BlockStateProperties.WATERLOGGED;
 
@@ -7,16 +7,16 @@ import java.util.function.Predicate;
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.fluids.tank.FluidTankBlock;
-import com.simibubi.create.content.contraptions.relays.elementary.ShaftBlock;
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
+import com.simibubi.create.content.fluids.tank.FluidTankBlock;
+import com.simibubi.create.content.kinetics.simpleRelays.ShaftBlock;
 import com.simibubi.create.foundation.advancement.AdvancementBehaviour;
 import com.simibubi.create.foundation.block.IBE;
+import com.simibubi.create.foundation.placement.IPlacementHelper;
+import com.simibubi.create.foundation.placement.PlacementHelpers;
+import com.simibubi.create.foundation.placement.PlacementOffset;
 import com.simibubi.create.foundation.utility.BlockHelper;
 import com.simibubi.create.foundation.utility.Couple;
-import com.simibubi.create.foundation.utility.placement.IPlacementHelper;
-import com.simibubi.create.foundation.utility.placement.PlacementHelpers;
-import com.simibubi.create.foundation.utility.placement.PlacementOffset;
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/steam/SteamEngineBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamEngineBlockEntity.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/components/steam/SteamEngineBlockEntity.java
rename to src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamEngineBlockEntity.java
index 1193ce618..5fb937cc4 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/steam/SteamEngineBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamEngineBlockEntity.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.steam;
+package com.simibubi.create.content.kinetics.steamEngine;
 
 import java.lang.ref.WeakReference;
 import java.util.List;
@@ -7,16 +7,16 @@ import javax.annotation.Nullable;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllSoundEvents;
-import com.simibubi.create.content.contraptions.base.GeneratingKineticBlockEntity;
-import com.simibubi.create.content.contraptions.base.IRotate;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityRenderer;
-import com.simibubi.create.content.contraptions.components.structureMovement.bearing.WindmillBearingBlockEntity.RotationDirection;
-import com.simibubi.create.content.contraptions.fluids.tank.FluidTankBlockEntity;
-import com.simibubi.create.content.contraptions.goggles.IHaveGoggleInformation;
+import com.simibubi.create.content.contraptions.bearing.WindmillBearingBlockEntity.RotationDirection;
+import com.simibubi.create.content.equipment.goggles.IHaveGoggleInformation;
+import com.simibubi.create.content.fluids.tank.FluidTankBlockEntity;
+import com.simibubi.create.content.kinetics.base.GeneratingKineticBlockEntity;
+import com.simibubi.create.content.kinetics.base.IRotate;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
-import com.simibubi.create.foundation.blockEntity.behaviour.scrollvalue.ScrollOptionBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollOptionBehaviour;
 import com.simibubi.create.foundation.utility.AngleHelper;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.VecHelper;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/steam/SteamEngineInstance.java b/src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamEngineInstance.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/components/steam/SteamEngineInstance.java
rename to src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamEngineInstance.java
index fba80524f..b65ce3742 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/steam/SteamEngineInstance.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamEngineInstance.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.steam;
+package com.simibubi.create.content.kinetics.steamEngine;
 
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.jozufozu.flywheel.api.instance.DynamicInstance;
@@ -6,7 +6,7 @@ import com.jozufozu.flywheel.backend.instancing.blockentity.BlockEntityInstance;
 import com.jozufozu.flywheel.core.Materials;
 import com.jozufozu.flywheel.core.materials.model.ModelData;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityRenderer;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
 import com.simibubi.create.foundation.utility.AngleHelper;
 
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/steam/SteamEngineRenderer.java b/src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamEngineRenderer.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/components/steam/SteamEngineRenderer.java
rename to src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamEngineRenderer.java
index 5cad5311c..fb80bfdd5 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/steam/SteamEngineRenderer.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamEngineRenderer.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.contraptions.components.steam;
+package com.simibubi.create.content.kinetics.steamEngine;
 
 import com.jozufozu.flywheel.backend.Backend;
 import com.jozufozu.flywheel.core.PartialModel;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityRenderer;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
 import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/steam/SteamEngineValueBox.java b/src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamEngineValueBox.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/components/steam/SteamEngineValueBox.java
rename to src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamEngineValueBox.java
index e83dbbbec..a7ae50b05 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/steam/SteamEngineValueBox.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamEngineValueBox.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.steam;
+package com.simibubi.create.content.kinetics.steamEngine;
 
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/steam/SteamJetParticle.java b/src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamJetParticle.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/contraptions/components/steam/SteamJetParticle.java
rename to src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamJetParticle.java
index 5f1f70c1f..e2017a0b9 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/steam/SteamJetParticle.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamJetParticle.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.steam;
+package com.simibubi.create.content.kinetics.steamEngine;
 
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.mojang.math.Quaternion;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/steam/SteamJetParticleData.java b/src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamJetParticleData.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/components/steam/SteamJetParticleData.java
rename to src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamJetParticleData.java
index 6b20e0405..263eccb5e 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/steam/SteamJetParticleData.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamJetParticleData.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.steam;
+package com.simibubi.create.content.kinetics.steamEngine;
 
 import java.util.Locale;
 
@@ -7,7 +7,7 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import com.simibubi.create.AllParticleTypes;
-import com.simibubi.create.content.contraptions.particle.ICustomParticleDataWithSprite;
+import com.simibubi.create.foundation.particle.ICustomParticleDataWithSprite;
 
 import net.minecraft.client.particle.ParticleEngine.SpriteParticleRegistration;
 import net.minecraft.core.particles.ParticleOptions;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/ClutchBlock.java b/src/main/java/com/simibubi/create/content/kinetics/transmission/ClutchBlock.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/encased/ClutchBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/transmission/ClutchBlock.java
index 241688487..8f356d778 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/ClutchBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/transmission/ClutchBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.relays.encased;
+package com.simibubi.create.content.kinetics.transmission;
 
 import com.simibubi.create.AllBlockEntityTypes;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/ClutchBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/transmission/ClutchBlockEntity.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/encased/ClutchBlockEntity.java
rename to src/main/java/com/simibubi/create/content/kinetics/transmission/ClutchBlockEntity.java
index dbc332f56..86c10d86e 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/ClutchBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/transmission/ClutchBlockEntity.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.relays.encased;
+package com.simibubi.create.content.kinetics.transmission;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/GearshiftBlock.java b/src/main/java/com/simibubi/create/content/kinetics/transmission/GearshiftBlock.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/encased/GearshiftBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/transmission/GearshiftBlock.java
index 2c3be225a..b67d01d47 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/GearshiftBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/transmission/GearshiftBlock.java
@@ -1,8 +1,9 @@
-package com.simibubi.create.content.contraptions.relays.encased;
+package com.simibubi.create.content.kinetics.transmission;
 
 import com.simibubi.create.AllBlockEntityTypes;
-import com.simibubi.create.content.contraptions.RotationPropagator;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.RotationPropagator;
+import com.simibubi.create.content.kinetics.base.AbstractEncasedShaftBlock;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
 import com.simibubi.create.foundation.block.IBE;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/gearbox/GearshiftBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/transmission/GearshiftBlockEntity.java
similarity index 81%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/gearbox/GearshiftBlockEntity.java
rename to src/main/java/com/simibubi/create/content/kinetics/transmission/GearshiftBlockEntity.java
index bd9d855c8..7147a07d2 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/gearbox/GearshiftBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/transmission/GearshiftBlockEntity.java
@@ -1,6 +1,4 @@
-package com.simibubi.create.content.contraptions.relays.gearbox;
-
-import com.simibubi.create.content.contraptions.relays.encased.SplitShaftBlockEntity;
+package com.simibubi.create.content.kinetics.transmission;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/SplitShaftBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/transmission/SplitShaftBlockEntity.java
similarity index 76%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/encased/SplitShaftBlockEntity.java
rename to src/main/java/com/simibubi/create/content/kinetics/transmission/SplitShaftBlockEntity.java
index 244d9ce99..9c3d8e8f0 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/SplitShaftBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/transmission/SplitShaftBlockEntity.java
@@ -1,4 +1,6 @@
-package com.simibubi.create.content.contraptions.relays.encased;
+package com.simibubi.create.content.kinetics.transmission;
+
+import com.simibubi.create.content.kinetics.base.DirectionalShaftHalvesBlockEntity;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/SplitShaftInstance.java b/src/main/java/com/simibubi/create/content/kinetics/transmission/SplitShaftInstance.java
similarity index 86%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/encased/SplitShaftInstance.java
rename to src/main/java/com/simibubi/create/content/kinetics/transmission/SplitShaftInstance.java
index a2fd454ec..1c5848359 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/SplitShaftInstance.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/transmission/SplitShaftInstance.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.relays.encased;
+package com.simibubi.create.content.kinetics.transmission;
 
 import java.util.ArrayList;
 
@@ -7,9 +7,9 @@ import com.jozufozu.flywheel.api.Instancer;
 import com.jozufozu.flywheel.api.Material;
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.base.IRotate;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityInstance;
-import com.simibubi.create.content.contraptions.base.flwdata.RotatingData;
+import com.simibubi.create.content.kinetics.base.IRotate;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityInstance;
+import com.simibubi.create.content.kinetics.base.flwdata.RotatingData;
 import com.simibubi.create.foundation.utility.Iterate;
 
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/SplitShaftRenderer.java b/src/main/java/com/simibubi/create/content/kinetics/transmission/SplitShaftRenderer.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/encased/SplitShaftRenderer.java
rename to src/main/java/com/simibubi/create/content/kinetics/transmission/SplitShaftRenderer.java
index 4f633560b..0846740c8 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/SplitShaftRenderer.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/transmission/SplitShaftRenderer.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.contraptions.relays.encased;
+package com.simibubi.create.content.kinetics.transmission;
 
 import com.jozufozu.flywheel.backend.Backend;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.base.IRotate;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityRenderer;
+import com.simibubi.create.content.kinetics.base.IRotate;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/ConfigureSequencedGearshiftPacket.java b/src/main/java/com/simibubi/create/content/kinetics/transmission/sequencer/ConfigureSequencedGearshiftPacket.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/ConfigureSequencedGearshiftPacket.java
rename to src/main/java/com/simibubi/create/content/kinetics/transmission/sequencer/ConfigureSequencedGearshiftPacket.java
index 190053b92..4c00bd0a1 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/ConfigureSequencedGearshiftPacket.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/transmission/sequencer/ConfigureSequencedGearshiftPacket.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.relays.advanced.sequencer;
+package com.simibubi.create.content.kinetics.transmission.sequencer;
 
 import com.simibubi.create.foundation.networking.BlockEntityConfigurationPacket;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/Instruction.java b/src/main/java/com/simibubi/create/content/kinetics/transmission/sequencer/Instruction.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/Instruction.java
rename to src/main/java/com/simibubi/create/content/kinetics/transmission/sequencer/Instruction.java
index 38af66e29..f23c7935e 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/Instruction.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/transmission/sequencer/Instruction.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.contraptions.relays.advanced.sequencer;
+package com.simibubi.create.content.kinetics.transmission.sequencer;
 
 import java.util.Vector;
 
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
 import com.simibubi.create.foundation.utility.NBTHelper;
 
 import net.minecraft.nbt.CompoundTag;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/InstructionSpeedModifiers.java b/src/main/java/com/simibubi/create/content/kinetics/transmission/sequencer/InstructionSpeedModifiers.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/InstructionSpeedModifiers.java
rename to src/main/java/com/simibubi/create/content/kinetics/transmission/sequencer/InstructionSpeedModifiers.java
index b1a1f236a..db3a5d598 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/InstructionSpeedModifiers.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/transmission/sequencer/InstructionSpeedModifiers.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.relays.advanced.sequencer;
+package com.simibubi.create.content.kinetics.transmission.sequencer;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/main/java/com/simibubi/create/content/kinetics/transmission/sequencer/OnIsPoweredResult.java b/src/main/java/com/simibubi/create/content/kinetics/transmission/sequencer/OnIsPoweredResult.java
new file mode 100644
index 000000000..328dbad04
--- /dev/null
+++ b/src/main/java/com/simibubi/create/content/kinetics/transmission/sequencer/OnIsPoweredResult.java
@@ -0,0 +1,6 @@
+package com.simibubi.create.content.kinetics.transmission.sequencer;
+
+public enum OnIsPoweredResult {
+    NOTHING,
+    CONTINUE
+}
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftBlock.java b/src/main/java/com/simibubi/create/content/kinetics/transmission/sequencer/SequencedGearshiftBlock.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/transmission/sequencer/SequencedGearshiftBlock.java
index 0074aca01..d765dd9b6 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/transmission/sequencer/SequencedGearshiftBlock.java
@@ -1,12 +1,12 @@
-package com.simibubi.create.content.contraptions.relays.advanced.sequencer;
+package com.simibubi.create.content.kinetics.transmission.sequencer;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.contraptions.base.HorizontalAxisKineticBlock;
-import com.simibubi.create.content.contraptions.base.KineticBlock;
-import com.simibubi.create.content.contraptions.base.RotatedPillarKineticBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.ITransformableBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.StructureTransform;
+import com.simibubi.create.content.contraptions.ITransformableBlock;
+import com.simibubi.create.content.contraptions.StructureTransform;
+import com.simibubi.create.content.kinetics.base.HorizontalAxisKineticBlock;
+import com.simibubi.create.content.kinetics.base.KineticBlock;
+import com.simibubi.create.content.kinetics.base.RotatedPillarKineticBlock;
 import com.simibubi.create.foundation.block.IBE;
 import com.simibubi.create.foundation.gui.ScreenOpener;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/transmission/sequencer/SequencedGearshiftBlockEntity.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftBlockEntity.java
rename to src/main/java/com/simibubi/create/content/kinetics/transmission/sequencer/SequencedGearshiftBlockEntity.java
index 717aa7ecd..a114c3728 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/transmission/sequencer/SequencedGearshiftBlockEntity.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.relays.advanced.sequencer;
+package com.simibubi.create.content.kinetics.transmission.sequencer;
 
 import java.util.List;
 import java.util.Vector;
@@ -9,9 +9,9 @@ import org.jetbrains.annotations.NotNull;
 
 import com.simibubi.create.compat.computercraft.AbstractComputerBehaviour;
 import com.simibubi.create.compat.computercraft.ComputerCraftProxy;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.relays.encased.SplitShaftBlockEntity;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.transmission.SplitShaftBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.NBTHelper;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftGenerator.java b/src/main/java/com/simibubi/create/content/kinetics/transmission/sequencer/SequencedGearshiftGenerator.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftGenerator.java
rename to src/main/java/com/simibubi/create/content/kinetics/transmission/sequencer/SequencedGearshiftGenerator.java
index 5c3ce9079..c27cc05a5 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftGenerator.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/transmission/sequencer/SequencedGearshiftGenerator.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.relays.advanced.sequencer;
+package com.simibubi.create.content.kinetics.transmission.sequencer;
 
 import com.simibubi.create.foundation.data.SpecialBlockStateGen;
 import com.tterrag.registrate.providers.DataGenContext;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftScreen.java b/src/main/java/com/simibubi/create/content/kinetics/transmission/sequencer/SequencedGearshiftScreen.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftScreen.java
rename to src/main/java/com/simibubi/create/content/kinetics/transmission/sequencer/SequencedGearshiftScreen.java
index 4c5d20620..1546802ed 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftScreen.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/transmission/sequencer/SequencedGearshiftScreen.java
@@ -1,9 +1,10 @@
-package com.simibubi.create.content.contraptions.relays.advanced.sequencer;
+package com.simibubi.create.content.kinetics.transmission.sequencer;
 
 import java.util.Vector;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllBlocks;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.compat.computercraft.ComputerScreen;
 import com.simibubi.create.foundation.gui.AbstractSimiScreen;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
@@ -12,7 +13,6 @@ import com.simibubi.create.foundation.gui.element.GuiGameElement;
 import com.simibubi.create.foundation.gui.widget.IconButton;
 import com.simibubi.create.foundation.gui.widget.ScrollInput;
 import com.simibubi.create.foundation.gui.widget.SelectionScrollInput;
-import com.simibubi.create.foundation.networking.AllPackets;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Lang;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencerInstructions.java b/src/main/java/com/simibubi/create/content/kinetics/transmission/sequencer/SequencerInstructions.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencerInstructions.java
rename to src/main/java/com/simibubi/create/content/kinetics/transmission/sequencer/SequencerInstructions.java
index dd2a73285..6ba463772 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencerInstructions.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/transmission/sequencer/SequencerInstructions.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.relays.advanced.sequencer;
+package com.simibubi.create.content.kinetics.transmission.sequencer;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/turntable/TurntableBlock.java b/src/main/java/com/simibubi/create/content/kinetics/turntable/TurntableBlock.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/components/turntable/TurntableBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/turntable/TurntableBlock.java
index a6d7a2122..57efdd765 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/turntable/TurntableBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/turntable/TurntableBlock.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.contraptions.components.turntable;
+package com.simibubi.create.content.kinetics.turntable;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.base.KineticBlock;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.base.KineticBlock;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
 import com.simibubi.create.foundation.block.IBE;
 import com.simibubi.create.foundation.utility.VecHelper;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/turntable/TurntableBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/turntable/TurntableBlockEntity.java
similarity index 70%
rename from src/main/java/com/simibubi/create/content/contraptions/components/turntable/TurntableBlockEntity.java
rename to src/main/java/com/simibubi/create/content/kinetics/turntable/TurntableBlockEntity.java
index d644df70c..c2fe73a86 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/turntable/TurntableBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/turntable/TurntableBlockEntity.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.contraptions.components.turntable;
+package com.simibubi.create.content.kinetics.turntable;
 
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.entity.BlockEntityType;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/turntable/TurntableHandler.java b/src/main/java/com/simibubi/create/content/kinetics/turntable/TurntableHandler.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/components/turntable/TurntableHandler.java
rename to src/main/java/com/simibubi/create/content/kinetics/turntable/TurntableHandler.java
index 83880e3e4..5fca562e3 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/turntable/TurntableHandler.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/turntable/TurntableHandler.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.turntable;
+package com.simibubi.create.content.kinetics.turntable;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/LargeWaterWheelBlock.java b/src/main/java/com/simibubi/create/content/kinetics/waterwheel/LargeWaterWheelBlock.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/LargeWaterWheelBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/waterwheel/LargeWaterWheelBlock.java
index 5366e7880..1d8ecc2c6 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/LargeWaterWheelBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/waterwheel/LargeWaterWheelBlock.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.contraptions.components.waterwheel;
+package com.simibubi.create.content.kinetics.waterwheel;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.base.RotatedPillarKineticBlock;
+import com.simibubi.create.content.kinetics.base.RotatedPillarKineticBlock;
 import com.simibubi.create.foundation.block.IBE;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.Iterate;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/LargeWaterWheelBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/waterwheel/LargeWaterWheelBlockEntity.java
similarity index 85%
rename from src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/LargeWaterWheelBlockEntity.java
rename to src/main/java/com/simibubi/create/content/kinetics/waterwheel/LargeWaterWheelBlockEntity.java
index 91bdfb571..6d21f526d 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/LargeWaterWheelBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/waterwheel/LargeWaterWheelBlockEntity.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.waterwheel;
+package com.simibubi.create.content.kinetics.waterwheel;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.entity.BlockEntityType;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/LargeWaterWheelBlockItem.java b/src/main/java/com/simibubi/create/content/kinetics/waterwheel/LargeWaterWheelBlockItem.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/LargeWaterWheelBlockItem.java
rename to src/main/java/com/simibubi/create/content/kinetics/waterwheel/LargeWaterWheelBlockItem.java
index 3caa0061e..9fb7e0e44 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/LargeWaterWheelBlockItem.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/waterwheel/LargeWaterWheelBlockItem.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.waterwheel;
+package com.simibubi.create.content.kinetics.waterwheel;
 
 import com.simibubi.create.CreateClient;
 import com.simibubi.create.foundation.utility.Lang;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelBlock.java b/src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelBlock.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelBlock.java
index a72863c12..adb7e6423 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelBlock.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.contraptions.components.waterwheel;
+package com.simibubi.create.content.kinetics.waterwheel;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.base.DirectionalKineticBlock;
+import com.simibubi.create.content.kinetics.base.DirectionalKineticBlock;
 import com.simibubi.create.foundation.block.IBE;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.Iterate;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelBlockEntity.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelBlockEntity.java
rename to src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelBlockEntity.java
index a2ff0b580..ed5b369ca 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelBlockEntity.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.waterwheel;
+package com.simibubi.create.content.kinetics.waterwheel;
 
 import java.util.EnumMap;
 import java.util.HashSet;
@@ -6,10 +6,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.simibubi.create.content.contraptions.base.GeneratingKineticBlockEntity;
-import com.simibubi.create.content.contraptions.base.IRotate;
+import com.simibubi.create.content.kinetics.base.GeneratingKineticBlockEntity;
+import com.simibubi.create.content.kinetics.base.IRotate;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.fluid.FluidHelper;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.VecHelper;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelInstance.java b/src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelInstance.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelInstance.java
rename to src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelInstance.java
index 8fac23bb8..b00ca8464 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelInstance.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelInstance.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.contraptions.components.waterwheel;
+package com.simibubi.create.content.kinetics.waterwheel;
 
 import com.jozufozu.flywheel.api.Instancer;
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.jozufozu.flywheel.core.model.BlockModel;
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.simibubi.create.content.contraptions.base.CutoutRotatingInstance;
-import com.simibubi.create.content.contraptions.base.flwdata.RotatingData;
+import com.simibubi.create.content.kinetics.base.CutoutRotatingInstance;
+import com.simibubi.create.content.kinetics.base.flwdata.RotatingData;
 import com.simibubi.create.foundation.render.CachedBufferer;
 
 import net.minecraft.client.resources.model.BakedModel;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelModelKey.java b/src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelModelKey.java
similarity index 67%
rename from src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelModelKey.java
rename to src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelModelKey.java
index 1fefc5a89..4999cb96d 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelModelKey.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelModelKey.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.waterwheel;
+package com.simibubi.create.content.kinetics.waterwheel;
 
 import net.minecraft.world.level.block.state.BlockState;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelRenderer.java b/src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelRenderer.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelRenderer.java
rename to src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelRenderer.java
index 5884b8bb2..fb74bb386 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelRenderer.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.waterwheel;
+package com.simibubi.create.content.kinetics.waterwheel;
 
 import java.util.List;
 import java.util.Map;
@@ -8,7 +8,7 @@ import com.jozufozu.flywheel.core.StitchedSprite;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllPartialModels;
 import com.simibubi.create.CreateClient;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityRenderer;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
 import com.simibubi.create.foundation.model.BakedModelHelper;
 import com.simibubi.create.foundation.render.BakedModelRenderHelper;
 import com.simibubi.create.foundation.render.CachedBufferer;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelStructuralBlock.java b/src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelStructuralBlock.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelStructuralBlock.java
rename to src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelStructuralBlock.java
index c0e631593..525bb1152 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelStructuralBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelStructuralBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.waterwheel;
+package com.simibubi.create.content.kinetics.waterwheel;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -7,8 +7,8 @@ import java.util.function.Consumer;
 import org.jetbrains.annotations.Nullable;
 
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.goggles.IProxyHoveringInformation;
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
+import com.simibubi.create.content.equipment.goggles.IProxyHoveringInformation;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
 import com.simibubi.create.foundation.block.render.MultiPosDestructionHandler;
 
 import net.minecraft.client.multiplayer.ClientLevel;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/ChromaticCompoundColor.java b/src/main/java/com/simibubi/create/content/legacy/ChromaticCompoundColor.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/curiosities/ChromaticCompoundColor.java
rename to src/main/java/com/simibubi/create/content/legacy/ChromaticCompoundColor.java
index 64b108331..6d00c28a1 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/ChromaticCompoundColor.java
+++ b/src/main/java/com/simibubi/create/content/legacy/ChromaticCompoundColor.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities;
+package com.simibubi.create.content.legacy;
 
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 import com.simibubi.create.foundation.utility.Color;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/ChromaticCompoundItem.java b/src/main/java/com/simibubi/create/content/legacy/ChromaticCompoundItem.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/curiosities/ChromaticCompoundItem.java
rename to src/main/java/com/simibubi/create/content/legacy/ChromaticCompoundItem.java
index 2a3cc1f7e..b8c65531a 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/ChromaticCompoundItem.java
+++ b/src/main/java/com/simibubi/create/content/legacy/ChromaticCompoundItem.java
@@ -1,16 +1,16 @@
-package com.simibubi.create.content.curiosities;
+package com.simibubi.create.content.legacy;
 
 import org.apache.commons.lang3.mutable.MutableBoolean;
 
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.TransportedItemStackHandlerBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.TransportedItemStackHandlerBehaviour.TransportedResult;
-import com.simibubi.create.foundation.config.AllConfigs;
-import com.simibubi.create.foundation.config.CRecipes;
+import com.simibubi.create.content.kinetics.belt.behaviour.TransportedItemStackHandlerBehaviour;
+import com.simibubi.create.content.kinetics.belt.behaviour.TransportedItemStackHandlerBehaviour.TransportedResult;
+import com.simibubi.create.content.kinetics.belt.transport.TransportedItemStack;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.Color;
 import com.simibubi.create.foundation.utility.VecHelper;
+import com.simibubi.create.infrastructure.config.AllConfigs;
+import com.simibubi.create.infrastructure.config.CRecipes;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/NoGravMagicalDohickyItem.java b/src/main/java/com/simibubi/create/content/legacy/NoGravMagicalDohickyItem.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/curiosities/NoGravMagicalDohickyItem.java
rename to src/main/java/com/simibubi/create/content/legacy/NoGravMagicalDohickyItem.java
index 4d314d720..127d91643 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/NoGravMagicalDohickyItem.java
+++ b/src/main/java/com/simibubi/create/content/legacy/NoGravMagicalDohickyItem.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities;
+package com.simibubi.create.content.legacy;
 
 import com.simibubi.create.foundation.utility.VecHelper;
 
diff --git a/src/main/java/com/simibubi/create/content/curiosities/RefinedRadianceItem.java b/src/main/java/com/simibubi/create/content/legacy/RefinedRadianceItem.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/curiosities/RefinedRadianceItem.java
rename to src/main/java/com/simibubi/create/content/legacy/RefinedRadianceItem.java
index 03ca5850b..577f0051c 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/RefinedRadianceItem.java
+++ b/src/main/java/com/simibubi/create/content/legacy/RefinedRadianceItem.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities;
+package com.simibubi.create.content.legacy;
 
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.entity.item.ItemEntity;
diff --git a/src/main/java/com/simibubi/create/content/curiosities/ShadowSteelItem.java b/src/main/java/com/simibubi/create/content/legacy/ShadowSteelItem.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/curiosities/ShadowSteelItem.java
rename to src/main/java/com/simibubi/create/content/legacy/ShadowSteelItem.java
index fa7c42ca8..9d85d2b1a 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/ShadowSteelItem.java
+++ b/src/main/java/com/simibubi/create/content/legacy/ShadowSteelItem.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities;
+package com.simibubi.create.content.legacy;
 
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.util.Mth;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/chute/AbstractChuteBlock.java b/src/main/java/com/simibubi/create/content/logistics/chute/AbstractChuteBlock.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/block/chute/AbstractChuteBlock.java
rename to src/main/java/com/simibubi/create/content/logistics/chute/AbstractChuteBlock.java
index 28b7fc2ee..351f5b458 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/chute/AbstractChuteBlock.java
+++ b/src/main/java/com/simibubi/create/content/logistics/chute/AbstractChuteBlock.java
@@ -1,15 +1,15 @@
-package com.simibubi.create.content.logistics.block.chute;
+package com.simibubi.create.content.logistics.chute;
 
 import java.util.function.Consumer;
 
 import javax.annotation.Nullable;
 
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
+import com.simibubi.create.content.kinetics.belt.behaviour.DirectBeltInputBehaviour;
 import com.simibubi.create.foundation.advancement.AdvancementBehaviour;
 import com.simibubi.create.foundation.block.IBE;
 import com.simibubi.create.foundation.block.render.ReducedDestroyEffects;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.DirectBeltInputBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.Iterate;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteBlock.java b/src/main/java/com/simibubi/create/content/logistics/chute/ChuteBlock.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteBlock.java
rename to src/main/java/com/simibubi/create/content/logistics/chute/ChuteBlock.java
index 1451eb1e6..09cb3490b 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteBlock.java
+++ b/src/main/java/com/simibubi/create/content/logistics/chute/ChuteBlock.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.logistics.block.chute;
+package com.simibubi.create.content.logistics.chute;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.logistics.block.funnel.FunnelBlock;
+import com.simibubi.create.content.logistics.funnel.FunnelBlock;
 import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.Lang;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteBlockEntity.java b/src/main/java/com/simibubi/create/content/logistics/chute/ChuteBlockEntity.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteBlockEntity.java
rename to src/main/java/com/simibubi/create/content/logistics/chute/ChuteBlockEntity.java
index c0b9efe01..a34826373 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/logistics/chute/ChuteBlockEntity.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.chute;
+package com.simibubi.create.content.logistics.chute;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -9,27 +9,27 @@ import javax.annotation.ParametersAreNonnullByDefault;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.contraptions.components.fan.AirCurrent;
-import com.simibubi.create.content.contraptions.components.fan.EncasedFanBlock;
-import com.simibubi.create.content.contraptions.components.fan.EncasedFanBlockEntity;
-import com.simibubi.create.content.contraptions.goggles.IHaveGoggleInformation;
-import com.simibubi.create.content.contraptions.particle.AirParticleData;
-import com.simibubi.create.content.logistics.block.funnel.FunnelBlock;
+import com.simibubi.create.content.equipment.goggles.IHaveGoggleInformation;
+import com.simibubi.create.content.kinetics.belt.behaviour.DirectBeltInputBehaviour;
+import com.simibubi.create.content.kinetics.belt.behaviour.TransportedItemStackHandlerBehaviour;
+import com.simibubi.create.content.kinetics.belt.behaviour.TransportedItemStackHandlerBehaviour.TransportedResult;
+import com.simibubi.create.content.kinetics.fan.AirCurrent;
+import com.simibubi.create.content.kinetics.fan.EncasedFanBlock;
+import com.simibubi.create.content.kinetics.fan.EncasedFanBlockEntity;
+import com.simibubi.create.content.logistics.funnel.FunnelBlock;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.DirectBeltInputBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.TransportedItemStackHandlerBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.TransportedItemStackHandlerBehaviour.TransportedResult;
-import com.simibubi.create.foundation.config.AllConfigs;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.item.ItemHelper;
 import com.simibubi.create.foundation.item.ItemHelper.ExtractionCountMode;
+import com.simibubi.create.foundation.particle.AirParticleData;
 import com.simibubi.create.foundation.utility.BlockHelper;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.VecHelper;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.ChatFormatting;
 import net.minecraft.MethodsReturnNonnullByDefault;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteGenerator.java b/src/main/java/com/simibubi/create/content/logistics/chute/ChuteGenerator.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteGenerator.java
rename to src/main/java/com/simibubi/create/content/logistics/chute/ChuteGenerator.java
index ee6a0a140..6c7098f23 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteGenerator.java
+++ b/src/main/java/com/simibubi/create/content/logistics/chute/ChuteGenerator.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.logistics.block.chute;
+package com.simibubi.create.content.logistics.chute;
 
-import com.simibubi.create.content.logistics.block.chute.ChuteBlock.Shape;
+import com.simibubi.create.content.logistics.chute.ChuteBlock.Shape;
 import com.simibubi.create.foundation.data.AssetLookup;
 import com.simibubi.create.foundation.data.SpecialBlockStateGen;
 import com.tterrag.registrate.providers.DataGenContext;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteItem.java b/src/main/java/com/simibubi/create/content/logistics/chute/ChuteItem.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteItem.java
rename to src/main/java/com/simibubi/create/content/logistics/chute/ChuteItem.java
index ec3521de6..0ece9042e 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteItem.java
+++ b/src/main/java/com/simibubi/create/content/logistics/chute/ChuteItem.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.chute;
+package com.simibubi.create.content.logistics.chute;
 
 import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteItemHandler.java b/src/main/java/com/simibubi/create/content/logistics/chute/ChuteItemHandler.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteItemHandler.java
rename to src/main/java/com/simibubi/create/content/logistics/chute/ChuteItemHandler.java
index ca0513d71..72a77ff01 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteItemHandler.java
+++ b/src/main/java/com/simibubi/create/content/logistics/chute/ChuteItemHandler.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.chute;
+package com.simibubi.create.content.logistics.chute;
 
 import net.minecraft.world.item.ItemStack;
 import net.minecraftforge.items.IItemHandler;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteRenderer.java b/src/main/java/com/simibubi/create/content/logistics/chute/ChuteRenderer.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteRenderer.java
rename to src/main/java/com/simibubi/create/content/logistics/chute/ChuteRenderer.java
index 0e014e7ba..c04a44e1c 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteRenderer.java
+++ b/src/main/java/com/simibubi/create/content/logistics/chute/ChuteRenderer.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.logistics.block.chute;
+package com.simibubi.create.content.logistics.chute;
 
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.simibubi.create.content.logistics.block.chute.ChuteBlock.Shape;
+import com.simibubi.create.content.logistics.chute.ChuteBlock.Shape;
 import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer;
 
 import net.minecraft.client.Minecraft;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteShapes.java b/src/main/java/com/simibubi/create/content/logistics/chute/ChuteShapes.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteShapes.java
rename to src/main/java/com/simibubi/create/content/logistics/chute/ChuteShapes.java
index 807ceff67..6d6735a41 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteShapes.java
+++ b/src/main/java/com/simibubi/create/content/logistics/chute/ChuteShapes.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.logistics.block.chute;
+package com.simibubi.create.content.logistics.chute;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.logistics.block.chute.ChuteBlock.Shape;
+import com.simibubi.create.content.logistics.chute.ChuteBlock.Shape;
 
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.Block;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/chute/SmartChuteBlock.java b/src/main/java/com/simibubi/create/content/logistics/chute/SmartChuteBlock.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/logistics/block/chute/SmartChuteBlock.java
rename to src/main/java/com/simibubi/create/content/logistics/chute/SmartChuteBlock.java
index fad83f142..5575d6883 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/chute/SmartChuteBlock.java
+++ b/src/main/java/com/simibubi/create/content/logistics/chute/SmartChuteBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.chute;
+package com.simibubi.create.content.logistics.chute;
 
 import com.simibubi.create.AllBlockEntityTypes;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/chute/SmartChuteBlockEntity.java b/src/main/java/com/simibubi/create/content/logistics/chute/SmartChuteBlockEntity.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/logistics/block/chute/SmartChuteBlockEntity.java
rename to src/main/java/com/simibubi/create/content/logistics/chute/SmartChuteBlockEntity.java
index 1cbc5346f..0ac591938 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/chute/SmartChuteBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/logistics/chute/SmartChuteBlockEntity.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.logistics.block.chute;
+package com.simibubi.create.content.logistics.chute;
 
 import java.util.List;
 
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour;
 import com.simibubi.create.foundation.item.ItemHelper.ExtractionCountMode;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/chute/SmartChuteFilterSlotPositioning.java b/src/main/java/com/simibubi/create/content/logistics/chute/SmartChuteFilterSlotPositioning.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/logistics/block/chute/SmartChuteFilterSlotPositioning.java
rename to src/main/java/com/simibubi/create/content/logistics/chute/SmartChuteFilterSlotPositioning.java
index 268800b30..cbc53fb03 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/chute/SmartChuteFilterSlotPositioning.java
+++ b/src/main/java/com/simibubi/create/content/logistics/chute/SmartChuteFilterSlotPositioning.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.chute;
+package com.simibubi.create.content.logistics.chute;
 
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform;
 import com.simibubi.create.foundation.utility.AngleHelper;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/chute/SmartChuteRenderer.java b/src/main/java/com/simibubi/create/content/logistics/chute/SmartChuteRenderer.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/logistics/block/chute/SmartChuteRenderer.java
rename to src/main/java/com/simibubi/create/content/logistics/chute/SmartChuteRenderer.java
index 4ab6ea573..f34bcecbd 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/chute/SmartChuteRenderer.java
+++ b/src/main/java/com/simibubi/create/content/logistics/chute/SmartChuteRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.chute;
+package com.simibubi.create.content.logistics.chute;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.foundation.blockEntity.renderer.SmartBlockEntityRenderer;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/inventories/BottomlessItemHandler.java b/src/main/java/com/simibubi/create/content/logistics/crate/BottomlessItemHandler.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/block/inventories/BottomlessItemHandler.java
rename to src/main/java/com/simibubi/create/content/logistics/crate/BottomlessItemHandler.java
index 1df0af6a2..6a2adf1db 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/inventories/BottomlessItemHandler.java
+++ b/src/main/java/com/simibubi/create/content/logistics/crate/BottomlessItemHandler.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.inventories;
+package com.simibubi.create.content.logistics.crate;
 
 import java.util.function.Supplier;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/inventories/CrateBlock.java b/src/main/java/com/simibubi/create/content/logistics/crate/CrateBlock.java
similarity index 87%
rename from src/main/java/com/simibubi/create/content/logistics/block/inventories/CrateBlock.java
rename to src/main/java/com/simibubi/create/content/logistics/crate/CrateBlock.java
index 6550f3bc6..ce54c2f77 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/inventories/CrateBlock.java
+++ b/src/main/java/com/simibubi/create/content/logistics/crate/CrateBlock.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.content.logistics.block.inventories;
+package com.simibubi.create.content.logistics.crate;
 
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
 import com.simibubi.create.foundation.block.WrenchableDirectionalBlock;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/inventories/CrateBlockEntity.java b/src/main/java/com/simibubi/create/content/logistics/crate/CrateBlockEntity.java
similarity index 79%
rename from src/main/java/com/simibubi/create/content/logistics/block/inventories/CrateBlockEntity.java
rename to src/main/java/com/simibubi/create/content/logistics/crate/CrateBlockEntity.java
index b6910a09a..9a7e2ccea 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/inventories/CrateBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/logistics/crate/CrateBlockEntity.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.logistics.block.inventories;
+package com.simibubi.create.content.logistics.crate;
 
 import java.util.List;
 
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.entity.BlockEntityType;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/inventories/CreativeCrateBlock.java b/src/main/java/com/simibubi/create/content/logistics/crate/CreativeCrateBlock.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/logistics/block/inventories/CreativeCrateBlock.java
rename to src/main/java/com/simibubi/create/content/logistics/crate/CreativeCrateBlock.java
index dd290a980..a436839ec 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/inventories/CreativeCrateBlock.java
+++ b/src/main/java/com/simibubi/create/content/logistics/crate/CreativeCrateBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.inventories;
+package com.simibubi.create.content.logistics.crate;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.foundation.block.IBE;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/inventories/CreativeCrateBlockEntity.java b/src/main/java/com/simibubi/create/content/logistics/crate/CreativeCrateBlockEntity.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/logistics/block/inventories/CreativeCrateBlockEntity.java
rename to src/main/java/com/simibubi/create/content/logistics/crate/CreativeCrateBlockEntity.java
index dea5bae67..0d23295a4 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/inventories/CreativeCrateBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/logistics/crate/CreativeCrateBlockEntity.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.logistics.block.inventories;
+package com.simibubi.create.content.logistics.crate;
 
 import java.util.List;
 
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform;
 import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour;
 import com.simibubi.create.foundation.utility.Lang;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/depot/DepotBehaviour.java b/src/main/java/com/simibubi/create/content/logistics/depot/DepotBehaviour.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/logistics/block/depot/DepotBehaviour.java
rename to src/main/java/com/simibubi/create/content/logistics/depot/DepotBehaviour.java
index fba517087..97c9bd475 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/depot/DepotBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/logistics/depot/DepotBehaviour.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.depot;
+package com.simibubi.create.content.logistics.depot;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -9,17 +9,17 @@ import java.util.function.Predicate;
 import java.util.function.Supplier;
 
 import com.simibubi.create.AllSoundEvents;
-import com.simibubi.create.content.contraptions.relays.belt.BeltHelper;
-import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack;
-import com.simibubi.create.content.logistics.block.funnel.AbstractFunnelBlock;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.kinetics.belt.BeltHelper;
+import com.simibubi.create.content.kinetics.belt.behaviour.BeltProcessingBehaviour;
+import com.simibubi.create.content.kinetics.belt.behaviour.BeltProcessingBehaviour.ProcessingResult;
+import com.simibubi.create.content.kinetics.belt.behaviour.DirectBeltInputBehaviour;
+import com.simibubi.create.content.kinetics.belt.behaviour.TransportedItemStackHandlerBehaviour;
+import com.simibubi.create.content.kinetics.belt.behaviour.TransportedItemStackHandlerBehaviour.TransportedResult;
+import com.simibubi.create.content.kinetics.belt.transport.TransportedItemStack;
+import com.simibubi.create.content.logistics.funnel.AbstractFunnelBlock;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
 import com.simibubi.create.foundation.blockEntity.behaviour.BehaviourType;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.BeltProcessingBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.BeltProcessingBehaviour.ProcessingResult;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.DirectBeltInputBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.TransportedItemStackHandlerBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.TransportedItemStackHandlerBehaviour.TransportedResult;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.item.ItemHelper;
 import com.simibubi.create.foundation.utility.NBTHelper;
 import com.simibubi.create.foundation.utility.VecHelper;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/depot/DepotBlock.java b/src/main/java/com/simibubi/create/content/logistics/depot/DepotBlock.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/block/depot/DepotBlock.java
rename to src/main/java/com/simibubi/create/content/logistics/depot/DepotBlock.java
index 23428c0d4..e664309dc 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/depot/DepotBlock.java
+++ b/src/main/java/com/simibubi/create/content/logistics/depot/DepotBlock.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.logistics.block.depot;
+package com.simibubi.create.content.logistics.depot;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
 import com.simibubi.create.foundation.block.IBE;
 import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/depot/DepotBlockEntity.java b/src/main/java/com/simibubi/create/content/logistics/depot/DepotBlockEntity.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/logistics/block/depot/DepotBlockEntity.java
rename to src/main/java/com/simibubi/create/content/logistics/depot/DepotBlockEntity.java
index dc9748b71..af3356704 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/depot/DepotBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/logistics/depot/DepotBlockEntity.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.logistics.block.depot;
+package com.simibubi.create.content.logistics.depot;
 
 import java.util.List;
 
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/depot/DepotItemHandler.java b/src/main/java/com/simibubi/create/content/logistics/depot/DepotItemHandler.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/logistics/block/depot/DepotItemHandler.java
rename to src/main/java/com/simibubi/create/content/logistics/depot/DepotItemHandler.java
index 979278742..c4873ec2c 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/depot/DepotItemHandler.java
+++ b/src/main/java/com/simibubi/create/content/logistics/depot/DepotItemHandler.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.logistics.block.depot;
+package com.simibubi.create.content.logistics.depot;
 
-import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack;
+import com.simibubi.create.content.kinetics.belt.transport.TransportedItemStack;
 
 import net.minecraft.world.item.ItemStack;
 import net.minecraftforge.items.IItemHandler;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/depot/DepotRenderer.java b/src/main/java/com/simibubi/create/content/logistics/depot/DepotRenderer.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/logistics/block/depot/DepotRenderer.java
rename to src/main/java/com/simibubi/create/content/logistics/depot/DepotRenderer.java
index 278db7d30..5f830e91d 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/depot/DepotRenderer.java
+++ b/src/main/java/com/simibubi/create/content/logistics/depot/DepotRenderer.java
@@ -1,12 +1,12 @@
-package com.simibubi.create.content.logistics.block.depot;
+package com.simibubi.create.content.logistics.depot;
 
 import java.util.Random;
 
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Vector3f;
-import com.simibubi.create.content.contraptions.relays.belt.BeltHelper;
-import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack;
+import com.simibubi.create.content.kinetics.belt.BeltHelper;
+import com.simibubi.create.content.kinetics.belt.transport.TransportedItemStack;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
 import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer;
 import com.simibubi.create.foundation.utility.VecHelper;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorAwardPacket.java b/src/main/java/com/simibubi/create/content/logistics/depot/EjectorAwardPacket.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorAwardPacket.java
rename to src/main/java/com/simibubi/create/content/logistics/depot/EjectorAwardPacket.java
index 41780d0c0..ecc786c0d 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorAwardPacket.java
+++ b/src/main/java/com/simibubi/create/content/logistics/depot/EjectorAwardPacket.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.depot;
+package com.simibubi.create.content.logistics.depot;
 
 import com.simibubi.create.foundation.advancement.AllAdvancements;
 import com.simibubi.create.foundation.networking.BlockEntityConfigurationPacket;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorBlock.java b/src/main/java/com/simibubi/create/content/logistics/depot/EjectorBlock.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorBlock.java
rename to src/main/java/com/simibubi/create/content/logistics/depot/EjectorBlock.java
index ce1b8c784..a75404840 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorBlock.java
+++ b/src/main/java/com/simibubi/create/content/logistics/depot/EjectorBlock.java
@@ -1,16 +1,16 @@
-package com.simibubi.create.content.logistics.block.depot;
+package com.simibubi.create.content.logistics.depot;
 
 import java.util.Optional;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.base.HorizontalKineticBlock;
-import com.simibubi.create.content.logistics.block.depot.EjectorBlockEntity.State;
+import com.simibubi.create.content.kinetics.base.HorizontalKineticBlock;
+import com.simibubi.create.content.logistics.depot.EjectorBlockEntity.State;
 import com.simibubi.create.foundation.block.IBE;
 import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
-import com.simibubi.create.foundation.networking.AllPackets;
 import com.simibubi.create.foundation.utility.VecHelper;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorBlockEntity.java b/src/main/java/com/simibubi/create/content/logistics/depot/EjectorBlockEntity.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorBlockEntity.java
rename to src/main/java/com/simibubi/create/content/logistics/depot/EjectorBlockEntity.java
index 61932b88c..83f6d089f 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/logistics/depot/EjectorBlockEntity.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.depot;
+package com.simibubi.create.content.logistics.depot;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -9,16 +9,15 @@ import javax.annotation.Nullable;
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack;
-import com.simibubi.create.content.logistics.block.funnel.AbstractFunnelBlock;
-import com.simibubi.create.content.logistics.block.funnel.FunnelBlock;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.AllPackets;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.belt.behaviour.DirectBeltInputBehaviour;
+import com.simibubi.create.content.kinetics.belt.transport.TransportedItemStack;
+import com.simibubi.create.content.logistics.funnel.AbstractFunnelBlock;
+import com.simibubi.create.content.logistics.funnel.FunnelBlock;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.DirectBeltInputBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.scrollvalue.ScrollValueBehaviour;
-import com.simibubi.create.foundation.config.AllConfigs;
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollValueBehaviour;
 import com.simibubi.create.foundation.utility.AngleHelper;
 import com.simibubi.create.foundation.utility.IntAttached;
 import com.simibubi.create.foundation.utility.Iterate;
@@ -28,6 +27,7 @@ import com.simibubi.create.foundation.utility.Pair;
 import com.simibubi.create.foundation.utility.VecHelper;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat.Chaser;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorElytraPacket.java b/src/main/java/com/simibubi/create/content/logistics/depot/EjectorElytraPacket.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorElytraPacket.java
rename to src/main/java/com/simibubi/create/content/logistics/depot/EjectorElytraPacket.java
index f0ffe391c..c625f91c9 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorElytraPacket.java
+++ b/src/main/java/com/simibubi/create/content/logistics/depot/EjectorElytraPacket.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.depot;
+package com.simibubi.create.content.logistics.depot;
 
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorInstance.java b/src/main/java/com/simibubi/create/content/logistics/depot/EjectorInstance.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorInstance.java
rename to src/main/java/com/simibubi/create/content/logistics/depot/EjectorInstance.java
index da3d080ee..10b0b4d5d 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorInstance.java
+++ b/src/main/java/com/simibubi/create/content/logistics/depot/EjectorInstance.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.logistics.block.depot;
+package com.simibubi.create.content.logistics.depot;
 
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.jozufozu.flywheel.api.instance.DynamicInstance;
 import com.jozufozu.flywheel.core.materials.model.ModelData;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.relays.encased.ShaftInstance;
+import com.simibubi.create.content.kinetics.base.ShaftInstance;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 
 import net.minecraft.util.Mth;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorItem.java b/src/main/java/com/simibubi/create/content/logistics/depot/EjectorItem.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorItem.java
rename to src/main/java/com/simibubi/create/content/logistics/depot/EjectorItem.java
index f4d2eb957..0a43a9db8 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorItem.java
+++ b/src/main/java/com/simibubi/create/content/logistics/depot/EjectorItem.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.depot;
+package com.simibubi.create.content.logistics.depot;
 
 import com.simibubi.create.foundation.networking.AllPackets;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorPlacementPacket.java b/src/main/java/com/simibubi/create/content/logistics/depot/EjectorPlacementPacket.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorPlacementPacket.java
rename to src/main/java/com/simibubi/create/content/logistics/depot/EjectorPlacementPacket.java
index 97bba7314..32cdfc8e7 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorPlacementPacket.java
+++ b/src/main/java/com/simibubi/create/content/logistics/depot/EjectorPlacementPacket.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.depot;
+package com.simibubi.create.content.logistics.depot;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.foundation.networking.SimplePacketBase;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorRenderer.java b/src/main/java/com/simibubi/create/content/logistics/depot/EjectorRenderer.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorRenderer.java
rename to src/main/java/com/simibubi/create/content/logistics/depot/EjectorRenderer.java
index b2be8ab6f..a03ded18b 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorRenderer.java
+++ b/src/main/java/com/simibubi/create/content/logistics/depot/EjectorRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.depot;
+package com.simibubi.create.content.logistics.depot;
 
 import com.jozufozu.flywheel.backend.Backend;
 import com.jozufozu.flywheel.util.transform.Rotate;
@@ -7,8 +7,8 @@ import com.jozufozu.flywheel.util.transform.Translate;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.relays.encased.ShaftRenderer;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.base.ShaftRenderer;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.utility.AngleHelper;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorTargetHandler.java b/src/main/java/com/simibubi/create/content/logistics/depot/EjectorTargetHandler.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorTargetHandler.java
rename to src/main/java/com/simibubi/create/content/logistics/depot/EjectorTargetHandler.java
index 5772b51dc..3c0545ed6 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorTargetHandler.java
+++ b/src/main/java/com/simibubi/create/content/logistics/depot/EjectorTargetHandler.java
@@ -1,15 +1,15 @@
-package com.simibubi.create.content.logistics.block.depot;
+package com.simibubi.create.content.logistics.depot;
 
 import com.mojang.math.Vector3f;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.CreateClient;
-import com.simibubi.create.foundation.config.AllConfigs;
-import com.simibubi.create.foundation.networking.AllPackets;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 import com.simibubi.create.foundation.utility.Color;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.VecHelper;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorTriggerPacket.java b/src/main/java/com/simibubi/create/content/logistics/depot/EjectorTriggerPacket.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorTriggerPacket.java
rename to src/main/java/com/simibubi/create/content/logistics/depot/EjectorTriggerPacket.java
index edf9dcec7..94e359149 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorTriggerPacket.java
+++ b/src/main/java/com/simibubi/create/content/logistics/depot/EjectorTriggerPacket.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.depot;
+package com.simibubi.create.content.logistics.depot;
 
 import com.simibubi.create.foundation.networking.BlockEntityConfigurationPacket;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/depot/EntityLauncher.java b/src/main/java/com/simibubi/create/content/logistics/depot/EntityLauncher.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/logistics/block/depot/EntityLauncher.java
rename to src/main/java/com/simibubi/create/content/logistics/depot/EntityLauncher.java
index ac7101318..3495a7d20 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/depot/EntityLauncher.java
+++ b/src/main/java/com/simibubi/create/content/logistics/depot/EntityLauncher.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.depot;
+package com.simibubi.create.content.logistics.depot;
 
 import com.simibubi.create.foundation.utility.AngleHelper;
 import com.simibubi.create.foundation.utility.VecHelper;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/depot/SharedDepotBlockMethods.java b/src/main/java/com/simibubi/create/content/logistics/depot/SharedDepotBlockMethods.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/logistics/block/depot/SharedDepotBlockMethods.java
rename to src/main/java/com/simibubi/create/content/logistics/depot/SharedDepotBlockMethods.java
index 26372d0f5..9fea80749 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/depot/SharedDepotBlockMethods.java
+++ b/src/main/java/com/simibubi/create/content/logistics/depot/SharedDepotBlockMethods.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.logistics.block.depot;
+package com.simibubi.create.content.logistics.depot;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllSoundEvents;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.DirectBeltInputBehaviour;
+import com.simibubi.create.content.kinetics.belt.behaviour.DirectBeltInputBehaviour;
+import com.simibubi.create.content.kinetics.belt.transport.TransportedItemStack;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/AbstractFilterMenu.java b/src/main/java/com/simibubi/create/content/logistics/filter/AbstractFilterMenu.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/item/filter/AbstractFilterMenu.java
rename to src/main/java/com/simibubi/create/content/logistics/filter/AbstractFilterMenu.java
index 76a98c56f..4a3d58625 100644
--- a/src/main/java/com/simibubi/create/content/logistics/item/filter/AbstractFilterMenu.java
+++ b/src/main/java/com/simibubi/create/content/logistics/filter/AbstractFilterMenu.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.item.filter;
+package com.simibubi.create.content.logistics.filter;
 
 import com.simibubi.create.foundation.gui.menu.GhostItemMenu;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/AbstractFilterScreen.java b/src/main/java/com/simibubi/create/content/logistics/filter/AbstractFilterScreen.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/logistics/item/filter/AbstractFilterScreen.java
rename to src/main/java/com/simibubi/create/content/logistics/filter/AbstractFilterScreen.java
index 3d50b60d4..f2ec3ab46 100644
--- a/src/main/java/com/simibubi/create/content/logistics/item/filter/AbstractFilterScreen.java
+++ b/src/main/java/com/simibubi/create/content/logistics/filter/AbstractFilterScreen.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.item.filter;
+package com.simibubi.create.content.logistics.filter;
 
 import static com.simibubi.create.foundation.gui.AllGuiTextures.PLAYER_INVENTORY;
 
@@ -8,7 +8,8 @@ import java.util.List;
 import com.google.common.collect.ImmutableList;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.logistics.item.filter.FilterScreenPacket.Option;
+import com.simibubi.create.AllPackets;
+import com.simibubi.create.content.logistics.filter.FilterScreenPacket.Option;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
 import com.simibubi.create.foundation.gui.AllIcons;
 import com.simibubi.create.foundation.gui.element.GuiGameElement;
@@ -18,7 +19,6 @@ import com.simibubi.create.foundation.gui.widget.Indicator;
 import com.simibubi.create.foundation.gui.widget.Indicator.State;
 import com.simibubi.create.foundation.item.TooltipHelper;
 import com.simibubi.create.foundation.item.TooltipHelper.Palette;
-import com.simibubi.create.foundation.networking.AllPackets;
 
 import net.minecraft.client.renderer.Rect2i;
 import net.minecraft.network.chat.Component;
diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/AttributeFilterMenu.java b/src/main/java/com/simibubi/create/content/logistics/filter/AttributeFilterMenu.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/logistics/item/filter/AttributeFilterMenu.java
rename to src/main/java/com/simibubi/create/content/logistics/filter/AttributeFilterMenu.java
index 5d3c57149..b66c6f31a 100644
--- a/src/main/java/com/simibubi/create/content/logistics/item/filter/AttributeFilterMenu.java
+++ b/src/main/java/com/simibubi/create/content/logistics/filter/AttributeFilterMenu.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.item.filter;
+package com.simibubi.create.content.logistics.filter;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/AttributeFilterScreen.java b/src/main/java/com/simibubi/create/content/logistics/filter/AttributeFilterScreen.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/logistics/item/filter/AttributeFilterScreen.java
rename to src/main/java/com/simibubi/create/content/logistics/filter/AttributeFilterScreen.java
index e191250bc..5617879a3 100644
--- a/src/main/java/com/simibubi/create/content/logistics/item/filter/AttributeFilterScreen.java
+++ b/src/main/java/com/simibubi/create/content/logistics/filter/AttributeFilterScreen.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.item.filter;
+package com.simibubi.create.content.logistics.filter;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -6,15 +6,15 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.simibubi.create.content.logistics.item.filter.AttributeFilterMenu.WhitelistMode;
-import com.simibubi.create.content.logistics.item.filter.FilterScreenPacket.Option;
+import com.simibubi.create.AllPackets;
+import com.simibubi.create.content.logistics.filter.AttributeFilterMenu.WhitelistMode;
+import com.simibubi.create.content.logistics.filter.FilterScreenPacket.Option;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
 import com.simibubi.create.foundation.gui.AllIcons;
 import com.simibubi.create.foundation.gui.widget.IconButton;
 import com.simibubi.create.foundation.gui.widget.Indicator;
 import com.simibubi.create.foundation.gui.widget.Label;
 import com.simibubi.create.foundation.gui.widget.SelectionScrollInput;
-import com.simibubi.create.foundation.networking.AllPackets;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.Pair;
diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/FilterItem.java b/src/main/java/com/simibubi/create/content/logistics/filter/FilterItem.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/item/filter/FilterItem.java
rename to src/main/java/com/simibubi/create/content/logistics/filter/FilterItem.java
index 48e94c6c8..da04be990 100644
--- a/src/main/java/com/simibubi/create/content/logistics/item/filter/FilterItem.java
+++ b/src/main/java/com/simibubi/create/content/logistics/filter/FilterItem.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.item.filter;
+package com.simibubi.create.content.logistics.filter;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -8,8 +8,8 @@ import javax.annotation.Nonnull;
 
 import com.simibubi.create.AllItems;
 import com.simibubi.create.AllKeys;
-import com.simibubi.create.content.contraptions.processing.EmptyingByBasin;
-import com.simibubi.create.content.logistics.item.filter.AttributeFilterMenu.WhitelistMode;
+import com.simibubi.create.content.fluids.transfer.GenericItemEmptying;
+import com.simibubi.create.content.logistics.filter.AttributeFilterMenu.WhitelistMode;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Lang;
 
@@ -291,9 +291,9 @@ public class FilterItem extends Item implements MenuProvider {
 			return false;
 
 		if (!(filter.getItem() instanceof FilterItem)) {
-			if (!EmptyingByBasin.canItemBeEmptied(world, filter))
+			if (!GenericItemEmptying.canItemBeEmptied(world, filter))
 				return false;
-			FluidStack fluidInFilter = EmptyingByBasin.emptyItem(world, filter, true)
+			FluidStack fluidInFilter = GenericItemEmptying.emptyItem(world, filter, true)
 				.getFirst();
 			if (fluidInFilter == null)
 				return false;
diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/FilterMenu.java b/src/main/java/com/simibubi/create/content/logistics/filter/FilterMenu.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/logistics/item/filter/FilterMenu.java
rename to src/main/java/com/simibubi/create/content/logistics/filter/FilterMenu.java
index 86a4f7c0e..29864709f 100644
--- a/src/main/java/com/simibubi/create/content/logistics/item/filter/FilterMenu.java
+++ b/src/main/java/com/simibubi/create/content/logistics/filter/FilterMenu.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.item.filter;
+package com.simibubi.create.content.logistics.filter;
 
 import com.simibubi.create.AllMenuTypes;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/FilterScreen.java b/src/main/java/com/simibubi/create/content/logistics/filter/FilterScreen.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/item/filter/FilterScreen.java
rename to src/main/java/com/simibubi/create/content/logistics/filter/FilterScreen.java
index ae6b4ab17..d2b5adb56 100644
--- a/src/main/java/com/simibubi/create/content/logistics/item/filter/FilterScreen.java
+++ b/src/main/java/com/simibubi/create/content/logistics/filter/FilterScreen.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.logistics.item.filter;
+package com.simibubi.create.content.logistics.filter;
 
 import java.util.Arrays;
 import java.util.List;
 
-import com.simibubi.create.content.logistics.item.filter.FilterScreenPacket.Option;
+import com.simibubi.create.content.logistics.filter.FilterScreenPacket.Option;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
 import com.simibubi.create.foundation.gui.AllIcons;
 import com.simibubi.create.foundation.gui.widget.IconButton;
diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/FilterScreenPacket.java b/src/main/java/com/simibubi/create/content/logistics/filter/FilterScreenPacket.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/logistics/item/filter/FilterScreenPacket.java
rename to src/main/java/com/simibubi/create/content/logistics/filter/FilterScreenPacket.java
index 4bfe03823..2896d8abc 100644
--- a/src/main/java/com/simibubi/create/content/logistics/item/filter/FilterScreenPacket.java
+++ b/src/main/java/com/simibubi/create/content/logistics/filter/FilterScreenPacket.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.logistics.item.filter;
+package com.simibubi.create.content.logistics.filter;
 
-import com.simibubi.create.content.logistics.item.filter.AttributeFilterMenu.WhitelistMode;
+import com.simibubi.create.content.logistics.filter.AttributeFilterMenu.WhitelistMode;
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 
 import net.minecraft.nbt.CompoundTag;
diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/ItemAttribute.java b/src/main/java/com/simibubi/create/content/logistics/filter/ItemAttribute.java
similarity index 89%
rename from src/main/java/com/simibubi/create/content/logistics/item/filter/ItemAttribute.java
rename to src/main/java/com/simibubi/create/content/logistics/filter/ItemAttribute.java
index 7e8939102..d85effd2d 100644
--- a/src/main/java/com/simibubi/create/content/logistics/item/filter/ItemAttribute.java
+++ b/src/main/java/com/simibubi/create/content/logistics/filter/ItemAttribute.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.item.filter;
+package com.simibubi.create.content.logistics.filter;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -13,18 +13,18 @@ import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.Nullable;
 
 import com.simibubi.create.AllRecipeTypes;
-import com.simibubi.create.content.contraptions.processing.InWorldProcessing;
-import com.simibubi.create.content.logistics.item.filter.attribute.BookAuthorAttribute;
-import com.simibubi.create.content.logistics.item.filter.attribute.BookCopyAttribute;
-import com.simibubi.create.content.logistics.item.filter.attribute.ColorAttribute;
-import com.simibubi.create.content.logistics.item.filter.attribute.EnchantAttribute;
-import com.simibubi.create.content.logistics.item.filter.attribute.FluidContentsAttribute;
-import com.simibubi.create.content.logistics.item.filter.attribute.ItemNameAttribute;
-import com.simibubi.create.content.logistics.item.filter.attribute.ShulkerFillLevelAttribute;
-import com.simibubi.create.content.logistics.item.filter.attribute.astralsorcery.AstralSorceryAmuletAttribute;
-import com.simibubi.create.content.logistics.item.filter.attribute.astralsorcery.AstralSorceryAttunementAttribute;
-import com.simibubi.create.content.logistics.item.filter.attribute.astralsorcery.AstralSorceryCrystalAttribute;
-import com.simibubi.create.content.logistics.item.filter.attribute.astralsorcery.AstralSorceryPerkGemAttribute;
+import com.simibubi.create.content.kinetics.fan.FanProcessing;
+import com.simibubi.create.content.logistics.filter.attribute.BookAuthorAttribute;
+import com.simibubi.create.content.logistics.filter.attribute.BookCopyAttribute;
+import com.simibubi.create.content.logistics.filter.attribute.ColorAttribute;
+import com.simibubi.create.content.logistics.filter.attribute.EnchantAttribute;
+import com.simibubi.create.content.logistics.filter.attribute.FluidContentsAttribute;
+import com.simibubi.create.content.logistics.filter.attribute.ItemNameAttribute;
+import com.simibubi.create.content.logistics.filter.attribute.ShulkerFillLevelAttribute;
+import com.simibubi.create.content.logistics.filter.attribute.astralsorcery.AstralSorceryAmuletAttribute;
+import com.simibubi.create.content.logistics.filter.attribute.astralsorcery.AstralSorceryAttunementAttribute;
+import com.simibubi.create.content.logistics.filter.attribute.astralsorcery.AstralSorceryCrystalAttribute;
+import com.simibubi.create.content.logistics.filter.attribute.astralsorcery.AstralSorceryPerkGemAttribute;
 import com.simibubi.create.foundation.utility.Lang;
 
 import net.minecraft.nbt.CompoundTag;
@@ -145,8 +145,8 @@ public interface ItemAttribute {
 		EQUIPABLE(s -> LivingEntity.getEquipmentSlotForItem(s)
 			.getType() != EquipmentSlot.Type.HAND),
 		FURNACE_FUEL(AbstractFurnaceBlockEntity::isFuel),
-		WASHABLE(InWorldProcessing::isWashable),
-		HAUNTABLE(InWorldProcessing::isHauntable),
+		WASHABLE(FanProcessing::isWashable),
+		HAUNTABLE(FanProcessing::isHauntable),
 		CRUSHABLE((s, w) -> testRecipe(s, w, AllRecipeTypes.CRUSHING.getType())
 			|| testRecipe(s, w, AllRecipeTypes.MILLING.getType())),
 		SMELTABLE((s, w) -> testRecipe(s, w, RecipeType.SMELTING)),
diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/BookAuthorAttribute.java b/src/main/java/com/simibubi/create/content/logistics/filter/attribute/BookAuthorAttribute.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/BookAuthorAttribute.java
rename to src/main/java/com/simibubi/create/content/logistics/filter/attribute/BookAuthorAttribute.java
index 9e7d8c026..c0eaf419f 100644
--- a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/BookAuthorAttribute.java
+++ b/src/main/java/com/simibubi/create/content/logistics/filter/attribute/BookAuthorAttribute.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.logistics.item.filter.attribute;
+package com.simibubi.create.content.logistics.filter.attribute;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.simibubi.create.content.logistics.item.filter.ItemAttribute;
+import com.simibubi.create.content.logistics.filter.ItemAttribute;
 
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.item.ItemStack;
diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/BookCopyAttribute.java b/src/main/java/com/simibubi/create/content/logistics/filter/attribute/BookCopyAttribute.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/BookCopyAttribute.java
rename to src/main/java/com/simibubi/create/content/logistics/filter/attribute/BookCopyAttribute.java
index 88a3c7c87..04a60b8b3 100644
--- a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/BookCopyAttribute.java
+++ b/src/main/java/com/simibubi/create/content/logistics/filter/attribute/BookCopyAttribute.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.logistics.item.filter.attribute;
+package com.simibubi.create.content.logistics.filter.attribute;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.simibubi.create.content.logistics.item.filter.ItemAttribute;
+import com.simibubi.create.content.logistics.filter.ItemAttribute;
 
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.item.ItemStack;
diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/ColorAttribute.java b/src/main/java/com/simibubi/create/content/logistics/filter/attribute/ColorAttribute.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/ColorAttribute.java
rename to src/main/java/com/simibubi/create/content/logistics/filter/attribute/ColorAttribute.java
index d41a6da25..59fc5ec70 100644
--- a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/ColorAttribute.java
+++ b/src/main/java/com/simibubi/create/content/logistics/filter/attribute/ColorAttribute.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.item.filter.attribute;
+package com.simibubi.create.content.logistics.filter.attribute;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -8,7 +8,7 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import com.simibubi.create.content.logistics.item.filter.ItemAttribute;
+import com.simibubi.create.content.logistics.filter.ItemAttribute;
 import com.simibubi.create.foundation.utility.RegisteredObjects;
 
 import net.minecraft.client.resources.language.I18n;
diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/EnchantAttribute.java b/src/main/java/com/simibubi/create/content/logistics/filter/attribute/EnchantAttribute.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/EnchantAttribute.java
rename to src/main/java/com/simibubi/create/content/logistics/filter/attribute/EnchantAttribute.java
index f64614243..fb61fe07f 100644
--- a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/EnchantAttribute.java
+++ b/src/main/java/com/simibubi/create/content/logistics/filter/attribute/EnchantAttribute.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.logistics.item.filter.attribute;
+package com.simibubi.create.content.logistics.filter.attribute;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
 import javax.annotation.Nullable;
 
-import com.simibubi.create.content.logistics.item.filter.ItemAttribute;
+import com.simibubi.create.content.logistics.filter.ItemAttribute;
 import com.simibubi.create.foundation.utility.Components;
 
 import net.minecraft.nbt.CompoundTag;
diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/FluidContentsAttribute.java b/src/main/java/com/simibubi/create/content/logistics/filter/attribute/FluidContentsAttribute.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/FluidContentsAttribute.java
rename to src/main/java/com/simibubi/create/content/logistics/filter/attribute/FluidContentsAttribute.java
index e78a75642..45c2a8402 100644
--- a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/FluidContentsAttribute.java
+++ b/src/main/java/com/simibubi/create/content/logistics/filter/attribute/FluidContentsAttribute.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.item.filter.attribute;
+package com.simibubi.create.content.logistics.filter.attribute;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -6,7 +6,7 @@ import java.util.stream.Collectors;
 
 import javax.annotation.Nullable;
 
-import com.simibubi.create.content.logistics.item.filter.ItemAttribute;
+import com.simibubi.create.content.logistics.filter.ItemAttribute;
 
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.resources.ResourceLocation;
diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/ItemNameAttribute.java b/src/main/java/com/simibubi/create/content/logistics/filter/attribute/ItemNameAttribute.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/ItemNameAttribute.java
rename to src/main/java/com/simibubi/create/content/logistics/filter/attribute/ItemNameAttribute.java
index ab3ff572b..83bab8d96 100644
--- a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/ItemNameAttribute.java
+++ b/src/main/java/com/simibubi/create/content/logistics/filter/attribute/ItemNameAttribute.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.logistics.item.filter.attribute;
+package com.simibubi.create.content.logistics.filter.attribute;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import com.google.gson.JsonParseException;
-import com.simibubi.create.content.logistics.item.filter.ItemAttribute;
+import com.simibubi.create.content.logistics.filter.ItemAttribute;
 
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/ShulkerFillLevelAttribute.java b/src/main/java/com/simibubi/create/content/logistics/filter/attribute/ShulkerFillLevelAttribute.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/ShulkerFillLevelAttribute.java
rename to src/main/java/com/simibubi/create/content/logistics/filter/attribute/ShulkerFillLevelAttribute.java
index 86fca30e0..9f0f20b06 100644
--- a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/ShulkerFillLevelAttribute.java
+++ b/src/main/java/com/simibubi/create/content/logistics/filter/attribute/ShulkerFillLevelAttribute.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.item.filter.attribute;
+package com.simibubi.create.content.logistics.filter.attribute;
 
 import java.util.Arrays;
 import java.util.List;
@@ -7,7 +7,7 @@ import java.util.stream.Collectors;
 
 import javax.annotation.Nullable;
 
-import com.simibubi.create.content.logistics.item.filter.ItemAttribute;
+import com.simibubi.create.content.logistics.filter.ItemAttribute;
 import com.simibubi.create.foundation.utility.Lang;
 
 import net.minecraft.core.NonNullList;
diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/astralsorcery/AstralSorceryAmuletAttribute.java b/src/main/java/com/simibubi/create/content/logistics/filter/attribute/astralsorcery/AstralSorceryAmuletAttribute.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/astralsorcery/AstralSorceryAmuletAttribute.java
rename to src/main/java/com/simibubi/create/content/logistics/filter/attribute/astralsorcery/AstralSorceryAmuletAttribute.java
index 76f3b351f..0bca33be9 100644
--- a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/astralsorcery/AstralSorceryAmuletAttribute.java
+++ b/src/main/java/com/simibubi/create/content/logistics/filter/attribute/astralsorcery/AstralSorceryAmuletAttribute.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.logistics.item.filter.attribute.astralsorcery;
+package com.simibubi.create.content.logistics.filter.attribute.astralsorcery;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.simibubi.create.content.logistics.item.filter.ItemAttribute;
+import com.simibubi.create.content.logistics.filter.ItemAttribute;
 import com.simibubi.create.foundation.utility.Components;
 
 import net.minecraft.nbt.CompoundTag;
diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/astralsorcery/AstralSorceryAttunementAttribute.java b/src/main/java/com/simibubi/create/content/logistics/filter/attribute/astralsorcery/AstralSorceryAttunementAttribute.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/astralsorcery/AstralSorceryAttunementAttribute.java
rename to src/main/java/com/simibubi/create/content/logistics/filter/attribute/astralsorcery/AstralSorceryAttunementAttribute.java
index be706047b..139eefe69 100644
--- a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/astralsorcery/AstralSorceryAttunementAttribute.java
+++ b/src/main/java/com/simibubi/create/content/logistics/filter/attribute/astralsorcery/AstralSorceryAttunementAttribute.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.logistics.item.filter.attribute.astralsorcery;
+package com.simibubi.create.content.logistics.filter.attribute.astralsorcery;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.simibubi.create.content.logistics.item.filter.ItemAttribute;
+import com.simibubi.create.content.logistics.filter.ItemAttribute;
 import com.simibubi.create.foundation.utility.Components;
 
 import net.minecraft.nbt.CompoundTag;
diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/astralsorcery/AstralSorceryCrystalAttribute.java b/src/main/java/com/simibubi/create/content/logistics/filter/attribute/astralsorcery/AstralSorceryCrystalAttribute.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/astralsorcery/AstralSorceryCrystalAttribute.java
rename to src/main/java/com/simibubi/create/content/logistics/filter/attribute/astralsorcery/AstralSorceryCrystalAttribute.java
index d33a7e6c5..d55d33771 100644
--- a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/astralsorcery/AstralSorceryCrystalAttribute.java
+++ b/src/main/java/com/simibubi/create/content/logistics/filter/attribute/astralsorcery/AstralSorceryCrystalAttribute.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.logistics.item.filter.attribute.astralsorcery;
+package com.simibubi.create.content.logistics.filter.attribute.astralsorcery;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.simibubi.create.content.logistics.item.filter.ItemAttribute;
+import com.simibubi.create.content.logistics.filter.ItemAttribute;
 import com.simibubi.create.foundation.utility.Components;
 
 import net.minecraft.nbt.CompoundTag;
diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/astralsorcery/AstralSorceryPerkGemAttribute.java b/src/main/java/com/simibubi/create/content/logistics/filter/attribute/astralsorcery/AstralSorceryPerkGemAttribute.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/astralsorcery/AstralSorceryPerkGemAttribute.java
rename to src/main/java/com/simibubi/create/content/logistics/filter/attribute/astralsorcery/AstralSorceryPerkGemAttribute.java
index 2e8e476fd..3e567c396 100644
--- a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/astralsorcery/AstralSorceryPerkGemAttribute.java
+++ b/src/main/java/com/simibubi/create/content/logistics/filter/attribute/astralsorcery/AstralSorceryPerkGemAttribute.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.logistics.item.filter.attribute.astralsorcery;
+package com.simibubi.create.content.logistics.filter.attribute.astralsorcery;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.simibubi.create.content.logistics.item.filter.ItemAttribute;
+import com.simibubi.create.content.logistics.filter.ItemAttribute;
 import com.simibubi.create.foundation.utility.Components;
 
 import net.minecraft.nbt.CompoundTag;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/flap/FlapData.java b/src/main/java/com/simibubi/create/content/logistics/flwdata/FlapData.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/logistics/block/flap/FlapData.java
rename to src/main/java/com/simibubi/create/content/logistics/flwdata/FlapData.java
index 591f0160c..6c616eefb 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/flap/FlapData.java
+++ b/src/main/java/com/simibubi/create/content/logistics/flwdata/FlapData.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.flap;
+package com.simibubi.create.content.logistics.flwdata;
 
 import com.jozufozu.flywheel.api.InstanceData;
 import com.jozufozu.flywheel.core.materials.FlatLit;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/flap/FlapType.java b/src/main/java/com/simibubi/create/content/logistics/flwdata/FlapType.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/block/flap/FlapType.java
rename to src/main/java/com/simibubi/create/content/logistics/flwdata/FlapType.java
index 1745d78db..42adae76e 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/flap/FlapType.java
+++ b/src/main/java/com/simibubi/create/content/logistics/flwdata/FlapType.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.flap;
+package com.simibubi.create.content.logistics.flwdata;
 
 import com.jozufozu.flywheel.api.struct.Batched;
 import com.jozufozu.flywheel.api.struct.Instanced;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/flap/UnsafeFlapWriter.java b/src/main/java/com/simibubi/create/content/logistics/flwdata/UnsafeFlapWriter.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/logistics/block/flap/UnsafeFlapWriter.java
rename to src/main/java/com/simibubi/create/content/logistics/flwdata/UnsafeFlapWriter.java
index 345fde063..4ca7961d5 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/flap/UnsafeFlapWriter.java
+++ b/src/main/java/com/simibubi/create/content/logistics/flwdata/UnsafeFlapWriter.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.flap;
+package com.simibubi.create.content.logistics.flwdata;
 
 import org.lwjgl.system.MemoryUtil;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/package-info.java b/src/main/java/com/simibubi/create/content/logistics/flwdata/package-info.java
similarity index 66%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/package-info.java
rename to src/main/java/com/simibubi/create/content/logistics/flwdata/package-info.java
index 08edd5958..5f4c5ce95 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/package-info.java
+++ b/src/main/java/com/simibubi/create/content/logistics/flwdata/package-info.java
@@ -1,5 +1,5 @@
 @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault
-package com.simibubi.create.content.contraptions.components.structureMovement.render;
+package com.simibubi.create.content.logistics.flwdata;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/funnel/AbstractDirectionalFunnelBlock.java b/src/main/java/com/simibubi/create/content/logistics/funnel/AbstractDirectionalFunnelBlock.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/logistics/block/funnel/AbstractDirectionalFunnelBlock.java
rename to src/main/java/com/simibubi/create/content/logistics/funnel/AbstractDirectionalFunnelBlock.java
index 9fabd9a11..2d7627ed8 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/funnel/AbstractDirectionalFunnelBlock.java
+++ b/src/main/java/com/simibubi/create/content/logistics/funnel/AbstractDirectionalFunnelBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.funnel;
+package com.simibubi.create.content.logistics.funnel;
 
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.Block;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/funnel/AbstractFunnelBlock.java b/src/main/java/com/simibubi/create/content/logistics/funnel/AbstractFunnelBlock.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/block/funnel/AbstractFunnelBlock.java
rename to src/main/java/com/simibubi/create/content/logistics/funnel/AbstractFunnelBlock.java
index 8ad4c7a46..f24c09370 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/funnel/AbstractFunnelBlock.java
+++ b/src/main/java/com/simibubi/create/content/logistics/funnel/AbstractFunnelBlock.java
@@ -1,15 +1,15 @@
-package com.simibubi.create.content.logistics.block.funnel;
+package com.simibubi.create.content.logistics.funnel;
 
 import java.util.function.Consumer;
 
 import javax.annotation.Nullable;
 
 import com.simibubi.create.AllBlockEntityTypes;
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
 import com.simibubi.create.foundation.block.IBE;
 import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
 import com.simibubi.create.foundation.block.render.ReducedDestroyEffects;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.inventory.InvManipulationBehaviour;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/funnel/AbstractHorizontalFunnelBlock.java b/src/main/java/com/simibubi/create/content/logistics/funnel/AbstractHorizontalFunnelBlock.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/logistics/block/funnel/AbstractHorizontalFunnelBlock.java
rename to src/main/java/com/simibubi/create/content/logistics/funnel/AbstractHorizontalFunnelBlock.java
index 7e1b03073..368d6dfd4 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/funnel/AbstractHorizontalFunnelBlock.java
+++ b/src/main/java/com/simibubi/create/content/logistics/funnel/AbstractHorizontalFunnelBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.funnel;
+package com.simibubi.create.content.logistics.funnel;
 
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.Block;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/funnel/AndesiteFunnelBlock.java b/src/main/java/com/simibubi/create/content/logistics/funnel/AndesiteFunnelBlock.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/logistics/block/funnel/AndesiteFunnelBlock.java
rename to src/main/java/com/simibubi/create/content/logistics/funnel/AndesiteFunnelBlock.java
index 26792cf23..239fe3cad 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/funnel/AndesiteFunnelBlock.java
+++ b/src/main/java/com/simibubi/create/content/logistics/funnel/AndesiteFunnelBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.funnel;
+package com.simibubi.create.content.logistics.funnel;
 
 import com.simibubi.create.AllBlocks;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/funnel/BeltFunnelBlock.java b/src/main/java/com/simibubi/create/content/logistics/funnel/BeltFunnelBlock.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/logistics/block/funnel/BeltFunnelBlock.java
rename to src/main/java/com/simibubi/create/content/logistics/funnel/BeltFunnelBlock.java
index 585af655c..bdf48f661 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/funnel/BeltFunnelBlock.java
+++ b/src/main/java/com/simibubi/create/content/logistics/funnel/BeltFunnelBlock.java
@@ -1,15 +1,15 @@
-package com.simibubi.create.content.logistics.block.funnel;
+package com.simibubi.create.content.logistics.funnel;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.relays.belt.BeltBlock;
-import com.simibubi.create.content.contraptions.relays.belt.BeltSlope;
-import com.simibubi.create.content.schematics.ISpecialBlockItemRequirement;
-import com.simibubi.create.content.schematics.ItemRequirement;
+import com.simibubi.create.content.kinetics.belt.BeltBlock;
+import com.simibubi.create.content.kinetics.belt.BeltSlope;
+import com.simibubi.create.content.kinetics.belt.behaviour.DirectBeltInputBehaviour;
+import com.simibubi.create.content.schematics.requirement.ISpecialBlockItemRequirement;
+import com.simibubi.create.content.schematics.requirement.ItemRequirement;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
 import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.DirectBeltInputBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.VoxelShaper;
 import com.tterrag.registrate.util.entry.BlockEntry;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/funnel/BeltFunnelGenerator.java b/src/main/java/com/simibubi/create/content/logistics/funnel/BeltFunnelGenerator.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/logistics/block/funnel/BeltFunnelGenerator.java
rename to src/main/java/com/simibubi/create/content/logistics/funnel/BeltFunnelGenerator.java
index d3928b952..3f3468d53 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/funnel/BeltFunnelGenerator.java
+++ b/src/main/java/com/simibubi/create/content/logistics/funnel/BeltFunnelGenerator.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.content.logistics.block.funnel;
+package com.simibubi.create.content.logistics.funnel;
 
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.block.funnel.BeltFunnelBlock.Shape;
+import com.simibubi.create.content.logistics.funnel.BeltFunnelBlock.Shape;
 import com.simibubi.create.foundation.data.SpecialBlockStateGen;
 import com.tterrag.registrate.providers.DataGenContext;
 import com.tterrag.registrate.providers.RegistrateBlockstateProvider;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/funnel/BrassFunnelBlock.java b/src/main/java/com/simibubi/create/content/logistics/funnel/BrassFunnelBlock.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/logistics/block/funnel/BrassFunnelBlock.java
rename to src/main/java/com/simibubi/create/content/logistics/funnel/BrassFunnelBlock.java
index 969f141dd..a9e273fbd 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/funnel/BrassFunnelBlock.java
+++ b/src/main/java/com/simibubi/create/content/logistics/funnel/BrassFunnelBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.funnel;
+package com.simibubi.create.content.logistics.funnel;
 
 import com.simibubi.create.AllBlocks;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelBlock.java b/src/main/java/com/simibubi/create/content/logistics/funnel/FunnelBlock.java
similarity index 99%
rename from src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelBlock.java
rename to src/main/java/com/simibubi/create/content/logistics/funnel/FunnelBlock.java
index 6ced3a1da..d617c9e42 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelBlock.java
+++ b/src/main/java/com/simibubi/create/content/logistics/funnel/FunnelBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.funnel;
+package com.simibubi.create.content.logistics.funnel;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelBlockEntity.java b/src/main/java/com/simibubi/create/content/logistics/funnel/FunnelBlockEntity.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelBlockEntity.java
rename to src/main/java/com/simibubi/create/content/logistics/funnel/FunnelBlockEntity.java
index fff1808de..281168261 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/logistics/funnel/FunnelBlockEntity.java
@@ -1,30 +1,29 @@
-package com.simibubi.create.content.logistics.block.funnel;
+package com.simibubi.create.content.logistics.funnel;
 
 import java.lang.ref.WeakReference;
 import java.util.List;
 
 import com.jozufozu.flywheel.backend.instancing.InstancedRenderDispatcher;
 import com.simibubi.create.AllBlocks;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.AllSoundEvents;
-import com.simibubi.create.content.contraptions.goggles.IHaveHoveringInformation;
-import com.simibubi.create.content.contraptions.relays.belt.BeltBlockEntity;
-import com.simibubi.create.content.contraptions.relays.belt.BeltHelper;
-import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack;
-import com.simibubi.create.content.logistics.block.funnel.BeltFunnelBlock.Shape;
-import com.simibubi.create.content.logistics.packet.FunnelFlapPacket;
+import com.simibubi.create.content.equipment.goggles.IHaveHoveringInformation;
+import com.simibubi.create.content.kinetics.belt.BeltBlockEntity;
+import com.simibubi.create.content.kinetics.belt.BeltHelper;
+import com.simibubi.create.content.kinetics.belt.behaviour.DirectBeltInputBehaviour;
+import com.simibubi.create.content.kinetics.belt.transport.TransportedItemStack;
+import com.simibubi.create.content.logistics.funnel.BeltFunnelBlock.Shape;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.DirectBeltInputBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.inventory.InvManipulationBehaviour;
-import com.simibubi.create.foundation.config.AllConfigs;
 import com.simibubi.create.foundation.item.ItemHelper.ExtractionCountMode;
-import com.simibubi.create.foundation.networking.AllPackets;
 import com.simibubi.create.foundation.utility.BlockFace;
 import com.simibubi.create.foundation.utility.VecHelper;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat.Chaser;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelFilterSlotPositioning.java b/src/main/java/com/simibubi/create/content/logistics/funnel/FunnelFilterSlotPositioning.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelFilterSlotPositioning.java
rename to src/main/java/com/simibubi/create/content/logistics/funnel/FunnelFilterSlotPositioning.java
index 0f152d657..8de1dd63d 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelFilterSlotPositioning.java
+++ b/src/main/java/com/simibubi/create/content/logistics/funnel/FunnelFilterSlotPositioning.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.logistics.block.funnel;
+package com.simibubi.create.content.logistics.funnel;
 
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.simibubi.create.content.logistics.block.funnel.BeltFunnelBlock.Shape;
+import com.simibubi.create.content.logistics.funnel.BeltFunnelBlock.Shape;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform;
 import com.simibubi.create.foundation.utility.AngleHelper;
 import com.simibubi.create.foundation.utility.VecHelper;
diff --git a/src/main/java/com/simibubi/create/content/logistics/packet/FunnelFlapPacket.java b/src/main/java/com/simibubi/create/content/logistics/funnel/FunnelFlapPacket.java
similarity index 85%
rename from src/main/java/com/simibubi/create/content/logistics/packet/FunnelFlapPacket.java
rename to src/main/java/com/simibubi/create/content/logistics/funnel/FunnelFlapPacket.java
index b9a1fc43b..b403a527d 100644
--- a/src/main/java/com/simibubi/create/content/logistics/packet/FunnelFlapPacket.java
+++ b/src/main/java/com/simibubi/create/content/logistics/funnel/FunnelFlapPacket.java
@@ -1,6 +1,5 @@
-package com.simibubi.create.content.logistics.packet;
+package com.simibubi.create.content.logistics.funnel;
 
-import com.simibubi.create.content.logistics.block.funnel.FunnelBlockEntity;
 import com.simibubi.create.foundation.networking.BlockEntityDataPacket;
 
 import net.minecraft.network.FriendlyByteBuf;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelGenerator.java b/src/main/java/com/simibubi/create/content/logistics/funnel/FunnelGenerator.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelGenerator.java
rename to src/main/java/com/simibubi/create/content/logistics/funnel/FunnelGenerator.java
index 59dcbff03..67d130ff6 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelGenerator.java
+++ b/src/main/java/com/simibubi/create/content/logistics/funnel/FunnelGenerator.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.funnel;
+package com.simibubi.create.content.logistics.funnel;
 
 import com.simibubi.create.Create;
 import com.simibubi.create.foundation.data.SpecialBlockStateGen;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelInstance.java b/src/main/java/com/simibubi/create/content/logistics/funnel/FunnelInstance.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelInstance.java
rename to src/main/java/com/simibubi/create/content/logistics/funnel/FunnelInstance.java
index 7fdb7da25..c386dc75d 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelInstance.java
+++ b/src/main/java/com/simibubi/create/content/logistics/funnel/FunnelInstance.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.funnel;
+package com.simibubi.create.content.logistics.funnel;
 
 import java.util.ArrayList;
 
@@ -9,7 +9,7 @@ import com.jozufozu.flywheel.api.instance.DynamicInstance;
 import com.jozufozu.flywheel.backend.instancing.blockentity.BlockEntityInstance;
 import com.jozufozu.flywheel.core.PartialModel;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.logistics.block.flap.FlapData;
+import com.simibubi.create.content.logistics.flwdata.FlapData;
 import com.simibubi.create.foundation.render.AllMaterialSpecs;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelItem.java b/src/main/java/com/simibubi/create/content/logistics/funnel/FunnelItem.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelItem.java
rename to src/main/java/com/simibubi/create/content/logistics/funnel/FunnelItem.java
index 7376cff5d..1e5eecbe3 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelItem.java
+++ b/src/main/java/com/simibubi/create/content/logistics/funnel/FunnelItem.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.funnel;
+package com.simibubi.create.content.logistics.funnel;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelMovementBehaviour.java b/src/main/java/com/simibubi/create/content/logistics/funnel/FunnelMovementBehaviour.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelMovementBehaviour.java
rename to src/main/java/com/simibubi/create/content/logistics/funnel/FunnelMovementBehaviour.java
index 8770a757a..9178f3684 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelMovementBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/logistics/funnel/FunnelMovementBehaviour.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.logistics.block.funnel;
+package com.simibubi.create.content.logistics.funnel;
 
 import java.util.List;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
-import com.simibubi.create.content.logistics.item.filter.FilterItem;
+import com.simibubi.create.content.contraptions.behaviour.MovementBehaviour;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
+import com.simibubi.create.content.logistics.filter.FilterItem;
 import com.simibubi.create.foundation.item.ItemHelper;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelRenderer.java b/src/main/java/com/simibubi/create/content/logistics/funnel/FunnelRenderer.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelRenderer.java
rename to src/main/java/com/simibubi/create/content/logistics/funnel/FunnelRenderer.java
index c4e5dc43a..e83c7db4e 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelRenderer.java
+++ b/src/main/java/com/simibubi/create/content/logistics/funnel/FunnelRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.funnel;
+package com.simibubi.create.content.logistics.funnel;
 
 import com.jozufozu.flywheel.backend.Backend;
 import com.jozufozu.flywheel.core.PartialModel;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelBlock.java b/src/main/java/com/simibubi/create/content/logistics/tunnel/BeltTunnelBlock.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelBlock.java
rename to src/main/java/com/simibubi/create/content/logistics/tunnel/BeltTunnelBlock.java
index a1c80302b..4c572e848 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelBlock.java
+++ b/src/main/java/com/simibubi/create/content/logistics/tunnel/BeltTunnelBlock.java
@@ -1,14 +1,14 @@
-package com.simibubi.create.content.logistics.block.belts.tunnel;
+package com.simibubi.create.content.logistics.tunnel;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.relays.belt.BeltBlock;
-import com.simibubi.create.content.contraptions.relays.belt.BeltSlope;
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
-import com.simibubi.create.content.logistics.block.funnel.BeltFunnelBlock;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
+import com.simibubi.create.content.kinetics.belt.BeltBlock;
+import com.simibubi.create.content.kinetics.belt.BeltSlope;
+import com.simibubi.create.content.kinetics.belt.behaviour.DirectBeltInputBehaviour;
+import com.simibubi.create.content.logistics.funnel.BeltFunnelBlock;
 import com.simibubi.create.foundation.block.IBE;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.DirectBeltInputBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.worldWrappers.WrappedWorld;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelBlockEntity.java b/src/main/java/com/simibubi/create/content/logistics/tunnel/BeltTunnelBlockEntity.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelBlockEntity.java
rename to src/main/java/com/simibubi/create/content/logistics/tunnel/BeltTunnelBlockEntity.java
index 0e1a81f02..86ab58df7 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/logistics/tunnel/BeltTunnelBlockEntity.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.belts.tunnel;
+package com.simibubi.create.content.logistics.tunnel;
 
 import java.util.EnumMap;
 import java.util.HashSet;
@@ -11,12 +11,11 @@ import org.apache.commons.lang3.tuple.Pair;
 
 import com.jozufozu.flywheel.backend.instancing.InstancedRenderDispatcher;
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelBlock.Shape;
-import com.simibubi.create.content.logistics.block.funnel.BeltFunnelBlock;
-import com.simibubi.create.content.logistics.packet.TunnelFlapPacket;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.AllPackets;
+import com.simibubi.create.content.logistics.funnel.BeltFunnelBlock;
+import com.simibubi.create.content.logistics.tunnel.BeltTunnelBlock.Shape;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat.Chaser;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelInstance.java b/src/main/java/com/simibubi/create/content/logistics/tunnel/BeltTunnelInstance.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelInstance.java
rename to src/main/java/com/simibubi/create/content/logistics/tunnel/BeltTunnelInstance.java
index d1365b05a..ccbd7d4a0 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelInstance.java
+++ b/src/main/java/com/simibubi/create/content/logistics/tunnel/BeltTunnelInstance.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.belts.tunnel;
+package com.simibubi.create.content.logistics.tunnel;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -11,7 +11,7 @@ import com.jozufozu.flywheel.api.MaterialManager;
 import com.jozufozu.flywheel.api.instance.DynamicInstance;
 import com.jozufozu.flywheel.backend.instancing.blockentity.BlockEntityInstance;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.logistics.block.flap.FlapData;
+import com.simibubi.create.content.logistics.flwdata.FlapData;
 import com.simibubi.create.foundation.render.AllMaterialSpecs;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelItem.java b/src/main/java/com/simibubi/create/content/logistics/tunnel/BeltTunnelItem.java
similarity index 84%
rename from src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelItem.java
rename to src/main/java/com/simibubi/create/content/logistics/tunnel/BeltTunnelItem.java
index 04cf1b358..c7f16b52d 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelItem.java
+++ b/src/main/java/com/simibubi/create/content/logistics/tunnel/BeltTunnelItem.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.logistics.block.belts.tunnel;
+package com.simibubi.create.content.logistics.tunnel;
 
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.relays.belt.BeltBlockEntity;
-import com.simibubi.create.content.contraptions.relays.belt.BeltBlockEntity.CasingType;
-import com.simibubi.create.content.contraptions.relays.belt.BeltHelper;
+import com.simibubi.create.content.kinetics.belt.BeltBlockEntity;
+import com.simibubi.create.content.kinetics.belt.BeltBlockEntity.CasingType;
+import com.simibubi.create.content.kinetics.belt.BeltHelper;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.player.Player;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelRenderer.java b/src/main/java/com/simibubi/create/content/logistics/tunnel/BeltTunnelRenderer.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelRenderer.java
rename to src/main/java/com/simibubi/create/content/logistics/tunnel/BeltTunnelRenderer.java
index 694c9bcca..5bcc9af4e 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelRenderer.java
+++ b/src/main/java/com/simibubi/create/content/logistics/tunnel/BeltTunnelRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.belts.tunnel;
+package com.simibubi.create.content.logistics.tunnel;
 
 import com.jozufozu.flywheel.backend.Backend;
 import com.jozufozu.flywheel.util.transform.TransformStack;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelShapes.java b/src/main/java/com/simibubi/create/content/logistics/tunnel/BeltTunnelShapes.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelShapes.java
rename to src/main/java/com/simibubi/create/content/logistics/tunnel/BeltTunnelShapes.java
index f7e359aec..b1dc2f5d8 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelShapes.java
+++ b/src/main/java/com/simibubi/create/content/logistics/tunnel/BeltTunnelShapes.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.belts.tunnel;
+package com.simibubi.create.content.logistics.tunnel;
 
 import static net.minecraft.world.level.block.Block.box;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BrassTunnelBlock.java b/src/main/java/com/simibubi/create/content/logistics/tunnel/BrassTunnelBlock.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BrassTunnelBlock.java
rename to src/main/java/com/simibubi/create/content/logistics/tunnel/BrassTunnelBlock.java
index 692f67ffc..5812add24 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BrassTunnelBlock.java
+++ b/src/main/java/com/simibubi/create/content/logistics/tunnel/BrassTunnelBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.belts.tunnel;
+package com.simibubi.create.content.logistics.tunnel;
 
 import java.util.List;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BrassTunnelBlockEntity.java b/src/main/java/com/simibubi/create/content/logistics/tunnel/BrassTunnelBlockEntity.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BrassTunnelBlockEntity.java
rename to src/main/java/com/simibubi/create/content/logistics/tunnel/BrassTunnelBlockEntity.java
index 026f017c6..b2f248fea 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BrassTunnelBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/logistics/tunnel/BrassTunnelBlockEntity.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.belts.tunnel;
+package com.simibubi.create.content.logistics.tunnel;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -14,19 +14,18 @@ import javax.annotation.Nullable;
 import org.apache.commons.lang3.tuple.Pair;
 
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.goggles.IHaveGoggleInformation;
-import com.simibubi.create.content.contraptions.relays.belt.BeltBlockEntity;
-import com.simibubi.create.content.contraptions.relays.belt.BeltHelper;
-import com.simibubi.create.content.logistics.block.funnel.BeltFunnelBlock;
-import com.simibubi.create.content.logistics.block.funnel.BeltFunnelBlock.Shape;
-import com.simibubi.create.content.logistics.block.funnel.FunnelBlock;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.DirectBeltInputBehaviour;
+import com.simibubi.create.content.equipment.goggles.IHaveGoggleInformation;
+import com.simibubi.create.content.kinetics.belt.BeltBlockEntity;
+import com.simibubi.create.content.kinetics.belt.BeltHelper;
+import com.simibubi.create.content.kinetics.belt.behaviour.DirectBeltInputBehaviour;
+import com.simibubi.create.content.logistics.funnel.BeltFunnelBlock;
+import com.simibubi.create.content.logistics.funnel.BeltFunnelBlock.Shape;
+import com.simibubi.create.content.logistics.funnel.FunnelBlock;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.filtering.SidedFilteringBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.scrollvalue.INamedIconOptions;
-import com.simibubi.create.foundation.blockEntity.behaviour.scrollvalue.ScrollOptionBehaviour;
-import com.simibubi.create.foundation.config.AllConfigs;
+import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.INamedIconOptions;
+import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollOptionBehaviour;
 import com.simibubi.create.foundation.gui.AllIcons;
 import com.simibubi.create.foundation.utility.BlockHelper;
 import com.simibubi.create.foundation.utility.Components;
@@ -34,6 +33,7 @@ import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.NBTHelper;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.ChatFormatting;
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BrassTunnelCTBehaviour.java b/src/main/java/com/simibubi/create/content/logistics/tunnel/BrassTunnelCTBehaviour.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BrassTunnelCTBehaviour.java
rename to src/main/java/com/simibubi/create/content/logistics/tunnel/BrassTunnelCTBehaviour.java
index 9b34ce129..7004a7c86 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BrassTunnelCTBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/logistics/tunnel/BrassTunnelCTBehaviour.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.belts.tunnel;
+package com.simibubi.create.content.logistics.tunnel;
 
 import org.jetbrains.annotations.Nullable;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BrassTunnelFilterSlot.java b/src/main/java/com/simibubi/create/content/logistics/tunnel/BrassTunnelFilterSlot.java
similarity index 83%
rename from src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BrassTunnelFilterSlot.java
rename to src/main/java/com/simibubi/create/content/logistics/tunnel/BrassTunnelFilterSlot.java
index 64bf18ed2..1c32b74d8 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BrassTunnelFilterSlot.java
+++ b/src/main/java/com/simibubi/create/content/logistics/tunnel/BrassTunnelFilterSlot.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.belts.tunnel;
+package com.simibubi.create.content.logistics.tunnel;
 
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform;
 import com.simibubi.create.foundation.utility.VecHelper;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BrassTunnelItemHandler.java b/src/main/java/com/simibubi/create/content/logistics/tunnel/BrassTunnelItemHandler.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BrassTunnelItemHandler.java
rename to src/main/java/com/simibubi/create/content/logistics/tunnel/BrassTunnelItemHandler.java
index 0bef12760..430755c50 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BrassTunnelItemHandler.java
+++ b/src/main/java/com/simibubi/create/content/logistics/tunnel/BrassTunnelItemHandler.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.belts.tunnel;
+package com.simibubi.create.content.logistics.tunnel;
 
 import net.minecraft.world.item.ItemStack;
 import net.minecraftforge.common.util.LazyOptional;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BrassTunnelModeSlot.java b/src/main/java/com/simibubi/create/content/logistics/tunnel/BrassTunnelModeSlot.java
similarity index 84%
rename from src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BrassTunnelModeSlot.java
rename to src/main/java/com/simibubi/create/content/logistics/tunnel/BrassTunnelModeSlot.java
index df78e2e6e..0b07a36c5 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BrassTunnelModeSlot.java
+++ b/src/main/java/com/simibubi/create/content/logistics/tunnel/BrassTunnelModeSlot.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.belts.tunnel;
+package com.simibubi.create.content.logistics.tunnel;
 
 import com.simibubi.create.foundation.blockEntity.behaviour.CenteredSideValueBoxTransform;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/packet/TunnelFlapPacket.java b/src/main/java/com/simibubi/create/content/logistics/tunnel/TunnelFlapPacket.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/logistics/packet/TunnelFlapPacket.java
rename to src/main/java/com/simibubi/create/content/logistics/tunnel/TunnelFlapPacket.java
index 0aafcbff1..1cfe8db70 100644
--- a/src/main/java/com/simibubi/create/content/logistics/packet/TunnelFlapPacket.java
+++ b/src/main/java/com/simibubi/create/content/logistics/tunnel/TunnelFlapPacket.java
@@ -1,11 +1,10 @@
-package com.simibubi.create.content.logistics.packet;
+package com.simibubi.create.content.logistics.tunnel;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.lang3.tuple.Pair;
 
-import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelBlockEntity;
 import com.simibubi.create.foundation.networking.BlockEntityDataPacket;
 
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/vault/ItemVaultBlock.java b/src/main/java/com/simibubi/create/content/logistics/vault/ItemVaultBlock.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/logistics/block/vault/ItemVaultBlock.java
rename to src/main/java/com/simibubi/create/content/logistics/vault/ItemVaultBlock.java
index 3284093be..134d6f0e0 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/vault/ItemVaultBlock.java
+++ b/src/main/java/com/simibubi/create/content/logistics/vault/ItemVaultBlock.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.logistics.block.vault;
+package com.simibubi.create.content.logistics.vault;
 
 import javax.annotation.Nullable;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.api.connectivity.ConnectivityHandler;
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
 import com.simibubi.create.foundation.block.IBE;
 import com.simibubi.create.foundation.item.ItemHelper;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/vault/ItemVaultBlockEntity.java b/src/main/java/com/simibubi/create/content/logistics/vault/ItemVaultBlockEntity.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/logistics/block/vault/ItemVaultBlockEntity.java
rename to src/main/java/com/simibubi/create/content/logistics/vault/ItemVaultBlockEntity.java
index 3abdcb6e1..9127bc91d 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/vault/ItemVaultBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/logistics/vault/ItemVaultBlockEntity.java
@@ -1,13 +1,13 @@
-package com.simibubi.create.content.logistics.block.vault;
+package com.simibubi.create.content.logistics.vault;
 
 import java.util.List;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.api.connectivity.ConnectivityHandler;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.IMultiBlockEntityContainer;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
-import com.simibubi.create.foundation.config.AllConfigs;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/vault/ItemVaultCTBehaviour.java b/src/main/java/com/simibubi/create/content/logistics/vault/ItemVaultCTBehaviour.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/logistics/block/vault/ItemVaultCTBehaviour.java
rename to src/main/java/com/simibubi/create/content/logistics/vault/ItemVaultCTBehaviour.java
index 808876277..d46b26616 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/vault/ItemVaultCTBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/logistics/vault/ItemVaultCTBehaviour.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.vault;
+package com.simibubi.create.content.logistics.vault;
 
 import org.jetbrains.annotations.Nullable;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/vault/ItemVaultItem.java b/src/main/java/com/simibubi/create/content/logistics/vault/ItemVaultItem.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/logistics/block/vault/ItemVaultItem.java
rename to src/main/java/com/simibubi/create/content/logistics/vault/ItemVaultItem.java
index 0ba4a29f6..4c29eaa5f 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/vault/ItemVaultItem.java
+++ b/src/main/java/com/simibubi/create/content/logistics/vault/ItemVaultItem.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.vault;
+package com.simibubi.create.content.logistics.vault;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.api.connectivity.ConnectivityHandler;
diff --git a/src/main/java/com/simibubi/create/content/materials/ExperienceBlock.java b/src/main/java/com/simibubi/create/content/materials/ExperienceBlock.java
new file mode 100644
index 000000000..42a90b194
--- /dev/null
+++ b/src/main/java/com/simibubi/create/content/materials/ExperienceBlock.java
@@ -0,0 +1,30 @@
+package com.simibubi.create.content.materials;
+
+import java.util.Random;
+
+import com.simibubi.create.foundation.utility.VecHelper;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.particles.ParticleTypes;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.Vec3;
+
+public class ExperienceBlock extends Block {
+
+	public ExperienceBlock(Properties pProperties) {
+		super(pProperties);
+	}
+
+	@Override
+	public void animateTick(BlockState pState, Level pLevel, BlockPos pPos, Random pRand) {
+		if (pRand.nextInt(5) != 0)
+			return;
+		Vec3 vec3 = VecHelper.clampComponentWise(VecHelper.offsetRandomly(Vec3.ZERO, pRand, .75f), .55f)
+			.add(VecHelper.getCenterOf(pPos));
+		pLevel.addParticle(ParticleTypes.END_ROD, vec3.x, vec3.y, vec3.z, pRand.nextGaussian() * 0.005D,
+			pRand.nextGaussian() * 0.005D, pRand.nextGaussian() * 0.005D);
+	}
+
+}
diff --git a/src/main/java/com/simibubi/create/content/curiosities/ExperienceNuggetItem.java b/src/main/java/com/simibubi/create/content/materials/ExperienceNuggetItem.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/curiosities/ExperienceNuggetItem.java
rename to src/main/java/com/simibubi/create/content/materials/ExperienceNuggetItem.java
index 4407cbd7b..3ac078117 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/ExperienceNuggetItem.java
+++ b/src/main/java/com/simibubi/create/content/materials/ExperienceNuggetItem.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities;
+package com.simibubi.create.content.materials;
 
 import com.simibubi.create.foundation.utility.VecHelper;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/AssemblyOperatorBlockItem.java b/src/main/java/com/simibubi/create/content/processing/AssemblyOperatorBlockItem.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/contraptions/components/AssemblyOperatorBlockItem.java
rename to src/main/java/com/simibubi/create/content/processing/AssemblyOperatorBlockItem.java
index c7e4d65db..0538cb5f6 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/AssemblyOperatorBlockItem.java
+++ b/src/main/java/com/simibubi/create/content/processing/AssemblyOperatorBlockItem.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.contraptions.components;
+package com.simibubi.create.content.processing;
 
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.relays.belt.BeltBlock;
-import com.simibubi.create.content.contraptions.relays.belt.BeltSlope;
+import com.simibubi.create.content.kinetics.belt.BeltBlock;
+import com.simibubi.create.content.kinetics.belt.BeltSlope;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/AssemblyOperatorUseContext.java b/src/main/java/com/simibubi/create/content/processing/AssemblyOperatorUseContext.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/components/AssemblyOperatorUseContext.java
rename to src/main/java/com/simibubi/create/content/processing/AssemblyOperatorUseContext.java
index 38a66bb7b..6115a9274 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/AssemblyOperatorUseContext.java
+++ b/src/main/java/com/simibubi/create/content/processing/AssemblyOperatorUseContext.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components;
+package com.simibubi.create.content.processing;
 
 import javax.annotation.Nullable;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/BasinBlock.java b/src/main/java/com/simibubi/create/content/processing/basin/BasinBlock.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/processing/BasinBlock.java
rename to src/main/java/com/simibubi/create/content/processing/basin/BasinBlock.java
index 3fca44289..941cd5a99 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/processing/BasinBlock.java
+++ b/src/main/java/com/simibubi/create/content/processing/basin/BasinBlock.java
@@ -1,16 +1,17 @@
-package com.simibubi.create.content.contraptions.processing;
+package com.simibubi.create.content.processing.basin;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllShapes;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.contraptions.fluids.actors.GenericItemFilling;
-import com.simibubi.create.content.contraptions.relays.belt.BeltBlockEntity;
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
-import com.simibubi.create.content.logistics.block.funnel.FunnelBlock;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
+import com.simibubi.create.content.fluids.transfer.GenericItemEmptying;
+import com.simibubi.create.content.fluids.transfer.GenericItemFilling;
+import com.simibubi.create.content.kinetics.belt.BeltBlockEntity;
+import com.simibubi.create.content.kinetics.belt.behaviour.DirectBeltInputBehaviour;
+import com.simibubi.create.content.logistics.funnel.FunnelBlock;
 import com.simibubi.create.foundation.block.IBE;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.DirectBeltInputBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.fluid.FluidHelper;
 import com.simibubi.create.foundation.item.ItemHelper;
 
@@ -85,12 +86,12 @@ public class BasinBlock extends Block implements IBE<BasinBlockEntity>, IWrencha
 
 		return onBlockEntityUse(worldIn, pos, be -> {
 			if (!heldItem.isEmpty()) {
-				if (FluidHelper.tryEmptyItemIntoTE(worldIn, player, handIn, heldItem, be))
+				if (FluidHelper.tryEmptyItemIntoBE(worldIn, player, handIn, heldItem, be))
 					return InteractionResult.SUCCESS;
-				if (FluidHelper.tryFillItemFromTE(worldIn, player, handIn, heldItem, be))
+				if (FluidHelper.tryFillItemFromBE(worldIn, player, handIn, heldItem, be))
 					return InteractionResult.SUCCESS;
 
-				if (EmptyingByBasin.canItemBeEmptied(worldIn, heldItem)
+				if (GenericItemEmptying.canItemBeEmptied(worldIn, heldItem)
 					|| GenericItemFilling.canItemBeFilled(worldIn, heldItem))
 					return InteractionResult.SUCCESS;
 				if (heldItem.getItem()
diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/BasinBlockEntity.java b/src/main/java/com/simibubi/create/content/processing/basin/BasinBlockEntity.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/processing/BasinBlockEntity.java
rename to src/main/java/com/simibubi/create/content/processing/basin/BasinBlockEntity.java
index e99d6ebe0..a8aa3c9a2 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/processing/BasinBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/processing/basin/BasinBlockEntity.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.processing;
+package com.simibubi.create.content.processing.basin;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -11,16 +11,16 @@ import javax.annotation.Nonnull;
 import com.google.common.collect.ImmutableList;
 import com.simibubi.create.AllParticleTypes;
 import com.simibubi.create.AllTags;
-import com.simibubi.create.content.contraptions.components.mixer.MechanicalMixerBlockEntity;
-import com.simibubi.create.content.contraptions.fluids.FluidFX;
-import com.simibubi.create.content.contraptions.fluids.particle.FluidParticleData;
-import com.simibubi.create.content.contraptions.goggles.IHaveGoggleInformation;
-import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock;
-import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock.HeatLevel;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.equipment.goggles.IHaveGoggleInformation;
+import com.simibubi.create.content.fluids.FluidFX;
+import com.simibubi.create.content.fluids.particle.FluidParticleData;
+import com.simibubi.create.content.kinetics.belt.behaviour.DirectBeltInputBehaviour;
+import com.simibubi.create.content.kinetics.mixer.MechanicalMixerBlockEntity;
+import com.simibubi.create.content.processing.burner.BlazeBurnerBlock;
+import com.simibubi.create.content.processing.burner.BlazeBurnerBlock.HeatLevel;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.DirectBeltInputBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour.TankSegment;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/BasinGenerator.java b/src/main/java/com/simibubi/create/content/processing/basin/BasinGenerator.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/processing/BasinGenerator.java
rename to src/main/java/com/simibubi/create/content/processing/basin/BasinGenerator.java
index 84704801e..1683a5eba 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/processing/BasinGenerator.java
+++ b/src/main/java/com/simibubi/create/content/processing/basin/BasinGenerator.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.processing;
+package com.simibubi.create.content.processing.basin;
 
 import com.simibubi.create.foundation.data.AssetLookup;
 import com.simibubi.create.foundation.data.SpecialBlockStateGen;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/BasinInventory.java b/src/main/java/com/simibubi/create/content/processing/basin/BasinInventory.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/processing/BasinInventory.java
rename to src/main/java/com/simibubi/create/content/processing/basin/BasinInventory.java
index 1ec54920c..0c88d4d0d 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/processing/BasinInventory.java
+++ b/src/main/java/com/simibubi/create/content/processing/basin/BasinInventory.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.processing;
+package com.simibubi.create.content.processing.basin;
 
 import com.simibubi.create.foundation.item.SmartInventory;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/BasinMovementBehaviour.java b/src/main/java/com/simibubi/create/content/processing/basin/BasinMovementBehaviour.java
similarity index 89%
rename from src/main/java/com/simibubi/create/content/contraptions/processing/BasinMovementBehaviour.java
rename to src/main/java/com/simibubi/create/content/processing/basin/BasinMovementBehaviour.java
index c7ad7b77c..646c3783d 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/processing/BasinMovementBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/processing/basin/BasinMovementBehaviour.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.contraptions.processing;
+package com.simibubi.create.content.processing.basin;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
+import com.simibubi.create.content.contraptions.behaviour.MovementBehaviour;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
 
 import net.minecraft.core.Direction;
 import net.minecraft.world.entity.item.ItemEntity;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/BasinOperatingBlockEntity.java b/src/main/java/com/simibubi/create/content/processing/basin/BasinOperatingBlockEntity.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/processing/BasinOperatingBlockEntity.java
rename to src/main/java/com/simibubi/create/content/processing/basin/BasinOperatingBlockEntity.java
index d357d0a10..d17993851 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/processing/BasinOperatingBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/processing/basin/BasinOperatingBlockEntity.java
@@ -1,15 +1,15 @@
-package com.simibubi.create.content.contraptions.processing;
+package com.simibubi.create.content.processing.basin;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
 import com.simibubi.create.foundation.advancement.CreateAdvancement;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.simple.DeferralBehaviour;
-import com.simibubi.create.foundation.utility.recipe.RecipeFinder;
+import com.simibubi.create.foundation.recipe.RecipeFinder;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.Container;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/BasinRecipe.java b/src/main/java/com/simibubi/create/content/processing/basin/BasinRecipe.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/processing/BasinRecipe.java
rename to src/main/java/com/simibubi/create/content/processing/basin/BasinRecipe.java
index fefcfe78b..ddcf9ecaa 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/processing/BasinRecipe.java
+++ b/src/main/java/com/simibubi/create/content/processing/basin/BasinRecipe.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.processing;
+package com.simibubi.create.content.processing.basin;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -8,16 +8,18 @@ import java.util.List;
 import javax.annotation.Nonnull;
 
 import com.simibubi.create.AllRecipeTypes;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipeBuilder.ProcessingRecipeParams;
-import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock.HeatLevel;
+import com.simibubi.create.content.processing.burner.BlazeBurnerBlock.HeatLevel;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipe;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder.ProcessingRecipeParams;
 import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour.TankSegment;
 import com.simibubi.create.foundation.fluid.FluidIngredient;
 import com.simibubi.create.foundation.item.SmartInventory;
+import com.simibubi.create.foundation.recipe.DummyCraftingContainer;
+import com.simibubi.create.foundation.recipe.IRecipeTypeInfo;
 import com.simibubi.create.foundation.utility.Iterate;
-import com.simibubi.create.foundation.utility.recipe.DummyCraftingContainer;
-import com.simibubi.create.foundation.utility.recipe.IRecipeTypeInfo;
 
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.CraftingRecipe;
@@ -100,10 +102,6 @@ public class BasinRecipe extends ProcessingRecipe<SmartInventory> {
 					ItemStack extracted = availableItems.extractItem(slot, 1, true);
 					if (!ingredient.test(extracted))
 						continue;
-					// Catalyst items are never consumed
-					if (extracted.hasCraftingRemainingItem() && extracted.getCraftingRemainingItem()
-						.sameItem(extracted))
-						continue Ingredients;
 					if (!simulate)
 						availableItems.extractItem(slot, 1, false);
 					extractedItemsFromSlot[slot]++;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/BasinRenderer.java b/src/main/java/com/simibubi/create/content/processing/basin/BasinRenderer.java
similarity index 99%
rename from src/main/java/com/simibubi/create/content/contraptions/processing/BasinRenderer.java
rename to src/main/java/com/simibubi/create/content/processing/basin/BasinRenderer.java
index 3533be5e5..4a42ecab6 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/processing/BasinRenderer.java
+++ b/src/main/java/com/simibubi/create/content/processing/basin/BasinRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.processing;
+package com.simibubi.create.content.processing.basin;
 
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerBlock.java b/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerBlock.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerBlock.java
rename to src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerBlock.java
index 159bc1bbf..de91b96e6 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerBlock.java
+++ b/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.processing.burner;
+package com.simibubi.create.content.processing.burner;
 
 import java.util.Random;
 
@@ -9,8 +9,8 @@ import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.processing.BasinBlockEntity;
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
+import com.simibubi.create.content.processing.basin.BasinBlockEntity;
 import com.simibubi.create.foundation.block.IBE;
 import com.simibubi.create.foundation.utility.Lang;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerBlockEntity.java b/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerBlockEntity.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerBlockEntity.java
rename to src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerBlockEntity.java
index c54a305c5..64873b435 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerBlockEntity.java
@@ -1,14 +1,14 @@
-package com.simibubi.create.content.contraptions.processing.burner;
+package com.simibubi.create.content.processing.burner;
 
 import java.util.List;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
 import com.simibubi.create.AllTags.AllItemTags;
-import com.simibubi.create.content.contraptions.fluids.tank.FluidTankBlock;
-import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock.HeatLevel;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.fluids.tank.FluidTankBlock;
+import com.simibubi.create.content.processing.burner.BlazeBurnerBlock.HeatLevel;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.AngleHelper;
 import com.simibubi.create.foundation.utility.VecHelper;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerBlockItem.java b/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerBlockItem.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerBlockItem.java
rename to src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerBlockItem.java
index 53a9371b8..554e323d0 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerBlockItem.java
+++ b/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerBlockItem.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.processing.burner;
+package com.simibubi.create.content.processing.burner;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerHandler.java b/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerHandler.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerHandler.java
rename to src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerHandler.java
index a3e3b40a5..6d63f2890 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerHandler.java
+++ b/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerHandler.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.contraptions.processing.burner;
+package com.simibubi.create.content.processing.burner;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllSoundEvents;
-import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlockEntity.FuelType;
+import com.simibubi.create.content.processing.burner.BlazeBurnerBlockEntity.FuelType;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerInteractionBehaviour.java b/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerInteractionBehaviour.java
similarity index 81%
rename from src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerInteractionBehaviour.java
rename to src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerInteractionBehaviour.java
index 2756310ad..72462cd3f 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerInteractionBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerInteractionBehaviour.java
@@ -1,16 +1,16 @@
-package com.simibubi.create.content.contraptions.processing.burner;
+package com.simibubi.create.content.processing.burner;
 
 import com.simibubi.create.AllItems;
 import com.simibubi.create.AllSoundEvents;
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.Contraption;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovingInteractionBehaviour;
-import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock.HeatLevel;
-import com.simibubi.create.content.logistics.trains.entity.CarriageContraption;
-import com.simibubi.create.content.logistics.trains.entity.CarriageContraptionEntity;
-import com.simibubi.create.content.logistics.trains.entity.Train;
-import com.simibubi.create.content.logistics.trains.management.schedule.Schedule;
-import com.simibubi.create.content.logistics.trains.management.schedule.ScheduleItem;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.Contraption;
+import com.simibubi.create.content.contraptions.behaviour.MovingInteractionBehaviour;
+import com.simibubi.create.content.processing.burner.BlazeBurnerBlock.HeatLevel;
+import com.simibubi.create.content.trains.entity.CarriageContraption;
+import com.simibubi.create.content.trains.entity.CarriageContraptionEntity;
+import com.simibubi.create.content.trains.entity.Train;
+import com.simibubi.create.content.trains.schedule.Schedule;
+import com.simibubi.create.content.trains.schedule.ScheduleItem;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.Lang;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerMovementBehaviour.java b/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerMovementBehaviour.java
similarity index 86%
rename from src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerMovementBehaviour.java
rename to src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerMovementBehaviour.java
index 08ceb83ef..2904d3004 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerMovementBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerMovementBehaviour.java
@@ -1,13 +1,13 @@
-package com.simibubi.create.content.contraptions.processing.burner;
+package com.simibubi.create.content.processing.burner;
 
 import com.jozufozu.flywheel.core.virtual.VirtualRenderWorld;
-import com.simibubi.create.content.contraptions.components.structureMovement.Contraption;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionMatrices;
-import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock.HeatLevel;
-import com.simibubi.create.content.logistics.trains.entity.CarriageContraption;
-import com.simibubi.create.content.logistics.trains.entity.CarriageContraptionEntity;
+import com.simibubi.create.content.contraptions.Contraption;
+import com.simibubi.create.content.contraptions.behaviour.MovementBehaviour;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
+import com.simibubi.create.content.contraptions.render.ContraptionMatrices;
+import com.simibubi.create.content.processing.burner.BlazeBurnerBlock.HeatLevel;
+import com.simibubi.create.content.trains.entity.CarriageContraption;
+import com.simibubi.create.content.trains.entity.CarriageContraptionEntity;
 import com.simibubi.create.foundation.utility.AngleHelper;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.VecHelper;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerRenderer.java b/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerRenderer.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerRenderer.java
rename to src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerRenderer.java
index 3951f34d2..976db1a60 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerRenderer.java
+++ b/src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.processing.burner;
+package com.simibubi.create.content.processing.burner;
 
 import javax.annotation.Nullable;
 
@@ -8,9 +8,9 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.simibubi.create.AllPartialModels;
 import com.simibubi.create.AllSpriteShifts;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionMatrices;
-import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock.HeatLevel;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
+import com.simibubi.create.content.contraptions.render.ContraptionMatrices;
+import com.simibubi.create.content.processing.burner.BlazeBurnerBlock.HeatLevel;
 import com.simibubi.create.foundation.block.render.SpriteShiftEntry;
 import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer;
 import com.simibubi.create.foundation.render.CachedBufferer;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/burner/LitBlazeBurnerBlock.java b/src/main/java/com/simibubi/create/content/processing/burner/LitBlazeBurnerBlock.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/processing/burner/LitBlazeBurnerBlock.java
rename to src/main/java/com/simibubi/create/content/processing/burner/LitBlazeBurnerBlock.java
index 72efff729..c989a5ea4 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/processing/burner/LitBlazeBurnerBlock.java
+++ b/src/main/java/com/simibubi/create/content/processing/burner/LitBlazeBurnerBlock.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.contraptions.processing.burner;
+package com.simibubi.create.content.processing.burner;
 
 import java.util.Random;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
 import com.simibubi.create.foundation.utility.Lang;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/HeatCondition.java b/src/main/java/com/simibubi/create/content/processing/recipe/HeatCondition.java
similarity index 83%
rename from src/main/java/com/simibubi/create/content/contraptions/processing/HeatCondition.java
rename to src/main/java/com/simibubi/create/content/processing/recipe/HeatCondition.java
index d2f3f5f39..da0a350fd 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/processing/HeatCondition.java
+++ b/src/main/java/com/simibubi/create/content/processing/recipe/HeatCondition.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.contraptions.processing;
+package com.simibubi.create.content.processing.recipe;
 
 import com.simibubi.create.Create;
-import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock;
-import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock.HeatLevel;
+import com.simibubi.create.content.processing.burner.BlazeBurnerBlock;
+import com.simibubi.create.content.processing.burner.BlazeBurnerBlock.HeatLevel;
 import com.simibubi.create.foundation.utility.Lang;
 
 public enum HeatCondition {
diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingInventory.java b/src/main/java/com/simibubi/create/content/processing/recipe/ProcessingInventory.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingInventory.java
rename to src/main/java/com/simibubi/create/content/processing/recipe/ProcessingInventory.java
index b80ac8318..0ffcdd332 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingInventory.java
+++ b/src/main/java/com/simibubi/create/content/processing/recipe/ProcessingInventory.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.processing;
+package com.simibubi.create.content.processing.recipe;
 
 import java.util.function.Consumer;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingOutput.java b/src/main/java/com/simibubi/create/content/processing/recipe/ProcessingOutput.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingOutput.java
rename to src/main/java/com/simibubi/create/content/processing/recipe/ProcessingOutput.java
index d986e74e8..10fb8f942 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingOutput.java
+++ b/src/main/java/com/simibubi/create/content/processing/recipe/ProcessingOutput.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.processing;
+package com.simibubi.create.content.processing.recipe;
 
 import java.util.Random;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingRecipe.java b/src/main/java/com/simibubi/create/content/processing/recipe/ProcessingRecipe.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingRecipe.java
rename to src/main/java/com/simibubi/create/content/processing/recipe/ProcessingRecipe.java
index 82c81c7ca..e21ff458e 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingRecipe.java
+++ b/src/main/java/com/simibubi/create/content/processing/recipe/ProcessingRecipe.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.processing;
+package com.simibubi.create.content.processing.recipe;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -11,9 +11,9 @@ import org.slf4j.Logger;
 
 import com.google.gson.JsonObject;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipeBuilder.ProcessingRecipeParams;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder.ProcessingRecipeParams;
 import com.simibubi.create.foundation.fluid.FluidIngredient;
-import com.simibubi.create.foundation.utility.recipe.IRecipeTypeInfo;
+import com.simibubi.create.foundation.recipe.IRecipeTypeInfo;
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.core.NonNullList;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingRecipeBuilder.java b/src/main/java/com/simibubi/create/content/processing/recipe/ProcessingRecipeBuilder.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingRecipeBuilder.java
rename to src/main/java/com/simibubi/create/content/processing/recipe/ProcessingRecipeBuilder.java
index 653b37d03..87ce9f530 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingRecipeBuilder.java
+++ b/src/main/java/com/simibubi/create/content/processing/recipe/ProcessingRecipeBuilder.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.processing;
+package com.simibubi.create.content.processing.recipe;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -10,8 +10,8 @@ import com.simibubi.create.foundation.data.SimpleDatagenIngredient;
 import com.simibubi.create.foundation.data.recipe.Mods;
 import com.simibubi.create.foundation.fluid.FluidHelper;
 import com.simibubi.create.foundation.fluid.FluidIngredient;
+import com.simibubi.create.foundation.recipe.IRecipeTypeInfo;
 import com.simibubi.create.foundation.utility.Pair;
-import com.simibubi.create.foundation.utility.recipe.IRecipeTypeInfo;
 import com.tterrag.registrate.util.DataIngredient;
 
 import net.minecraft.core.NonNullList;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingRecipeSerializer.java b/src/main/java/com/simibubi/create/content/processing/recipe/ProcessingRecipeSerializer.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingRecipeSerializer.java
rename to src/main/java/com/simibubi/create/content/processing/recipe/ProcessingRecipeSerializer.java
index d7599330c..8a1d910fe 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingRecipeSerializer.java
+++ b/src/main/java/com/simibubi/create/content/processing/recipe/ProcessingRecipeSerializer.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.contraptions.processing;
+package com.simibubi.create.content.processing.recipe;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipeBuilder.ProcessingRecipeFactory;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder.ProcessingRecipeFactory;
 import com.simibubi.create.foundation.fluid.FluidHelper;
 import com.simibubi.create.foundation.fluid.FluidIngredient;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/itemAssembly/IAssemblyRecipe.java b/src/main/java/com/simibubi/create/content/processing/sequenced/IAssemblyRecipe.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/itemAssembly/IAssemblyRecipe.java
rename to src/main/java/com/simibubi/create/content/processing/sequenced/IAssemblyRecipe.java
index 708388a73..abf2249b0 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/itemAssembly/IAssemblyRecipe.java
+++ b/src/main/java/com/simibubi/create/content/processing/sequenced/IAssemblyRecipe.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.itemAssembly;
+package com.simibubi.create.content.processing.sequenced;
 
 import java.util.List;
 import java.util.Set;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/itemAssembly/SequencedAssemblyItem.java b/src/main/java/com/simibubi/create/content/processing/sequenced/SequencedAssemblyItem.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/itemAssembly/SequencedAssemblyItem.java
rename to src/main/java/com/simibubi/create/content/processing/sequenced/SequencedAssemblyItem.java
index 4240b612c..6c088c8d3 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/itemAssembly/SequencedAssemblyItem.java
+++ b/src/main/java/com/simibubi/create/content/processing/sequenced/SequencedAssemblyItem.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.itemAssembly;
+package com.simibubi.create.content.processing.sequenced;
 
 import com.simibubi.create.foundation.utility.Color;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/itemAssembly/SequencedAssemblyRecipe.java b/src/main/java/com/simibubi/create/content/processing/sequenced/SequencedAssemblyRecipe.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/itemAssembly/SequencedAssemblyRecipe.java
rename to src/main/java/com/simibubi/create/content/processing/sequenced/SequencedAssemblyRecipe.java
index 09b25e0aa..9eaee45b9 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/itemAssembly/SequencedAssemblyRecipe.java
+++ b/src/main/java/com/simibubi/create/content/processing/sequenced/SequencedAssemblyRecipe.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.itemAssembly;
+package com.simibubi.create.content.processing.sequenced;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -9,8 +9,8 @@ import java.util.stream.Stream;
 
 import com.simibubi.create.AllRecipeTypes;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.contraptions.processing.ProcessingOutput;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipe;
+import com.simibubi.create.content.processing.recipe.ProcessingOutput;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipe;
 import com.simibubi.create.foundation.fluid.FluidIngredient;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Lang;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/itemAssembly/SequencedAssemblyRecipeBuilder.java b/src/main/java/com/simibubi/create/content/processing/sequenced/SequencedAssemblyRecipeBuilder.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/contraptions/itemAssembly/SequencedAssemblyRecipeBuilder.java
rename to src/main/java/com/simibubi/create/content/processing/sequenced/SequencedAssemblyRecipeBuilder.java
index 18924d88a..6e9745de5 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/itemAssembly/SequencedAssemblyRecipeBuilder.java
+++ b/src/main/java/com/simibubi/create/content/processing/sequenced/SequencedAssemblyRecipeBuilder.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.itemAssembly;
+package com.simibubi.create.content.processing.sequenced;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -8,10 +8,10 @@ import java.util.function.UnaryOperator;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.simibubi.create.AllRecipeTypes;
-import com.simibubi.create.content.contraptions.processing.ProcessingOutput;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipe;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipeBuilder;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipeBuilder.ProcessingRecipeFactory;
+import com.simibubi.create.content.processing.recipe.ProcessingOutput;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipe;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder.ProcessingRecipeFactory;
 
 import net.minecraft.data.recipes.FinishedRecipe;
 import net.minecraft.resources.ResourceLocation;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/itemAssembly/SequencedAssemblyRecipeSerializer.java b/src/main/java/com/simibubi/create/content/processing/sequenced/SequencedAssemblyRecipeSerializer.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/itemAssembly/SequencedAssemblyRecipeSerializer.java
rename to src/main/java/com/simibubi/create/content/processing/sequenced/SequencedAssemblyRecipeSerializer.java
index 7a7622002..ab786275e 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/itemAssembly/SequencedAssemblyRecipeSerializer.java
+++ b/src/main/java/com/simibubi/create/content/processing/sequenced/SequencedAssemblyRecipeSerializer.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.contraptions.itemAssembly;
+package com.simibubi.create.content.processing.sequenced;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-import com.simibubi.create.content.contraptions.processing.ProcessingOutput;
+import com.simibubi.create.content.processing.recipe.ProcessingOutput;
 
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.resources.ResourceLocation;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/itemAssembly/SequencedRecipe.java b/src/main/java/com/simibubi/create/content/processing/sequenced/SequencedRecipe.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/contraptions/itemAssembly/SequencedRecipe.java
rename to src/main/java/com/simibubi/create/content/processing/sequenced/SequencedRecipe.java
index c16d0d07e..76c5f3426 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/itemAssembly/SequencedRecipe.java
+++ b/src/main/java/com/simibubi/create/content/processing/sequenced/SequencedRecipe.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.contraptions.itemAssembly;
+package com.simibubi.create.content.processing.sequenced;
 
 import com.google.common.collect.ImmutableList;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipe;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipeSerializer;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipe;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipeSerializer;
 import com.simibubi.create.foundation.utility.RegisteredObjects;
 
 import net.minecraft.network.FriendlyByteBuf;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/DirectedDirectionalBlock.java b/src/main/java/com/simibubi/create/content/redstone/DirectedDirectionalBlock.java
similarity index 89%
rename from src/main/java/com/simibubi/create/content/logistics/block/redstone/DirectedDirectionalBlock.java
rename to src/main/java/com/simibubi/create/content/redstone/DirectedDirectionalBlock.java
index 8759cbc37..5fb2d1c05 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/DirectedDirectionalBlock.java
+++ b/src/main/java/com/simibubi/create/content/redstone/DirectedDirectionalBlock.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.logistics.block.redstone;
+package com.simibubi.create.content.redstone;
 
 import javax.annotation.Nullable;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.ITransformableBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.StructureTransform;
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
+import com.simibubi.create.content.contraptions.ITransformableBlock;
+import com.simibubi.create.content.contraptions.StructureTransform;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
 
 import net.minecraft.core.Direction;
 import net.minecraft.core.Direction.Axis;
@@ -51,7 +51,7 @@ public class DirectedDirectionalBlock extends HorizontalDirectionalBlock impleme
 		return null;
 	}
 
-	protected static Direction getTargetDirection(BlockState pState) {
+	public static Direction getTargetDirection(BlockState pState) {
 		switch ((AttachFace) pState.getValue(TARGET)) {
 		case CEILING:
 			return Direction.UP;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/FilteredDetectorFilterSlot.java b/src/main/java/com/simibubi/create/content/redstone/FilteredDetectorFilterSlot.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/block/redstone/FilteredDetectorFilterSlot.java
rename to src/main/java/com/simibubi/create/content/redstone/FilteredDetectorFilterSlot.java
index e298e29d7..04c7ebf3c 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/FilteredDetectorFilterSlot.java
+++ b/src/main/java/com/simibubi/create/content/redstone/FilteredDetectorFilterSlot.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.redstone;
+package com.simibubi.create.content.redstone;
 
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/RoseQuartzLampBlock.java b/src/main/java/com/simibubi/create/content/redstone/RoseQuartzLampBlock.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/block/redstone/RoseQuartzLampBlock.java
rename to src/main/java/com/simibubi/create/content/redstone/RoseQuartzLampBlock.java
index 879a2a844..c5b70b24f 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/RoseQuartzLampBlock.java
+++ b/src/main/java/com/simibubi/create/content/redstone/RoseQuartzLampBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.redstone;
+package com.simibubi.create.content.redstone;
 
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -6,8 +6,8 @@ import java.util.List;
 import java.util.Set;
 import java.util.function.BiConsumer;
 
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
-import com.simibubi.create.content.logistics.block.diodes.BrassDiodeBlock;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
+import com.simibubi.create.content.redstone.diodes.BrassDiodeBlock;
 import com.simibubi.create.foundation.utility.Iterate;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/AnalogLeverBlock.java b/src/main/java/com/simibubi/create/content/redstone/analogLever/AnalogLeverBlock.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/logistics/block/redstone/AnalogLeverBlock.java
rename to src/main/java/com/simibubi/create/content/redstone/analogLever/AnalogLeverBlock.java
index ce4e9e2be..6b134cdfd 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/AnalogLeverBlock.java
+++ b/src/main/java/com/simibubi/create/content/redstone/analogLever/AnalogLeverBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.redstone;
+package com.simibubi.create.content.redstone.analogLever;
 
 import com.mojang.math.Vector3f;
 import com.simibubi.create.AllBlockEntityTypes;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/AnalogLeverBlockEntity.java b/src/main/java/com/simibubi/create/content/redstone/analogLever/AnalogLeverBlockEntity.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/logistics/block/redstone/AnalogLeverBlockEntity.java
rename to src/main/java/com/simibubi/create/content/redstone/analogLever/AnalogLeverBlockEntity.java
index 50d505a4b..3902009ff 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/AnalogLeverBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/redstone/analogLever/AnalogLeverBlockEntity.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.logistics.block.redstone;
+package com.simibubi.create.content.redstone.analogLever;
 
 import java.util.List;
 
-import com.simibubi.create.content.contraptions.goggles.IHaveGoggleInformation;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.equipment.goggles.IHaveGoggleInformation;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat.Chaser;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/AnalogLeverInstance.java b/src/main/java/com/simibubi/create/content/redstone/analogLever/AnalogLeverInstance.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/logistics/block/redstone/AnalogLeverInstance.java
rename to src/main/java/com/simibubi/create/content/redstone/analogLever/AnalogLeverInstance.java
index 122e61f12..0f5145e15 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/AnalogLeverInstance.java
+++ b/src/main/java/com/simibubi/create/content/redstone/analogLever/AnalogLeverInstance.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.redstone;
+package com.simibubi.create.content.redstone.analogLever;
 
 import com.jozufozu.flywheel.api.Material;
 import com.jozufozu.flywheel.api.MaterialManager;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/AnalogLeverRenderer.java b/src/main/java/com/simibubi/create/content/redstone/analogLever/AnalogLeverRenderer.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/logistics/block/redstone/AnalogLeverRenderer.java
rename to src/main/java/com/simibubi/create/content/redstone/analogLever/AnalogLeverRenderer.java
index ccb0d7395..89a6150c1 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/AnalogLeverRenderer.java
+++ b/src/main/java/com/simibubi/create/content/redstone/analogLever/AnalogLeverRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.redstone;
+package com.simibubi.create.content.redstone.analogLever;
 
 import com.jozufozu.flywheel.backend.Backend;
 import com.mojang.blaze3d.vertex.PoseStack;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/ContactMovementBehaviour.java b/src/main/java/com/simibubi/create/content/redstone/contact/ContactMovementBehaviour.java
similarity index 87%
rename from src/main/java/com/simibubi/create/content/logistics/block/redstone/ContactMovementBehaviour.java
rename to src/main/java/com/simibubi/create/content/redstone/contact/ContactMovementBehaviour.java
index 4e5cfa5f6..e4f4bef7b 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/ContactMovementBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/redstone/contact/ContactMovementBehaviour.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.logistics.block.redstone;
+package com.simibubi.create.content.redstone.contact;
 
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
-import com.simibubi.create.content.contraptions.components.structureMovement.elevator.ElevatorContraption;
+import com.simibubi.create.content.contraptions.behaviour.MovementBehaviour;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
+import com.simibubi.create.content.contraptions.elevator.ElevatorContraption;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/RedstoneContactBlock.java b/src/main/java/com/simibubi/create/content/redstone/contact/RedstoneContactBlock.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/logistics/block/redstone/RedstoneContactBlock.java
rename to src/main/java/com/simibubi/create/content/redstone/contact/RedstoneContactBlock.java
index 874de03ae..40bde7345 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/RedstoneContactBlock.java
+++ b/src/main/java/com/simibubi/create/content/redstone/contact/RedstoneContactBlock.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.logistics.block.redstone;
+package com.simibubi.create.content.redstone.contact;
 
 import javax.annotation.Nullable;
 import javax.annotation.ParametersAreNonnullByDefault;
 
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.components.structureMovement.elevator.ElevatorColumn;
-import com.simibubi.create.content.contraptions.components.structureMovement.elevator.ElevatorColumn.ColumnCoords;
+import com.simibubi.create.content.contraptions.elevator.ElevatorColumn;
+import com.simibubi.create.content.contraptions.elevator.ElevatorColumn.ColumnCoords;
 import com.simibubi.create.foundation.block.WrenchableDirectionalBlock;
 import com.simibubi.create.foundation.utility.BlockHelper;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/RedstoneContactItem.java b/src/main/java/com/simibubi/create/content/redstone/contact/RedstoneContactItem.java
similarity index 81%
rename from src/main/java/com/simibubi/create/content/logistics/block/redstone/RedstoneContactItem.java
rename to src/main/java/com/simibubi/create/content/redstone/contact/RedstoneContactItem.java
index 7fc3488af..7969b3995 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/RedstoneContactItem.java
+++ b/src/main/java/com/simibubi/create/content/redstone/contact/RedstoneContactItem.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.logistics.block.redstone;
+package com.simibubi.create.content.redstone.contact;
 
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.components.structureMovement.elevator.ElevatorColumn;
-import com.simibubi.create.content.contraptions.components.structureMovement.elevator.ElevatorColumn.ColumnCoords;
+import com.simibubi.create.content.contraptions.elevator.ElevatorColumn;
+import com.simibubi.create.content.contraptions.elevator.ElevatorColumn.ColumnCoords;
 import com.simibubi.create.foundation.utility.BlockHelper;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/diodes/AbstractDiodeBlock.java b/src/main/java/com/simibubi/create/content/redstone/diodes/AbstractDiodeBlock.java
similarity index 73%
rename from src/main/java/com/simibubi/create/content/logistics/block/diodes/AbstractDiodeBlock.java
rename to src/main/java/com/simibubi/create/content/redstone/diodes/AbstractDiodeBlock.java
index 3b1c7d2b8..2c16bb1d9 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/diodes/AbstractDiodeBlock.java
+++ b/src/main/java/com/simibubi/create/content/redstone/diodes/AbstractDiodeBlock.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.logistics.block.diodes;
+package com.simibubi.create.content.redstone.diodes;
 
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
 
 import net.minecraft.world.level.block.DiodeBlock;
 import net.minecraft.world.level.block.state.BlockState;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/diodes/AbstractDiodeGenerator.java b/src/main/java/com/simibubi/create/content/redstone/diodes/AbstractDiodeGenerator.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/logistics/block/diodes/AbstractDiodeGenerator.java
rename to src/main/java/com/simibubi/create/content/redstone/diodes/AbstractDiodeGenerator.java
index 89a74d08f..e5abcfb3c 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/diodes/AbstractDiodeGenerator.java
+++ b/src/main/java/com/simibubi/create/content/redstone/diodes/AbstractDiodeGenerator.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.diodes;
+package com.simibubi.create.content.redstone.diodes;
 
 import java.util.Vector;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/diodes/BrassDiodeBlock.java b/src/main/java/com/simibubi/create/content/redstone/diodes/BrassDiodeBlock.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/logistics/block/diodes/BrassDiodeBlock.java
rename to src/main/java/com/simibubi/create/content/redstone/diodes/BrassDiodeBlock.java
index b21562d06..c80c6a4a9 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/diodes/BrassDiodeBlock.java
+++ b/src/main/java/com/simibubi/create/content/redstone/diodes/BrassDiodeBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.diodes;
+package com.simibubi.create.content.redstone.diodes;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/diodes/BrassDiodeBlockEntity.java b/src/main/java/com/simibubi/create/content/redstone/diodes/BrassDiodeBlockEntity.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/logistics/block/diodes/BrassDiodeBlockEntity.java
rename to src/main/java/com/simibubi/create/content/redstone/diodes/BrassDiodeBlockEntity.java
index d465fe9e6..9de08f8d5 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/diodes/BrassDiodeBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/redstone/diodes/BrassDiodeBlockEntity.java
@@ -1,13 +1,13 @@
-package com.simibubi.create.content.logistics.block.diodes;
+package com.simibubi.create.content.redstone.diodes;
 
-import static com.simibubi.create.content.logistics.block.diodes.BrassDiodeBlock.POWERING;
+import static com.simibubi.create.content.redstone.diodes.BrassDiodeBlock.POWERING;
 
 import java.util.List;
 
-import com.simibubi.create.content.curiosities.clipboard.ClipboardCloneable;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.equipment.clipboard.ClipboardCloneable;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
-import com.simibubi.create.foundation.blockEntity.behaviour.scrollvalue.ScrollValueBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollValueBehaviour;
 import com.simibubi.create.foundation.utility.Lang;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/diodes/BrassDiodeGenerator.java b/src/main/java/com/simibubi/create/content/redstone/diodes/BrassDiodeGenerator.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/logistics/block/diodes/BrassDiodeGenerator.java
rename to src/main/java/com/simibubi/create/content/redstone/diodes/BrassDiodeGenerator.java
index a1ee76859..dc3055f4c 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/diodes/BrassDiodeGenerator.java
+++ b/src/main/java/com/simibubi/create/content/redstone/diodes/BrassDiodeGenerator.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.diodes;
+package com.simibubi.create.content.redstone.diodes;
 
 import java.util.Vector;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/diodes/BrassDiodeInstance.java b/src/main/java/com/simibubi/create/content/redstone/diodes/BrassDiodeInstance.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/block/diodes/BrassDiodeInstance.java
rename to src/main/java/com/simibubi/create/content/redstone/diodes/BrassDiodeInstance.java
index 75be2a479..0c51e6b76 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/diodes/BrassDiodeInstance.java
+++ b/src/main/java/com/simibubi/create/content/redstone/diodes/BrassDiodeInstance.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.diodes;
+package com.simibubi.create.content.redstone.diodes;
 
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.jozufozu.flywheel.api.instance.TickableInstance;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/diodes/BrassDiodeRenderer.java b/src/main/java/com/simibubi/create/content/redstone/diodes/BrassDiodeRenderer.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/logistics/block/diodes/BrassDiodeRenderer.java
rename to src/main/java/com/simibubi/create/content/redstone/diodes/BrassDiodeRenderer.java
index 0f7d75f9e..3cf4a8d0f 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/diodes/BrassDiodeRenderer.java
+++ b/src/main/java/com/simibubi/create/content/redstone/diodes/BrassDiodeRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.diodes;
+package com.simibubi.create.content.redstone.diodes;
 
 import com.simibubi.create.AllPartialModels;
 import com.simibubi.create.foundation.blockEntity.renderer.ColoredOverlayBlockEntityRenderer;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/diodes/BrassDiodeScrollSlot.java b/src/main/java/com/simibubi/create/content/redstone/diodes/BrassDiodeScrollSlot.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/logistics/block/diodes/BrassDiodeScrollSlot.java
rename to src/main/java/com/simibubi/create/content/redstone/diodes/BrassDiodeScrollSlot.java
index 6da51eda1..c492cae70 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/diodes/BrassDiodeScrollSlot.java
+++ b/src/main/java/com/simibubi/create/content/redstone/diodes/BrassDiodeScrollSlot.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.diodes;
+package com.simibubi.create.content.redstone.diodes;
 
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/diodes/BrassDiodeScrollValueBehaviour.java b/src/main/java/com/simibubi/create/content/redstone/diodes/BrassDiodeScrollValueBehaviour.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/block/diodes/BrassDiodeScrollValueBehaviour.java
rename to src/main/java/com/simibubi/create/content/redstone/diodes/BrassDiodeScrollValueBehaviour.java
index 51466c4ca..51bcd78b4 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/diodes/BrassDiodeScrollValueBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/redstone/diodes/BrassDiodeScrollValueBehaviour.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.logistics.block.diodes;
+package com.simibubi.create.content.redstone.diodes;
 
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsBoard;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsFormatter;
-import com.simibubi.create.foundation.blockEntity.behaviour.scrollvalue.ScrollValueBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollValueBehaviour;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Lang;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/diodes/PoweredLatchBlock.java b/src/main/java/com/simibubi/create/content/redstone/diodes/PoweredLatchBlock.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/logistics/block/diodes/PoweredLatchBlock.java
rename to src/main/java/com/simibubi/create/content/redstone/diodes/PoweredLatchBlock.java
index 56858b057..15f1d24fa 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/diodes/PoweredLatchBlock.java
+++ b/src/main/java/com/simibubi/create/content/redstone/diodes/PoweredLatchBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.diodes;
+package com.simibubi.create.content.redstone.diodes;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/diodes/PoweredLatchGenerator.java b/src/main/java/com/simibubi/create/content/redstone/diodes/PoweredLatchGenerator.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/logistics/block/diodes/PoweredLatchGenerator.java
rename to src/main/java/com/simibubi/create/content/redstone/diodes/PoweredLatchGenerator.java
index 290df7517..5928f3649 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/diodes/PoweredLatchGenerator.java
+++ b/src/main/java/com/simibubi/create/content/redstone/diodes/PoweredLatchGenerator.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.diodes;
+package com.simibubi.create.content.redstone.diodes;
 
 import java.util.Vector;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/diodes/PulseExtenderBlockEntity.java b/src/main/java/com/simibubi/create/content/redstone/diodes/PulseExtenderBlockEntity.java
similarity index 85%
rename from src/main/java/com/simibubi/create/content/logistics/block/diodes/PulseExtenderBlockEntity.java
rename to src/main/java/com/simibubi/create/content/redstone/diodes/PulseExtenderBlockEntity.java
index fe566ef77..23dc3cf74 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/diodes/PulseExtenderBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/redstone/diodes/PulseExtenderBlockEntity.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.logistics.block.diodes;
+package com.simibubi.create.content.redstone.diodes;
 
-import static com.simibubi.create.content.logistics.block.diodes.BrassDiodeBlock.POWERING;
+import static com.simibubi.create.content.redstone.diodes.BrassDiodeBlock.POWERING;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.entity.BlockEntityType;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/diodes/PulseRepeaterBlockEntity.java b/src/main/java/com/simibubi/create/content/redstone/diodes/PulseRepeaterBlockEntity.java
similarity index 85%
rename from src/main/java/com/simibubi/create/content/logistics/block/diodes/PulseRepeaterBlockEntity.java
rename to src/main/java/com/simibubi/create/content/redstone/diodes/PulseRepeaterBlockEntity.java
index 7ef2503a3..76e9dc004 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/diodes/PulseRepeaterBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/redstone/diodes/PulseRepeaterBlockEntity.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.logistics.block.diodes;
+package com.simibubi.create.content.redstone.diodes;
 
-import static com.simibubi.create.content.logistics.block.diodes.BrassDiodeBlock.POWERING;
+import static com.simibubi.create.content.redstone.diodes.BrassDiodeBlock.POWERING;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.entity.BlockEntityType;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/diodes/ToggleLatchBlock.java b/src/main/java/com/simibubi/create/content/redstone/diodes/ToggleLatchBlock.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/logistics/block/diodes/ToggleLatchBlock.java
rename to src/main/java/com/simibubi/create/content/redstone/diodes/ToggleLatchBlock.java
index 47c86403a..24eefae6c 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/diodes/ToggleLatchBlock.java
+++ b/src/main/java/com/simibubi/create/content/redstone/diodes/ToggleLatchBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.diodes;
+package com.simibubi.create.content.redstone.diodes;
 
 import com.simibubi.create.AllItems;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/diodes/ToggleLatchGenerator.java b/src/main/java/com/simibubi/create/content/redstone/diodes/ToggleLatchGenerator.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/logistics/block/diodes/ToggleLatchGenerator.java
rename to src/main/java/com/simibubi/create/content/redstone/diodes/ToggleLatchGenerator.java
index 9e09e32fd..c98d3a51a 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/diodes/ToggleLatchGenerator.java
+++ b/src/main/java/com/simibubi/create/content/redstone/diodes/ToggleLatchGenerator.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.diodes;
+package com.simibubi.create.content.redstone.diodes;
 
 import java.util.Vector;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/AllDisplayBehaviours.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/AllDisplayBehaviours.java
similarity index 84%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/AllDisplayBehaviours.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/AllDisplayBehaviours.java
index 27a8aab6a..43963ea65 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/AllDisplayBehaviours.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/AllDisplayBehaviours.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.display;
+package com.simibubi.create.content.redstone.displayLink;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -10,15 +10,15 @@ import javax.annotation.Nullable;
 
 import com.simibubi.create.Create;
 import com.simibubi.create.compat.Mods;
-import com.simibubi.create.content.logistics.block.display.source.ComputerDisplaySource;
-import com.simibubi.create.content.logistics.block.display.source.DeathCounterDisplaySource;
-import com.simibubi.create.content.logistics.block.display.source.DisplaySource;
-import com.simibubi.create.content.logistics.block.display.source.EnchantPowerDisplaySource;
-import com.simibubi.create.content.logistics.block.display.source.RedstonePowerDisplaySource;
-import com.simibubi.create.content.logistics.block.display.source.ScoreboardDisplaySource;
-import com.simibubi.create.content.logistics.block.display.target.DisplayTarget;
-import com.simibubi.create.content.logistics.block.display.target.LecternDisplayTarget;
-import com.simibubi.create.content.logistics.block.display.target.SignDisplayTarget;
+import com.simibubi.create.content.redstone.displayLink.source.ComputerDisplaySource;
+import com.simibubi.create.content.redstone.displayLink.source.DeathCounterDisplaySource;
+import com.simibubi.create.content.redstone.displayLink.source.DisplaySource;
+import com.simibubi.create.content.redstone.displayLink.source.EnchantPowerDisplaySource;
+import com.simibubi.create.content.redstone.displayLink.source.RedstonePowerDisplaySource;
+import com.simibubi.create.content.redstone.displayLink.source.ScoreboardDisplaySource;
+import com.simibubi.create.content.redstone.displayLink.target.DisplayTarget;
+import com.simibubi.create.content.redstone.displayLink.target.LecternDisplayTarget;
+import com.simibubi.create.content.redstone.displayLink.target.SignDisplayTarget;
 import com.simibubi.create.foundation.utility.AttachedRegistry;
 import com.simibubi.create.foundation.utility.RegisteredObjects;
 import com.tterrag.registrate.util.nullness.NonNullConsumer;
@@ -62,11 +62,6 @@ public class AllDisplayBehaviours {
 			TARGETS_BY_BLOCK.register(block, target);
 		}
 	}
-
-	@Deprecated
-	public static void assignTile(DisplayBehaviour behaviour, ResourceLocation beType) {
-		assignBlockEntity(behaviour, beType);
-	}
 	
 	public static void assignBlockEntity(DisplayBehaviour behaviour, ResourceLocation beType) {
 		if (behaviour instanceof DisplaySource source) {
@@ -95,11 +90,6 @@ public class AllDisplayBehaviours {
 			TARGETS_BY_BLOCK.register(block, target);
 		}
 	}
-
-	@Deprecated
-	public static void assignTile(DisplayBehaviour behaviour, BlockEntityType<?> beType) {
-		assignBlockEntity(behaviour, beType);
-	}
 	
 	public static void assignBlockEntity(DisplayBehaviour behaviour, BlockEntityType<?> beType) {
 		if (behaviour instanceof DisplaySource source) {
@@ -247,10 +237,10 @@ public class AllDisplayBehaviours {
 		Mods.COMPUTERCRAFT.executeIfInstalled(() -> () -> {
 			DisplayBehaviour computerDisplaySource = register(Create.asResource("computer_display_source"), new ComputerDisplaySource());
 
-			assignTile(computerDisplaySource, new ResourceLocation(Mods.COMPUTERCRAFT.asId(), "wired_modem_full"));
-			assignTile(computerDisplaySource, new ResourceLocation(Mods.COMPUTERCRAFT.asId(), "computer_normal"));
-			assignTile(computerDisplaySource, new ResourceLocation(Mods.COMPUTERCRAFT.asId(), "computer_advanced"));
-			assignTile(computerDisplaySource, new ResourceLocation(Mods.COMPUTERCRAFT.asId(), "computer_command"));
+			assignBlockEntity(computerDisplaySource, new ResourceLocation(Mods.COMPUTERCRAFT.asId(), "wired_modem_full"));
+			assignBlockEntity(computerDisplaySource, new ResourceLocation(Mods.COMPUTERCRAFT.asId(), "computer_normal"));
+			assignBlockEntity(computerDisplaySource, new ResourceLocation(Mods.COMPUTERCRAFT.asId(), "computer_advanced"));
+			assignBlockEntity(computerDisplaySource, new ResourceLocation(Mods.COMPUTERCRAFT.asId(), "computer_command"));
 		});
 	}
 }
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/DisplayBehaviour.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/DisplayBehaviour.java
similarity index 67%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/DisplayBehaviour.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/DisplayBehaviour.java
index 712c85d6b..7c067394d 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/DisplayBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/DisplayBehaviour.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.display;
+package com.simibubi.create.content.redstone.displayLink;
 
 import net.minecraft.resources.ResourceLocation;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/DisplayLinkBlock.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/DisplayLinkBlock.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/DisplayLinkBlock.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/DisplayLinkBlock.java
index 5e51f1f64..976dd552b 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/DisplayLinkBlock.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/DisplayLinkBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.display;
+package com.simibubi.create.content.redstone.displayLink;
 
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
@@ -6,8 +6,8 @@ import java.util.function.Consumer;
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.logistics.block.display.source.DisplaySource;
-import com.simibubi.create.content.logistics.block.display.source.RedstonePowerDisplaySource;
+import com.simibubi.create.content.redstone.displayLink.source.DisplaySource;
+import com.simibubi.create.content.redstone.displayLink.source.RedstonePowerDisplaySource;
 import com.simibubi.create.foundation.advancement.AdvancementBehaviour;
 import com.simibubi.create.foundation.block.IBE;
 import com.simibubi.create.foundation.block.WrenchableDirectionalBlock;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/DisplayLinkBlockEntity.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/DisplayLinkBlockEntity.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/DisplayLinkBlockEntity.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/DisplayLinkBlockEntity.java
index 54ae8af36..26771c942 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/DisplayLinkBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/DisplayLinkBlockEntity.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.display;
+package com.simibubi.create.content.redstone.displayLink;
 
 import java.util.List;
 
@@ -7,11 +7,11 @@ import org.jetbrains.annotations.Nullable;
 
 import com.simibubi.create.compat.computercraft.AbstractComputerBehaviour;
 import com.simibubi.create.compat.computercraft.ComputerCraftProxy;
-import com.simibubi.create.content.logistics.block.display.source.DisplaySource;
-import com.simibubi.create.content.logistics.block.display.target.DisplayTarget;
+import com.simibubi.create.content.redstone.displayLink.source.DisplaySource;
+import com.simibubi.create.content.redstone.displayLink.target.DisplayTarget;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.NBTHelper;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat.Chaser;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/DisplayLinkBlockItem.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/DisplayLinkBlockItem.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/DisplayLinkBlockItem.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/DisplayLinkBlockItem.java
index 1a6476af7..e1a7857e0 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/DisplayLinkBlockItem.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/DisplayLinkBlockItem.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.logistics.block.display;
+package com.simibubi.create.content.redstone.displayLink;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.CreateClient;
-import com.simibubi.create.content.logistics.block.display.target.DisplayTarget;
-import com.simibubi.create.foundation.config.AllConfigs;
+import com.simibubi.create.content.redstone.displayLink.target.DisplayTarget;
 import com.simibubi.create.foundation.utility.Lang;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/DisplayLinkConfigurationPacket.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/DisplayLinkConfigurationPacket.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/DisplayLinkConfigurationPacket.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/DisplayLinkConfigurationPacket.java
index 70866264c..70fbba6a6 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/DisplayLinkConfigurationPacket.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/DisplayLinkConfigurationPacket.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.logistics.block.display;
+package com.simibubi.create.content.redstone.displayLink;
 
-import com.simibubi.create.content.logistics.block.display.source.DisplaySource;
+import com.simibubi.create.content.redstone.displayLink.source.DisplaySource;
 import com.simibubi.create.foundation.networking.BlockEntityConfigurationPacket;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/DisplayLinkContext.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/DisplayLinkContext.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/DisplayLinkContext.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/DisplayLinkContext.java
index f6ec4440f..0bbebc50d 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/DisplayLinkContext.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/DisplayLinkContext.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.display;
+package com.simibubi.create.content.redstone.displayLink;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/DisplayLinkRenderer.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/DisplayLinkRenderer.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/DisplayLinkRenderer.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/DisplayLinkRenderer.java
index 448712b59..c53bb68e8 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/DisplayLinkRenderer.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/DisplayLinkRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.display;
+package com.simibubi.create.content.redstone.displayLink;
 
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/DisplayLinkScreen.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/DisplayLinkScreen.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/DisplayLinkScreen.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/DisplayLinkScreen.java
index 0cae4ae23..e0742597e 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/DisplayLinkScreen.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/DisplayLinkScreen.java
@@ -1,14 +1,15 @@
-package com.simibubi.create.content.logistics.block.display;
+package com.simibubi.create.content.redstone.displayLink;
 
 import java.util.Collections;
 import java.util.List;
 
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.simibubi.create.content.logistics.block.display.source.DisplaySource;
-import com.simibubi.create.content.logistics.block.display.source.SingleLineDisplaySource;
-import com.simibubi.create.content.logistics.block.display.target.DisplayTarget;
-import com.simibubi.create.content.logistics.block.display.target.DisplayTargetStats;
+import com.simibubi.create.AllPackets;
+import com.simibubi.create.content.redstone.displayLink.source.DisplaySource;
+import com.simibubi.create.content.redstone.displayLink.source.SingleLineDisplaySource;
+import com.simibubi.create.content.redstone.displayLink.target.DisplayTarget;
+import com.simibubi.create.content.redstone.displayLink.target.DisplayTargetStats;
 import com.simibubi.create.foundation.gui.AbstractSimiScreen;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
 import com.simibubi.create.foundation.gui.AllIcons;
@@ -22,12 +23,11 @@ import com.simibubi.create.foundation.gui.widget.IconButton;
 import com.simibubi.create.foundation.gui.widget.Label;
 import com.simibubi.create.foundation.gui.widget.ScrollInput;
 import com.simibubi.create.foundation.gui.widget.SelectionScrollInput;
-import com.simibubi.create.foundation.networking.AllPackets;
-import com.simibubi.create.foundation.ponder.PonderTag;
 import com.simibubi.create.foundation.ponder.ui.PonderTagScreen;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.Lang;
+import com.simibubi.create.infrastructure.ponder.AllPonderTags;
 
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.gui.components.events.GuiEventListener;
@@ -155,7 +155,7 @@ public class DisplayLinkScreen extends AbstractSimiScreen {
 		sourceWidget = new ElementWidget(x + 37, y + 26)
 				.showingElement(GuiGameElement.of(sourceIcon))
 				.withCallback((mX, mY) -> {
-					ScreenOpener.open(new PonderTagScreen(PonderTag.DISPLAY_SOURCES));
+					ScreenOpener.open(new PonderTagScreen(AllPonderTags.DISPLAY_SOURCES));
 				});
 
 		sourceWidget.getToolTip().addAll(List.of(
@@ -172,7 +172,7 @@ public class DisplayLinkScreen extends AbstractSimiScreen {
 		targetWidget = new ElementWidget(x + 37, y + 105)
 				.showingElement(GuiGameElement.of(targetIcon))
 				.withCallback((mX, mY) -> {
-					ScreenOpener.open(new PonderTagScreen(PonderTag.DISPLAY_TARGETS));
+					ScreenOpener.open(new PonderTagScreen(AllPonderTags.DISPLAY_TARGETS));
 				});
 
 		targetWidget.getToolTip().addAll(List.of(
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/source/AccumulatedItemCountDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/AccumulatedItemCountDisplaySource.java
similarity index 73%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/source/AccumulatedItemCountDisplaySource.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/source/AccumulatedItemCountDisplaySource.java
index f036d8ad3..8ebd8f3fd 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/source/AccumulatedItemCountDisplaySource.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/AccumulatedItemCountDisplaySource.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.logistics.block.display.source;
+package com.simibubi.create.content.redstone.displayLink.source;
 
-import com.simibubi.create.content.logistics.block.display.DisplayLinkBlock;
-import com.simibubi.create.content.logistics.block.display.DisplayLinkBlockEntity;
-import com.simibubi.create.content.logistics.block.display.DisplayLinkContext;
-import com.simibubi.create.content.logistics.block.display.target.DisplayTargetStats;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkBlock;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkBlockEntity;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext;
+import com.simibubi.create.content.redstone.displayLink.target.DisplayTargetStats;
 import com.simibubi.create.foundation.utility.Components;
 
 import net.minecraft.network.chat.MutableComponent;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/source/BoilerDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/BoilerDisplaySource.java
similarity index 89%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/source/BoilerDisplaySource.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/source/BoilerDisplaySource.java
index cd5587d49..8ea2a88ab 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/source/BoilerDisplaySource.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/BoilerDisplaySource.java
@@ -1,16 +1,16 @@
-package com.simibubi.create.content.logistics.block.display.source;
+package com.simibubi.create.content.redstone.displayLink.source;
 
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Stream;
 
-import com.simibubi.create.content.contraptions.fluids.tank.BoilerData;
-import com.simibubi.create.content.contraptions.fluids.tank.FluidTankBlockEntity;
-import com.simibubi.create.content.logistics.block.display.DisplayLinkContext;
-import com.simibubi.create.content.logistics.block.display.target.DisplayTargetStats;
-import com.simibubi.create.content.logistics.trains.management.display.FlapDisplayBlockEntity;
-import com.simibubi.create.content.logistics.trains.management.display.FlapDisplayLayout;
-import com.simibubi.create.content.logistics.trains.management.display.FlapDisplaySection;
+import com.simibubi.create.content.fluids.tank.BoilerData;
+import com.simibubi.create.content.fluids.tank.FluidTankBlockEntity;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext;
+import com.simibubi.create.content.redstone.displayLink.target.DisplayTargetStats;
+import com.simibubi.create.content.trains.display.FlapDisplayBlockEntity;
+import com.simibubi.create.content.trains.display.FlapDisplayLayout;
+import com.simibubi.create.content.trains.display.FlapDisplaySection;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Lang;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/source/ComputerDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/ComputerDisplaySource.java
similarity index 76%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/source/ComputerDisplaySource.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/source/ComputerDisplaySource.java
index e3e988143..1d99ae70b 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/source/ComputerDisplaySource.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/ComputerDisplaySource.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.logistics.block.display.source;
+package com.simibubi.create.content.redstone.displayLink.source;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.simibubi.create.content.logistics.block.display.DisplayLinkContext;
-import com.simibubi.create.content.logistics.block.display.target.DisplayTargetStats;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext;
+import com.simibubi.create.content.redstone.displayLink.target.DisplayTargetStats;
 import com.simibubi.create.foundation.utility.Components;
 
 import net.minecraft.nbt.ListTag;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/source/CurrentFloorDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/CurrentFloorDisplaySource.java
similarity index 64%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/source/CurrentFloorDisplaySource.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/source/CurrentFloorDisplaySource.java
index 2468d904a..19012cea4 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/source/CurrentFloorDisplaySource.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/CurrentFloorDisplaySource.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.logistics.block.display.source;
+package com.simibubi.create.content.redstone.displayLink.source;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.elevator.ElevatorContactBlockEntity;
-import com.simibubi.create.content.logistics.block.display.DisplayLinkContext;
-import com.simibubi.create.content.logistics.block.display.target.DisplayTargetStats;
+import com.simibubi.create.content.contraptions.elevator.ElevatorContactBlockEntity;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext;
+import com.simibubi.create.content.redstone.displayLink.target.DisplayTargetStats;
 import com.simibubi.create.foundation.utility.Components;
 
 import net.minecraft.network.chat.MutableComponent;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/source/DeathCounterDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/DeathCounterDisplaySource.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/source/DeathCounterDisplaySource.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/source/DeathCounterDisplaySource.java
index d248da249..f051926fb 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/source/DeathCounterDisplaySource.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/DeathCounterDisplaySource.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.display.source;
+package com.simibubi.create.content.redstone.displayLink.source;
 
 import com.simibubi.create.foundation.utility.Lang;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/source/DisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/DisplaySource.java
similarity index 79%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/source/DisplaySource.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/source/DisplaySource.java
index 3fff48f59..b5db5c057 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/source/DisplaySource.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/DisplaySource.java
@@ -1,16 +1,16 @@
-package com.simibubi.create.content.logistics.block.display.source;
+package com.simibubi.create.content.redstone.displayLink.source;
 
 import java.util.Arrays;
 import java.util.List;
 
 import com.google.common.collect.ImmutableList;
-import com.simibubi.create.content.logistics.block.display.DisplayBehaviour;
-import com.simibubi.create.content.logistics.block.display.DisplayLinkContext;
-import com.simibubi.create.content.logistics.block.display.target.DisplayBoardTarget;
-import com.simibubi.create.content.logistics.block.display.target.DisplayTarget;
-import com.simibubi.create.content.logistics.block.display.target.DisplayTargetStats;
-import com.simibubi.create.content.logistics.trains.management.display.FlapDisplayBlockEntity;
-import com.simibubi.create.content.logistics.trains.management.display.FlapDisplayLayout;
+import com.simibubi.create.content.redstone.displayLink.DisplayBehaviour;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext;
+import com.simibubi.create.content.redstone.displayLink.target.DisplayBoardTarget;
+import com.simibubi.create.content.redstone.displayLink.target.DisplayTarget;
+import com.simibubi.create.content.redstone.displayLink.target.DisplayTargetStats;
+import com.simibubi.create.content.trains.display.FlapDisplayBlockEntity;
+import com.simibubi.create.content.trains.display.FlapDisplayLayout;
 import com.simibubi.create.foundation.gui.ModularGuiLineBuilder;
 import com.simibubi.create.foundation.utility.Components;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/source/EnchantPowerDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/EnchantPowerDisplaySource.java
similarity index 87%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/source/EnchantPowerDisplaySource.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/source/EnchantPowerDisplaySource.java
index ff31ada04..4de9bc362 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/source/EnchantPowerDisplaySource.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/EnchantPowerDisplaySource.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.content.logistics.block.display.source;
+package com.simibubi.create.content.redstone.displayLink.source;
 
-import com.simibubi.create.content.logistics.block.display.DisplayLinkContext;
-import com.simibubi.create.content.logistics.block.display.target.DisplayTargetStats;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext;
+import com.simibubi.create.content.redstone.displayLink.target.DisplayTargetStats;
 import com.simibubi.create.foundation.utility.Components;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/source/EntityNameDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/EntityNameDisplaySource.java
similarity index 73%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/source/EntityNameDisplaySource.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/source/EntityNameDisplaySource.java
index 0f6375a73..8dd981462 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/source/EntityNameDisplaySource.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/EntityNameDisplaySource.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.logistics.block.display.source;
+package com.simibubi.create.content.redstone.displayLink.source;
 
 import java.util.List;
 
-import com.simibubi.create.content.contraptions.components.actors.SeatEntity;
-import com.simibubi.create.content.logistics.block.display.DisplayLinkContext;
-import com.simibubi.create.content.logistics.block.display.target.DisplayTargetStats;
+import com.simibubi.create.content.contraptions.actors.seat.SeatEntity;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext;
+import com.simibubi.create.content.redstone.displayLink.target.DisplayTargetStats;
 
 import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.world.entity.Entity;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/source/FillLevelDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/FillLevelDisplaySource.java
similarity index 86%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/source/FillLevelDisplaySource.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/source/FillLevelDisplaySource.java
index 58c8d0ea7..0918cc1d4 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/source/FillLevelDisplaySource.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/FillLevelDisplaySource.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.content.logistics.block.display.source;
+package com.simibubi.create.content.redstone.displayLink.source;
 
-import com.simibubi.create.content.logistics.block.display.DisplayLinkContext;
-import com.simibubi.create.content.logistics.block.redstone.ThresholdSwitchBlockEntity;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext;
+import com.simibubi.create.content.redstone.thresholdSwitch.ThresholdSwitchBlockEntity;
 import com.simibubi.create.foundation.gui.ModularGuiLineBuilder;
 import com.simibubi.create.foundation.utility.Lang;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/source/FluidAmountDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/FluidAmountDisplaySource.java
similarity index 83%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/source/FluidAmountDisplaySource.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/source/FluidAmountDisplaySource.java
index e5f57243a..dbed634dc 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/source/FluidAmountDisplaySource.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/FluidAmountDisplaySource.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.logistics.block.display.source;
+package com.simibubi.create.content.redstone.displayLink.source;
 
-import com.simibubi.create.content.logistics.block.display.DisplayLinkContext;
-import com.simibubi.create.content.logistics.block.display.target.DisplayTargetStats;
-import com.simibubi.create.content.logistics.block.redstone.SmartObserverBlockEntity;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext;
+import com.simibubi.create.content.redstone.displayLink.target.DisplayTargetStats;
+import com.simibubi.create.content.redstone.smartObserver.SmartObserverBlockEntity;
 import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.inventory.TankManipulationBehaviour;
 import com.simibubi.create.foundation.utility.Components;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/source/FluidListDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/FluidListDisplaySource.java
similarity index 88%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/source/FluidListDisplaySource.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/source/FluidListDisplaySource.java
index 2e83e9aba..159640f9e 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/source/FluidListDisplaySource.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/FluidListDisplaySource.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.display.source;
+package com.simibubi.create.content.redstone.displayLink.source;
 
 import java.util.Comparator;
 import java.util.HashMap;
@@ -8,11 +8,11 @@ import java.util.stream.Stream;
 
 import org.apache.commons.lang3.mutable.MutableInt;
 
-import com.simibubi.create.content.logistics.block.display.DisplayLinkContext;
-import com.simibubi.create.content.logistics.block.redstone.SmartObserverBlockEntity;
-import com.simibubi.create.content.logistics.trains.management.display.FlapDisplayBlockEntity;
-import com.simibubi.create.content.logistics.trains.management.display.FlapDisplayLayout;
-import com.simibubi.create.content.logistics.trains.management.display.FlapDisplaySection;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext;
+import com.simibubi.create.content.redstone.smartObserver.SmartObserverBlockEntity;
+import com.simibubi.create.content.trains.display.FlapDisplayBlockEntity;
+import com.simibubi.create.content.trains.display.FlapDisplayLayout;
+import com.simibubi.create.content.trains.display.FlapDisplaySection;
 import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.inventory.TankManipulationBehaviour;
 import com.simibubi.create.foundation.utility.Components;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/source/ItemCountDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/ItemCountDisplaySource.java
similarity index 83%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/source/ItemCountDisplaySource.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/source/ItemCountDisplaySource.java
index c1b635397..752718a62 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/source/ItemCountDisplaySource.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/ItemCountDisplaySource.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.logistics.block.display.source;
+package com.simibubi.create.content.redstone.displayLink.source;
 
-import com.simibubi.create.content.logistics.block.display.DisplayLinkContext;
-import com.simibubi.create.content.logistics.block.display.target.DisplayTargetStats;
-import com.simibubi.create.content.logistics.block.redstone.SmartObserverBlockEntity;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext;
+import com.simibubi.create.content.redstone.displayLink.target.DisplayTargetStats;
+import com.simibubi.create.content.redstone.smartObserver.SmartObserverBlockEntity;
 import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.inventory.InvManipulationBehaviour;
 import com.simibubi.create.foundation.utility.Components;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/source/ItemListDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/ItemListDisplaySource.java
similarity index 85%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/source/ItemListDisplaySource.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/source/ItemListDisplaySource.java
index c01283c05..2869bbe99 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/source/ItemListDisplaySource.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/ItemListDisplaySource.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.logistics.block.display.source;
+package com.simibubi.create.content.redstone.displayLink.source;
 
 import java.util.stream.Stream;
 
-import com.simibubi.create.content.logistics.block.display.DisplayLinkContext;
-import com.simibubi.create.content.logistics.block.redstone.SmartObserverBlockEntity;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext;
+import com.simibubi.create.content.redstone.smartObserver.SmartObserverBlockEntity;
 import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.inventory.InvManipulationBehaviour;
 import com.simibubi.create.foundation.item.CountedItemStackList;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/source/ItemNameDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/ItemNameDisplaySource.java
similarity index 71%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/source/ItemNameDisplaySource.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/source/ItemNameDisplaySource.java
index 7f70ce4f8..5c7aef3c8 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/source/ItemNameDisplaySource.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/ItemNameDisplaySource.java
@@ -1,13 +1,13 @@
-package com.simibubi.create.content.logistics.block.display.source;
+package com.simibubi.create.content.redstone.displayLink.source;
 
 import org.apache.commons.lang3.mutable.MutableObject;
 
-import com.simibubi.create.content.logistics.block.display.DisplayLinkBlockEntity;
-import com.simibubi.create.content.logistics.block.display.DisplayLinkContext;
-import com.simibubi.create.content.logistics.block.display.target.DisplayTargetStats;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.TransportedItemStackHandlerBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.TransportedItemStackHandlerBehaviour.TransportedResult;
+import com.simibubi.create.content.kinetics.belt.behaviour.TransportedItemStackHandlerBehaviour;
+import com.simibubi.create.content.kinetics.belt.behaviour.TransportedItemStackHandlerBehaviour.TransportedResult;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkBlockEntity;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext;
+import com.simibubi.create.content.redstone.displayLink.target.DisplayTargetStats;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 
 import net.minecraft.core.BlockPos.MutableBlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/source/ItemThroughputDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/ItemThroughputDisplaySource.java
similarity index 89%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/source/ItemThroughputDisplaySource.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/source/ItemThroughputDisplaySource.java
index b1cfbe701..38ff12f6c 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/source/ItemThroughputDisplaySource.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/ItemThroughputDisplaySource.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.logistics.block.display.source;
+package com.simibubi.create.content.redstone.displayLink.source;
 
-import com.simibubi.create.content.logistics.block.display.DisplayLinkBlock;
-import com.simibubi.create.content.logistics.block.display.DisplayLinkBlockEntity;
-import com.simibubi.create.content.logistics.block.display.DisplayLinkContext;
-import com.simibubi.create.content.logistics.block.display.target.DisplayTargetStats;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkBlock;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkBlockEntity;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext;
+import com.simibubi.create.content.redstone.displayLink.target.DisplayTargetStats;
 import com.simibubi.create.foundation.gui.ModularGuiLineBuilder;
 import com.simibubi.create.foundation.utility.Lang;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/source/KineticSpeedDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/KineticSpeedDisplaySource.java
similarity index 82%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/source/KineticSpeedDisplaySource.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/source/KineticSpeedDisplaySource.java
index 943ac57d5..6db6f2491 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/source/KineticSpeedDisplaySource.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/KineticSpeedDisplaySource.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.logistics.block.display.source;
+package com.simibubi.create.content.redstone.displayLink.source;
 
-import com.simibubi.create.content.contraptions.relays.gauge.SpeedGaugeBlockEntity;
-import com.simibubi.create.content.logistics.block.display.DisplayLinkContext;
-import com.simibubi.create.content.logistics.block.display.target.DisplayTargetStats;
+import com.simibubi.create.content.kinetics.gauge.SpeedGaugeBlockEntity;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext;
+import com.simibubi.create.content.redstone.displayLink.target.DisplayTargetStats;
 import com.simibubi.create.foundation.gui.ModularGuiLineBuilder;
 import com.simibubi.create.foundation.utility.Lang;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/source/KineticStressDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/KineticStressDisplaySource.java
similarity index 87%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/source/KineticStressDisplaySource.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/source/KineticStressDisplaySource.java
index 6c48bc086..343a2b283 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/source/KineticStressDisplaySource.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/KineticStressDisplaySource.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.logistics.block.display.source;
+package com.simibubi.create.content.redstone.displayLink.source;
 
-import com.simibubi.create.content.contraptions.relays.gauge.StressGaugeBlockEntity;
-import com.simibubi.create.content.logistics.block.display.DisplayLinkContext;
-import com.simibubi.create.content.logistics.trains.management.display.FlapDisplayBlockEntity;
+import com.simibubi.create.content.kinetics.gauge.StressGaugeBlockEntity;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext;
+import com.simibubi.create.content.trains.display.FlapDisplayBlockEntity;
 import com.simibubi.create.foundation.gui.ModularGuiLineBuilder;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.LangBuilder;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/source/NixieTubeDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/NixieTubeDisplaySource.java
similarity index 74%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/source/NixieTubeDisplaySource.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/source/NixieTubeDisplaySource.java
index 45f75188a..3d08cd1f9 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/source/NixieTubeDisplaySource.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/NixieTubeDisplaySource.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.logistics.block.display.source;
+package com.simibubi.create.content.redstone.displayLink.source;
 
-import com.simibubi.create.content.logistics.block.display.DisplayLinkContext;
-import com.simibubi.create.content.logistics.block.display.target.DisplayTargetStats;
-import com.simibubi.create.content.logistics.block.display.target.NixieTubeDisplayTarget;
-import com.simibubi.create.content.logistics.block.redstone.NixieTubeBlockEntity;
-import com.simibubi.create.content.logistics.trains.management.display.FlapDisplaySection;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext;
+import com.simibubi.create.content.redstone.displayLink.target.DisplayTargetStats;
+import com.simibubi.create.content.redstone.displayLink.target.NixieTubeDisplayTarget;
+import com.simibubi.create.content.redstone.nixieTube.NixieTubeBlockEntity;
+import com.simibubi.create.content.trains.display.FlapDisplaySection;
 
 import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.world.level.block.entity.BlockEntity;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/source/NumericSingleLineDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/NumericSingleLineDisplaySource.java
similarity index 70%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/source/NumericSingleLineDisplaySource.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/source/NumericSingleLineDisplaySource.java
index 001d2cd91..ffb702116 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/source/NumericSingleLineDisplaySource.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/NumericSingleLineDisplaySource.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.content.logistics.block.display.source;
+package com.simibubi.create.content.redstone.displayLink.source;
 
-import com.simibubi.create.content.logistics.block.display.DisplayLinkContext;
-import com.simibubi.create.content.logistics.trains.management.display.FlapDisplaySection;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext;
+import com.simibubi.create.content.trains.display.FlapDisplaySection;
 import com.simibubi.create.foundation.utility.Components;
 
 import net.minecraft.network.chat.Component;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/source/ObservedTrainNameSource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/ObservedTrainNameSource.java
similarity index 66%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/source/ObservedTrainNameSource.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/source/ObservedTrainNameSource.java
index 3025a62ac..e8ba86669 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/source/ObservedTrainNameSource.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/ObservedTrainNameSource.java
@@ -1,13 +1,13 @@
-package com.simibubi.create.content.logistics.block.display.source;
+package com.simibubi.create.content.redstone.displayLink.source;
 
 import java.util.UUID;
 
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.block.display.DisplayLinkContext;
-import com.simibubi.create.content.logistics.block.display.target.DisplayTargetStats;
-import com.simibubi.create.content.logistics.trains.entity.Train;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.observer.TrackObserver;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.observer.TrackObserverBlockEntity;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext;
+import com.simibubi.create.content.redstone.displayLink.target.DisplayTargetStats;
+import com.simibubi.create.content.trains.entity.Train;
+import com.simibubi.create.content.trains.observer.TrackObserver;
+import com.simibubi.create.content.trains.observer.TrackObserverBlockEntity;
 
 import net.minecraft.network.chat.MutableComponent;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/source/PercentOrProgressBarDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/PercentOrProgressBarDisplaySource.java
similarity index 81%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/source/PercentOrProgressBarDisplaySource.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/source/PercentOrProgressBarDisplaySource.java
index 5028caf92..b4985985b 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/source/PercentOrProgressBarDisplaySource.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/PercentOrProgressBarDisplaySource.java
@@ -1,13 +1,13 @@
-package com.simibubi.create.content.logistics.block.display.source;
+package com.simibubi.create.content.redstone.displayLink.source;
 
-import static com.simibubi.create.content.logistics.trains.management.display.FlapDisplaySection.WIDE_MONOSPACE;
+import static com.simibubi.create.content.trains.display.FlapDisplaySection.WIDE_MONOSPACE;
 
 import javax.annotation.Nullable;
 
-import com.simibubi.create.content.logistics.block.display.DisplayLinkContext;
-import com.simibubi.create.content.logistics.block.display.target.DisplayTargetStats;
-import com.simibubi.create.content.logistics.trains.management.display.FlapDisplayBlockEntity;
-import com.simibubi.create.content.logistics.trains.management.display.FlapDisplaySection;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext;
+import com.simibubi.create.content.redstone.displayLink.target.DisplayTargetStats;
+import com.simibubi.create.content.trains.display.FlapDisplayBlockEntity;
+import com.simibubi.create.content.trains.display.FlapDisplaySection;
 import com.simibubi.create.foundation.utility.Components;
 
 import net.minecraft.network.chat.MutableComponent;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/source/RedstonePowerDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/RedstonePowerDisplaySource.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/source/RedstonePowerDisplaySource.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/source/RedstonePowerDisplaySource.java
index 68ff0e51e..45ebde9fb 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/source/RedstonePowerDisplaySource.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/RedstonePowerDisplaySource.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.logistics.block.display.source;
+package com.simibubi.create.content.redstone.displayLink.source;
 
-import com.simibubi.create.content.logistics.block.display.DisplayLinkContext;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext;
 import com.simibubi.create.foundation.gui.ModularGuiLineBuilder;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Lang;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/source/ScoreboardDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/ScoreboardDisplaySource.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/source/ScoreboardDisplaySource.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/source/ScoreboardDisplaySource.java
index ad74dbce6..1081078ae 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/source/ScoreboardDisplaySource.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/ScoreboardDisplaySource.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.logistics.block.display.source;
+package com.simibubi.create.content.redstone.displayLink.source;
 
 import java.util.stream.Stream;
 
 import com.google.common.collect.ImmutableList;
-import com.simibubi.create.content.logistics.block.display.DisplayLinkContext;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext;
 import com.simibubi.create.foundation.gui.ModularGuiLineBuilder;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.IntAttached;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/source/SingleLineDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/SingleLineDisplaySource.java
similarity index 87%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/source/SingleLineDisplaySource.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/source/SingleLineDisplaySource.java
index 10a47f45e..a07064dc5 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/source/SingleLineDisplaySource.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/SingleLineDisplaySource.java
@@ -1,13 +1,13 @@
-package com.simibubi.create.content.logistics.block.display.source;
+package com.simibubi.create.content.redstone.displayLink.source;
 
 import java.util.List;
 
 import com.google.common.collect.ImmutableList;
-import com.simibubi.create.content.logistics.block.display.DisplayLinkContext;
-import com.simibubi.create.content.logistics.block.display.target.DisplayTargetStats;
-import com.simibubi.create.content.logistics.trains.management.display.FlapDisplayBlockEntity;
-import com.simibubi.create.content.logistics.trains.management.display.FlapDisplayLayout;
-import com.simibubi.create.content.logistics.trains.management.display.FlapDisplaySection;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext;
+import com.simibubi.create.content.redstone.displayLink.target.DisplayTargetStats;
+import com.simibubi.create.content.trains.display.FlapDisplayBlockEntity;
+import com.simibubi.create.content.trains.display.FlapDisplayLayout;
+import com.simibubi.create.content.trains.display.FlapDisplaySection;
 import com.simibubi.create.foundation.gui.ModularGuiLineBuilder;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Lang;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/source/StatTrackingDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/StatTrackingDisplaySource.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/source/StatTrackingDisplaySource.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/source/StatTrackingDisplaySource.java
index 487fdf978..14391ef1b 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/source/StatTrackingDisplaySource.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/StatTrackingDisplaySource.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.logistics.block.display.source;
+package com.simibubi.create.content.redstone.displayLink.source;
 
 import java.util.stream.Stream;
 
-import com.simibubi.create.content.logistics.block.display.DisplayLinkContext;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext;
 import com.simibubi.create.foundation.gui.ModularGuiLineBuilder;
 import com.simibubi.create.foundation.utility.IntAttached;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/source/StationSummaryDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/StationSummaryDisplaySource.java
similarity index 87%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/source/StationSummaryDisplaySource.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/source/StationSummaryDisplaySource.java
index e79dd2434..b6655a4ff 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/source/StationSummaryDisplaySource.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/StationSummaryDisplaySource.java
@@ -1,19 +1,19 @@
-package com.simibubi.create.content.logistics.block.display.source;
+package com.simibubi.create.content.redstone.displayLink.source;
 
-import static com.simibubi.create.content.logistics.trains.management.display.FlapDisplaySection.MONOSPACE;
+import static com.simibubi.create.content.trains.display.FlapDisplaySection.MONOSPACE;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import com.google.common.collect.ImmutableList;
-import com.simibubi.create.content.logistics.block.display.DisplayLinkContext;
-import com.simibubi.create.content.logistics.block.display.target.DisplayTargetStats;
-import com.simibubi.create.content.logistics.trains.management.display.FlapDisplayBlockEntity;
-import com.simibubi.create.content.logistics.trains.management.display.FlapDisplayLayout;
-import com.simibubi.create.content.logistics.trains.management.display.FlapDisplaySection;
-import com.simibubi.create.content.logistics.trains.management.display.GlobalTrainDisplayData;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.station.GlobalStation;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.station.StationBlockEntity;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext;
+import com.simibubi.create.content.redstone.displayLink.target.DisplayTargetStats;
+import com.simibubi.create.content.trains.display.FlapDisplayBlockEntity;
+import com.simibubi.create.content.trains.display.FlapDisplayLayout;
+import com.simibubi.create.content.trains.display.FlapDisplaySection;
+import com.simibubi.create.content.trains.display.GlobalTrainDisplayData;
+import com.simibubi.create.content.trains.station.GlobalStation;
+import com.simibubi.create.content.trains.station.StationBlockEntity;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
 import com.simibubi.create.foundation.gui.ModularGuiLineBuilder;
 import com.simibubi.create.foundation.utility.Components;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/source/StopWatchDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/StopWatchDisplaySource.java
similarity index 81%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/source/StopWatchDisplaySource.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/source/StopWatchDisplaySource.java
index ed5a387e4..fffa5ba6c 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/source/StopWatchDisplaySource.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/StopWatchDisplaySource.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.logistics.block.display.source;
+package com.simibubi.create.content.redstone.displayLink.source;
 
-import com.simibubi.create.content.contraptions.components.clock.CuckooClockBlockEntity;
-import com.simibubi.create.content.logistics.block.display.DisplayLinkContext;
-import com.simibubi.create.content.logistics.block.display.target.DisplayTargetStats;
-import com.simibubi.create.content.logistics.trains.management.display.FlapDisplaySection;
+import com.simibubi.create.content.kinetics.clock.CuckooClockBlockEntity;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext;
+import com.simibubi.create.content.redstone.displayLink.target.DisplayTargetStats;
+import com.simibubi.create.content.trains.display.FlapDisplaySection;
 import com.simibubi.create.foundation.utility.Components;
 
 import net.minecraft.network.chat.MutableComponent;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/source/TimeOfDayDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/TimeOfDayDisplaySource.java
similarity index 86%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/source/TimeOfDayDisplaySource.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/source/TimeOfDayDisplaySource.java
index 60c81106e..8be2ea74e 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/source/TimeOfDayDisplaySource.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/TimeOfDayDisplaySource.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.logistics.block.display.source;
+package com.simibubi.create.content.redstone.displayLink.source;
 
 import com.simibubi.create.Create;
-import com.simibubi.create.content.contraptions.components.clock.CuckooClockBlockEntity;
-import com.simibubi.create.content.logistics.block.display.DisplayLinkContext;
-import com.simibubi.create.content.logistics.block.display.target.DisplayTargetStats;
-import com.simibubi.create.content.logistics.trains.management.display.FlapDisplaySection;
+import com.simibubi.create.content.kinetics.clock.CuckooClockBlockEntity;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext;
+import com.simibubi.create.content.redstone.displayLink.target.DisplayTargetStats;
+import com.simibubi.create.content.trains.display.FlapDisplaySection;
 import com.simibubi.create.foundation.gui.ModularGuiLineBuilder;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Lang;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/source/TrainStatusDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/TrainStatusDisplaySource.java
similarity index 59%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/source/TrainStatusDisplaySource.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/source/TrainStatusDisplaySource.java
index 7f1985ac7..c36153570 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/source/TrainStatusDisplaySource.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/TrainStatusDisplaySource.java
@@ -1,13 +1,13 @@
-package com.simibubi.create.content.logistics.block.display.source;
+package com.simibubi.create.content.redstone.displayLink.source;
 
-import com.simibubi.create.content.logistics.block.display.DisplayLinkContext;
-import com.simibubi.create.content.logistics.block.display.target.DisplayTargetStats;
-import com.simibubi.create.content.logistics.trains.entity.Train;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.station.GlobalStation;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.station.StationBlockEntity;
-import com.simibubi.create.content.logistics.trains.management.schedule.Schedule;
-import com.simibubi.create.content.logistics.trains.management.schedule.ScheduleRuntime;
-import com.simibubi.create.content.logistics.trains.management.schedule.ScheduleRuntime.State;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext;
+import com.simibubi.create.content.redstone.displayLink.target.DisplayTargetStats;
+import com.simibubi.create.content.trains.entity.Train;
+import com.simibubi.create.content.trains.schedule.Schedule;
+import com.simibubi.create.content.trains.schedule.ScheduleRuntime;
+import com.simibubi.create.content.trains.schedule.ScheduleRuntime.State;
+import com.simibubi.create.content.trains.station.GlobalStation;
+import com.simibubi.create.content.trains.station.StationBlockEntity;
 
 import net.minecraft.network.chat.MutableComponent;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/source/ValueListDisplaySource.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/ValueListDisplaySource.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/source/ValueListDisplaySource.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/source/ValueListDisplaySource.java
index 982eba9cf..057171755 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/source/ValueListDisplaySource.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/source/ValueListDisplaySource.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.logistics.block.display.source;
+package com.simibubi.create.content.redstone.displayLink.source;
 
-import static com.simibubi.create.content.logistics.trains.management.display.FlapDisplaySection.MONOSPACE;
+import static com.simibubi.create.content.trains.display.FlapDisplaySection.MONOSPACE;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -9,11 +9,11 @@ import java.util.stream.Stream;
 
 import org.apache.commons.lang3.mutable.MutableInt;
 
-import com.simibubi.create.content.logistics.block.display.DisplayLinkContext;
-import com.simibubi.create.content.logistics.block.display.target.DisplayTargetStats;
-import com.simibubi.create.content.logistics.trains.management.display.FlapDisplayBlockEntity;
-import com.simibubi.create.content.logistics.trains.management.display.FlapDisplayLayout;
-import com.simibubi.create.content.logistics.trains.management.display.FlapDisplaySection;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext;
+import com.simibubi.create.content.redstone.displayLink.target.DisplayTargetStats;
+import com.simibubi.create.content.trains.display.FlapDisplayBlockEntity;
+import com.simibubi.create.content.trains.display.FlapDisplayLayout;
+import com.simibubi.create.content.trains.display.FlapDisplaySection;
 import com.simibubi.create.foundation.gui.ModularGuiLineBuilder;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Couple;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/target/DisplayBoardTarget.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/target/DisplayBoardTarget.java
similarity index 86%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/target/DisplayBoardTarget.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/target/DisplayBoardTarget.java
index 467755fb0..87f8660b3 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/target/DisplayBoardTarget.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/target/DisplayBoardTarget.java
@@ -1,12 +1,12 @@
-package com.simibubi.create.content.logistics.block.display.target;
+package com.simibubi.create.content.redstone.displayLink.target;
 
 import java.util.List;
 
-import com.simibubi.create.content.logistics.block.display.DisplayLinkContext;
-import com.simibubi.create.content.logistics.block.display.source.DisplaySource;
-import com.simibubi.create.content.logistics.block.display.source.SingleLineDisplaySource;
-import com.simibubi.create.content.logistics.trains.management.display.FlapDisplayBlockEntity;
-import com.simibubi.create.content.logistics.trains.management.display.FlapDisplayLayout;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext;
+import com.simibubi.create.content.redstone.displayLink.source.DisplaySource;
+import com.simibubi.create.content.redstone.displayLink.source.SingleLineDisplaySource;
+import com.simibubi.create.content.trains.display.FlapDisplayBlockEntity;
+import com.simibubi.create.content.trains.display.FlapDisplayLayout;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Vec3i;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/target/DisplayTarget.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/target/DisplayTarget.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/target/DisplayTarget.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/target/DisplayTarget.java
index d4cc49c4e..ee6163d8a 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/target/DisplayTarget.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/target/DisplayTarget.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.logistics.block.display.target;
+package com.simibubi.create.content.redstone.displayLink.target;
 
 import java.util.List;
 
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.logistics.block.display.DisplayBehaviour;
-import com.simibubi.create.content.logistics.block.display.DisplayLinkContext;
+import com.simibubi.create.content.redstone.displayLink.DisplayBehaviour;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext;
 import com.simibubi.create.foundation.utility.Lang;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/target/DisplayTargetStats.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/target/DisplayTargetStats.java
similarity index 56%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/target/DisplayTargetStats.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/target/DisplayTargetStats.java
index 4381fc021..13dff9550 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/target/DisplayTargetStats.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/target/DisplayTargetStats.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.display.target;
+package com.simibubi.create.content.redstone.displayLink.target;
 
 public record DisplayTargetStats(int maxRows, int maxColumns, DisplayTarget type) {
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/target/LecternDisplayTarget.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/target/LecternDisplayTarget.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/target/LecternDisplayTarget.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/target/LecternDisplayTarget.java
index 21954ed0a..fdc087b4f 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/target/LecternDisplayTarget.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/target/LecternDisplayTarget.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.logistics.block.display.target;
+package com.simibubi.create.content.redstone.displayLink.target;
 
 import java.util.List;
 
-import com.simibubi.create.content.logistics.block.display.DisplayLinkContext;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext;
 import com.simibubi.create.foundation.utility.Lang;
 
 import net.minecraft.nbt.CompoundTag;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/target/NixieTubeDisplayTarget.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/target/NixieTubeDisplayTarget.java
similarity index 86%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/target/NixieTubeDisplayTarget.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/target/NixieTubeDisplayTarget.java
index 7e186846a..13415b9be 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/target/NixieTubeDisplayTarget.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/target/NixieTubeDisplayTarget.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.logistics.block.display.target;
+package com.simibubi.create.content.redstone.displayLink.target;
 
 import org.apache.commons.lang3.mutable.MutableInt;
 import org.apache.commons.lang3.mutable.MutableObject;
 
-import com.simibubi.create.content.logistics.block.display.DisplayLinkContext;
-import com.simibubi.create.content.logistics.block.redstone.NixieTubeBlock;
-import com.simibubi.create.content.logistics.block.redstone.NixieTubeBlockEntity;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext;
+import com.simibubi.create.content.redstone.nixieTube.NixieTubeBlock;
+import com.simibubi.create.content.redstone.nixieTube.NixieTubeBlockEntity;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.Component;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/target/SignDisplayTarget.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/target/SignDisplayTarget.java
similarity index 87%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/target/SignDisplayTarget.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/target/SignDisplayTarget.java
index be2fd6c56..77efd5436 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/target/SignDisplayTarget.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/target/SignDisplayTarget.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.logistics.block.display.target;
+package com.simibubi.create.content.redstone.displayLink.target;
 
 import java.util.List;
 
-import com.simibubi.create.content.logistics.block.display.DisplayLinkContext;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext;
 
 import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.world.level.block.entity.BlockEntity;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/target/SingleLineDisplayTarget.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/target/SingleLineDisplayTarget.java
similarity index 84%
rename from src/main/java/com/simibubi/create/content/logistics/block/display/target/SingleLineDisplayTarget.java
rename to src/main/java/com/simibubi/create/content/redstone/displayLink/target/SingleLineDisplayTarget.java
index 0858e5a92..e1a59719f 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/display/target/SingleLineDisplayTarget.java
+++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/target/SingleLineDisplayTarget.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.logistics.block.display.target;
+package com.simibubi.create.content.redstone.displayLink.target;
 
 import java.util.List;
 
-import com.simibubi.create.content.logistics.block.display.DisplayLinkContext;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext;
 import com.simibubi.create.foundation.utility.Lang;
 
 import net.minecraft.network.chat.Component;
diff --git a/src/main/java/com/simibubi/create/content/logistics/IRedstoneLinkable.java b/src/main/java/com/simibubi/create/content/redstone/link/IRedstoneLinkable.java
similarity index 72%
rename from src/main/java/com/simibubi/create/content/logistics/IRedstoneLinkable.java
rename to src/main/java/com/simibubi/create/content/redstone/link/IRedstoneLinkable.java
index 1fa782796..4d44880cb 100644
--- a/src/main/java/com/simibubi/create/content/logistics/IRedstoneLinkable.java
+++ b/src/main/java/com/simibubi/create/content/redstone/link/IRedstoneLinkable.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.logistics;
+package com.simibubi.create.content.redstone.link;
 
-import com.simibubi.create.content.logistics.RedstoneLinkNetworkHandler.Frequency;
+import com.simibubi.create.content.redstone.link.RedstoneLinkNetworkHandler.Frequency;
 import com.simibubi.create.foundation.utility.Couple;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/linked/LinkBehaviour.java b/src/main/java/com/simibubi/create/content/redstone/link/LinkBehaviour.java
similarity index 93%
rename from src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/linked/LinkBehaviour.java
rename to src/main/java/com/simibubi/create/content/redstone/link/LinkBehaviour.java
index cc5990990..982d4d544 100644
--- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/linked/LinkBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/redstone/link/LinkBehaviour.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.blockEntity.behaviour.linked;
+package com.simibubi.create.content.redstone.link;
 
 import java.util.function.Function;
 import java.util.function.IntConsumer;
@@ -7,13 +7,11 @@ import java.util.function.IntSupplier;
 import org.apache.commons.lang3.tuple.Pair;
 
 import com.simibubi.create.Create;
-import com.simibubi.create.content.curiosities.clipboard.ClipboardCloneable;
-import com.simibubi.create.content.logistics.IRedstoneLinkable;
-import com.simibubi.create.content.logistics.RedstoneLinkNetworkHandler;
-import com.simibubi.create.content.logistics.RedstoneLinkNetworkHandler.Frequency;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.equipment.clipboard.ClipboardCloneable;
+import com.simibubi.create.content.redstone.link.RedstoneLinkNetworkHandler.Frequency;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
 import com.simibubi.create.foundation.blockEntity.behaviour.BehaviourType;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform;
 import com.simibubi.create.foundation.utility.Couple;
 
diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/linked/LinkHandler.java b/src/main/java/com/simibubi/create/content/redstone/link/LinkHandler.java
similarity index 94%
rename from src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/linked/LinkHandler.java
rename to src/main/java/com/simibubi/create/content/redstone/link/LinkHandler.java
index 4aa2d103c..ab4489dad 100644
--- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/linked/LinkHandler.java
+++ b/src/main/java/com/simibubi/create/content/redstone/link/LinkHandler.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.foundation.blockEntity.behaviour.linked;
+package com.simibubi.create.content.redstone.link;
 
 import java.util.Arrays;
 
 import com.simibubi.create.AllItems;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.RaycastHelper;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/linked/LinkRenderer.java b/src/main/java/com/simibubi/create/content/redstone/link/LinkRenderer.java
similarity index 94%
rename from src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/linked/LinkRenderer.java
rename to src/main/java/com/simibubi/create/content/redstone/link/LinkRenderer.java
index 2031c0f1f..fe9dd8b56 100644
--- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/linked/LinkRenderer.java
+++ b/src/main/java/com/simibubi/create/content/redstone/link/LinkRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.blockEntity.behaviour.linked;
+package com.simibubi.create.content.redstone.link;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -6,15 +6,15 @@ import java.util.List;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.datafixers.util.Pair;
 import com.simibubi.create.CreateClient;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBox;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxRenderer;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform;
-import com.simibubi.create.foundation.config.AllConfigs;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.VecHelper;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ClientLevel;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/RedstoneLinkBlock.java b/src/main/java/com/simibubi/create/content/redstone/link/RedstoneLinkBlock.java
similarity index 99%
rename from src/main/java/com/simibubi/create/content/logistics/block/redstone/RedstoneLinkBlock.java
rename to src/main/java/com/simibubi/create/content/redstone/link/RedstoneLinkBlock.java
index ba8dbf56c..170168159 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/RedstoneLinkBlock.java
+++ b/src/main/java/com/simibubi/create/content/redstone/link/RedstoneLinkBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.redstone;
+package com.simibubi.create.content.redstone.link;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllShapes;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/RedstoneLinkBlockEntity.java b/src/main/java/com/simibubi/create/content/redstone/link/RedstoneLinkBlockEntity.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/logistics/block/redstone/RedstoneLinkBlockEntity.java
rename to src/main/java/com/simibubi/create/content/redstone/link/RedstoneLinkBlockEntity.java
index 58bf29ad4..7b5b706d2 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/RedstoneLinkBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/redstone/link/RedstoneLinkBlockEntity.java
@@ -1,14 +1,13 @@
-package com.simibubi.create.content.logistics.block.redstone;
+package com.simibubi.create.content.redstone.link;
 
 import java.util.List;
 
 import org.apache.commons.lang3.tuple.Pair;
 
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform;
-import com.simibubi.create.foundation.blockEntity.behaviour.linked.LinkBehaviour;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/RedstoneLinkFrequencySlot.java b/src/main/java/com/simibubi/create/content/redstone/link/RedstoneLinkFrequencySlot.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/block/redstone/RedstoneLinkFrequencySlot.java
rename to src/main/java/com/simibubi/create/content/redstone/link/RedstoneLinkFrequencySlot.java
index 0e6a41ab4..715e7780a 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/RedstoneLinkFrequencySlot.java
+++ b/src/main/java/com/simibubi/create/content/redstone/link/RedstoneLinkFrequencySlot.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.redstone;
+package com.simibubi.create.content.redstone.link;
 
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/RedstoneLinkGenerator.java b/src/main/java/com/simibubi/create/content/redstone/link/RedstoneLinkGenerator.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/logistics/block/redstone/RedstoneLinkGenerator.java
rename to src/main/java/com/simibubi/create/content/redstone/link/RedstoneLinkGenerator.java
index 769138d43..24ca6ae8f 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/RedstoneLinkGenerator.java
+++ b/src/main/java/com/simibubi/create/content/redstone/link/RedstoneLinkGenerator.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.redstone;
+package com.simibubi.create.content.redstone.link;
 
 import com.simibubi.create.foundation.data.SpecialBlockStateGen;
 import com.tterrag.registrate.providers.DataGenContext;
diff --git a/src/main/java/com/simibubi/create/content/logistics/RedstoneLinkNetworkHandler.java b/src/main/java/com/simibubi/create/content/redstone/link/RedstoneLinkNetworkHandler.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/RedstoneLinkNetworkHandler.java
rename to src/main/java/com/simibubi/create/content/redstone/link/RedstoneLinkNetworkHandler.java
index 63d8f8022..5faa0f30e 100644
--- a/src/main/java/com/simibubi/create/content/logistics/RedstoneLinkNetworkHandler.java
+++ b/src/main/java/com/simibubi/create/content/redstone/link/RedstoneLinkNetworkHandler.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics;
+package com.simibubi.create.content.redstone.link;
 
 import java.util.HashMap;
 import java.util.IdentityHashMap;
@@ -9,10 +9,9 @@ import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import com.simibubi.create.Create;
-import com.simibubi.create.foundation.blockEntity.behaviour.linked.LinkBehaviour;
-import com.simibubi.create.foundation.config.AllConfigs;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.WorldHelper;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.item.Item;
diff --git a/src/main/java/com/simibubi/create/content/logistics/item/LecternControllerBlock.java b/src/main/java/com/simibubi/create/content/redstone/link/controller/LecternControllerBlock.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/logistics/item/LecternControllerBlock.java
rename to src/main/java/com/simibubi/create/content/redstone/link/controller/LecternControllerBlock.java
index 80776b156..a2b793a58 100644
--- a/src/main/java/com/simibubi/create/content/logistics/item/LecternControllerBlock.java
+++ b/src/main/java/com/simibubi/create/content/redstone/link/controller/LecternControllerBlock.java
@@ -1,12 +1,12 @@
-package com.simibubi.create.content.logistics.item;
+package com.simibubi.create.content.redstone.link.controller;
 
 import java.util.ArrayList;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllItems;
 import com.simibubi.create.AllSoundEvents;
-import com.simibubi.create.content.schematics.ISpecialBlockItemRequirement;
-import com.simibubi.create.content.schematics.ItemRequirement;
+import com.simibubi.create.content.schematics.requirement.ISpecialBlockItemRequirement;
+import com.simibubi.create.content.schematics.requirement.ItemRequirement;
 import com.simibubi.create.foundation.block.IBE;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/logistics/item/LecternControllerBlockEntity.java b/src/main/java/com/simibubi/create/content/redstone/link/controller/LecternControllerBlockEntity.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/logistics/item/LecternControllerBlockEntity.java
rename to src/main/java/com/simibubi/create/content/redstone/link/controller/LecternControllerBlockEntity.java
index 3fb5164a8..1c0cd29ba 100644
--- a/src/main/java/com/simibubi/create/content/logistics/item/LecternControllerBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/redstone/link/controller/LecternControllerBlockEntity.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.logistics.item;
+package com.simibubi.create.content.redstone.link.controller;
 
 import java.util.List;
 import java.util.UUID;
 
 import com.simibubi.create.AllSoundEvents;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/logistics/item/LecternControllerRenderer.java b/src/main/java/com/simibubi/create/content/redstone/link/controller/LecternControllerRenderer.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/logistics/item/LecternControllerRenderer.java
rename to src/main/java/com/simibubi/create/content/redstone/link/controller/LecternControllerRenderer.java
index c20d56274..355f26380 100644
--- a/src/main/java/com/simibubi/create/content/logistics/item/LecternControllerRenderer.java
+++ b/src/main/java/com/simibubi/create/content/redstone/link/controller/LecternControllerRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.item;
+package com.simibubi.create.content.redstone.link.controller;
 
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
diff --git a/src/main/java/com/simibubi/create/content/logistics/item/LinkedControllerBindPacket.java b/src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerBindPacket.java
similarity index 88%
rename from src/main/java/com/simibubi/create/content/logistics/item/LinkedControllerBindPacket.java
rename to src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerBindPacket.java
index 9b94f0fd0..5c9e790ff 100644
--- a/src/main/java/com/simibubi/create/content/logistics/item/LinkedControllerBindPacket.java
+++ b/src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerBindPacket.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.content.logistics.item;
+package com.simibubi.create.content.redstone.link.controller;
 
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.linked.LinkBehaviour;
+import com.simibubi.create.content.redstone.link.LinkBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.FriendlyByteBuf;
diff --git a/src/main/java/com/simibubi/create/content/logistics/item/LinkedControllerClientHandler.java b/src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerClientHandler.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/item/LinkedControllerClientHandler.java
rename to src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerClientHandler.java
index 2797757e2..830905e81 100644
--- a/src/main/java/com/simibubi/create/content/logistics/item/LinkedControllerClientHandler.java
+++ b/src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerClientHandler.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.item;
+package com.simibubi.create.content.redstone.link.controller;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -12,13 +12,13 @@ import com.mojang.blaze3d.platform.InputConstants;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.AllSoundEvents;
 import com.simibubi.create.CreateClient;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.linked.LinkBehaviour;
+import com.simibubi.create.content.redstone.link.LinkBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.item.TooltipHelper;
 import com.simibubi.create.foundation.item.TooltipHelper.Palette;
-import com.simibubi.create.foundation.networking.AllPackets;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.ControlsUtil;
 import com.simibubi.create.foundation.utility.Lang;
diff --git a/src/main/java/com/simibubi/create/content/logistics/item/LinkedControllerInputPacket.java b/src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerInputPacket.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/item/LinkedControllerInputPacket.java
rename to src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerInputPacket.java
index e8fed21f6..0eabc73a4 100644
--- a/src/main/java/com/simibubi/create/content/logistics/item/LinkedControllerInputPacket.java
+++ b/src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerInputPacket.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.item;
+package com.simibubi.create.content.redstone.link.controller;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/main/java/com/simibubi/create/content/logistics/item/LinkedControllerItem.java b/src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerItem.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/logistics/item/LinkedControllerItem.java
rename to src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerItem.java
index 298c22052..8988c489d 100644
--- a/src/main/java/com/simibubi/create/content/logistics/item/LinkedControllerItem.java
+++ b/src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerItem.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.logistics.item;
+package com.simibubi.create.content.redstone.link.controller;
 
 import java.util.function.Consumer;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.logistics.RedstoneLinkNetworkHandler;
-import com.simibubi.create.content.logistics.RedstoneLinkNetworkHandler.Frequency;
+import com.simibubi.create.content.redstone.link.RedstoneLinkNetworkHandler;
+import com.simibubi.create.content.redstone.link.RedstoneLinkNetworkHandler.Frequency;
 import com.simibubi.create.foundation.item.render.SimpleCustomRenderer;
 import com.simibubi.create.foundation.utility.Couple;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/item/LinkedControllerItemRenderer.java b/src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerItemRenderer.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/logistics/item/LinkedControllerItemRenderer.java
rename to src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerItemRenderer.java
index 6ad8acdcd..0db4bfbea 100644
--- a/src/main/java/com/simibubi/create/content/logistics/item/LinkedControllerItemRenderer.java
+++ b/src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerItemRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.item;
+package com.simibubi.create.content.redstone.link.controller;
 
 import java.util.Vector;
 
@@ -7,7 +7,7 @@ import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllItems;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.item.LinkedControllerClientHandler.Mode;
+import com.simibubi.create.content.redstone.link.controller.LinkedControllerClientHandler.Mode;
 import com.simibubi.create.foundation.item.render.CustomRenderedItemModel;
 import com.simibubi.create.foundation.item.render.CustomRenderedItemModelRenderer;
 import com.simibubi.create.foundation.item.render.PartialItemModelRenderer;
diff --git a/src/main/java/com/simibubi/create/content/logistics/item/LinkedControllerMenu.java b/src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerMenu.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/logistics/item/LinkedControllerMenu.java
rename to src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerMenu.java
index d8a68ea11..51bb6f905 100644
--- a/src/main/java/com/simibubi/create/content/logistics/item/LinkedControllerMenu.java
+++ b/src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerMenu.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.item;
+package com.simibubi.create.content.redstone.link.controller;
 
 import com.simibubi.create.AllMenuTypes;
 import com.simibubi.create.foundation.gui.menu.GhostItemMenu;
diff --git a/src/main/java/com/simibubi/create/content/logistics/item/LinkedControllerPacketBase.java b/src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerPacketBase.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/item/LinkedControllerPacketBase.java
rename to src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerPacketBase.java
index 612d784fd..0b0739777 100644
--- a/src/main/java/com/simibubi/create/content/logistics/item/LinkedControllerPacketBase.java
+++ b/src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerPacketBase.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.item;
+package com.simibubi.create.content.redstone.link.controller;
 
 import com.simibubi.create.AllItems;
 import com.simibubi.create.foundation.networking.SimplePacketBase;
diff --git a/src/main/java/com/simibubi/create/content/logistics/item/LinkedControllerScreen.java b/src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerScreen.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/logistics/item/LinkedControllerScreen.java
rename to src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerScreen.java
index ad2803c5c..a923b1df9 100644
--- a/src/main/java/com/simibubi/create/content/logistics/item/LinkedControllerScreen.java
+++ b/src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerScreen.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.item;
+package com.simibubi.create.content.redstone.link.controller;
 
 import static com.simibubi.create.foundation.gui.AllGuiTextures.PLAYER_INVENTORY;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/item/LinkedControllerServerHandler.java b/src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerServerHandler.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/logistics/item/LinkedControllerServerHandler.java
rename to src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerServerHandler.java
index 881841d20..727fadc9a 100644
--- a/src/main/java/com/simibubi/create/content/logistics/item/LinkedControllerServerHandler.java
+++ b/src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerServerHandler.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.item;
+package com.simibubi.create.content.redstone.link.controller;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -10,10 +10,10 @@ import java.util.Map.Entry;
 import java.util.UUID;
 
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.IRedstoneLinkable;
-import com.simibubi.create.content.logistics.RedstoneLinkNetworkHandler.Frequency;
+import com.simibubi.create.content.redstone.link.IRedstoneLinkable;
+import com.simibubi.create.content.redstone.link.LinkBehaviour;
+import com.simibubi.create.content.redstone.link.RedstoneLinkNetworkHandler.Frequency;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
-import com.simibubi.create.foundation.blockEntity.behaviour.linked.LinkBehaviour;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.IntAttached;
 import com.simibubi.create.foundation.utility.WorldAttached;
diff --git a/src/main/java/com/simibubi/create/content/logistics/item/LinkedControllerStopLecternPacket.java b/src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerStopLecternPacket.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/logistics/item/LinkedControllerStopLecternPacket.java
rename to src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerStopLecternPacket.java
index f18ee674c..1281e0e49 100644
--- a/src/main/java/com/simibubi/create/content/logistics/item/LinkedControllerStopLecternPacket.java
+++ b/src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerStopLecternPacket.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.item;
+package com.simibubi.create.content.redstone.link.controller;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.FriendlyByteBuf;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/DoubleFaceAttachedBlock.java b/src/main/java/com/simibubi/create/content/redstone/nixieTube/DoubleFaceAttachedBlock.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/logistics/block/redstone/DoubleFaceAttachedBlock.java
rename to src/main/java/com/simibubi/create/content/redstone/nixieTube/DoubleFaceAttachedBlock.java
index 0d7625ff7..adeca87f0 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/DoubleFaceAttachedBlock.java
+++ b/src/main/java/com/simibubi/create/content/redstone/nixieTube/DoubleFaceAttachedBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.redstone;
+package com.simibubi.create.content.redstone.nixieTube;
 
 import javax.annotation.Nullable;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/NixieTubeBlock.java b/src/main/java/com/simibubi/create/content/redstone/nixieTube/NixieTubeBlock.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/logistics/block/redstone/NixieTubeBlock.java
rename to src/main/java/com/simibubi/create/content/redstone/nixieTube/NixieTubeBlock.java
index 3cbeee89c..aedc16041 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/NixieTubeBlock.java
+++ b/src/main/java/com/simibubi/create/content/redstone/nixieTube/NixieTubeBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.redstone;
+package com.simibubi.create.content.redstone.nixieTube;
 
 import static net.minecraft.world.level.block.state.properties.BlockStateProperties.WATERLOGGED;
 
@@ -8,11 +8,11 @@ import java.util.function.BiConsumer;
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
-import com.simibubi.create.content.curiosities.clipboard.ClipboardEntry;
-import com.simibubi.create.content.schematics.ISpecialBlockItemRequirement;
-import com.simibubi.create.content.schematics.ItemRequirement;
-import com.simibubi.create.content.schematics.ItemRequirement.ItemUseType;
+import com.simibubi.create.content.equipment.clipboard.ClipboardEntry;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
+import com.simibubi.create.content.schematics.requirement.ISpecialBlockItemRequirement;
+import com.simibubi.create.content.schematics.requirement.ItemRequirement;
+import com.simibubi.create.content.schematics.requirement.ItemRequirement.ItemUseType;
 import com.simibubi.create.foundation.block.IBE;
 import com.simibubi.create.foundation.utility.Iterate;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/NixieTubeBlockEntity.java b/src/main/java/com/simibubi/create/content/redstone/nixieTube/NixieTubeBlockEntity.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/logistics/block/redstone/NixieTubeBlockEntity.java
rename to src/main/java/com/simibubi/create/content/redstone/nixieTube/NixieTubeBlockEntity.java
index 3cefc7e76..b1c13be2c 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/NixieTubeBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/redstone/nixieTube/NixieTubeBlockEntity.java
@@ -1,14 +1,14 @@
-package com.simibubi.create.content.logistics.block.redstone;
+package com.simibubi.create.content.redstone.nixieTube;
 
 import java.lang.ref.WeakReference;
 import java.util.List;
 import java.util.Optional;
 
-import com.simibubi.create.content.logistics.block.display.DisplayLinkBlock;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.SignalBlockEntity;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.SignalBlockEntity.SignalState;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkBlock;
+import com.simibubi.create.content.trains.signal.SignalBlockEntity;
+import com.simibubi.create.content.trains.signal.SignalBlockEntity.SignalState;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.DynamicComponent;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/NixieTubeGenerator.java b/src/main/java/com/simibubi/create/content/redstone/nixieTube/NixieTubeGenerator.java
similarity index 86%
rename from src/main/java/com/simibubi/create/content/logistics/block/redstone/NixieTubeGenerator.java
rename to src/main/java/com/simibubi/create/content/redstone/nixieTube/NixieTubeGenerator.java
index c39fde187..63e0277d0 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/NixieTubeGenerator.java
+++ b/src/main/java/com/simibubi/create/content/redstone/nixieTube/NixieTubeGenerator.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.logistics.block.redstone;
+package com.simibubi.create.content.redstone.nixieTube;
 
-import com.simibubi.create.content.logistics.block.redstone.DoubleFaceAttachedBlock.DoubleAttachFace;
+import com.simibubi.create.content.redstone.nixieTube.DoubleFaceAttachedBlock.DoubleAttachFace;
 import com.simibubi.create.foundation.data.SpecialBlockStateGen;
 import com.tterrag.registrate.providers.DataGenContext;
 import com.tterrag.registrate.providers.RegistrateBlockstateProvider;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/NixieTubeRenderer.java b/src/main/java/com/simibubi/create/content/redstone/nixieTube/NixieTubeRenderer.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/logistics/block/redstone/NixieTubeRenderer.java
rename to src/main/java/com/simibubi/create/content/redstone/nixieTube/NixieTubeRenderer.java
index 492c0f0c1..e1cf7edfc 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/NixieTubeRenderer.java
+++ b/src/main/java/com/simibubi/create/content/redstone/nixieTube/NixieTubeRenderer.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.logistics.block.redstone;
+package com.simibubi.create.content.redstone.nixieTube;
 
 import java.util.Random;
 
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.logistics.block.redstone.DoubleFaceAttachedBlock.DoubleAttachFace;
+import com.simibubi.create.content.redstone.nixieTube.DoubleFaceAttachedBlock.DoubleAttachFace;
 import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.RenderTypes;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/tracks/ControllerRailBlock.java b/src/main/java/com/simibubi/create/content/redstone/rail/ControllerRailBlock.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/contraptions/components/tracks/ControllerRailBlock.java
rename to src/main/java/com/simibubi/create/content/redstone/rail/ControllerRailBlock.java
index 2c5914c76..7dcb8cf42 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/tracks/ControllerRailBlock.java
+++ b/src/main/java/com/simibubi/create/content/redstone/rail/ControllerRailBlock.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.contraptions.components.tracks;
+package com.simibubi.create.content.redstone.rail;
 
 import javax.annotation.Nullable;
 import javax.annotation.ParametersAreNonnullByDefault;
 
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.VecHelper;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/tracks/ControllerRailGenerator.java b/src/main/java/com/simibubi/create/content/redstone/rail/ControllerRailGenerator.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/components/tracks/ControllerRailGenerator.java
rename to src/main/java/com/simibubi/create/content/redstone/rail/ControllerRailGenerator.java
index d8510c7bb..a36300544 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/tracks/ControllerRailGenerator.java
+++ b/src/main/java/com/simibubi/create/content/redstone/rail/ControllerRailGenerator.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.components.tracks;
+package com.simibubi.create.content.redstone.rail;
 
 import com.simibubi.create.foundation.data.AssetLookup;
 import com.simibubi.create.foundation.data.SpecialBlockStateGen;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/SmartObserverBlock.java b/src/main/java/com/simibubi/create/content/redstone/smartObserver/SmartObserverBlock.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/logistics/block/redstone/SmartObserverBlock.java
rename to src/main/java/com/simibubi/create/content/redstone/smartObserver/SmartObserverBlock.java
index 10854ce0e..69326a35b 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/SmartObserverBlock.java
+++ b/src/main/java/com/simibubi/create/content/redstone/smartObserver/SmartObserverBlock.java
@@ -1,12 +1,13 @@
-package com.simibubi.create.content.logistics.block.redstone;
+package com.simibubi.create.content.redstone.smartObserver;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.fluids.FluidTransportBehaviour;
-import com.simibubi.create.content.logistics.block.funnel.FunnelBlockEntity;
+import com.simibubi.create.content.fluids.FluidTransportBehaviour;
+import com.simibubi.create.content.kinetics.belt.behaviour.TransportedItemStackHandlerBehaviour;
+import com.simibubi.create.content.logistics.funnel.FunnelBlockEntity;
+import com.simibubi.create.content.redstone.DirectedDirectionalBlock;
 import com.simibubi.create.foundation.block.IBE;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.TransportedItemStackHandlerBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.inventory.InvManipulationBehaviour;
 import com.simibubi.create.foundation.utility.Iterate;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/SmartObserverBlockEntity.java b/src/main/java/com/simibubi/create/content/redstone/smartObserver/SmartObserverBlockEntity.java
similarity index 87%
rename from src/main/java/com/simibubi/create/content/logistics/block/redstone/SmartObserverBlockEntity.java
rename to src/main/java/com/simibubi/create/content/redstone/smartObserver/SmartObserverBlockEntity.java
index cff50eb9e..484aeab56 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/SmartObserverBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/redstone/smartObserver/SmartObserverBlockEntity.java
@@ -1,13 +1,15 @@
-package com.simibubi.create.content.logistics.block.redstone;
+package com.simibubi.create.content.redstone.smartObserver;
 
 import java.util.List;
 
-import com.simibubi.create.content.contraptions.fluids.FluidTransportBehaviour;
-import com.simibubi.create.content.contraptions.fluids.PipeConnection.Flow;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.fluids.FluidTransportBehaviour;
+import com.simibubi.create.content.fluids.PipeConnection.Flow;
+import com.simibubi.create.content.kinetics.belt.behaviour.TransportedItemStackHandlerBehaviour;
+import com.simibubi.create.content.kinetics.belt.behaviour.TransportedItemStackHandlerBehaviour.TransportedResult;
+import com.simibubi.create.content.redstone.DirectedDirectionalBlock;
+import com.simibubi.create.content.redstone.FilteredDetectorFilterSlot;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.TransportedItemStackHandlerBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.TransportedItemStackHandlerBehaviour.TransportedResult;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.inventory.CapManipulationBehaviourBase.InterfaceProvider;
 import com.simibubi.create.foundation.blockEntity.behaviour.inventory.InvManipulationBehaviour;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/SmartObserverGenerator.java b/src/main/java/com/simibubi/create/content/redstone/smartObserver/SmartObserverGenerator.java
similarity index 87%
rename from src/main/java/com/simibubi/create/content/logistics/block/redstone/SmartObserverGenerator.java
rename to src/main/java/com/simibubi/create/content/redstone/smartObserver/SmartObserverGenerator.java
index 45007f969..9f7f73289 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/SmartObserverGenerator.java
+++ b/src/main/java/com/simibubi/create/content/redstone/smartObserver/SmartObserverGenerator.java
@@ -1,5 +1,6 @@
-package com.simibubi.create.content.logistics.block.redstone;
+package com.simibubi.create.content.redstone.smartObserver;
 
+import com.simibubi.create.content.redstone.thresholdSwitch.ThresholdSwitchBlock;
 import com.simibubi.create.foundation.data.AssetLookup;
 import com.simibubi.create.foundation.data.SpecialBlockStateGen;
 import com.tterrag.registrate.providers.DataGenContext;
diff --git a/src/main/java/com/simibubi/create/content/logistics/packet/ConfigureStockswitchPacket.java b/src/main/java/com/simibubi/create/content/redstone/thresholdSwitch/ConfigureThresholdSwitchPacket.java
similarity index 67%
rename from src/main/java/com/simibubi/create/content/logistics/packet/ConfigureStockswitchPacket.java
rename to src/main/java/com/simibubi/create/content/redstone/thresholdSwitch/ConfigureThresholdSwitchPacket.java
index bb6020b37..235023c7d 100644
--- a/src/main/java/com/simibubi/create/content/logistics/packet/ConfigureStockswitchPacket.java
+++ b/src/main/java/com/simibubi/create/content/redstone/thresholdSwitch/ConfigureThresholdSwitchPacket.java
@@ -1,25 +1,24 @@
-package com.simibubi.create.content.logistics.packet;
+package com.simibubi.create.content.redstone.thresholdSwitch;
 
-import com.simibubi.create.content.logistics.block.redstone.ThresholdSwitchBlockEntity;
 import com.simibubi.create.foundation.networking.BlockEntityConfigurationPacket;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.FriendlyByteBuf;
 
-public class ConfigureStockswitchPacket extends BlockEntityConfigurationPacket<ThresholdSwitchBlockEntity> {
+public class ConfigureThresholdSwitchPacket extends BlockEntityConfigurationPacket<ThresholdSwitchBlockEntity> {
 
 	private float offBelow;
 	private float onAbove;
 	private boolean invert;
-	
-	public ConfigureStockswitchPacket(BlockPos pos, float offBelow, float onAbove, boolean invert) {
+
+	public ConfigureThresholdSwitchPacket(BlockPos pos, float offBelow, float onAbove, boolean invert) {
 		super(pos);
 		this.offBelow = offBelow;
 		this.onAbove = onAbove;
 		this.invert = invert;
 	}
 	
-	public ConfigureStockswitchPacket(FriendlyByteBuf buffer) {
+	public ConfigureThresholdSwitchPacket(FriendlyByteBuf buffer) {
 		super(buffer);
 	}
 	
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/ThresholdSwitchBlock.java b/src/main/java/com/simibubi/create/content/redstone/thresholdSwitch/ThresholdSwitchBlock.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/logistics/block/redstone/ThresholdSwitchBlock.java
rename to src/main/java/com/simibubi/create/content/redstone/thresholdSwitch/ThresholdSwitchBlock.java
index 7ed83dd8f..b88499c03 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/ThresholdSwitchBlock.java
+++ b/src/main/java/com/simibubi/create/content/redstone/thresholdSwitch/ThresholdSwitchBlock.java
@@ -1,7 +1,8 @@
-package com.simibubi.create.content.logistics.block.redstone;
+package com.simibubi.create.content.redstone.thresholdSwitch;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllItems;
+import com.simibubi.create.content.redstone.DirectedDirectionalBlock;
 import com.simibubi.create.foundation.block.IBE;
 import com.simibubi.create.foundation.gui.ScreenOpener;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/ThresholdSwitchBlockEntity.java b/src/main/java/com/simibubi/create/content/redstone/thresholdSwitch/ThresholdSwitchBlockEntity.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/logistics/block/redstone/ThresholdSwitchBlockEntity.java
rename to src/main/java/com/simibubi/create/content/redstone/thresholdSwitch/ThresholdSwitchBlockEntity.java
index c51f9b26a..124e8fbfc 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/ThresholdSwitchBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/redstone/thresholdSwitch/ThresholdSwitchBlockEntity.java
@@ -1,11 +1,13 @@
-package com.simibubi.create.content.logistics.block.redstone;
+package com.simibubi.create.content.redstone.thresholdSwitch;
 
 import java.util.List;
 
 import com.simibubi.create.compat.storageDrawers.StorageDrawers;
-import com.simibubi.create.content.logistics.block.display.DisplayLinkBlock;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.redstone.DirectedDirectionalBlock;
+import com.simibubi.create.content.redstone.FilteredDetectorFilterSlot;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkBlock;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.inventory.CapManipulationBehaviourBase.InterfaceProvider;
 import com.simibubi.create.foundation.blockEntity.behaviour.inventory.InvManipulationBehaviour;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/ThresholdSwitchGenerator.java b/src/main/java/com/simibubi/create/content/redstone/thresholdSwitch/ThresholdSwitchGenerator.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/logistics/block/redstone/ThresholdSwitchGenerator.java
rename to src/main/java/com/simibubi/create/content/redstone/thresholdSwitch/ThresholdSwitchGenerator.java
index c31dda70b..d85e974d6 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/ThresholdSwitchGenerator.java
+++ b/src/main/java/com/simibubi/create/content/redstone/thresholdSwitch/ThresholdSwitchGenerator.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.redstone;
+package com.simibubi.create.content.redstone.thresholdSwitch;
 
 import com.simibubi.create.Create;
 import com.simibubi.create.foundation.data.SpecialBlockStateGen;
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/ThresholdSwitchObservable.java b/src/main/java/com/simibubi/create/content/redstone/thresholdSwitch/ThresholdSwitchObservable.java
similarity index 56%
rename from src/main/java/com/simibubi/create/content/logistics/block/redstone/ThresholdSwitchObservable.java
rename to src/main/java/com/simibubi/create/content/redstone/thresholdSwitch/ThresholdSwitchObservable.java
index 8343d9dbb..039945c2a 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/ThresholdSwitchObservable.java
+++ b/src/main/java/com/simibubi/create/content/redstone/thresholdSwitch/ThresholdSwitchObservable.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.block.redstone;
+package com.simibubi.create.content.redstone.thresholdSwitch;
 
 public interface ThresholdSwitchObservable {
 	
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/ThresholdSwitchScreen.java b/src/main/java/com/simibubi/create/content/redstone/thresholdSwitch/ThresholdSwitchScreen.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/logistics/block/redstone/ThresholdSwitchScreen.java
rename to src/main/java/com/simibubi/create/content/redstone/thresholdSwitch/ThresholdSwitchScreen.java
index 844432ac1..fc74d4cf0 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/ThresholdSwitchScreen.java
+++ b/src/main/java/com/simibubi/create/content/redstone/thresholdSwitch/ThresholdSwitchScreen.java
@@ -1,15 +1,14 @@
-package com.simibubi.create.content.logistics.block.redstone;
+package com.simibubi.create.content.redstone.thresholdSwitch;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.logistics.packet.ConfigureStockswitchPacket;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.foundation.gui.AbstractSimiScreen;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
 import com.simibubi.create.foundation.gui.AllIcons;
 import com.simibubi.create.foundation.gui.element.GuiGameElement;
 import com.simibubi.create.foundation.gui.widget.IconButton;
 import com.simibubi.create.foundation.gui.widget.ScrollInput;
-import com.simibubi.create.foundation.networking.AllPackets;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat;
@@ -163,7 +162,7 @@ public class ThresholdSwitchScreen extends AbstractSimiScreen {
 
 	protected void send(boolean invert) {
 		AllPackets.getChannel()
-			.sendToServer(new ConfigureStockswitchPacket(blockEntity.getBlockPos(), offBelow.getState() / 100f,
+			.sendToServer(new ConfigureThresholdSwitchPacket(blockEntity.getBlockPos(), offBelow.getState() / 100f,
 				onAbove.getState() / 100f, invert));
 	}
 
diff --git a/src/main/java/com/simibubi/create/content/schematics/item/SchematicAndQuillItem.java b/src/main/java/com/simibubi/create/content/schematics/SchematicAndQuillItem.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/schematics/item/SchematicAndQuillItem.java
rename to src/main/java/com/simibubi/create/content/schematics/SchematicAndQuillItem.java
index fe5160009..f3b9fc908 100644
--- a/src/main/java/com/simibubi/create/content/schematics/item/SchematicAndQuillItem.java
+++ b/src/main/java/com/simibubi/create/content/schematics/SchematicAndQuillItem.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.schematics.item;
+package com.simibubi.create.content.schematics;
 
 import java.util.Iterator;
 
 import com.simibubi.create.AllEntityTypes;
-import com.simibubi.create.content.contraptions.components.structureMovement.glue.SuperGlueEntity;
+import com.simibubi.create.content.contraptions.glue.SuperGlueEntity;
 import com.simibubi.create.foundation.utility.NBTHelper;
 import com.simibubi.create.foundation.utility.RegisteredObjects;
 
diff --git a/src/main/java/com/simibubi/create/content/schematics/SchematicExport.java b/src/main/java/com/simibubi/create/content/schematics/SchematicExport.java
index 6bad9f5a6..66bbc923b 100644
--- a/src/main/java/com/simibubi/create/content/schematics/SchematicExport.java
+++ b/src/main/java/com/simibubi/create/content/schematics/SchematicExport.java
@@ -1,7 +1,14 @@
 package com.simibubi.create.content.schematics;
 
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
+
+import javax.annotation.Nullable;
+
 import com.simibubi.create.Create;
-import com.simibubi.create.content.schematics.item.SchematicAndQuillItem;
 import com.simibubi.create.foundation.utility.FilesHelper;
 import com.simibubi.create.foundation.utility.Lang;
 
@@ -13,17 +20,8 @@ import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.levelgen.structure.BoundingBox;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
 import net.minecraft.world.phys.AABB;
-import net.minecraftforge.fml.loading.FMLEnvironment;
 import net.minecraftforge.fml.loading.FMLPaths;
 
-import javax.annotation.Nullable;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardOpenOption;
-
 public class SchematicExport {
 	public static final Path SCHEMATICS = FMLPaths.GAMEDIR.get().resolve("schematics");
 
diff --git a/src/main/java/com/simibubi/create/content/schematics/filtering/SchematicInstances.java b/src/main/java/com/simibubi/create/content/schematics/SchematicInstances.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/schematics/filtering/SchematicInstances.java
rename to src/main/java/com/simibubi/create/content/schematics/SchematicInstances.java
index 6f16bda7e..e26d75e84 100644
--- a/src/main/java/com/simibubi/create/content/schematics/filtering/SchematicInstances.java
+++ b/src/main/java/com/simibubi/create/content/schematics/SchematicInstances.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.schematics.filtering;
+package com.simibubi.create.content.schematics;
 
 import java.util.concurrent.TimeUnit;
 
@@ -6,9 +6,7 @@ import javax.annotation.Nullable;
 
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
-import com.simibubi.create.content.contraptions.components.structureMovement.StructureTransform;
-import com.simibubi.create.content.schematics.SchematicWorld;
-import com.simibubi.create.content.schematics.item.SchematicItem;
+import com.simibubi.create.content.contraptions.StructureTransform;
 import com.simibubi.create.foundation.utility.WorldAttached;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/schematics/item/SchematicItem.java b/src/main/java/com/simibubi/create/content/schematics/SchematicItem.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/schematics/item/SchematicItem.java
rename to src/main/java/com/simibubi/create/content/schematics/SchematicItem.java
index 94d492361..2df436f7a 100644
--- a/src/main/java/com/simibubi/create/content/schematics/item/SchematicItem.java
+++ b/src/main/java/com/simibubi/create/content/schematics/SchematicItem.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.schematics.item;
+package com.simibubi.create.content.schematics;
 
 import java.io.BufferedInputStream;
 import java.io.DataInputStream;
@@ -16,9 +16,7 @@ import org.slf4j.Logger;
 
 import com.mojang.logging.LogUtils;
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.schematics.SchematicProcessor;
 import com.simibubi.create.content.schematics.client.SchematicEditScreen;
-import com.simibubi.create.content.schematics.filtering.SchematicInstances;
 import com.simibubi.create.foundation.gui.ScreenOpener;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Lang;
diff --git a/src/main/java/com/simibubi/create/content/schematics/SchematicPrinter.java b/src/main/java/com/simibubi/create/content/schematics/SchematicPrinter.java
index 183a70f23..b4fdc4317 100644
--- a/src/main/java/com/simibubi/create/content/schematics/SchematicPrinter.java
+++ b/src/main/java/com/simibubi/create/content/schematics/SchematicPrinter.java
@@ -6,9 +6,10 @@ import java.util.stream.Collectors;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.contraptions.components.structureMovement.BlockMovementChecks;
-import com.simibubi.create.content.contraptions.components.structureMovement.StructureTransform;
-import com.simibubi.create.content.schematics.item.SchematicItem;
+import com.simibubi.create.content.contraptions.BlockMovementChecks;
+import com.simibubi.create.content.contraptions.StructureTransform;
+import com.simibubi.create.content.schematics.cannon.MaterialChecklist;
+import com.simibubi.create.content.schematics.requirement.ItemRequirement;
 import com.simibubi.create.foundation.blockEntity.IMergeableBE;
 import com.simibubi.create.foundation.utility.BBHelper;
 import com.simibubi.create.foundation.utility.BlockHelper;
diff --git a/src/main/java/com/simibubi/create/content/schematics/ServerSchematicLoader.java b/src/main/java/com/simibubi/create/content/schematics/ServerSchematicLoader.java
index a68056da4..de206d31a 100644
--- a/src/main/java/com/simibubi/create/content/schematics/ServerSchematicLoader.java
+++ b/src/main/java/com/simibubi/create/content/schematics/ServerSchematicLoader.java
@@ -18,13 +18,12 @@ import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
 import com.simibubi.create.Create;
 import com.simibubi.create.content.schematics.SchematicExport.SchematicExportResult;
-import com.simibubi.create.content.schematics.block.SchematicTableBlockEntity;
-import com.simibubi.create.content.schematics.item.SchematicItem;
-import com.simibubi.create.foundation.config.AllConfigs;
-import com.simibubi.create.foundation.config.CSchematics;
+import com.simibubi.create.content.schematics.table.SchematicTableBlockEntity;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.FilesHelper;
 import com.simibubi.create.foundation.utility.Lang;
+import com.simibubi.create.infrastructure.config.AllConfigs;
+import com.simibubi.create.infrastructure.config.CSchematics;
 
 import net.minecraft.ChatFormatting;
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/schematics/packet/ConfigureSchematicannonPacket.java b/src/main/java/com/simibubi/create/content/schematics/cannon/ConfigureSchematicannonPacket.java
similarity index 86%
rename from src/main/java/com/simibubi/create/content/schematics/packet/ConfigureSchematicannonPacket.java
rename to src/main/java/com/simibubi/create/content/schematics/cannon/ConfigureSchematicannonPacket.java
index 9988da0c5..041e0ae15 100644
--- a/src/main/java/com/simibubi/create/content/schematics/packet/ConfigureSchematicannonPacket.java
+++ b/src/main/java/com/simibubi/create/content/schematics/cannon/ConfigureSchematicannonPacket.java
@@ -1,8 +1,6 @@
-package com.simibubi.create.content.schematics.packet;
+package com.simibubi.create.content.schematics.cannon;
 
-import com.simibubi.create.content.schematics.block.SchematicannonBlockEntity;
-import com.simibubi.create.content.schematics.block.SchematicannonBlockEntity.State;
-import com.simibubi.create.content.schematics.block.SchematicannonMenu;
+import com.simibubi.create.content.schematics.cannon.SchematicannonBlockEntity.State;
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 
 import net.minecraft.network.FriendlyByteBuf;
diff --git a/src/main/java/com/simibubi/create/content/schematics/block/LaunchedItem.java b/src/main/java/com/simibubi/create/content/schematics/cannon/LaunchedItem.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/schematics/block/LaunchedItem.java
rename to src/main/java/com/simibubi/create/content/schematics/cannon/LaunchedItem.java
index 4223da307..7e919fa33 100644
--- a/src/main/java/com/simibubi/create/content/schematics/block/LaunchedItem.java
+++ b/src/main/java/com/simibubi/create/content/schematics/cannon/LaunchedItem.java
@@ -1,16 +1,16 @@
-package com.simibubi.create.content.schematics.block;
+package com.simibubi.create.content.schematics.cannon;
 
 import java.util.Arrays;
 import java.util.Optional;
 
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.relays.belt.BeltBlock;
-import com.simibubi.create.content.contraptions.relays.belt.BeltBlockEntity;
-import com.simibubi.create.content.contraptions.relays.belt.BeltBlockEntity.CasingType;
-import com.simibubi.create.content.contraptions.relays.belt.BeltPart;
-import com.simibubi.create.content.contraptions.relays.belt.BeltSlope;
-import com.simibubi.create.content.contraptions.relays.belt.item.BeltConnectorItem;
-import com.simibubi.create.content.contraptions.relays.elementary.AbstractSimpleShaftBlock;
+import com.simibubi.create.content.kinetics.belt.BeltBlock;
+import com.simibubi.create.content.kinetics.belt.BeltBlockEntity;
+import com.simibubi.create.content.kinetics.belt.BeltBlockEntity.CasingType;
+import com.simibubi.create.content.kinetics.belt.BeltPart;
+import com.simibubi.create.content.kinetics.belt.BeltSlope;
+import com.simibubi.create.content.kinetics.belt.item.BeltConnectorItem;
+import com.simibubi.create.content.kinetics.simpleRelays.AbstractSimpleShaftBlock;
 import com.simibubi.create.foundation.utility.BlockHelper;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/schematics/MaterialChecklist.java b/src/main/java/com/simibubi/create/content/schematics/cannon/MaterialChecklist.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/schematics/MaterialChecklist.java
rename to src/main/java/com/simibubi/create/content/schematics/cannon/MaterialChecklist.java
index b6da6936e..5c87847a9 100644
--- a/src/main/java/com/simibubi/create/content/schematics/MaterialChecklist.java
+++ b/src/main/java/com/simibubi/create/content/schematics/cannon/MaterialChecklist.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.schematics;
+package com.simibubi.create.content.schematics.cannon;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -7,10 +7,11 @@ import java.util.Locale;
 
 import com.google.common.collect.Sets;
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.curiosities.clipboard.ClipboardEntry;
-import com.simibubi.create.content.curiosities.clipboard.ClipboardOverrides;
-import com.simibubi.create.content.curiosities.clipboard.ClipboardOverrides.ClipboardType;
-import com.simibubi.create.content.schematics.ItemRequirement.ItemUseType;
+import com.simibubi.create.content.equipment.clipboard.ClipboardEntry;
+import com.simibubi.create.content.equipment.clipboard.ClipboardOverrides;
+import com.simibubi.create.content.equipment.clipboard.ClipboardOverrides.ClipboardType;
+import com.simibubi.create.content.schematics.requirement.ItemRequirement;
+import com.simibubi.create.content.schematics.requirement.ItemRequirement.ItemUseType;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Lang;
 
@@ -48,7 +49,7 @@ public class MaterialChecklist {
 		if (requirement.isInvalid())
 			return;
 
-		for (ItemRequirement.StackRequirement stack : requirement.requiredItems) {
+		for (ItemRequirement.StackRequirement stack : requirement.getRequiredItems()) {
 			if (stack.usage == ItemUseType.DAMAGE)
 				putOrIncrement(damageRequired, stack.stack);
 			if (stack.usage == ItemUseType.CONSUME)
diff --git a/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonBlock.java b/src/main/java/com/simibubi/create/content/schematics/cannon/SchematicannonBlock.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/schematics/block/SchematicannonBlock.java
rename to src/main/java/com/simibubi/create/content/schematics/cannon/SchematicannonBlock.java
index 68a33d1e2..bb982113c 100644
--- a/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonBlock.java
+++ b/src/main/java/com/simibubi/create/content/schematics/cannon/SchematicannonBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.schematics.block;
+package com.simibubi.create.content.schematics.cannon;
 
 import javax.annotation.Nullable;
 
diff --git a/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonBlockEntity.java b/src/main/java/com/simibubi/create/content/schematics/cannon/SchematicannonBlockEntity.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/schematics/block/SchematicannonBlockEntity.java
rename to src/main/java/com/simibubi/create/content/schematics/cannon/SchematicannonBlockEntity.java
index 7e58de350..a8137b678 100644
--- a/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/schematics/cannon/SchematicannonBlockEntity.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.schematics.block;
+package com.simibubi.create.content.schematics.cannon;
 
 import java.util.Arrays;
 import java.util.LinkedHashSet;
@@ -11,26 +11,25 @@ import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
 import com.simibubi.create.AllSoundEvents;
 import com.simibubi.create.AllTags.AllBlockTags;
-import com.simibubi.create.content.contraptions.relays.belt.BeltBlock;
-import com.simibubi.create.content.contraptions.relays.belt.BeltBlockEntity;
-import com.simibubi.create.content.contraptions.relays.belt.BeltBlockEntity.CasingType;
-import com.simibubi.create.content.contraptions.relays.belt.BeltPart;
-import com.simibubi.create.content.contraptions.relays.belt.BeltSlope;
-import com.simibubi.create.content.contraptions.relays.elementary.AbstractSimpleShaftBlock;
-import com.simibubi.create.content.schematics.ItemRequirement;
-import com.simibubi.create.content.schematics.ItemRequirement.ItemUseType;
-import com.simibubi.create.content.schematics.MaterialChecklist;
+import com.simibubi.create.content.kinetics.belt.BeltBlock;
+import com.simibubi.create.content.kinetics.belt.BeltBlockEntity;
+import com.simibubi.create.content.kinetics.belt.BeltBlockEntity.CasingType;
+import com.simibubi.create.content.kinetics.belt.BeltPart;
+import com.simibubi.create.content.kinetics.belt.BeltSlope;
+import com.simibubi.create.content.kinetics.simpleRelays.AbstractSimpleShaftBlock;
 import com.simibubi.create.content.schematics.SchematicPrinter;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.schematics.requirement.ItemRequirement;
+import com.simibubi.create.content.schematics.requirement.ItemRequirement.ItemUseType;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
-import com.simibubi.create.foundation.config.AllConfigs;
-import com.simibubi.create.foundation.config.CSchematics;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.item.ItemHelper;
 import com.simibubi.create.foundation.item.ItemHelper.ExtractionCountMode;
 import com.simibubi.create.foundation.utility.IPartialSafeNBT;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.NBTProcessors;
+import com.simibubi.create.infrastructure.config.AllConfigs;
+import com.simibubi.create.infrastructure.config.CSchematics;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonInstance.java b/src/main/java/com/simibubi/create/content/schematics/cannon/SchematicannonInstance.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/schematics/block/SchematicannonInstance.java
rename to src/main/java/com/simibubi/create/content/schematics/cannon/SchematicannonInstance.java
index 81ee43e05..d2a447a6b 100644
--- a/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonInstance.java
+++ b/src/main/java/com/simibubi/create/content/schematics/cannon/SchematicannonInstance.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.schematics.block;
+package com.simibubi.create.content.schematics.cannon;
 
 import com.jozufozu.flywheel.api.Material;
 import com.jozufozu.flywheel.api.MaterialManager;
diff --git a/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonInventory.java b/src/main/java/com/simibubi/create/content/schematics/cannon/SchematicannonInventory.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/schematics/block/SchematicannonInventory.java
rename to src/main/java/com/simibubi/create/content/schematics/cannon/SchematicannonInventory.java
index ea174b46f..9292e6fb4 100644
--- a/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonInventory.java
+++ b/src/main/java/com/simibubi/create/content/schematics/cannon/SchematicannonInventory.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.schematics.block;
+package com.simibubi.create.content.schematics.cannon;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
diff --git a/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonMenu.java b/src/main/java/com/simibubi/create/content/schematics/cannon/SchematicannonMenu.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/schematics/block/SchematicannonMenu.java
rename to src/main/java/com/simibubi/create/content/schematics/cannon/SchematicannonMenu.java
index 3c0b29454..a46b07696 100644
--- a/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonMenu.java
+++ b/src/main/java/com/simibubi/create/content/schematics/cannon/SchematicannonMenu.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.schematics.block;
+package com.simibubi.create.content.schematics.cannon;
 
 import com.simibubi.create.AllMenuTypes;
 import com.simibubi.create.foundation.gui.menu.MenuBase;
diff --git a/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonRenderer.java b/src/main/java/com/simibubi/create/content/schematics/cannon/SchematicannonRenderer.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/schematics/block/SchematicannonRenderer.java
rename to src/main/java/com/simibubi/create/content/schematics/cannon/SchematicannonRenderer.java
index 657779c12..f4dfc200a 100644
--- a/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonRenderer.java
+++ b/src/main/java/com/simibubi/create/content/schematics/cannon/SchematicannonRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.schematics.block;
+package com.simibubi.create.content.schematics.cannon;
 
 import com.jozufozu.flywheel.backend.Backend;
 import com.jozufozu.flywheel.core.model.ModelUtil;
@@ -7,9 +7,9 @@ import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.mojang.math.Vector3f;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.schematics.block.LaunchedItem.ForBelt;
-import com.simibubi.create.content.schematics.block.LaunchedItem.ForBlockState;
-import com.simibubi.create.content.schematics.block.LaunchedItem.ForEntity;
+import com.simibubi.create.content.schematics.cannon.LaunchedItem.ForBelt;
+import com.simibubi.create.content.schematics.cannon.LaunchedItem.ForBlockState;
+import com.simibubi.create.content.schematics.cannon.LaunchedItem.ForEntity;
 import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
diff --git a/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonScreen.java b/src/main/java/com/simibubi/create/content/schematics/cannon/SchematicannonScreen.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/schematics/block/SchematicannonScreen.java
rename to src/main/java/com/simibubi/create/content/schematics/cannon/SchematicannonScreen.java
index 6f05f63b4..c0cc7369f 100644
--- a/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonScreen.java
+++ b/src/main/java/com/simibubi/create/content/schematics/cannon/SchematicannonScreen.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.schematics.block;
+package com.simibubi.create.content.schematics.cannon;
 
 import static net.minecraft.ChatFormatting.BLUE;
 import static net.minecraft.ChatFormatting.DARK_PURPLE;
@@ -12,8 +12,8 @@ import java.util.Vector;
 import com.google.common.collect.ImmutableList;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.schematics.packet.ConfigureSchematicannonPacket;
-import com.simibubi.create.content.schematics.packet.ConfigureSchematicannonPacket.Option;
+import com.simibubi.create.AllPackets;
+import com.simibubi.create.content.schematics.cannon.ConfigureSchematicannonPacket.Option;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
 import com.simibubi.create.foundation.gui.AllIcons;
 import com.simibubi.create.foundation.gui.element.GuiGameElement;
@@ -23,7 +23,6 @@ import com.simibubi.create.foundation.gui.widget.Indicator;
 import com.simibubi.create.foundation.gui.widget.Indicator.State;
 import com.simibubi.create.foundation.item.TooltipHelper;
 import com.simibubi.create.foundation.item.TooltipHelper.Palette;
-import com.simibubi.create.foundation.networking.AllPackets;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Lang;
 
diff --git a/src/main/java/com/simibubi/create/content/schematics/ClientSchematicLoader.java b/src/main/java/com/simibubi/create/content/schematics/client/ClientSchematicLoader.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/schematics/ClientSchematicLoader.java
rename to src/main/java/com/simibubi/create/content/schematics/client/ClientSchematicLoader.java
index f46fca1a2..ea40b1def 100644
--- a/src/main/java/com/simibubi/create/content/schematics/ClientSchematicLoader.java
+++ b/src/main/java/com/simibubi/create/content/schematics/client/ClientSchematicLoader.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.schematics;
+package com.simibubi.create.content.schematics.client;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -14,13 +14,13 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.Create;
 import com.simibubi.create.content.schematics.packet.SchematicUploadPacket;
-import com.simibubi.create.foundation.config.AllConfigs;
-import com.simibubi.create.foundation.networking.AllPackets;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.FilesHelper;
 import com.simibubi.create.foundation.utility.Lang;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.player.LocalPlayer;
diff --git a/src/main/java/com/simibubi/create/content/schematics/client/SchematicAndQuillHandler.java b/src/main/java/com/simibubi/create/content/schematics/client/SchematicAndQuillHandler.java
index 3e6785bf0..7dc3f64b8 100644
--- a/src/main/java/com/simibubi/create/content/schematics/client/SchematicAndQuillHandler.java
+++ b/src/main/java/com/simibubi/create/content/schematics/client/SchematicAndQuillHandler.java
@@ -6,21 +6,20 @@ import java.nio.file.Path;
 
 import com.simibubi.create.AllItems;
 import com.simibubi.create.AllKeys;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.AllSpecialTextures;
 import com.simibubi.create.Create;
 import com.simibubi.create.CreateClient;
-import com.simibubi.create.content.schematics.ClientSchematicLoader;
 import com.simibubi.create.content.schematics.SchematicExport;
 import com.simibubi.create.content.schematics.SchematicExport.SchematicExportResult;
 import com.simibubi.create.content.schematics.packet.InstantSchematicPacket;
 import com.simibubi.create.foundation.gui.ScreenOpener;
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.foundation.outliner.Outliner;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.RaycastHelper;
 import com.simibubi.create.foundation.utility.RaycastHelper.PredicateTraceResult;
 import com.simibubi.create.foundation.utility.VecHelper;
-import com.simibubi.create.foundation.utility.outliner.Outliner;
 
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
diff --git a/src/main/java/com/simibubi/create/content/schematics/client/SchematicHandler.java b/src/main/java/com/simibubi/create/content/schematics/client/SchematicHandler.java
index af64b2270..ba39f974e 100644
--- a/src/main/java/com/simibubi/create/content/schematics/client/SchematicHandler.java
+++ b/src/main/java/com/simibubi/create/content/schematics/client/SchematicHandler.java
@@ -8,20 +8,20 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
 import com.simibubi.create.AllKeys;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.contraptions.components.structureMovement.StructureTransform;
+import com.simibubi.create.content.contraptions.StructureTransform;
+import com.simibubi.create.content.schematics.SchematicInstances;
+import com.simibubi.create.content.schematics.SchematicItem;
 import com.simibubi.create.content.schematics.SchematicWorld;
-import com.simibubi.create.content.schematics.client.tools.Tools;
-import com.simibubi.create.content.schematics.filtering.SchematicInstances;
-import com.simibubi.create.content.schematics.item.SchematicItem;
+import com.simibubi.create.content.schematics.client.tools.ToolType;
 import com.simibubi.create.content.schematics.packet.SchematicPlacePacket;
 import com.simibubi.create.content.schematics.packet.SchematicSyncPacket;
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.foundation.outliner.AABBOutline;
 import com.simibubi.create.foundation.render.SuperRenderTypeBuffer;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.NBTHelper;
-import com.simibubi.create.foundation.utility.outliner.AABBOutline;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.player.LocalPlayer;
@@ -56,7 +56,7 @@ public class SchematicHandler implements IGuiOverlay {
 	private AABB bounds;
 	private boolean deployed;
 	private boolean active;
-	private Tools currentTool;
+	private ToolType currentTool;
 
 	private static final int SYNC_DELAY = 10;
 	private int syncCooldown;
@@ -74,8 +74,8 @@ public class SchematicHandler implements IGuiOverlay {
 			renderers.add(new SchematicRenderer());
 
 		overlay = new SchematicHotbarSlotOverlay();
-		currentTool = Tools.Deploy;
-		selectionScreen = new ToolSelectionScreen(ImmutableList.of(Tools.Deploy), this::equip);
+		currentTool = ToolType.DEPLOY;
+		selectionScreen = new ToolSelectionScreen(ImmutableList.of(ToolType.DEPLOY), this::equip);
 		transformation = new SchematicTransformation();
 	}
 
@@ -133,14 +133,14 @@ public class SchematicHandler implements IGuiOverlay {
 		active = true;
 		if (deployed) {
 			setupRenderer();
-			Tools toolBefore = currentTool;
-			selectionScreen = new ToolSelectionScreen(Tools.getTools(player.isCreative()), this::equip);
+			ToolType toolBefore = currentTool;
+			selectionScreen = new ToolSelectionScreen(ToolType.getTools(player.isCreative()), this::equip);
 			if (toolBefore != null) {
 				selectionScreen.setSelectedElement(toolBefore);
 				equip(toolBefore);
 			}
 		} else
-			selectionScreen = new ToolSelectionScreen(ImmutableList.of(Tools.Deploy), this::equip);
+			selectionScreen = new ToolSelectionScreen(ImmutableList.of(ToolType.DEPLOY), this::equip);
 	}
 
 	private void setupRenderer() {
@@ -334,7 +334,7 @@ public class SchematicHandler implements IGuiOverlay {
 			transformation.getAnchor(), deployed));
 	}
 
-	public void equip(Tools tool) {
+	public void equip(ToolType tool) {
 		this.currentTool = tool;
 		currentTool.getTool()
 			.init();
@@ -361,7 +361,7 @@ public class SchematicHandler implements IGuiOverlay {
 
 	public void deploy() {
 		if (!deployed) {
-			List<Tools> tools = Tools.getTools(Minecraft.getInstance().player.isCreative());
+			List<ToolType> tools = ToolType.getTools(Minecraft.getInstance().player.isCreative());
 			selectionScreen = new ToolSelectionScreen(tools, this::equip);
 		}
 		deployed = true;
diff --git a/src/main/java/com/simibubi/create/content/schematics/client/ToolSelectionScreen.java b/src/main/java/com/simibubi/create/content/schematics/client/ToolSelectionScreen.java
index dbf7a5b8a..20d0058fc 100644
--- a/src/main/java/com/simibubi/create/content/schematics/client/ToolSelectionScreen.java
+++ b/src/main/java/com/simibubi/create/content/schematics/client/ToolSelectionScreen.java
@@ -7,7 +7,7 @@ import com.mojang.blaze3d.platform.Window;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllKeys;
-import com.simibubi.create.content.schematics.client.tools.Tools;
+import com.simibubi.create.content.schematics.client.tools.ToolType;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Lang;
@@ -22,8 +22,8 @@ public class ToolSelectionScreen extends Screen {
 		.getString();
 	public final String holdToFocus = "gui.toolmenu.focusKey";
 
-	protected List<Tools> tools;
-	protected Consumer<Tools> callback;
+	protected List<ToolType> tools;
+	protected Consumer<ToolType> callback;
 	public boolean focused;
 	private float yOffset;
 	protected int selection;
@@ -32,7 +32,7 @@ public class ToolSelectionScreen extends Screen {
 	protected int w;
 	protected int h;
 
-	public ToolSelectionScreen(List<Tools> tools, Consumer<Tools> callback) {
+	public ToolSelectionScreen(List<ToolType> tools, Consumer<ToolType> callback) {
 		super(Components.literal("Tool Selection"));
 		this.minecraft = Minecraft.getInstance();
 		this.tools = tools;
@@ -48,7 +48,7 @@ public class ToolSelectionScreen extends Screen {
 		h = 30;
 	}
 
-	public void setSelectedElement(Tools tool) {
+	public void setSelectedElement(ToolType tool) {
 		if (!tools.contains(tool))
 			return;
 		selection = tools.indexOf(tool);
diff --git a/src/main/java/com/simibubi/create/content/schematics/client/tools/DeployTool.java b/src/main/java/com/simibubi/create/content/schematics/client/tools/DeployTool.java
index eeb53148f..e27d4f34c 100644
--- a/src/main/java/com/simibubi/create/content/schematics/client/tools/DeployTool.java
+++ b/src/main/java/com/simibubi/create/content/schematics/client/tools/DeployTool.java
@@ -4,9 +4,9 @@ import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllKeys;
 import com.simibubi.create.content.schematics.client.SchematicTransformation;
+import com.simibubi.create.foundation.outliner.AABBOutline;
 import com.simibubi.create.foundation.render.SuperRenderTypeBuffer;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
-import com.simibubi.create.foundation.utility.outliner.AABBOutline;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.NbtUtils;
diff --git a/src/main/java/com/simibubi/create/content/schematics/client/tools/FlipTool.java b/src/main/java/com/simibubi/create/content/schematics/client/tools/FlipTool.java
index 23238c092..14f80ea94 100644
--- a/src/main/java/com/simibubi/create/content/schematics/client/tools/FlipTool.java
+++ b/src/main/java/com/simibubi/create/content/schematics/client/tools/FlipTool.java
@@ -2,9 +2,9 @@ package com.simibubi.create.content.schematics.client.tools;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllSpecialTextures;
+import com.simibubi.create.foundation.outliner.AABBOutline;
 import com.simibubi.create.foundation.render.SuperRenderTypeBuffer;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
-import com.simibubi.create.foundation.utility.outliner.AABBOutline;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/schematics/client/tools/RotateTool.java b/src/main/java/com/simibubi/create/content/schematics/client/tools/RotateTool.java
index 0bd8bf218..d9de64f7d 100644
--- a/src/main/java/com/simibubi/create/content/schematics/client/tools/RotateTool.java
+++ b/src/main/java/com/simibubi/create/content/schematics/client/tools/RotateTool.java
@@ -1,9 +1,9 @@
 package com.simibubi.create.content.schematics.client.tools;
 
 import com.mojang.blaze3d.vertex.PoseStack;
+import com.simibubi.create.foundation.outliner.LineOutline;
 import com.simibubi.create.foundation.render.SuperRenderTypeBuffer;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
-import com.simibubi.create.foundation.utility.outliner.LineOutline;
 
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
diff --git a/src/main/java/com/simibubi/create/content/schematics/client/tools/SchematicToolBase.java b/src/main/java/com/simibubi/create/content/schematics/client/tools/SchematicToolBase.java
index ae86ad529..88bd8b0db 100644
--- a/src/main/java/com/simibubi/create/content/schematics/client/tools/SchematicToolBase.java
+++ b/src/main/java/com/simibubi/create/content/schematics/client/tools/SchematicToolBase.java
@@ -9,12 +9,12 @@ import com.simibubi.create.AllSpecialTextures;
 import com.simibubi.create.CreateClient;
 import com.simibubi.create.content.schematics.client.SchematicHandler;
 import com.simibubi.create.content.schematics.client.SchematicTransformation;
+import com.simibubi.create.foundation.outliner.AABBOutline;
 import com.simibubi.create.foundation.render.SuperRenderTypeBuffer;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 import com.simibubi.create.foundation.utility.RaycastHelper;
 import com.simibubi.create.foundation.utility.RaycastHelper.PredicateTraceResult;
 import com.simibubi.create.foundation.utility.VecHelper;
-import com.simibubi.create.foundation.utility.outliner.AABBOutline;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.player.LocalPlayer;
diff --git a/src/main/java/com/simibubi/create/content/schematics/client/tools/Tools.java b/src/main/java/com/simibubi/create/content/schematics/client/tools/ToolType.java
similarity index 60%
rename from src/main/java/com/simibubi/create/content/schematics/client/tools/Tools.java
rename to src/main/java/com/simibubi/create/content/schematics/client/tools/ToolType.java
index 507f9565d..703ba4df6 100644
--- a/src/main/java/com/simibubi/create/content/schematics/client/tools/Tools.java
+++ b/src/main/java/com/simibubi/create/content/schematics/client/tools/ToolType.java
@@ -10,19 +10,19 @@ import com.simibubi.create.foundation.utility.Lang;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
 
-public enum Tools {
+public enum ToolType {
 
-	Deploy(new DeployTool(), AllIcons.I_TOOL_DEPLOY),
-	Move(new MoveTool(), AllIcons.I_TOOL_MOVE_XZ),
-	MoveY(new MoveVerticalTool(), AllIcons.I_TOOL_MOVE_Y),
-	Rotate(new RotateTool(), AllIcons.I_TOOL_ROTATE),
-	Print(new PlaceTool(), AllIcons.I_CONFIRM),
-	Flip(new FlipTool(), AllIcons.I_TOOL_MIRROR);
+	DEPLOY(new DeployTool(), AllIcons.I_TOOL_DEPLOY),
+	MOVE(new MoveTool(), AllIcons.I_TOOL_MOVE_XZ),
+	MOVE_Y(new MoveVerticalTool(), AllIcons.I_TOOL_MOVE_Y),
+	ROTATE(new RotateTool(), AllIcons.I_TOOL_ROTATE),
+	FLIP(new FlipTool(), AllIcons.I_TOOL_MIRROR),
+	PRINT(new PlaceTool(), AllIcons.I_CONFIRM);
 
 	private ISchematicTool tool;
 	private AllIcons icon;
 
-	private Tools(ISchematicTool tool, AllIcons icon) {
+	private ToolType(ISchematicTool tool, AllIcons icon) {
 		this.tool = tool;
 		this.icon = icon;
 	}
@@ -39,11 +39,11 @@ public enum Tools {
 		return icon;
 	}
 
-	public static List<Tools> getTools(boolean creative) {
-		List<Tools> tools = new ArrayList<>();
-		Collections.addAll(tools, Move, MoveY, Deploy, Rotate, Flip);
+	public static List<ToolType> getTools(boolean creative) {
+		List<ToolType> tools = new ArrayList<>();
+		Collections.addAll(tools, MOVE, MOVE_Y, DEPLOY, ROTATE, FLIP);
 		if (creative)
-			tools.add(Print);
+			tools.add(PRINT);
 		return tools;
 	}
 
diff --git a/src/main/java/com/simibubi/create/content/schematics/packet/SchematicPlacePacket.java b/src/main/java/com/simibubi/create/content/schematics/packet/SchematicPlacePacket.java
index 4d5ca5016..c60758bff 100644
--- a/src/main/java/com/simibubi/create/content/schematics/packet/SchematicPlacePacket.java
+++ b/src/main/java/com/simibubi/create/content/schematics/packet/SchematicPlacePacket.java
@@ -1,9 +1,9 @@
 package com.simibubi.create.content.schematics.packet;
 
 import com.simibubi.create.content.schematics.SchematicPrinter;
-import com.simibubi.create.foundation.config.AllConfigs;
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 import com.simibubi.create.foundation.utility.BlockHelper;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.FriendlyByteBuf;
@@ -35,6 +35,8 @@ public class SchematicPlacePacket extends SimplePacketBase {
 			ServerPlayer player = context.getSender();
 			if (player == null)
 				return;
+			if (!player.isCreative())
+				return;
 
 			Level world = player.getLevel();
 			SchematicPrinter printer = new SchematicPrinter();
diff --git a/src/main/java/com/simibubi/create/content/schematics/packet/SchematicSyncPacket.java b/src/main/java/com/simibubi/create/content/schematics/packet/SchematicSyncPacket.java
index 9da539ad4..9cdda5020 100644
--- a/src/main/java/com/simibubi/create/content/schematics/packet/SchematicSyncPacket.java
+++ b/src/main/java/com/simibubi/create/content/schematics/packet/SchematicSyncPacket.java
@@ -1,7 +1,7 @@
 package com.simibubi.create.content.schematics.packet;
 
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.schematics.filtering.SchematicInstances;
+import com.simibubi.create.content.schematics.SchematicInstances;
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/schematics/packet/SchematicUploadPacket.java b/src/main/java/com/simibubi/create/content/schematics/packet/SchematicUploadPacket.java
index bae36796d..69c19a5c2 100644
--- a/src/main/java/com/simibubi/create/content/schematics/packet/SchematicUploadPacket.java
+++ b/src/main/java/com/simibubi/create/content/schematics/packet/SchematicUploadPacket.java
@@ -1,7 +1,7 @@
 package com.simibubi.create.content.schematics.packet;
 
 import com.simibubi.create.Create;
-import com.simibubi.create.content.schematics.block.SchematicTableMenu;
+import com.simibubi.create.content.schematics.table.SchematicTableMenu;
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/schematics/ISpecialBlockEntityItemRequirement.java b/src/main/java/com/simibubi/create/content/schematics/requirement/ISpecialBlockEntityItemRequirement.java
similarity index 74%
rename from src/main/java/com/simibubi/create/content/schematics/ISpecialBlockEntityItemRequirement.java
rename to src/main/java/com/simibubi/create/content/schematics/requirement/ISpecialBlockEntityItemRequirement.java
index bfcb9ef69..3e2c9a2a5 100644
--- a/src/main/java/com/simibubi/create/content/schematics/ISpecialBlockEntityItemRequirement.java
+++ b/src/main/java/com/simibubi/create/content/schematics/requirement/ISpecialBlockEntityItemRequirement.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.schematics;
+package com.simibubi.create.content.schematics.requirement;
 
 import net.minecraft.world.level.block.state.BlockState;
 
diff --git a/src/main/java/com/simibubi/create/content/schematics/ISpecialBlockItemRequirement.java b/src/main/java/com/simibubi/create/content/schematics/requirement/ISpecialBlockItemRequirement.java
similarity index 80%
rename from src/main/java/com/simibubi/create/content/schematics/ISpecialBlockItemRequirement.java
rename to src/main/java/com/simibubi/create/content/schematics/requirement/ISpecialBlockItemRequirement.java
index c275f49a1..f55d45121 100644
--- a/src/main/java/com/simibubi/create/content/schematics/ISpecialBlockItemRequirement.java
+++ b/src/main/java/com/simibubi/create/content/schematics/requirement/ISpecialBlockItemRequirement.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.schematics;
+package com.simibubi.create.content.schematics.requirement;
 
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
diff --git a/src/main/java/com/simibubi/create/content/schematics/ISpecialEntityItemRequirement.java b/src/main/java/com/simibubi/create/content/schematics/requirement/ISpecialEntityItemRequirement.java
similarity index 62%
rename from src/main/java/com/simibubi/create/content/schematics/ISpecialEntityItemRequirement.java
rename to src/main/java/com/simibubi/create/content/schematics/requirement/ISpecialEntityItemRequirement.java
index 7cdf23c5e..309500907 100644
--- a/src/main/java/com/simibubi/create/content/schematics/ISpecialEntityItemRequirement.java
+++ b/src/main/java/com/simibubi/create/content/schematics/requirement/ISpecialEntityItemRequirement.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.schematics;
+package com.simibubi.create.content.schematics.requirement;
 
 public interface ISpecialEntityItemRequirement {
 
diff --git a/src/main/java/com/simibubi/create/content/schematics/ItemRequirement.java b/src/main/java/com/simibubi/create/content/schematics/requirement/ItemRequirement.java
similarity index 99%
rename from src/main/java/com/simibubi/create/content/schematics/ItemRequirement.java
rename to src/main/java/com/simibubi/create/content/schematics/requirement/ItemRequirement.java
index 235ff5ae3..6b07940dc 100644
--- a/src/main/java/com/simibubi/create/content/schematics/ItemRequirement.java
+++ b/src/main/java/com/simibubi/create/content/schematics/requirement/ItemRequirement.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.schematics;
+package com.simibubi.create.content.schematics.requirement;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/main/java/com/simibubi/create/content/schematics/block/SchematicTableBlock.java b/src/main/java/com/simibubi/create/content/schematics/table/SchematicTableBlock.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/schematics/block/SchematicTableBlock.java
rename to src/main/java/com/simibubi/create/content/schematics/table/SchematicTableBlock.java
index 9b1842178..761de4383 100644
--- a/src/main/java/com/simibubi/create/content/schematics/block/SchematicTableBlock.java
+++ b/src/main/java/com/simibubi/create/content/schematics/table/SchematicTableBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.schematics.block;
+package com.simibubi.create.content.schematics.table;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllShapes;
diff --git a/src/main/java/com/simibubi/create/content/schematics/block/SchematicTableBlockEntity.java b/src/main/java/com/simibubi/create/content/schematics/table/SchematicTableBlockEntity.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/schematics/block/SchematicTableBlockEntity.java
rename to src/main/java/com/simibubi/create/content/schematics/table/SchematicTableBlockEntity.java
index 38e2bba5c..92eb5f38f 100644
--- a/src/main/java/com/simibubi/create/content/schematics/block/SchematicTableBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/schematics/table/SchematicTableBlockEntity.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.schematics.block;
+package com.simibubi.create.content.schematics.table;
 
 import java.util.List;
 
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.IInteractionChecker;
 import com.simibubi.create.foundation.utility.Lang;
 
diff --git a/src/main/java/com/simibubi/create/content/schematics/block/SchematicTableMenu.java b/src/main/java/com/simibubi/create/content/schematics/table/SchematicTableMenu.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/schematics/block/SchematicTableMenu.java
rename to src/main/java/com/simibubi/create/content/schematics/table/SchematicTableMenu.java
index 1384545b9..ea6841b83 100644
--- a/src/main/java/com/simibubi/create/content/schematics/block/SchematicTableMenu.java
+++ b/src/main/java/com/simibubi/create/content/schematics/table/SchematicTableMenu.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.schematics.block;
+package com.simibubi.create.content.schematics.table;
 
 import com.simibubi.create.AllItems;
 import com.simibubi.create.AllMenuTypes;
diff --git a/src/main/java/com/simibubi/create/content/schematics/block/SchematicTableScreen.java b/src/main/java/com/simibubi/create/content/schematics/table/SchematicTableScreen.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/schematics/block/SchematicTableScreen.java
rename to src/main/java/com/simibubi/create/content/schematics/table/SchematicTableScreen.java
index 844378f59..b09d9001c 100644
--- a/src/main/java/com/simibubi/create/content/schematics/block/SchematicTableScreen.java
+++ b/src/main/java/com/simibubi/create/content/schematics/table/SchematicTableScreen.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.schematics.block;
+package com.simibubi.create.content.schematics.table;
 
 import static com.simibubi.create.foundation.gui.AllGuiTextures.PLAYER_INVENTORY;
 import static com.simibubi.create.foundation.gui.AllGuiTextures.SCHEMATIC_TABLE_PROGRESS;
@@ -11,7 +11,7 @@ import com.google.common.collect.ImmutableList;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.CreateClient;
-import com.simibubi.create.content.schematics.ClientSchematicLoader;
+import com.simibubi.create.content.schematics.client.ClientSchematicLoader;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
 import com.simibubi.create.foundation.gui.AllIcons;
 import com.simibubi.create.foundation.gui.element.GuiGameElement;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/CameraDistanceModifier.java b/src/main/java/com/simibubi/create/content/trains/CameraDistanceModifier.java
similarity index 88%
rename from src/main/java/com/simibubi/create/content/logistics/trains/CameraDistanceModifier.java
rename to src/main/java/com/simibubi/create/content/trains/CameraDistanceModifier.java
index cfe15456a..fb3ffc649 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/CameraDistanceModifier.java
+++ b/src/main/java/com/simibubi/create/content/trains/CameraDistanceModifier.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.logistics.trains;
+package com.simibubi.create.content.trains;
 
-import com.simibubi.create.foundation.config.AllConfigs;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 public class CameraDistanceModifier {
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/particle/CubeParticle.java b/src/main/java/com/simibubi/create/content/trains/CubeParticle.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/contraptions/particle/CubeParticle.java
rename to src/main/java/com/simibubi/create/content/trains/CubeParticle.java
index 59f36cb06..d41049dad 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/particle/CubeParticle.java
+++ b/src/main/java/com/simibubi/create/content/trains/CubeParticle.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.particle;
+package com.simibubi.create.content.trains;
 
 import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.systems.RenderSystem;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/particle/CubeParticleData.java b/src/main/java/com/simibubi/create/content/trains/CubeParticleData.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/contraptions/particle/CubeParticleData.java
rename to src/main/java/com/simibubi/create/content/trains/CubeParticleData.java
index 7bb7e5217..e17553e1a 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/particle/CubeParticleData.java
+++ b/src/main/java/com/simibubi/create/content/trains/CubeParticleData.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.particle;
+package com.simibubi.create.content.trains;
 
 import java.util.Locale;
 
@@ -7,6 +7,7 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import com.simibubi.create.AllParticleTypes;
+import com.simibubi.create.foundation.particle.ICustomParticleData;
 
 import net.minecraft.client.particle.ParticleProvider;
 import net.minecraft.core.particles.ParticleOptions;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/GlobalRailwayManager.java b/src/main/java/com/simibubi/create/content/trains/GlobalRailwayManager.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/logistics/trains/GlobalRailwayManager.java
rename to src/main/java/com/simibubi/create/content/trains/GlobalRailwayManager.java
index 046edb367..b20f8b9f7 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/GlobalRailwayManager.java
+++ b/src/main/java/com/simibubi/create/content/trains/GlobalRailwayManager.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains;
+package com.simibubi.create.content.trains;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -14,14 +14,18 @@ import javax.annotation.Nullable;
 
 import org.apache.commons.lang3.mutable.MutableObject;
 
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.CreateClient;
-import com.simibubi.create.content.contraptions.KineticDebugger;
-import com.simibubi.create.content.logistics.trains.entity.Train;
-import com.simibubi.create.content.logistics.trains.entity.TrainPacket;
-import com.simibubi.create.content.logistics.trains.management.display.GlobalTrainDisplayData;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.SignalEdgeGroup;
-import com.simibubi.create.foundation.config.AllConfigs;
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.content.kinetics.KineticDebugger;
+import com.simibubi.create.content.trains.display.GlobalTrainDisplayData;
+import com.simibubi.create.content.trains.entity.Train;
+import com.simibubi.create.content.trains.entity.TrainPacket;
+import com.simibubi.create.content.trains.graph.TrackGraph;
+import com.simibubi.create.content.trains.graph.TrackGraphSync;
+import com.simibubi.create.content.trains.graph.TrackGraphVisualizer;
+import com.simibubi.create.content.trains.graph.TrackNodeLocation;
+import com.simibubi.create.content.trains.signal.SignalEdgeGroup;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerPlayer;
@@ -123,7 +127,7 @@ public class GlobalRailwayManager {
 	public TrackGraph getOrCreateGraph(UUID graphID, int netId) {
 		return trackNetworks.computeIfAbsent(graphID, uid -> {
 			TrackGraph trackGraph = new TrackGraph(graphID);
-			trackGraph.netId = netId;
+			trackGraph.setNetId(netId);
 			return trackGraph;
 		});
 	}
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/controls/HonkPacket.java b/src/main/java/com/simibubi/create/content/trains/HonkPacket.java
similarity index 88%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/controls/HonkPacket.java
rename to src/main/java/com/simibubi/create/content/trains/HonkPacket.java
index 19828b979..b5f8c3f84 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/controls/HonkPacket.java
+++ b/src/main/java/com/simibubi/create/content/trains/HonkPacket.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.interaction.controls;
+package com.simibubi.create.content.trains;
 
 import java.util.UUID;
 
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.trains.entity.Train;
+import com.simibubi.create.content.trains.entity.Train;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
-import com.simibubi.create.foundation.networking.AllPackets;
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 
 import net.minecraft.network.FriendlyByteBuf;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/RailwaySavedData.java b/src/main/java/com/simibubi/create/content/trains/RailwaySavedData.java
similarity index 88%
rename from src/main/java/com/simibubi/create/content/logistics/trains/RailwaySavedData.java
rename to src/main/java/com/simibubi/create/content/trains/RailwaySavedData.java
index a5b2c1fb3..3a3ee63a6 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/RailwaySavedData.java
+++ b/src/main/java/com/simibubi/create/content/trains/RailwaySavedData.java
@@ -1,14 +1,16 @@
-package com.simibubi.create.content.logistics.trains;
+package com.simibubi.create.content.trains;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.trains.entity.Train;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.EdgePointType;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.SignalBoundary;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.SignalEdgeGroup;
+import com.simibubi.create.content.trains.entity.Train;
+import com.simibubi.create.content.trains.graph.DimensionPalette;
+import com.simibubi.create.content.trains.graph.EdgePointType;
+import com.simibubi.create.content.trains.graph.TrackGraph;
+import com.simibubi.create.content.trains.signal.SignalBoundary;
+import com.simibubi.create.content.trains.signal.SignalEdgeGroup;
 import com.simibubi.create.foundation.utility.NBTHelper;
 
 import net.minecraft.nbt.CompoundTag;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/controls/TrainHUD.java b/src/main/java/com/simibubi/create/content/trains/TrainHUD.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/controls/TrainHUD.java
rename to src/main/java/com/simibubi/create/content/trains/TrainHUD.java
index 59d8f984c..52e452142 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/controls/TrainHUD.java
+++ b/src/main/java/com/simibubi/create/content/trains/TrainHUD.java
@@ -1,17 +1,19 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.interaction.controls;
+package com.simibubi.create.content.trains;
 
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.simibubi.create.content.logistics.trains.entity.Carriage;
-import com.simibubi.create.content.logistics.trains.entity.CarriageContraptionEntity;
-import com.simibubi.create.content.logistics.trains.entity.Train;
-import com.simibubi.create.foundation.config.AllConfigs;
+import com.simibubi.create.AllPackets;
+import com.simibubi.create.content.contraptions.actors.trainControls.ControlsBlock;
+import com.simibubi.create.content.contraptions.actors.trainControls.ControlsHandler;
+import com.simibubi.create.content.trains.entity.Carriage;
+import com.simibubi.create.content.trains.entity.CarriageContraptionEntity;
+import com.simibubi.create.content.trains.entity.Train;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.foundation.placement.PlacementHelpers;
 import com.simibubi.create.foundation.utility.AngleHelper;
 import com.simibubi.create.foundation.utility.ControlsUtil;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat.Chaser;
-import com.simibubi.create.foundation.utility.placement.PlacementHelpers;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
@@ -100,7 +102,7 @@ public class TrainHUD {
 	}
 
 	private static Carriage getCarriage() {
-		if (!(ControlsHandler.entityRef.get() instanceof CarriageContraptionEntity cce))
+		if (!(ControlsHandler.getContraption() instanceof CarriageContraptionEntity cce))
 			return null;
 		return cce.getCarriage();
 	}
@@ -111,7 +113,7 @@ public class TrainHUD {
 		if (mc.options.hideGui || mc.gameMode.getPlayerMode() == GameType.SPECTATOR)
 			return;
 
-		if (!(ControlsHandler.entityRef.get() instanceof CarriageContraptionEntity cce))
+		if (!(ControlsHandler.getContraption() instanceof CarriageContraptionEntity cce))
 			return;
 		Carriage carriage = cce.getCarriage();
 		if (carriage == null)
@@ -120,7 +122,7 @@ public class TrainHUD {
 			.getCameraEntity();
 		if (cameraEntity == null)
 			return;
-		BlockPos localPos = ControlsHandler.controlsPos;
+		BlockPos localPos = ControlsHandler.getControlsPos();
 		if (localPos == null)
 			return;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/controls/TrainHUDUpdatePacket.java b/src/main/java/com/simibubi/create/content/trains/TrainHUDUpdatePacket.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/controls/TrainHUDUpdatePacket.java
rename to src/main/java/com/simibubi/create/content/trains/TrainHUDUpdatePacket.java
index f4fcd4d2b..c0c97fceb 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/interaction/controls/TrainHUDUpdatePacket.java
+++ b/src/main/java/com/simibubi/create/content/trains/TrainHUDUpdatePacket.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.contraptions.components.structureMovement.interaction.controls;
+package com.simibubi.create.content.trains;
 
 import java.util.UUID;
 
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.trains.entity.Train;
+import com.simibubi.create.content.trains.entity.Train;
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 
 import net.minecraft.network.FriendlyByteBuf;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/AbstractBogeyBlock.java b/src/main/java/com/simibubi/create/content/trains/bogey/AbstractBogeyBlock.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/logistics/trains/AbstractBogeyBlock.java
rename to src/main/java/com/simibubi/create/content/trains/bogey/AbstractBogeyBlock.java
index dff97a9ef..aa174ad29 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/AbstractBogeyBlock.java
+++ b/src/main/java/com/simibubi/create/content/trains/bogey/AbstractBogeyBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains;
+package com.simibubi.create.content.trains.bogey;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -19,14 +19,13 @@ import com.mojang.math.Vector3f;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllBogeyStyles;
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
-import com.simibubi.create.content.logistics.trains.entity.BogeyStyle;
-import com.simibubi.create.content.logistics.trains.entity.Carriage;
-import com.simibubi.create.content.logistics.trains.entity.CarriageBogey;
-import com.simibubi.create.content.logistics.trains.entity.TravellingPoint;
-import com.simibubi.create.content.logistics.trains.track.AbstractBogeyBlockEntity;
-import com.simibubi.create.content.schematics.ISpecialBlockItemRequirement;
-import com.simibubi.create.content.schematics.ItemRequirement;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
+import com.simibubi.create.content.schematics.requirement.ISpecialBlockItemRequirement;
+import com.simibubi.create.content.schematics.requirement.ItemRequirement;
+import com.simibubi.create.content.trains.entity.Carriage;
+import com.simibubi.create.content.trains.entity.CarriageBogey;
+import com.simibubi.create.content.trains.entity.TravellingPoint;
+import com.simibubi.create.content.trains.track.TrackMaterial;
 import com.simibubi.create.foundation.block.IBE;
 import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
 import com.simibubi.create.foundation.utility.Iterate;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/track/AbstractBogeyBlockEntity.java b/src/main/java/com/simibubi/create/content/trains/bogey/AbstractBogeyBlockEntity.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/logistics/trains/track/AbstractBogeyBlockEntity.java
rename to src/main/java/com/simibubi/create/content/trains/bogey/AbstractBogeyBlockEntity.java
index 548e99151..59985cc7a 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/track/AbstractBogeyBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/trains/bogey/AbstractBogeyBlockEntity.java
@@ -1,12 +1,10 @@
-package com.simibubi.create.content.logistics.trains.track;
+package com.simibubi.create.content.trains.bogey;
 
-import static com.simibubi.create.content.logistics.trains.entity.CarriageBogey.UPSIDE_DOWN_KEY;
+import static com.simibubi.create.content.trains.entity.CarriageBogey.UPSIDE_DOWN_KEY;
 
 import org.jetbrains.annotations.NotNull;
 
 import com.simibubi.create.AllBogeyStyles;
-import com.simibubi.create.content.logistics.trains.AbstractBogeyBlock;
-import com.simibubi.create.content.logistics.trains.entity.BogeyStyle;
 import com.simibubi.create.foundation.blockEntity.CachedRenderBBBlockEntity;
 import com.simibubi.create.foundation.utility.NBTHelper;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/entity/BackupBogeyRenderer.java b/src/main/java/com/simibubi/create/content/trains/bogey/BackupBogeyRenderer.java
similarity index 81%
rename from src/main/java/com/simibubi/create/content/logistics/trains/entity/BackupBogeyRenderer.java
rename to src/main/java/com/simibubi/create/content/trains/bogey/BackupBogeyRenderer.java
index 80494a94a..0ba43df26 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/entity/BackupBogeyRenderer.java
+++ b/src/main/java/com/simibubi/create/content/trains/bogey/BackupBogeyRenderer.java
@@ -1,9 +1,8 @@
-package com.simibubi.create.content.logistics.trains.entity;
+package com.simibubi.create.content.trains.bogey;
 
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
-import com.simibubi.create.content.logistics.trains.BogeyRenderer;
 
 import net.minecraft.nbt.CompoundTag;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/BogeyBlockEntityRenderer.java b/src/main/java/com/simibubi/create/content/trains/bogey/BogeyBlockEntityRenderer.java
similarity index 88%
rename from src/main/java/com/simibubi/create/content/logistics/trains/BogeyBlockEntityRenderer.java
rename to src/main/java/com/simibubi/create/content/trains/bogey/BogeyBlockEntityRenderer.java
index 2afd1dc29..2b1ec674c 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/BogeyBlockEntityRenderer.java
+++ b/src/main/java/com/simibubi/create/content/trains/bogey/BogeyBlockEntityRenderer.java
@@ -1,7 +1,6 @@
-package com.simibubi.create.content.logistics.trains;
+package com.simibubi.create.content.trains.bogey;
 
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.simibubi.create.content.logistics.trains.track.AbstractBogeyBlockEntity;
 import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer;
 
 import net.minecraft.client.renderer.MultiBufferSource;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/entity/BogeyInstance.java b/src/main/java/com/simibubi/create/content/trains/bogey/BogeyInstance.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/logistics/trains/entity/BogeyInstance.java
rename to src/main/java/com/simibubi/create/content/trains/bogey/BogeyInstance.java
index 2e512847d..1c68ef95e 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/entity/BogeyInstance.java
+++ b/src/main/java/com/simibubi/create/content/trains/bogey/BogeyInstance.java
@@ -1,12 +1,12 @@
-package com.simibubi.create.content.logistics.trains.entity;
+package com.simibubi.create.content.trains.bogey;
 
 import java.util.Optional;
 
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.jozufozu.flywheel.util.AnimationTickHolder;
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.simibubi.create.content.logistics.trains.BogeyRenderer;
-import com.simibubi.create.content.logistics.trains.BogeySizes;
+import com.simibubi.create.content.trains.entity.CarriageBogey;
+import com.simibubi.create.content.trains.entity.CarriageContraptionEntity;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockAndTintGetter;
@@ -34,10 +34,6 @@ public final class BogeyInstance {
 		renderer.initialiseContraptionModelData(materialManager);
 	}
 
-	void hiddenFrame() {
-		beginFrame(0, null);
-	}
-
 	public void beginFrame(float wheelAngle, PoseStack ms) {
 		if (ms == null) {
 			renderer.emptyTransforms();
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/BogeyRenderer.java b/src/main/java/com/simibubi/create/content/trains/bogey/BogeyRenderer.java
similarity index 99%
rename from src/main/java/com/simibubi/create/content/logistics/trains/BogeyRenderer.java
rename to src/main/java/com/simibubi/create/content/trains/bogey/BogeyRenderer.java
index 02ea4f185..1d8055be0 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/BogeyRenderer.java
+++ b/src/main/java/com/simibubi/create/content/trains/bogey/BogeyRenderer.java
@@ -1,4 +1,11 @@
-package com.simibubi.create.content.logistics.trains;
+package com.simibubi.create.content.trains.bogey;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jetbrains.annotations.Nullable;
 
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.jozufozu.flywheel.core.Materials;
@@ -6,28 +13,16 @@ import com.jozufozu.flywheel.core.PartialModel;
 import com.jozufozu.flywheel.core.materials.model.ModelData;
 import com.jozufozu.flywheel.util.transform.Transform;
 import com.mojang.blaze3d.vertex.PoseStack;
-
 import com.mojang.blaze3d.vertex.VertexConsumer;
-
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 
 import net.minecraft.nbt.CompoundTag;
-
 import net.minecraft.world.level.block.Blocks;
-
 import net.minecraft.world.level.block.state.BlockState;
-
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
 public abstract class BogeyRenderer {
 	Map<String, ModelData[]> contraptionModelData = new HashMap<>();
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/BogeySizes.java b/src/main/java/com/simibubi/create/content/trains/bogey/BogeySizes.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/logistics/trains/BogeySizes.java
rename to src/main/java/com/simibubi/create/content/trains/bogey/BogeySizes.java
index 41fc13344..e9bcc2d48 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/BogeySizes.java
+++ b/src/main/java/com/simibubi/create/content/trains/bogey/BogeySizes.java
@@ -1,8 +1,4 @@
-package com.simibubi.create.content.logistics.trains;
-
-import com.simibubi.create.Create;
-
-import net.minecraft.resources.ResourceLocation;
+package com.simibubi.create.content.trains.bogey;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -11,6 +7,10 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import com.simibubi.create.Create;
+
+import net.minecraft.resources.ResourceLocation;
+
 public class BogeySizes {
 	private static final Collection<BogeySize> BOGEY_SIZES = new HashSet<>();
 	public static final BogeySize SMALL = new BogeySize(Create.ID, "small", 6.5f / 16f);
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/entity/BogeyStyle.java b/src/main/java/com/simibubi/create/content/trains/bogey/BogeyStyle.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/logistics/trains/entity/BogeyStyle.java
rename to src/main/java/com/simibubi/create/content/trains/bogey/BogeyStyle.java
index 1c4adf8b4..bf40b2b5f 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/entity/BogeyStyle.java
+++ b/src/main/java/com/simibubi/create/content/trains/bogey/BogeyStyle.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.entity;
+package com.simibubi.create.content.trains.bogey;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -12,9 +12,8 @@ import org.jetbrains.annotations.NotNull;
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.simibubi.create.AllBogeyStyles;
 import com.simibubi.create.AllSoundEvents;
-import com.simibubi.create.content.logistics.trains.BogeyRenderer;
-import com.simibubi.create.content.logistics.trains.BogeyRenderer.CommonRenderer;
-import com.simibubi.create.content.logistics.trains.BogeySizes;
+import com.simibubi.create.content.trains.bogey.BogeyRenderer.CommonRenderer;
+import com.simibubi.create.content.trains.entity.CarriageBogey;
 
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.nbt.CompoundTag;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/track/StandardBogeyBlock.java b/src/main/java/com/simibubi/create/content/trains/bogey/StandardBogeyBlock.java
similarity index 82%
rename from src/main/java/com/simibubi/create/content/logistics/trains/track/StandardBogeyBlock.java
rename to src/main/java/com/simibubi/create/content/trains/bogey/StandardBogeyBlock.java
index ded15125d..b4bceecfa 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/track/StandardBogeyBlock.java
+++ b/src/main/java/com/simibubi/create/content/trains/bogey/StandardBogeyBlock.java
@@ -1,13 +1,10 @@
-package com.simibubi.create.content.logistics.trains.track;
+package com.simibubi.create.content.trains.bogey;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllBogeyStyles;
-import com.simibubi.create.content.logistics.trains.AbstractBogeyBlock;
-import com.simibubi.create.content.logistics.trains.BogeySizes;
-import com.simibubi.create.content.logistics.trains.TrackMaterial;
-import com.simibubi.create.content.logistics.trains.entity.BogeyStyle;
-import com.simibubi.create.content.schematics.ISpecialBlockItemRequirement;
+import com.simibubi.create.content.schematics.requirement.ISpecialBlockItemRequirement;
+import com.simibubi.create.content.trains.track.TrackMaterial;
 import com.simibubi.create.foundation.block.IBE;
 import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/track/StandardBogeyBlockEntity.java b/src/main/java/com/simibubi/create/content/trains/bogey/StandardBogeyBlockEntity.java
similarity index 78%
rename from src/main/java/com/simibubi/create/content/logistics/trains/track/StandardBogeyBlockEntity.java
rename to src/main/java/com/simibubi/create/content/trains/bogey/StandardBogeyBlockEntity.java
index 5efe440f4..d60c88da6 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/track/StandardBogeyBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/trains/bogey/StandardBogeyBlockEntity.java
@@ -1,7 +1,6 @@
-package com.simibubi.create.content.logistics.trains.track;
+package com.simibubi.create.content.trains.bogey;
 
 import com.simibubi.create.AllBogeyStyles;
-import com.simibubi.create.content.logistics.trains.entity.BogeyStyle;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.entity.BlockEntityType;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/StandardBogeyRenderer.java b/src/main/java/com/simibubi/create/content/trains/bogey/StandardBogeyRenderer.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/logistics/trains/StandardBogeyRenderer.java
rename to src/main/java/com/simibubi/create/content/trains/bogey/StandardBogeyRenderer.java
index cfd779dd2..429be66f2 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/StandardBogeyRenderer.java
+++ b/src/main/java/com/simibubi/create/content/trains/bogey/StandardBogeyRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains;
+package com.simibubi.create.content.trains.bogey;
 
 import static com.simibubi.create.AllPartialModels.BOGEY_DRIVE;
 import static com.simibubi.create.AllPartialModels.BOGEY_FRAME;
@@ -12,7 +12,7 @@ import com.jozufozu.flywheel.util.transform.Transform;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.relays.elementary.ShaftBlock;
+import com.simibubi.create.content.kinetics.simpleRelays.ShaftBlock;
 import com.simibubi.create.foundation.utility.AngleHelper;
 import com.simibubi.create.foundation.utility.Iterate;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/display/FlapDisplayBlock.java b/src/main/java/com/simibubi/create/content/trains/display/FlapDisplayBlock.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/display/FlapDisplayBlock.java
rename to src/main/java/com/simibubi/create/content/trains/display/FlapDisplayBlock.java
index a449d4a9c..9abf42398 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/display/FlapDisplayBlock.java
+++ b/src/main/java/com/simibubi/create/content/trains/display/FlapDisplayBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.management.display;
+package com.simibubi.create.content.trains.display;
 
 import static net.minecraft.world.level.block.state.properties.BlockStateProperties.WATERLOGGED;
 
@@ -8,17 +8,17 @@ import java.util.function.Predicate;
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.base.HorizontalKineticBlock;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.relays.elementary.ICogWheel;
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
-import com.simibubi.create.content.curiosities.clipboard.ClipboardEntry;
+import com.simibubi.create.content.equipment.clipboard.ClipboardEntry;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
+import com.simibubi.create.content.kinetics.base.HorizontalKineticBlock;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.simpleRelays.ICogWheel;
 import com.simibubi.create.foundation.block.IBE;
+import com.simibubi.create.foundation.placement.IPlacementHelper;
+import com.simibubi.create.foundation.placement.PlacementHelpers;
+import com.simibubi.create.foundation.placement.PlacementOffset;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Iterate;
-import com.simibubi.create.foundation.utility.placement.IPlacementHelper;
-import com.simibubi.create.foundation.utility.placement.PlacementHelpers;
-import com.simibubi.create.foundation.utility.placement.PlacementOffset;
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/display/FlapDisplayBlockEntity.java b/src/main/java/com/simibubi/create/content/trains/display/FlapDisplayBlockEntity.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/display/FlapDisplayBlockEntity.java
rename to src/main/java/com/simibubi/create/content/trains/display/FlapDisplayBlockEntity.java
index 074f2c404..06813e48e 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/display/FlapDisplayBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/trains/display/FlapDisplayBlockEntity.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.management.display;
+package com.simibubi.create.content.trains.display;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -6,8 +6,8 @@ import java.util.List;
 
 import com.google.gson.JsonElement;
 import com.simibubi.create.AllSoundEvents;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.DyeHelper;
 import com.simibubi.create.foundation.utility.DynamicComponent;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/display/FlapDisplayLayout.java b/src/main/java/com/simibubi/create/content/trains/display/FlapDisplayLayout.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/display/FlapDisplayLayout.java
rename to src/main/java/com/simibubi/create/content/trains/display/FlapDisplayLayout.java
index 192467846..24188f469 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/display/FlapDisplayLayout.java
+++ b/src/main/java/com/simibubi/create/content/trains/display/FlapDisplayLayout.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.management.display;
+package com.simibubi.create.content.trains.display;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/display/FlapDisplayRenderer.java b/src/main/java/com/simibubi/create/content/trains/display/FlapDisplayRenderer.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/display/FlapDisplayRenderer.java
rename to src/main/java/com/simibubi/create/content/trains/display/FlapDisplayRenderer.java
index 8771ffc53..4ee5bc9db 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/display/FlapDisplayRenderer.java
+++ b/src/main/java/com/simibubi/create/content/trains/display/FlapDisplayRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.management.display;
+package com.simibubi.create.content.trains.display;
 
 import java.util.List;
 
@@ -9,7 +9,7 @@ import com.mojang.blaze3d.vertex.PoseStack.Pose;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.mojang.math.Matrix4f;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntityRenderer;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 import com.simibubi.create.foundation.utility.AngleHelper;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/display/FlapDisplaySection.java b/src/main/java/com/simibubi/create/content/trains/display/FlapDisplaySection.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/display/FlapDisplaySection.java
rename to src/main/java/com/simibubi/create/content/trains/display/FlapDisplaySection.java
index ece16fcef..06c75eab6 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/display/FlapDisplaySection.java
+++ b/src/main/java/com/simibubi/create/content/trains/display/FlapDisplaySection.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.management.display;
+package com.simibubi.create.content.trains.display;
 
 import java.util.HashMap;
 import java.util.Locale;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/display/GlobalTrainDisplayData.java b/src/main/java/com/simibubi/create/content/trains/display/GlobalTrainDisplayData.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/display/GlobalTrainDisplayData.java
rename to src/main/java/com/simibubi/create/content/trains/display/GlobalTrainDisplayData.java
index 24a4ed405..dd8c622c0 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/display/GlobalTrainDisplayData.java
+++ b/src/main/java/com/simibubi/create/content/trains/display/GlobalTrainDisplayData.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.management.display;
+package com.simibubi.create.content.trains.display;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -7,7 +7,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.trains.entity.Train;
+import com.simibubi.create.content.trains.entity.Train;
 
 import net.minecraft.network.chat.MutableComponent;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/entity/ArrivalSoundQueue.java b/src/main/java/com/simibubi/create/content/trains/entity/ArrivalSoundQueue.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/logistics/trains/entity/ArrivalSoundQueue.java
rename to src/main/java/com/simibubi/create/content/trains/entity/ArrivalSoundQueue.java
index f96bace94..93768b87d 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/entity/ArrivalSoundQueue.java
+++ b/src/main/java/com/simibubi/create/content/trains/entity/ArrivalSoundQueue.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.entity;
+package com.simibubi.create.content.trains.entity;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -9,9 +9,9 @@ import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllSoundEvents;
-import com.simibubi.create.content.contraptions.components.steam.whistle.WhistleBlock;
-import com.simibubi.create.content.contraptions.components.steam.whistle.WhistleBlock.WhistleSize;
-import com.simibubi.create.content.contraptions.components.structureMovement.Contraption;
+import com.simibubi.create.content.contraptions.Contraption;
+import com.simibubi.create.content.decoration.steamWhistle.WhistleBlock;
+import com.simibubi.create.content.decoration.steamWhistle.WhistleBlock.WhistleSize;
 import com.simibubi.create.foundation.utility.NBTHelper;
 import com.simibubi.create.foundation.utility.Pair;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/entity/Carriage.java b/src/main/java/com/simibubi/create/content/trains/entity/Carriage.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/logistics/trains/entity/Carriage.java
rename to src/main/java/com/simibubi/create/content/trains/entity/Carriage.java
index 45d129f94..86a2c3eee 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/entity/Carriage.java
+++ b/src/main/java/com/simibubi/create/content/trains/entity/Carriage.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.entity;
+package com.simibubi.create.content.trains.entity;
 
 import java.lang.ref.WeakReference;
 import java.util.HashMap;
@@ -18,13 +18,13 @@ import javax.annotation.Nullable;
 
 import org.apache.commons.lang3.mutable.MutableDouble;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.Contraption;
-import com.simibubi.create.content.contraptions.components.structureMovement.train.TrainCargoManager;
-import com.simibubi.create.content.logistics.trains.DimensionPalette;
-import com.simibubi.create.content.logistics.trains.TrackGraph;
-import com.simibubi.create.content.logistics.trains.TrackNodeLocation;
-import com.simibubi.create.content.logistics.trains.entity.TravellingPoint.IEdgePointListener;
-import com.simibubi.create.content.logistics.trains.entity.TravellingPoint.ITrackSelector;
+import com.simibubi.create.content.contraptions.Contraption;
+import com.simibubi.create.content.contraptions.minecart.TrainCargoManager;
+import com.simibubi.create.content.trains.entity.TravellingPoint.IEdgePointListener;
+import com.simibubi.create.content.trains.entity.TravellingPoint.ITrackSelector;
+import com.simibubi.create.content.trains.graph.DimensionPalette;
+import com.simibubi.create.content.trains.graph.TrackGraph;
+import com.simibubi.create.content.trains.graph.TrackNodeLocation;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.Iterate;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageBogey.java b/src/main/java/com/simibubi/create/content/trains/entity/CarriageBogey.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageBogey.java
rename to src/main/java/com/simibubi/create/content/trains/entity/CarriageBogey.java
index b11b7fee2..b313bf02f 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageBogey.java
+++ b/src/main/java/com/simibubi/create/content/trains/entity/CarriageBogey.java
@@ -1,17 +1,19 @@
-package com.simibubi.create.content.logistics.trains.entity;
+package com.simibubi.create.content.trains.entity;
 
-import static com.simibubi.create.content.logistics.trains.track.AbstractBogeyBlockEntity.BOGEY_DATA_KEY;
-import static com.simibubi.create.content.logistics.trains.track.AbstractBogeyBlockEntity.BOGEY_STYLE_KEY;
+import static com.simibubi.create.content.trains.bogey.AbstractBogeyBlockEntity.BOGEY_DATA_KEY;
+import static com.simibubi.create.content.trains.bogey.AbstractBogeyBlockEntity.BOGEY_STYLE_KEY;
 
 import javax.annotation.Nullable;
 
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.simibubi.create.AllBogeyStyles;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.trains.AbstractBogeyBlock;
-import com.simibubi.create.content.logistics.trains.DimensionPalette;
-import com.simibubi.create.content.logistics.trains.TrackGraph;
-import com.simibubi.create.content.logistics.trains.track.AbstractBogeyBlockEntity;
+import com.simibubi.create.content.trains.bogey.AbstractBogeyBlock;
+import com.simibubi.create.content.trains.bogey.AbstractBogeyBlockEntity;
+import com.simibubi.create.content.trains.bogey.BogeyInstance;
+import com.simibubi.create.content.trains.bogey.BogeyStyle;
+import com.simibubi.create.content.trains.graph.DimensionPalette;
+import com.simibubi.create.content.trains.graph.TrackGraph;
 import com.simibubi.create.foundation.utility.AngleHelper;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.Iterate;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraption.java b/src/main/java/com/simibubi/create/content/trains/entity/CarriageContraption.java
similarity index 89%
rename from src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraption.java
rename to src/main/java/com/simibubi/create/content/trains/entity/CarriageContraption.java
index de323e7ec..f935a485f 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraption.java
+++ b/src/main/java/com/simibubi/create/content/trains/entity/CarriageContraption.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.entity;
+package com.simibubi.create.content.trains.entity;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -11,18 +11,18 @@ import java.util.Optional;
 import org.apache.commons.lang3.tuple.Pair;
 
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.AssemblyException;
-import com.simibubi.create.content.contraptions.components.structureMovement.Contraption;
-import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionType;
-import com.simibubi.create.content.contraptions.components.structureMovement.MountedStorageManager;
-import com.simibubi.create.content.contraptions.components.structureMovement.NonStationaryLighter;
-import com.simibubi.create.content.contraptions.components.structureMovement.interaction.controls.ControlsBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionLighter;
-import com.simibubi.create.content.contraptions.components.structureMovement.train.TrainCargoManager;
-import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock;
-import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock.HeatLevel;
-import com.simibubi.create.content.logistics.trains.AbstractBogeyBlock;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.AssemblyException;
+import com.simibubi.create.content.contraptions.Contraption;
+import com.simibubi.create.content.contraptions.ContraptionType;
+import com.simibubi.create.content.contraptions.MountedStorageManager;
+import com.simibubi.create.content.contraptions.actors.trainControls.ControlsBlock;
+import com.simibubi.create.content.contraptions.minecart.TrainCargoManager;
+import com.simibubi.create.content.contraptions.render.ContraptionLighter;
+import com.simibubi.create.content.contraptions.render.NonStationaryLighter;
+import com.simibubi.create.content.processing.burner.BlazeBurnerBlock;
+import com.simibubi.create.content.processing.burner.BlazeBurnerBlock.HeatLevel;
+import com.simibubi.create.content.trains.bogey.AbstractBogeyBlock;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.Lang;
@@ -239,7 +239,7 @@ public class CarriageContraption extends Contraption {
 	}
 
 	@Override
-	protected ContraptionType getType() {
+	public ContraptionType getType() {
 		return ContraptionType.CARRIAGE;
 	}
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraptionEntity.java b/src/main/java/com/simibubi/create/content/trains/entity/CarriageContraptionEntity.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraptionEntity.java
rename to src/main/java/com/simibubi/create/content/trains/entity/CarriageContraptionEntity.java
index 46356b894..a7c86d7a3 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraptionEntity.java
+++ b/src/main/java/com/simibubi/create/content/trains/entity/CarriageContraptionEntity.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.entity;
+package com.simibubi.create.content.trains.entity;
 
 import java.lang.ref.WeakReference;
 import java.util.Collection;
@@ -11,26 +11,26 @@ import java.util.UUID;
 import com.google.common.base.Strings;
 import com.simibubi.create.AllEntityDataSerializers;
 import com.simibubi.create.AllEntityTypes;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.Create;
 import com.simibubi.create.CreateClient;
-import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionBlockChangedPacket;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
-import com.simibubi.create.content.contraptions.components.structureMovement.OrientedContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.interaction.controls.ControlsBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.interaction.controls.TrainHUDUpdatePacket;
-import com.simibubi.create.content.contraptions.particle.CubeParticleData;
-import com.simibubi.create.content.logistics.trains.TrackGraph;
-import com.simibubi.create.content.logistics.trains.entity.Carriage.DimensionalCarriageEntity;
-import com.simibubi.create.content.logistics.trains.entity.TravellingPoint.SteerDirection;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.station.GlobalStation;
-import com.simibubi.create.foundation.config.AllConfigs;
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.content.contraptions.ContraptionBlockChangedPacket;
+import com.simibubi.create.content.contraptions.OrientedContraptionEntity;
+import com.simibubi.create.content.contraptions.actors.trainControls.ControlsBlock;
+import com.simibubi.create.content.contraptions.behaviour.MovementBehaviour;
+import com.simibubi.create.content.contraptions.behaviour.MovementContext;
+import com.simibubi.create.content.trains.CubeParticleData;
+import com.simibubi.create.content.trains.TrainHUDUpdatePacket;
+import com.simibubi.create.content.trains.entity.Carriage.DimensionalCarriageEntity;
+import com.simibubi.create.content.trains.entity.TravellingPoint.SteerDirection;
+import com.simibubi.create.content.trains.graph.TrackGraph;
+import com.simibubi.create.content.trains.station.GlobalStation;
 import com.simibubi.create.foundation.utility.Color;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.VecHelper;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraptionEntityRenderer.java b/src/main/java/com/simibubi/create/content/trains/entity/CarriageContraptionEntityRenderer.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraptionEntityRenderer.java
rename to src/main/java/com/simibubi/create/content/trains/entity/CarriageContraptionEntityRenderer.java
index 02b219074..30e3f0a48 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraptionEntityRenderer.java
+++ b/src/main/java/com/simibubi/create/content/trains/entity/CarriageContraptionEntityRenderer.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.logistics.trains.entity;
+package com.simibubi.create.content.trains.entity;
 
 import java.util.Objects;
 
 import com.jozufozu.flywheel.backend.Backend;
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionEntityRenderer;
+import com.simibubi.create.content.contraptions.render.ContraptionEntityRenderer;
 
 import net.minecraft.client.renderer.LightTexture;
 import net.minecraft.client.renderer.MultiBufferSource;
@@ -13,7 +13,6 @@ import net.minecraft.client.renderer.culling.Frustum;
 import net.minecraft.client.renderer.entity.EntityRendererProvider;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.LightLayer;
-import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.phys.Vec3;
 
 public class CarriageContraptionEntityRenderer extends ContraptionEntityRenderer<CarriageContraptionEntity> {
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraptionInstance.java b/src/main/java/com/simibubi/create/content/trains/entity/CarriageContraptionInstance.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraptionInstance.java
rename to src/main/java/com/simibubi/create/content/trains/entity/CarriageContraptionInstance.java
index 6797c05cd..6303188e7 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraptionInstance.java
+++ b/src/main/java/com/simibubi/create/content/trains/entity/CarriageContraptionInstance.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.entity;
+package com.simibubi.create.content.trains.entity;
 
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.jozufozu.flywheel.api.instance.DynamicInstance;
@@ -7,7 +7,8 @@ import com.jozufozu.flywheel.util.AnimationTickHolder;
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Vector3f;
-import com.simibubi.create.content.logistics.trains.BogeyRenderer;
+import com.simibubi.create.content.trains.bogey.BogeyInstance;
+import com.simibubi.create.content.trains.bogey.BogeyRenderer;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.Iterate;
 
@@ -66,7 +67,7 @@ public class CarriageContraptionInstance extends EntityInstance<CarriageContrapt
 			if (instance == null)
 				continue;
 			if (bogeyHidden.get(current)) {
-				instance.hiddenFrame();
+				instance.beginFrame(0, null);
 				continue;
 			}
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageCouplingRenderer.java b/src/main/java/com/simibubi/create/content/trains/entity/CarriageCouplingRenderer.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageCouplingRenderer.java
rename to src/main/java/com/simibubi/create/content/trains/entity/CarriageCouplingRenderer.java
index ef5ca2e75..e941000f2 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageCouplingRenderer.java
+++ b/src/main/java/com/simibubi/create/content/trains/entity/CarriageCouplingRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.entity;
+package com.simibubi.create.content.trains.entity;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageEntityHandler.java b/src/main/java/com/simibubi/create/content/trains/entity/CarriageEntityHandler.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageEntityHandler.java
rename to src/main/java/com/simibubi/create/content/trains/entity/CarriageEntityHandler.java
index 3cc309af5..1d1baa1a6 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageEntityHandler.java
+++ b/src/main/java/com/simibubi/create/content/trains/entity/CarriageEntityHandler.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.entity;
+package com.simibubi.create.content.trains.entity;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.SectionPos;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageParticles.java b/src/main/java/com/simibubi/create/content/trains/entity/CarriageParticles.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageParticles.java
rename to src/main/java/com/simibubi/create/content/trains/entity/CarriageParticles.java
index 4639b0539..b153a6d68 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageParticles.java
+++ b/src/main/java/com/simibubi/create/content/trains/entity/CarriageParticles.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.logistics.trains.entity;
+package com.simibubi.create.content.trains.entity;
 
-import com.simibubi.create.content.logistics.trains.entity.Carriage.DimensionalCarriageEntity;
+import com.simibubi.create.content.trains.entity.Carriage.DimensionalCarriageEntity;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.VecHelper;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageSounds.java b/src/main/java/com/simibubi/create/content/trains/entity/CarriageSounds.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageSounds.java
rename to src/main/java/com/simibubi/create/content/trains/entity/CarriageSounds.java
index 89127ddc6..53ce0df96 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageSounds.java
+++ b/src/main/java/com/simibubi/create/content/trains/entity/CarriageSounds.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.logistics.trains.entity;
+package com.simibubi.create.content.trains.entity;
 
 import com.simibubi.create.AllSoundEvents;
 import com.simibubi.create.AllSoundEvents.SoundEntry;
-import com.simibubi.create.content.logistics.trains.entity.Carriage.DimensionalCarriageEntity;
+import com.simibubi.create.content.trains.entity.Carriage.DimensionalCarriageEntity;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat.Chaser;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageSyncData.java b/src/main/java/com/simibubi/create/content/trains/entity/CarriageSyncData.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageSyncData.java
rename to src/main/java/com/simibubi/create/content/trains/entity/CarriageSyncData.java
index 50ad64dc3..70ac8d235 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageSyncData.java
+++ b/src/main/java/com/simibubi/create/content/trains/entity/CarriageSyncData.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.entity;
+package com.simibubi.create.content.trains.entity;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -13,11 +13,11 @@ import java.util.Vector;
 
 import org.apache.commons.lang3.mutable.MutableBoolean;
 
-import com.simibubi.create.content.logistics.trains.TrackEdge;
-import com.simibubi.create.content.logistics.trains.TrackGraph;
-import com.simibubi.create.content.logistics.trains.TrackNode;
-import com.simibubi.create.content.logistics.trains.entity.Carriage.DimensionalCarriageEntity;
-import com.simibubi.create.content.logistics.trains.entity.TravellingPoint.ITrackSelector;
+import com.simibubi.create.content.trains.entity.Carriage.DimensionalCarriageEntity;
+import com.simibubi.create.content.trains.entity.TravellingPoint.ITrackSelector;
+import com.simibubi.create.content.trains.graph.TrackEdge;
+import com.simibubi.create.content.trains.graph.TrackGraph;
+import com.simibubi.create.content.trains.graph.TrackNode;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.Pair;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageSyncDataSerializer.java b/src/main/java/com/simibubi/create/content/trains/entity/CarriageSyncDataSerializer.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageSyncDataSerializer.java
rename to src/main/java/com/simibubi/create/content/trains/entity/CarriageSyncDataSerializer.java
index 762998b35..723685f75 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageSyncDataSerializer.java
+++ b/src/main/java/com/simibubi/create/content/trains/entity/CarriageSyncDataSerializer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.entity;
+package com.simibubi.create.content.trains.entity;
 
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.syncher.EntityDataSerializer;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/entity/Navigation.java b/src/main/java/com/simibubi/create/content/trains/entity/Navigation.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/logistics/trains/entity/Navigation.java
rename to src/main/java/com/simibubi/create/content/trains/entity/Navigation.java
index 138f96269..0bca29673 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/entity/Navigation.java
+++ b/src/main/java/com/simibubi/create/content/trains/entity/Navigation.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.entity;
+package com.simibubi.create.content.trains.entity;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -14,26 +14,25 @@ import java.util.UUID;
 
 import javax.annotation.Nullable;
 
-import com.simibubi.create.content.logistics.trains.TrackMaterial;
-
 import org.apache.commons.lang3.mutable.MutableDouble;
 import org.apache.commons.lang3.mutable.MutableObject;
 
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.trains.BezierConnection;
-import com.simibubi.create.content.logistics.trains.DimensionPalette;
-import com.simibubi.create.content.logistics.trains.TrackEdge;
-import com.simibubi.create.content.logistics.trains.TrackGraph;
-import com.simibubi.create.content.logistics.trains.TrackNode;
-import com.simibubi.create.content.logistics.trains.TrackNodeLocation;
-import com.simibubi.create.content.logistics.trains.entity.TravellingPoint.ITrackSelector;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.EdgeData;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.EdgePointType;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.SignalBlock.SignalType;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.SignalBoundary;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.SignalEdgeGroup;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.TrackEdgePoint;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.station.GlobalStation;
+import com.simibubi.create.content.trains.entity.TravellingPoint.ITrackSelector;
+import com.simibubi.create.content.trains.graph.DimensionPalette;
+import com.simibubi.create.content.trains.graph.EdgeData;
+import com.simibubi.create.content.trains.graph.EdgePointType;
+import com.simibubi.create.content.trains.graph.TrackEdge;
+import com.simibubi.create.content.trains.graph.TrackGraph;
+import com.simibubi.create.content.trains.graph.TrackNode;
+import com.simibubi.create.content.trains.graph.TrackNodeLocation;
+import com.simibubi.create.content.trains.signal.SignalBlock.SignalType;
+import com.simibubi.create.content.trains.signal.SignalBoundary;
+import com.simibubi.create.content.trains.signal.SignalEdgeGroup;
+import com.simibubi.create.content.trains.signal.TrackEdgePoint;
+import com.simibubi.create.content.trains.station.GlobalStation;
+import com.simibubi.create.content.trains.track.BezierConnection;
+import com.simibubi.create.content.trains.track.TrackMaterial;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.NBTHelper;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/entity/Train.java b/src/main/java/com/simibubi/create/content/trains/entity/Train.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/logistics/trains/entity/Train.java
rename to src/main/java/com/simibubi/create/content/trains/entity/Train.java
index f9949dde4..4dd5a7820 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/entity/Train.java
+++ b/src/main/java/com/simibubi/create/content/trains/entity/Train.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.entity;
+package com.simibubi.create.content.trains.entity;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -21,37 +21,37 @@ import org.apache.commons.lang3.mutable.MutableBoolean;
 import org.apache.commons.lang3.mutable.MutableObject;
 
 import com.simibubi.create.AllMovementBehaviours;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour;
-import com.simibubi.create.content.logistics.item.filter.FilterItem;
-import com.simibubi.create.content.logistics.trains.DimensionPalette;
-import com.simibubi.create.content.logistics.trains.GraphLocation;
-import com.simibubi.create.content.logistics.trains.TrackEdge;
-import com.simibubi.create.content.logistics.trains.TrackGraph;
-import com.simibubi.create.content.logistics.trains.TrackNode;
-import com.simibubi.create.content.logistics.trains.entity.Carriage.DimensionalCarriageEntity;
-import com.simibubi.create.content.logistics.trains.entity.TravellingPoint.IEdgePointListener;
-import com.simibubi.create.content.logistics.trains.entity.TravellingPoint.SteerDirection;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.EdgeData;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.EdgePointType;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.observer.TrackObserver;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.SignalBlock.SignalType;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.SignalBoundary;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.SignalEdgeGroup;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.station.GlobalStation;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.station.StationBlockEntity;
-import com.simibubi.create.content.logistics.trains.management.schedule.ScheduleRuntime;
-import com.simibubi.create.content.logistics.trains.management.schedule.ScheduleRuntime.State;
-import com.simibubi.create.content.logistics.trains.track.AbstractBogeyBlockEntity;
+import com.simibubi.create.content.contraptions.behaviour.MovementBehaviour;
+import com.simibubi.create.content.logistics.filter.FilterItem;
+import com.simibubi.create.content.trains.bogey.AbstractBogeyBlockEntity;
+import com.simibubi.create.content.trains.entity.Carriage.DimensionalCarriageEntity;
+import com.simibubi.create.content.trains.entity.TravellingPoint.IEdgePointListener;
+import com.simibubi.create.content.trains.entity.TravellingPoint.SteerDirection;
+import com.simibubi.create.content.trains.graph.TrackGraphLocation;
+import com.simibubi.create.content.trains.graph.DimensionPalette;
+import com.simibubi.create.content.trains.graph.EdgeData;
+import com.simibubi.create.content.trains.graph.EdgePointType;
+import com.simibubi.create.content.trains.graph.TrackEdge;
+import com.simibubi.create.content.trains.graph.TrackGraph;
+import com.simibubi.create.content.trains.graph.TrackNode;
+import com.simibubi.create.content.trains.observer.TrackObserver;
+import com.simibubi.create.content.trains.schedule.ScheduleRuntime;
+import com.simibubi.create.content.trains.schedule.ScheduleRuntime.State;
+import com.simibubi.create.content.trains.signal.SignalBlock.SignalType;
+import com.simibubi.create.content.trains.signal.SignalBoundary;
+import com.simibubi.create.content.trains.signal.SignalEdgeGroup;
+import com.simibubi.create.content.trains.station.GlobalStation;
+import com.simibubi.create.content.trains.station.StationBlockEntity;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
-import com.simibubi.create.foundation.config.AllConfigs;
-import com.simibubi.create.foundation.networking.AllPackets;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.NBTHelper;
 import com.simibubi.create.foundation.utility.Pair;
 import com.simibubi.create.foundation.utility.VecHelper;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -843,11 +843,11 @@ public class Train {
 		}
 
 		Set<Entry<UUID, TrackGraph>> entrySet = new HashSet<>(Create.RAILWAYS.trackNetworks.entrySet());
-		Map<UUID, List<GraphLocation>> successfulMigrations = new HashMap<>();
+		Map<UUID, List<TrackGraphLocation>> successfulMigrations = new HashMap<>();
 		for (TrainMigration md : migratingPoints) {
 			for (Iterator<Entry<UUID, TrackGraph>> iterator = entrySet.iterator(); iterator.hasNext();) {
 				Entry<UUID, TrackGraph> entry = iterator.next();
-				GraphLocation gl = md.tryMigratingTo(entry.getValue());
+				TrackGraphLocation gl = md.tryMigratingTo(entry.getValue());
 				if (gl == null) {
 					iterator.remove();
 					continue;
@@ -866,7 +866,7 @@ public class Train {
 
 		for (Entry<UUID, TrackGraph> entry : entrySet) {
 			graph = entry.getValue();
-			List<GraphLocation> locations = successfulMigrations.get(entry.getKey());
+			List<TrackGraphLocation> locations = successfulMigrations.get(entry.getKey());
 			forEachTravellingPoint(tp -> tp.migrateTo(locations));
 			migratingPoints.clear();
 			if (derailed)
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/entity/TrainIconType.java b/src/main/java/com/simibubi/create/content/trains/entity/TrainIconType.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/logistics/trains/entity/TrainIconType.java
rename to src/main/java/com/simibubi/create/content/trains/entity/TrainIconType.java
index 3db2e3800..fa2d55bb5 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/entity/TrainIconType.java
+++ b/src/main/java/com/simibubi/create/content/trains/entity/TrainIconType.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.entity;
+package com.simibubi.create.content.trains.entity;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/entity/TrainMigration.java b/src/main/java/com/simibubi/create/content/trains/entity/TrainMigration.java
similarity index 84%
rename from src/main/java/com/simibubi/create/content/logistics/trains/entity/TrainMigration.java
rename to src/main/java/com/simibubi/create/content/trains/entity/TrainMigration.java
index 06b0b0efb..8e90ef857 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/entity/TrainMigration.java
+++ b/src/main/java/com/simibubi/create/content/trains/entity/TrainMigration.java
@@ -1,13 +1,13 @@
-package com.simibubi.create.content.logistics.trains.entity;
+package com.simibubi.create.content.trains.entity;
 
 import java.util.Map.Entry;
 
-import com.simibubi.create.content.logistics.trains.DimensionPalette;
-import com.simibubi.create.content.logistics.trains.GraphLocation;
-import com.simibubi.create.content.logistics.trains.TrackEdge;
-import com.simibubi.create.content.logistics.trains.TrackGraph;
-import com.simibubi.create.content.logistics.trains.TrackNode;
-import com.simibubi.create.content.logistics.trains.TrackNodeLocation;
+import com.simibubi.create.content.trains.graph.TrackGraphLocation;
+import com.simibubi.create.content.trains.graph.DimensionPalette;
+import com.simibubi.create.content.trains.graph.TrackEdge;
+import com.simibubi.create.content.trains.graph.TrackGraph;
+import com.simibubi.create.content.trains.graph.TrackNode;
+import com.simibubi.create.content.trains.graph.TrackNodeLocation;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.VecHelper;
 
@@ -33,14 +33,14 @@ public class TrainMigration {
 		locations = Couple.create(point.node1.getLocation(), point.node2.getLocation());
 	}
 
-	public GraphLocation tryMigratingTo(TrackGraph graph) {
+	public TrackGraphLocation tryMigratingTo(TrackGraph graph) {
 		TrackNode node1 = graph.locateNode(locations.getFirst());
 		TrackNode node2 = graph.locateNode(locations.getSecond());
 		if (node1 != null && node2 != null) {
 			TrackEdge edge = graph.getConnectionsFrom(node1)
 				.get(node2);
 			if (edge != null) {
-				GraphLocation graphLocation = new GraphLocation();
+				TrackGraphLocation graphLocation = new TrackGraphLocation();
 				graphLocation.graph = graph;
 				graphLocation.edge = locations;
 				graphLocation.position = positionOnOldEdge;
@@ -88,7 +88,7 @@ public class TrainMigration {
 				if (position > edgeLength)
 					continue;
 
-				GraphLocation graphLocation = new GraphLocation();
+				TrackGraphLocation graphLocation = new TrackGraphLocation();
 				graphLocation.graph = graph;
 				graphLocation.edge = Couple.create(loc, newNode2.getLocation());
 				graphLocation.position = position;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/entity/TrainPacket.java b/src/main/java/com/simibubi/create/content/trains/entity/TrainPacket.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/trains/entity/TrainPacket.java
rename to src/main/java/com/simibubi/create/content/trains/entity/TrainPacket.java
index f16014085..288555ea4 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/entity/TrainPacket.java
+++ b/src/main/java/com/simibubi/create/content/trains/entity/TrainPacket.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.entity;
+package com.simibubi.create.content.trains.entity;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -6,7 +6,7 @@ import java.util.Map;
 import java.util.UUID;
 
 import com.simibubi.create.CreateClient;
-import com.simibubi.create.content.logistics.trains.AbstractBogeyBlock;
+import com.simibubi.create.content.trains.bogey.AbstractBogeyBlock;
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.Iterate;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/entity/TrainPromptPacket.java b/src/main/java/com/simibubi/create/content/trains/entity/TrainPromptPacket.java
similarity index 87%
rename from src/main/java/com/simibubi/create/content/logistics/trains/entity/TrainPromptPacket.java
rename to src/main/java/com/simibubi/create/content/trains/entity/TrainPromptPacket.java
index f01bebbea..3e5acbcfd 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/entity/TrainPromptPacket.java
+++ b/src/main/java/com/simibubi/create/content/trains/entity/TrainPromptPacket.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.logistics.trains.entity;
+package com.simibubi.create.content.trains.entity;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.interaction.controls.TrainHUD;
+import com.simibubi.create.content.trains.TrainHUD;
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 
 import net.minecraft.network.FriendlyByteBuf;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/entity/TrainRelocationPacket.java b/src/main/java/com/simibubi/create/content/trains/entity/TrainRelocationPacket.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/logistics/trains/entity/TrainRelocationPacket.java
rename to src/main/java/com/simibubi/create/content/trains/entity/TrainRelocationPacket.java
index 598b56bf7..8762dbd5f 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/entity/TrainRelocationPacket.java
+++ b/src/main/java/com/simibubi/create/content/trains/entity/TrainRelocationPacket.java
@@ -1,15 +1,15 @@
-package com.simibubi.create.content.logistics.trains.entity;
+package com.simibubi.create.content.trains.entity;
 
 import java.util.UUID;
 
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionRelocationPacket;
-import com.simibubi.create.content.logistics.trains.track.BezierTrackPointLocation;
-import com.simibubi.create.foundation.config.AllConfigs;
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.content.contraptions.ContraptionRelocationPacket;
+import com.simibubi.create.content.trains.track.BezierTrackPointLocation;
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.VecHelper;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.ChatFormatting;
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/entity/TrainRelocator.java b/src/main/java/com/simibubi/create/content/trains/entity/TrainRelocator.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/logistics/trains/entity/TrainRelocator.java
rename to src/main/java/com/simibubi/create/content/trains/entity/TrainRelocator.java
index 76a3438b6..4ce608836 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/entity/TrainRelocator.java
+++ b/src/main/java/com/simibubi/create/content/trains/entity/TrainRelocator.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.entity;
+package com.simibubi.create.content.trains.entity;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
@@ -13,25 +13,25 @@ import org.apache.commons.lang3.mutable.MutableBoolean;
 import org.apache.commons.lang3.mutable.MutableInt;
 
 import com.simibubi.create.AllItems;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.Create;
 import com.simibubi.create.CreateClient;
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionHandlerClient;
-import com.simibubi.create.content.logistics.trains.GraphLocation;
-import com.simibubi.create.content.logistics.trains.ITrackBlock;
-import com.simibubi.create.content.logistics.trains.TrackEdge;
-import com.simibubi.create.content.logistics.trains.TrackGraph;
-import com.simibubi.create.content.logistics.trains.TrackGraphHelper;
-import com.simibubi.create.content.logistics.trains.TrackNode;
-import com.simibubi.create.content.logistics.trains.entity.TravellingPoint.IEdgePointListener;
-import com.simibubi.create.content.logistics.trains.entity.TravellingPoint.ITrackSelector;
-import com.simibubi.create.content.logistics.trains.entity.TravellingPoint.ITurnListener;
-import com.simibubi.create.content.logistics.trains.entity.TravellingPoint.SteerDirection;
-import com.simibubi.create.content.logistics.trains.track.BezierTrackPointLocation;
-import com.simibubi.create.content.logistics.trains.track.TrackBlockOutline;
-import com.simibubi.create.content.logistics.trains.track.TrackBlockOutline.BezierPointSelection;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.ContraptionHandlerClient;
+import com.simibubi.create.content.trains.entity.TravellingPoint.IEdgePointListener;
+import com.simibubi.create.content.trains.entity.TravellingPoint.ITrackSelector;
+import com.simibubi.create.content.trains.entity.TravellingPoint.ITurnListener;
+import com.simibubi.create.content.trains.entity.TravellingPoint.SteerDirection;
+import com.simibubi.create.content.trains.graph.TrackGraphLocation;
+import com.simibubi.create.content.trains.graph.TrackEdge;
+import com.simibubi.create.content.trains.graph.TrackGraph;
+import com.simibubi.create.content.trains.graph.TrackGraphHelper;
+import com.simibubi.create.content.trains.graph.TrackNode;
+import com.simibubi.create.content.trains.track.BezierTrackPointLocation;
+import com.simibubi.create.content.trains.track.ITrackBlock;
+import com.simibubi.create.content.trains.track.TrackBlockOutline;
+import com.simibubi.create.content.trains.track.TrackBlockOutline.BezierPointSelection;
 import com.simibubi.create.foundation.item.TooltipHelper;
-import com.simibubi.create.foundation.networking.AllPackets;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.Pair;
@@ -168,7 +168,7 @@ public class TrainRelocator {
 			return false;
 
 		Pair<Vec3, AxisDirection> nearestTrackAxis = track.getNearestTrackAxis(level, pos, blockState, lookAngle);
-		GraphLocation graphLocation = bezier != null
+		TrackGraphLocation graphLocation = bezier != null
 			? TrackGraphHelper.getBezierGraphLocationAt(level, pos,
 				bezierDirection ? AxisDirection.POSITIVE : AxisDirection.NEGATIVE, bezier)
 			: TrackGraphHelper.getGraphLocationAt(level, pos, nearestTrackAxis.getSecond(),
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/entity/TrainStatus.java b/src/main/java/com/simibubi/create/content/trains/entity/TrainStatus.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/logistics/trains/entity/TrainStatus.java
rename to src/main/java/com/simibubi/create/content/trains/entity/TrainStatus.java
index 79b5bb9db..1a3e73d84 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/entity/TrainStatus.java
+++ b/src/main/java/com/simibubi/create/content/trains/entity/TrainStatus.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.entity;
+package com.simibubi.create.content.trains.entity;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/entity/TravellingPoint.java b/src/main/java/com/simibubi/create/content/trains/entity/TravellingPoint.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/logistics/trains/entity/TravellingPoint.java
rename to src/main/java/com/simibubi/create/content/trains/entity/TravellingPoint.java
index 3251d6b49..b88fe9319 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/entity/TravellingPoint.java
+++ b/src/main/java/com/simibubi/create/content/trains/entity/TravellingPoint.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.entity;
+package com.simibubi.create.content.trains.entity;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -16,14 +16,14 @@ import java.util.function.Predicate;
 import javax.annotation.Nullable;
 
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.trains.DimensionPalette;
-import com.simibubi.create.content.logistics.trains.GraphLocation;
-import com.simibubi.create.content.logistics.trains.TrackEdge;
-import com.simibubi.create.content.logistics.trains.TrackGraph;
-import com.simibubi.create.content.logistics.trains.TrackNode;
-import com.simibubi.create.content.logistics.trains.TrackNodeLocation;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.EdgeData;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.TrackEdgePoint;
+import com.simibubi.create.content.trains.graph.TrackGraphLocation;
+import com.simibubi.create.content.trains.graph.DimensionPalette;
+import com.simibubi.create.content.trains.graph.EdgeData;
+import com.simibubi.create.content.trains.graph.TrackEdge;
+import com.simibubi.create.content.trains.graph.TrackGraph;
+import com.simibubi.create.content.trains.graph.TrackNode;
+import com.simibubi.create.content.trains.graph.TrackNodeLocation;
+import com.simibubi.create.content.trains.signal.TrackEdgePoint;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.Pair;
 
@@ -411,8 +411,8 @@ public class TravellingPoint {
 				.scale(upsideDown ^ flipUpsideDown ? -1 : 1));
 	}
 
-	public void migrateTo(List<GraphLocation> locations) {
-		GraphLocation location = locations.remove(0);
+	public void migrateTo(List<TrackGraphLocation> locations) {
+		TrackGraphLocation location = locations.remove(0);
 		TrackGraph graph = location.graph;
 		node1 = graph.locateNode(location.edge.getFirst());
 		node2 = graph.locateNode(location.edge.getSecond());
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/DimensionPalette.java b/src/main/java/com/simibubi/create/content/trains/graph/DimensionPalette.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/logistics/trains/DimensionPalette.java
rename to src/main/java/com/simibubi/create/content/trains/graph/DimensionPalette.java
index 8ab827f42..0190f5bee 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/DimensionPalette.java
+++ b/src/main/java/com/simibubi/create/content/trains/graph/DimensionPalette.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains;
+package com.simibubi.create.content.trains.graph;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/EdgeData.java b/src/main/java/com/simibubi/create/content/trains/graph/EdgeData.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/EdgeData.java
rename to src/main/java/com/simibubi/create/content/trains/graph/EdgeData.java
index 942ccc02c..8e15284f6 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/EdgeData.java
+++ b/src/main/java/com/simibubi/create/content/trains/graph/EdgeData.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.management.edgePoint;
+package com.simibubi.create.content.trains.graph;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -10,14 +10,9 @@ import javax.annotation.Nullable;
 
 import com.google.common.base.Objects;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.trains.DimensionPalette;
-import com.simibubi.create.content.logistics.trains.TrackEdge;
-import com.simibubi.create.content.logistics.trains.TrackGraph;
-import com.simibubi.create.content.logistics.trains.TrackNode;
-import com.simibubi.create.content.logistics.trains.TrackNodeLocation;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.SignalBoundary;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.SignalEdgeGroup;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.TrackEdgePoint;
+import com.simibubi.create.content.trains.signal.SignalBoundary;
+import com.simibubi.create.content.trains.signal.SignalEdgeGroup;
+import com.simibubi.create.content.trains.signal.TrackEdgePoint;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.NBTHelper;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/EdgePointManager.java b/src/main/java/com/simibubi/create/content/trains/graph/EdgePointManager.java
similarity index 77%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/EdgePointManager.java
rename to src/main/java/com/simibubi/create/content/trains/graph/EdgePointManager.java
index ecca7e8d4..fafe1109f 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/EdgePointManager.java
+++ b/src/main/java/com/simibubi/create/content/trains/graph/EdgePointManager.java
@@ -1,11 +1,7 @@
-package com.simibubi.create.content.logistics.trains.management.edgePoint;
+package com.simibubi.create.content.trains.graph;
 
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.trains.TrackEdge;
-import com.simibubi.create.content.logistics.trains.TrackGraph;
-import com.simibubi.create.content.logistics.trains.TrackNode;
-import com.simibubi.create.content.logistics.trains.TrackNodeLocation;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.TrackEdgePoint;
+import com.simibubi.create.content.trains.signal.TrackEdgePoint;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.Iterate;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/EdgePointStorage.java b/src/main/java/com/simibubi/create/content/trains/graph/EdgePointStorage.java
similarity index 89%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/EdgePointStorage.java
rename to src/main/java/com/simibubi/create/content/trains/graph/EdgePointStorage.java
index d12c50d9c..b4ff98c61 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/EdgePointStorage.java
+++ b/src/main/java/com/simibubi/create/content/trains/graph/EdgePointStorage.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.management.edgePoint;
+package com.simibubi.create.content.trains.graph;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -7,9 +7,7 @@ import java.util.Map.Entry;
 import java.util.UUID;
 
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.trains.DimensionPalette;
-import com.simibubi.create.content.logistics.trains.TrackGraph;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.TrackEdgePoint;
+import com.simibubi.create.content.trains.signal.TrackEdgePoint;
 import com.simibubi.create.foundation.utility.NBTHelper;
 
 import net.minecraft.nbt.CompoundTag;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/EdgePointType.java b/src/main/java/com/simibubi/create/content/trains/graph/EdgePointType.java
similarity index 74%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/EdgePointType.java
rename to src/main/java/com/simibubi/create/content/trains/graph/EdgePointType.java
index 306ad68ba..411e27875 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/EdgePointType.java
+++ b/src/main/java/com/simibubi/create/content/trains/graph/EdgePointType.java
@@ -1,15 +1,14 @@
-package com.simibubi.create.content.logistics.trains.management.edgePoint;
+package com.simibubi.create.content.trains.graph;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Supplier;
 
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.trains.DimensionPalette;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.observer.TrackObserver;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.SignalBoundary;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.TrackEdgePoint;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.station.GlobalStation;
+import com.simibubi.create.content.trains.observer.TrackObserver;
+import com.simibubi.create.content.trains.signal.SignalBoundary;
+import com.simibubi.create.content.trains.signal.TrackEdgePoint;
+import com.simibubi.create.content.trains.station.GlobalStation;
 
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.resources.ResourceLocation;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/TrackEdge.java b/src/main/java/com/simibubi/create/content/trains/graph/TrackEdge.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/logistics/trains/TrackEdge.java
rename to src/main/java/com/simibubi/create/content/trains/graph/TrackEdge.java
index 111c59dd3..997b21f3e 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/TrackEdge.java
+++ b/src/main/java/com/simibubi/create/content/trains/graph/TrackEdge.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains;
+package com.simibubi.create.content.trains.graph;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -7,7 +7,8 @@ import java.util.Collections;
 import javax.annotation.Nullable;
 
 import com.google.common.collect.ImmutableList;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.EdgeData;
+import com.simibubi.create.content.trains.track.BezierConnection;
+import com.simibubi.create.content.trains.track.TrackMaterial;
 import com.simibubi.create.foundation.utility.VecHelper;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/TrackEdgeIntersection.java b/src/main/java/com/simibubi/create/content/trains/graph/TrackEdgeIntersection.java
similarity index 88%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/TrackEdgeIntersection.java
rename to src/main/java/com/simibubi/create/content/trains/graph/TrackEdgeIntersection.java
index eeea62a1e..954df2a81 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/TrackEdgeIntersection.java
+++ b/src/main/java/com/simibubi/create/content/trains/graph/TrackEdgeIntersection.java
@@ -1,9 +1,7 @@
-package com.simibubi.create.content.logistics.trains.management.edgePoint;
+package com.simibubi.create.content.trains.graph;
 
 import java.util.UUID;
 
-import com.simibubi.create.content.logistics.trains.DimensionPalette;
-import com.simibubi.create.content.logistics.trains.TrackNodeLocation;
 import com.simibubi.create.foundation.utility.Couple;
 
 import net.minecraft.nbt.CompoundTag;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/TrackGraph.java b/src/main/java/com/simibubi/create/content/trains/graph/TrackGraph.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/logistics/trains/TrackGraph.java
rename to src/main/java/com/simibubi/create/content/trains/graph/TrackGraph.java
index 8bb92da9f..10cace626 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/TrackGraph.java
+++ b/src/main/java/com/simibubi/create/content/trains/graph/TrackGraph.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains;
+package com.simibubi.create.content.trains.graph;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -19,15 +19,12 @@ import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.trains.TrackNodeLocation.DiscoveredLocation;
-import com.simibubi.create.content.logistics.trains.entity.Train;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.EdgeData;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.EdgePointManager;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.EdgePointStorage;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.EdgePointType;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.TrackEdgeIntersection;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.SignalEdgeGroup;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.TrackEdgePoint;
+import com.simibubi.create.content.trains.entity.Train;
+import com.simibubi.create.content.trains.graph.TrackNodeLocation.DiscoveredLocation;
+import com.simibubi.create.content.trains.signal.SignalEdgeGroup;
+import com.simibubi.create.content.trains.signal.TrackEdgePoint;
+import com.simibubi.create.content.trains.track.BezierConnection;
+import com.simibubi.create.content.trains.track.TrackMaterial;
 import com.simibubi.create.foundation.utility.Color;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.NBTHelper;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/TrackGraphBounds.java b/src/main/java/com/simibubi/create/content/trains/graph/TrackGraphBounds.java
similarity index 89%
rename from src/main/java/com/simibubi/create/content/logistics/trains/TrackGraphBounds.java
rename to src/main/java/com/simibubi/create/content/trains/graph/TrackGraphBounds.java
index 52e30d0f8..e2d06385c 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/TrackGraphBounds.java
+++ b/src/main/java/com/simibubi/create/content/trains/graph/TrackGraphBounds.java
@@ -1,9 +1,11 @@
-package com.simibubi.create.content.logistics.trains;
+package com.simibubi.create.content.trains.graph;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import com.simibubi.create.content.trains.track.BezierConnection;
+
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.AABB;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/TrackGraphHelper.java b/src/main/java/com/simibubi/create/content/trains/graph/TrackGraphHelper.java
similarity index 86%
rename from src/main/java/com/simibubi/create/content/logistics/trains/TrackGraphHelper.java
rename to src/main/java/com/simibubi/create/content/trains/graph/TrackGraphHelper.java
index 33ca6a7c8..203cdcc71 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/TrackGraphHelper.java
+++ b/src/main/java/com/simibubi/create/content/trains/graph/TrackGraphHelper.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains;
+package com.simibubi.create.content.trains.graph;
 
 import java.util.Collection;
 import java.util.Map;
@@ -7,9 +7,11 @@ import java.util.Map.Entry;
 import javax.annotation.Nullable;
 
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.trains.TrackNodeLocation.DiscoveredLocation;
-import com.simibubi.create.content.logistics.trains.track.BezierTrackPointLocation;
-import com.simibubi.create.content.logistics.trains.track.TrackBlockEntity;
+import com.simibubi.create.content.trains.graph.TrackNodeLocation.DiscoveredLocation;
+import com.simibubi.create.content.trains.track.BezierConnection;
+import com.simibubi.create.content.trains.track.BezierTrackPointLocation;
+import com.simibubi.create.content.trains.track.ITrackBlock;
+import com.simibubi.create.content.trains.track.TrackBlockEntity;
 import com.simibubi.create.foundation.utility.Couple;
 
 import net.minecraft.core.BlockPos;
@@ -21,7 +23,7 @@ import net.minecraft.world.phys.Vec3;
 public class TrackGraphHelper {
 
 	@Nullable
-	public static GraphLocation getGraphLocationAt(Level level, BlockPos pos, AxisDirection targetDirection,
+	public static TrackGraphLocation getGraphLocationAt(Level level, BlockPos pos, AxisDirection targetDirection,
 		Vec3 targetAxis) {
 		BlockState trackBlockState = level.getBlockState(pos);
 		if (!(trackBlockState.getBlock()instanceof ITrackBlock track))
@@ -49,7 +51,7 @@ public class TrackGraphHelper {
 						.distanceToSqr(axis.scale(-1)) > 1 / 4096f)
 						continue;
 
-					GraphLocation graphLocation = new GraphLocation();
+					TrackGraphLocation graphLocation = new TrackGraphLocation();
 					graphLocation.edge = Couple.create(node.getLocation(), backNode.getLocation());
 					graphLocation.position = 0;
 					graphLocation.graph = graph;
@@ -135,7 +137,7 @@ public class TrackGraphHelper {
 					.getLocation())
 				/ 2.0;
 
-		GraphLocation graphLocation = new GraphLocation();
+		TrackGraphLocation graphLocation = new TrackGraphLocation();
 		graphLocation.edge = Couple.create(backNode.getLocation(), frontNode.getLocation());
 		graphLocation.position = position;
 		graphLocation.graph = graph;
@@ -143,7 +145,7 @@ public class TrackGraphHelper {
 	}
 
 	@Nullable
-	public static GraphLocation getBezierGraphLocationAt(Level level, BlockPos pos, AxisDirection targetDirection,
+	public static TrackGraphLocation getBezierGraphLocationAt(Level level, BlockPos pos, AxisDirection targetDirection,
 		BezierTrackPointLocation targetBezier) {
 		BlockState state = level.getBlockState(pos);
 
@@ -174,7 +176,7 @@ public class TrackGraphHelper {
 			if (edge == null)
 				continue;
 
-			GraphLocation graphLocation = new GraphLocation();
+			TrackGraphLocation graphLocation = new TrackGraphLocation();
 			graphLocation.graph = graph;
 			graphLocation.edge = Couple.create(location, targetLoc);
 			graphLocation.position = (targetBezier.segment() + 1) / 2f;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/GraphLocation.java b/src/main/java/com/simibubi/create/content/trains/graph/TrackGraphLocation.java
similarity index 64%
rename from src/main/java/com/simibubi/create/content/logistics/trains/GraphLocation.java
rename to src/main/java/com/simibubi/create/content/trains/graph/TrackGraphLocation.java
index e64513743..edf6ff213 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/GraphLocation.java
+++ b/src/main/java/com/simibubi/create/content/trains/graph/TrackGraphLocation.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.logistics.trains;
+package com.simibubi.create.content.trains.graph;
 
 import com.simibubi.create.foundation.utility.Couple;
 
-public class GraphLocation {
+public class TrackGraphLocation {
 	
 	public TrackGraph graph;
 	public Couple<TrackNodeLocation> edge;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/TrackGraphPacket.java b/src/main/java/com/simibubi/create/content/trains/graph/TrackGraphPacket.java
similarity index 84%
rename from src/main/java/com/simibubi/create/content/logistics/trains/TrackGraphPacket.java
rename to src/main/java/com/simibubi/create/content/trains/graph/TrackGraphPacket.java
index 8464cc4d8..8a2811761 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/TrackGraphPacket.java
+++ b/src/main/java/com/simibubi/create/content/trains/graph/TrackGraphPacket.java
@@ -1,8 +1,9 @@
-package com.simibubi.create.content.logistics.trains;
+package com.simibubi.create.content.trains.graph;
 
 import java.util.UUID;
 
 import com.simibubi.create.CreateClient;
+import com.simibubi.create.content.trains.GlobalRailwayManager;
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 
 import net.minecraftforge.network.NetworkEvent.Context;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/TrackGraphRequestPacket.java b/src/main/java/com/simibubi/create/content/trains/graph/TrackGraphRequestPacket.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/logistics/trains/TrackGraphRequestPacket.java
rename to src/main/java/com/simibubi/create/content/trains/graph/TrackGraphRequestPacket.java
index 28d13f2f8..982158f19 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/TrackGraphRequestPacket.java
+++ b/src/main/java/com/simibubi/create/content/trains/graph/TrackGraphRequestPacket.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains;
+package com.simibubi.create.content.trains.graph;
 
 import com.simibubi.create.Create;
 import com.simibubi.create.foundation.networking.SimplePacketBase;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/TrackGraphRollCallPacket.java b/src/main/java/com/simibubi/create/content/trains/graph/TrackGraphRollCallPacket.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/logistics/trains/TrackGraphRollCallPacket.java
rename to src/main/java/com/simibubi/create/content/trains/graph/TrackGraphRollCallPacket.java
index 17054efa6..f95e768e2 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/TrackGraphRollCallPacket.java
+++ b/src/main/java/com/simibubi/create/content/trains/graph/TrackGraphRollCallPacket.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains;
+package com.simibubi.create.content.trains.graph;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -8,8 +8,9 @@ import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.Create;
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.content.trains.GlobalRailwayManager;
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 
 import net.minecraft.network.FriendlyByteBuf;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/TrackGraphSync.java b/src/main/java/com/simibubi/create/content/trains/graph/TrackGraphSync.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/logistics/trains/TrackGraphSync.java
rename to src/main/java/com/simibubi/create/content/trains/graph/TrackGraphSync.java
index a82977da8..b9ac69f6a 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/TrackGraphSync.java
+++ b/src/main/java/com/simibubi/create/content/trains/graph/TrackGraphSync.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains;
+package com.simibubi.create.content.trains.graph;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -9,12 +9,11 @@ import java.util.UUID;
 import javax.annotation.Nullable;
 
 import com.google.common.collect.ImmutableList;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.EdgePointType;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.EdgeGroupColor;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.SignalEdgeGroupPacket;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.TrackEdgePoint;
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.content.trains.signal.EdgeGroupColor;
+import com.simibubi.create.content.trains.signal.SignalEdgeGroupPacket;
+import com.simibubi.create.content.trains.signal.TrackEdgePoint;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.Pair;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/TrackGraphSyncPacket.java b/src/main/java/com/simibubi/create/content/trains/graph/TrackGraphSyncPacket.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/trains/TrackGraphSyncPacket.java
rename to src/main/java/com/simibubi/create/content/trains/graph/TrackGraphSyncPacket.java
index 7707db41b..e5cda7b42 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/TrackGraphSyncPacket.java
+++ b/src/main/java/com/simibubi/create/content/trains/graph/TrackGraphSyncPacket.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains;
+package com.simibubi.create.content.trains.graph;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -9,9 +9,10 @@ import java.util.Objects;
 import java.util.UUID;
 
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.EdgeData;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.EdgePointType;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.TrackEdgePoint;
+import com.simibubi.create.content.trains.GlobalRailwayManager;
+import com.simibubi.create.content.trains.signal.TrackEdgePoint;
+import com.simibubi.create.content.trains.track.BezierConnection;
+import com.simibubi.create.content.trains.track.TrackMaterial;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.Pair;
 import com.simibubi.create.foundation.utility.VecHelper;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/TrackGraphVisualizer.java b/src/main/java/com/simibubi/create/content/trains/graph/TrackGraphVisualizer.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/logistics/trains/TrackGraphVisualizer.java
rename to src/main/java/com/simibubi/create/content/trains/graph/TrackGraphVisualizer.java
index d7ed0979c..3083ba5a5 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/TrackGraphVisualizer.java
+++ b/src/main/java/com/simibubi/create/content/trains/graph/TrackGraphVisualizer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains;
+package com.simibubi.create.content.trains.graph;
 
 import java.util.Iterator;
 import java.util.Map;
@@ -10,13 +10,13 @@ import org.lwjgl.glfw.GLFW;
 import com.simibubi.create.AllKeys;
 import com.simibubi.create.Create;
 import com.simibubi.create.CreateClient;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.EdgeData;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.SignalBoundary;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.SignalEdgeGroup;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.TrackEdgePoint;
+import com.simibubi.create.content.trains.signal.SignalBoundary;
+import com.simibubi.create.content.trains.signal.SignalEdgeGroup;
+import com.simibubi.create.content.trains.signal.TrackEdgePoint;
+import com.simibubi.create.content.trains.track.BezierConnection;
+import com.simibubi.create.foundation.outliner.Outliner;
 import com.simibubi.create.foundation.utility.Color;
 import com.simibubi.create.foundation.utility.Pair;
-import com.simibubi.create.foundation.utility.outliner.Outliner;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.world.entity.Entity;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/TrackNode.java b/src/main/java/com/simibubi/create/content/trains/graph/TrackNode.java
similarity index 88%
rename from src/main/java/com/simibubi/create/content/logistics/trains/TrackNode.java
rename to src/main/java/com/simibubi/create/content/trains/graph/TrackNode.java
index 0944aaf64..3fc8312eb 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/TrackNode.java
+++ b/src/main/java/com/simibubi/create/content/trains/graph/TrackNode.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains;
+package com.simibubi.create.content.trains.graph;
 
 import net.minecraft.world.phys.Vec3;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/TrackNodeLocation.java b/src/main/java/com/simibubi/create/content/trains/graph/TrackNodeLocation.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/logistics/trains/TrackNodeLocation.java
rename to src/main/java/com/simibubi/create/content/trains/graph/TrackNodeLocation.java
index d0e0a487b..868bbc77c 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/TrackNodeLocation.java
+++ b/src/main/java/com/simibubi/create/content/trains/graph/TrackNodeLocation.java
@@ -1,10 +1,12 @@
-package com.simibubi.create.content.logistics.trains;
+package com.simibubi.create.content.trains.graph;
 
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
 
+import com.simibubi.create.content.trains.track.BezierConnection;
+import com.simibubi.create.content.trains.track.TrackMaterial;
 import com.simibubi.create.foundation.utility.Iterate;
 
 import net.minecraft.core.BlockPos;
@@ -203,6 +205,10 @@ public class TrackNodeLocation extends Vec3i {
 				&& Math.max(direction.dot(this.direction), direction.dot(this.direction.scale(-1))) < 7 / 8f;
 		}
 
+		public Vec3 getDirection() {
+			return direction;
+		}
+
 	}
 
 }
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/observer/TrackObserver.java b/src/main/java/com/simibubi/create/content/trains/observer/TrackObserver.java
similarity index 81%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/observer/TrackObserver.java
rename to src/main/java/com/simibubi/create/content/trains/observer/TrackObserver.java
index 18b706d67..fb599f296 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/observer/TrackObserver.java
+++ b/src/main/java/com/simibubi/create/content/trains/observer/TrackObserver.java
@@ -1,15 +1,15 @@
-package com.simibubi.create.content.logistics.trains.management.edgePoint.observer;
+package com.simibubi.create.content.trains.observer;
 
 import java.util.UUID;
 
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.trains.DimensionPalette;
-import com.simibubi.create.content.logistics.trains.TrackEdge;
-import com.simibubi.create.content.logistics.trains.TrackGraph;
-import com.simibubi.create.content.logistics.trains.entity.Train;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.SignalPropagator;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.SingleBlockEntityEdgePoint;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.trains.entity.Train;
+import com.simibubi.create.content.trains.graph.DimensionPalette;
+import com.simibubi.create.content.trains.graph.TrackEdge;
+import com.simibubi.create.content.trains.graph.TrackGraph;
+import com.simibubi.create.content.trains.signal.SignalPropagator;
+import com.simibubi.create.content.trains.signal.SingleBlockEntityEdgePoint;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour;
 
 import net.minecraft.nbt.CompoundTag;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/observer/TrackObserverBlock.java b/src/main/java/com/simibubi/create/content/trains/observer/TrackObserverBlock.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/observer/TrackObserverBlock.java
rename to src/main/java/com/simibubi/create/content/trains/observer/TrackObserverBlock.java
index 809d752ab..efc99dc27 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/observer/TrackObserverBlock.java
+++ b/src/main/java/com/simibubi/create/content/trains/observer/TrackObserverBlock.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.content.logistics.trains.management.edgePoint.observer;
+package com.simibubi.create.content.trains.observer;
 
 import com.simibubi.create.AllBlockEntityTypes;
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
 import com.simibubi.create.foundation.block.IBE;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/observer/TrackObserverBlockEntity.java b/src/main/java/com/simibubi/create/content/trains/observer/TrackObserverBlockEntity.java
similarity index 83%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/observer/TrackObserverBlockEntity.java
rename to src/main/java/com/simibubi/create/content/trains/observer/TrackObserverBlockEntity.java
index 5138c0a2b..48e01b499 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/observer/TrackObserverBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/trains/observer/TrackObserverBlockEntity.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.management.edgePoint.observer;
+package com.simibubi.create.content.trains.observer;
 
 import java.util.List;
 
@@ -6,13 +6,13 @@ import javax.annotation.Nullable;
 
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.simibubi.create.content.contraptions.components.structureMovement.ITransformableBlockEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.StructureTransform;
-import com.simibubi.create.content.logistics.block.display.DisplayLinkBlock;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.EdgePointType;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.TrackTargetingBehaviour;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.contraptions.ITransformableBlockEntity;
+import com.simibubi.create.content.contraptions.StructureTransform;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkBlock;
+import com.simibubi.create.content.trains.graph.EdgePointType;
+import com.simibubi.create.content.trains.track.TrackTargetingBehaviour;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform;
 import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour;
 import com.simibubi.create.foundation.utility.Lang;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/observer/TrackObserverRenderer.java b/src/main/java/com/simibubi/create/content/trains/observer/TrackObserverRenderer.java
similarity index 80%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/observer/TrackObserverRenderer.java
rename to src/main/java/com/simibubi/create/content/trains/observer/TrackObserverRenderer.java
index 305d2ba91..f55302396 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/observer/TrackObserverRenderer.java
+++ b/src/main/java/com/simibubi/create/content/trains/observer/TrackObserverRenderer.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.logistics.trains.management.edgePoint.observer;
+package com.simibubi.create.content.trains.observer;
 
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.simibubi.create.content.logistics.trains.ITrackBlock;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.TrackTargetingBehaviour;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.TrackTargetingBehaviour.RenderedTrackOverlayType;
+import com.simibubi.create.content.trains.track.ITrackBlock;
+import com.simibubi.create.content.trains.track.TrackTargetingBehaviour;
+import com.simibubi.create.content.trains.track.TrackTargetingBehaviour.RenderedTrackOverlayType;
 import com.simibubi.create.foundation.blockEntity.renderer.SmartBlockEntityRenderer;
 
 import net.minecraft.client.renderer.MultiBufferSource;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/DestinationSuggestions.java b/src/main/java/com/simibubi/create/content/trains/schedule/DestinationSuggestions.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/DestinationSuggestions.java
rename to src/main/java/com/simibubi/create/content/trains/schedule/DestinationSuggestions.java
index 43ff18a2b..bbcbf0f63 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/DestinationSuggestions.java
+++ b/src/main/java/com/simibubi/create/content/trains/schedule/DestinationSuggestions.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.management.schedule;
+package com.simibubi.create.content.trains.schedule;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/IScheduleInput.java b/src/main/java/com/simibubi/create/content/trains/schedule/IScheduleInput.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/IScheduleInput.java
rename to src/main/java/com/simibubi/create/content/trains/schedule/IScheduleInput.java
index 41392f608..5e0faf255 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/IScheduleInput.java
+++ b/src/main/java/com/simibubi/create/content/trains/schedule/IScheduleInput.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.management.schedule;
+package com.simibubi.create.content.trains.schedule;
 
 import java.util.List;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/Schedule.java b/src/main/java/com/simibubi/create/content/trains/schedule/Schedule.java
similarity index 66%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/Schedule.java
rename to src/main/java/com/simibubi/create/content/trains/schedule/Schedule.java
index f27ea2f9c..b23680b57 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/Schedule.java
+++ b/src/main/java/com/simibubi/create/content/trains/schedule/Schedule.java
@@ -1,24 +1,24 @@
-package com.simibubi.create.content.logistics.trains.management.schedule;
+package com.simibubi.create.content.trains.schedule;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Supplier;
 
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.trains.management.schedule.condition.FluidThresholdCondition;
-import com.simibubi.create.content.logistics.trains.management.schedule.condition.IdleCargoCondition;
-import com.simibubi.create.content.logistics.trains.management.schedule.condition.ItemThresholdCondition;
-import com.simibubi.create.content.logistics.trains.management.schedule.condition.PlayerPassengerCondition;
-import com.simibubi.create.content.logistics.trains.management.schedule.condition.RedstoneLinkCondition;
-import com.simibubi.create.content.logistics.trains.management.schedule.condition.ScheduleWaitCondition;
-import com.simibubi.create.content.logistics.trains.management.schedule.condition.ScheduledDelay;
-import com.simibubi.create.content.logistics.trains.management.schedule.condition.StationPoweredCondition;
-import com.simibubi.create.content.logistics.trains.management.schedule.condition.StationUnloadedCondition;
-import com.simibubi.create.content.logistics.trains.management.schedule.condition.TimeOfDayCondition;
-import com.simibubi.create.content.logistics.trains.management.schedule.destination.ChangeThrottleInstruction;
-import com.simibubi.create.content.logistics.trains.management.schedule.destination.ChangeTitleInstruction;
-import com.simibubi.create.content.logistics.trains.management.schedule.destination.DestinationInstruction;
-import com.simibubi.create.content.logistics.trains.management.schedule.destination.ScheduleInstruction;
+import com.simibubi.create.content.trains.schedule.condition.FluidThresholdCondition;
+import com.simibubi.create.content.trains.schedule.condition.IdleCargoCondition;
+import com.simibubi.create.content.trains.schedule.condition.ItemThresholdCondition;
+import com.simibubi.create.content.trains.schedule.condition.PlayerPassengerCondition;
+import com.simibubi.create.content.trains.schedule.condition.RedstoneLinkCondition;
+import com.simibubi.create.content.trains.schedule.condition.ScheduleWaitCondition;
+import com.simibubi.create.content.trains.schedule.condition.ScheduledDelay;
+import com.simibubi.create.content.trains.schedule.condition.StationPoweredCondition;
+import com.simibubi.create.content.trains.schedule.condition.StationUnloadedCondition;
+import com.simibubi.create.content.trains.schedule.condition.TimeOfDayCondition;
+import com.simibubi.create.content.trains.schedule.destination.ChangeThrottleInstruction;
+import com.simibubi.create.content.trains.schedule.destination.ChangeTitleInstruction;
+import com.simibubi.create.content.trains.schedule.destination.DestinationInstruction;
+import com.simibubi.create.content.trains.schedule.destination.ScheduleInstruction;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.NBTHelper;
 import com.simibubi.create.foundation.utility.Pair;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/ScheduleDataEntry.java b/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleDataEntry.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/ScheduleDataEntry.java
rename to src/main/java/com/simibubi/create/content/trains/schedule/ScheduleDataEntry.java
index c2c7144c7..4712df960 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/ScheduleDataEntry.java
+++ b/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleDataEntry.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.management.schedule;
+package com.simibubi.create.content.trains.schedule;
 
 import net.minecraft.nbt.CompoundTag;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/ScheduleEditPacket.java b/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleEditPacket.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/ScheduleEditPacket.java
rename to src/main/java/com/simibubi/create/content/trains/schedule/ScheduleEditPacket.java
index 3b74e6c01..33c062af9 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/ScheduleEditPacket.java
+++ b/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleEditPacket.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.management.schedule;
+package com.simibubi.create.content.trains.schedule;
 
 import com.simibubi.create.AllItems;
 import com.simibubi.create.foundation.networking.SimplePacketBase;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/ScheduleEntry.java b/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleEntry.java
similarity index 82%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/ScheduleEntry.java
rename to src/main/java/com/simibubi/create/content/trains/schedule/ScheduleEntry.java
index 1aeefc729..44e7cf2d8 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/ScheduleEntry.java
+++ b/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleEntry.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.logistics.trains.management.schedule;
+package com.simibubi.create.content.trains.schedule;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.simibubi.create.content.logistics.trains.management.schedule.condition.ScheduleWaitCondition;
-import com.simibubi.create.content.logistics.trains.management.schedule.destination.ScheduleInstruction;
+import com.simibubi.create.content.trains.schedule.condition.ScheduleWaitCondition;
+import com.simibubi.create.content.trains.schedule.destination.ScheduleInstruction;
 import com.simibubi.create.foundation.utility.NBTHelper;
 
 import net.minecraft.nbt.CompoundTag;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/ScheduleItem.java b/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleItem.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/ScheduleItem.java
rename to src/main/java/com/simibubi/create/content/trains/schedule/ScheduleItem.java
index 895186366..6d9240fe8 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/ScheduleItem.java
+++ b/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleItem.java
@@ -1,14 +1,14 @@
-package com.simibubi.create.content.logistics.trains.management.schedule;
+package com.simibubi.create.content.trains.schedule;
 
 import java.util.List;
 
 import com.simibubi.create.AllMenuTypes;
 import com.simibubi.create.AllSoundEvents;
-import com.simibubi.create.content.contraptions.components.structureMovement.Contraption;
-import com.simibubi.create.content.logistics.trains.entity.CarriageContraption;
-import com.simibubi.create.content.logistics.trains.entity.CarriageContraptionEntity;
-import com.simibubi.create.content.logistics.trains.entity.Train;
-import com.simibubi.create.content.logistics.trains.management.schedule.destination.DestinationInstruction;
+import com.simibubi.create.content.contraptions.Contraption;
+import com.simibubi.create.content.trains.entity.CarriageContraption;
+import com.simibubi.create.content.trains.entity.CarriageContraptionEntity;
+import com.simibubi.create.content.trains.entity.Train;
+import com.simibubi.create.content.trains.schedule.destination.DestinationInstruction;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Couple;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/ScheduleItemEntityInteraction.java b/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleItemEntityInteraction.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/ScheduleItemEntityInteraction.java
rename to src/main/java/com/simibubi/create/content/trains/schedule/ScheduleItemEntityInteraction.java
index f2ba64612..11b067933 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/ScheduleItemEntityInteraction.java
+++ b/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleItemEntityInteraction.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.logistics.trains.management.schedule;
+package com.simibubi.create.content.trains.schedule;
 
 import com.simibubi.create.AllItems;
 import com.simibubi.create.AllSoundEvents;
-import com.simibubi.create.content.contraptions.components.structureMovement.Contraption;
-import com.simibubi.create.content.logistics.trains.entity.CarriageContraption;
-import com.simibubi.create.content.logistics.trains.entity.CarriageContraptionEntity;
-import com.simibubi.create.content.logistics.trains.entity.Train;
+import com.simibubi.create.content.contraptions.Contraption;
+import com.simibubi.create.content.trains.entity.CarriageContraption;
+import com.simibubi.create.content.trains.entity.CarriageContraptionEntity;
+import com.simibubi.create.content.trains.entity.Train;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.Lang;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/ScheduleMenu.java b/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleMenu.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/ScheduleMenu.java
rename to src/main/java/com/simibubi/create/content/trains/schedule/ScheduleMenu.java
index a55ca4a1b..14585c6cb 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/ScheduleMenu.java
+++ b/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleMenu.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.management.schedule;
+package com.simibubi.create.content.trains.schedule;
 
 import com.simibubi.create.foundation.gui.menu.GhostItemMenu;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/ScheduleRuntime.java b/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleRuntime.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/ScheduleRuntime.java
rename to src/main/java/com/simibubi/create/content/trains/schedule/ScheduleRuntime.java
index f7bc8a340..5147edf96 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/ScheduleRuntime.java
+++ b/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleRuntime.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.management.schedule;
+package com.simibubi.create.content.trains.schedule;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -6,17 +6,17 @@ import java.util.List;
 import java.util.Objects;
 
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.logistics.trains.entity.Carriage;
-import com.simibubi.create.content.logistics.trains.entity.Train;
-import com.simibubi.create.content.logistics.trains.management.display.GlobalTrainDisplayData.TrainDeparturePrediction;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.EdgePointType;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.station.GlobalStation;
-import com.simibubi.create.content.logistics.trains.management.schedule.condition.ScheduleWaitCondition;
-import com.simibubi.create.content.logistics.trains.management.schedule.condition.ScheduledDelay;
-import com.simibubi.create.content.logistics.trains.management.schedule.destination.ChangeThrottleInstruction;
-import com.simibubi.create.content.logistics.trains.management.schedule.destination.ChangeTitleInstruction;
-import com.simibubi.create.content.logistics.trains.management.schedule.destination.DestinationInstruction;
-import com.simibubi.create.content.logistics.trains.management.schedule.destination.ScheduleInstruction;
+import com.simibubi.create.content.trains.display.GlobalTrainDisplayData.TrainDeparturePrediction;
+import com.simibubi.create.content.trains.entity.Carriage;
+import com.simibubi.create.content.trains.entity.Train;
+import com.simibubi.create.content.trains.graph.EdgePointType;
+import com.simibubi.create.content.trains.schedule.condition.ScheduleWaitCondition;
+import com.simibubi.create.content.trains.schedule.condition.ScheduledDelay;
+import com.simibubi.create.content.trains.schedule.destination.ChangeThrottleInstruction;
+import com.simibubi.create.content.trains.schedule.destination.ChangeTitleInstruction;
+import com.simibubi.create.content.trains.schedule.destination.DestinationInstruction;
+import com.simibubi.create.content.trains.schedule.destination.ScheduleInstruction;
+import com.simibubi.create.content.trains.station.GlobalStation;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.NBTHelper;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/ScheduleScreen.java b/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleScreen.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/ScheduleScreen.java
rename to src/main/java/com/simibubi/create/content/trains/schedule/ScheduleScreen.java
index 1009c0ab2..2cf2e2a16 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/ScheduleScreen.java
+++ b/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleScreen.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.management.schedule;
+package com.simibubi.create.content.trains.schedule;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -18,15 +18,16 @@ import com.mojang.blaze3d.platform.InputConstants;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Matrix4f;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.trains.GlobalRailwayManager;
-import com.simibubi.create.content.logistics.trains.TrackGraph;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.EdgePointType;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.station.GlobalStation;
-import com.simibubi.create.content.logistics.trains.management.schedule.condition.ScheduleWaitCondition;
-import com.simibubi.create.content.logistics.trains.management.schedule.condition.ScheduledDelay;
-import com.simibubi.create.content.logistics.trains.management.schedule.destination.DestinationInstruction;
-import com.simibubi.create.content.logistics.trains.management.schedule.destination.ScheduleInstruction;
+import com.simibubi.create.content.trains.GlobalRailwayManager;
+import com.simibubi.create.content.trains.graph.EdgePointType;
+import com.simibubi.create.content.trains.graph.TrackGraph;
+import com.simibubi.create.content.trains.schedule.condition.ScheduleWaitCondition;
+import com.simibubi.create.content.trains.schedule.condition.ScheduledDelay;
+import com.simibubi.create.content.trains.schedule.destination.DestinationInstruction;
+import com.simibubi.create.content.trains.schedule.destination.ScheduleInstruction;
+import com.simibubi.create.content.trains.station.GlobalStation;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
 import com.simibubi.create.foundation.gui.AllIcons;
 import com.simibubi.create.foundation.gui.ModularGuiLine;
@@ -40,7 +41,6 @@ import com.simibubi.create.foundation.gui.widget.Indicator;
 import com.simibubi.create.foundation.gui.widget.Indicator.State;
 import com.simibubi.create.foundation.gui.widget.Label;
 import com.simibubi.create.foundation.gui.widget.SelectionScrollInput;
-import com.simibubi.create.foundation.networking.AllPackets;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.IntAttached;
 import com.simibubi.create.foundation.utility.Lang;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/TrainHatArmorLayer.java b/src/main/java/com/simibubi/create/content/trains/schedule/TrainHatArmorLayer.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/TrainHatArmorLayer.java
rename to src/main/java/com/simibubi/create/content/trains/schedule/TrainHatArmorLayer.java
index 8f0fa650d..6bd8c4a02 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/TrainHatArmorLayer.java
+++ b/src/main/java/com/simibubi/create/content/trains/schedule/TrainHatArmorLayer.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.logistics.trains.management.schedule;
+package com.simibubi.create.content.trains.schedule;
 
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.components.structureMovement.Contraption;
-import com.simibubi.create.content.logistics.trains.entity.CarriageContraption;
-import com.simibubi.create.content.logistics.trains.entity.CarriageContraptionEntity;
+import com.simibubi.create.content.contraptions.Contraption;
+import com.simibubi.create.content.trains.entity.CarriageContraption;
+import com.simibubi.create.content.trains.entity.CarriageContraptionEntity;
 import com.simibubi.create.foundation.mixin.accessor.AgeableListModelAccessor;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.utility.Couple;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/TrainHatOffsets.java b/src/main/java/com/simibubi/create/content/trains/schedule/TrainHatOffsets.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/TrainHatOffsets.java
rename to src/main/java/com/simibubi/create/content/trains/schedule/TrainHatOffsets.java
index a98383e95..772156ac7 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/TrainHatOffsets.java
+++ b/src/main/java/com/simibubi/create/content/trains/schedule/TrainHatOffsets.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.management.schedule;
+package com.simibubi.create.content.trains.schedule;
 
 import net.minecraft.client.model.AgeableListModel;
 import net.minecraft.client.model.AxolotlModel;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/CargoThresholdCondition.java b/src/main/java/com/simibubi/create/content/trains/schedule/condition/CargoThresholdCondition.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/CargoThresholdCondition.java
rename to src/main/java/com/simibubi/create/content/trains/schedule/condition/CargoThresholdCondition.java
index 75b1f0a07..337d732f0 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/CargoThresholdCondition.java
+++ b/src/main/java/com/simibubi/create/content/trains/schedule/condition/CargoThresholdCondition.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.logistics.trains.management.schedule.condition;
+package com.simibubi.create.content.trains.schedule.condition;
 
 import java.util.Arrays;
 import java.util.List;
 
 import com.google.common.collect.ImmutableList;
-import com.simibubi.create.content.logistics.trains.entity.Carriage;
-import com.simibubi.create.content.logistics.trains.entity.Train;
+import com.simibubi.create.content.trains.entity.Carriage;
+import com.simibubi.create.content.trains.entity.Train;
 import com.simibubi.create.foundation.gui.ModularGuiLineBuilder;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Lang;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/FluidThresholdCondition.java b/src/main/java/com/simibubi/create/content/trains/schedule/condition/FluidThresholdCondition.java
similarity index 88%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/FluidThresholdCondition.java
rename to src/main/java/com/simibubi/create/content/trains/schedule/condition/FluidThresholdCondition.java
index f9ab12a18..6fedc7789 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/FluidThresholdCondition.java
+++ b/src/main/java/com/simibubi/create/content/trains/schedule/condition/FluidThresholdCondition.java
@@ -1,13 +1,13 @@
-package com.simibubi.create.content.logistics.trains.management.schedule.condition;
+package com.simibubi.create.content.trains.schedule.condition;
 
 import java.util.List;
 
 import com.google.common.collect.ImmutableList;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.contraptions.processing.EmptyingByBasin;
-import com.simibubi.create.content.logistics.item.filter.FilterItem;
-import com.simibubi.create.content.logistics.trains.entity.Carriage;
-import com.simibubi.create.content.logistics.trains.entity.Train;
+import com.simibubi.create.content.fluids.transfer.GenericItemEmptying;
+import com.simibubi.create.content.logistics.filter.FilterItem;
+import com.simibubi.create.content.trains.entity.Carriage;
+import com.simibubi.create.content.trains.entity.Train;
 import com.simibubi.create.foundation.gui.ModularGuiLineBuilder;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Lang;
@@ -82,9 +82,9 @@ public class FluidThresholdCondition extends CargoThresholdCondition {
 		if (fluidStack != null)
 			return fluidStack;
 		fluidStack = FluidStack.EMPTY;
-		if (!EmptyingByBasin.canItemBeEmptied(Minecraft.getInstance().level, compareStack))
+		if (!GenericItemEmptying.canItemBeEmptied(Minecraft.getInstance().level, compareStack))
 			return fluidStack;
-		FluidStack fluidInFilter = EmptyingByBasin.emptyItem(Minecraft.getInstance().level, compareStack, true)
+		FluidStack fluidInFilter = GenericItemEmptying.emptyItem(Minecraft.getInstance().level, compareStack, true)
 			.getFirst();
 		if (fluidInFilter == null)
 			return fluidStack;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/IdleCargoCondition.java b/src/main/java/com/simibubi/create/content/trains/schedule/condition/IdleCargoCondition.java
similarity index 82%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/IdleCargoCondition.java
rename to src/main/java/com/simibubi/create/content/trains/schedule/condition/IdleCargoCondition.java
index d4801c0ca..dc7bfcc54 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/IdleCargoCondition.java
+++ b/src/main/java/com/simibubi/create/content/trains/schedule/condition/IdleCargoCondition.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.logistics.trains.management.schedule.condition;
+package com.simibubi.create.content.trains.schedule.condition;
 
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.trains.entity.Carriage;
-import com.simibubi.create.content.logistics.trains.entity.Train;
+import com.simibubi.create.content.trains.entity.Carriage;
+import com.simibubi.create.content.trains.entity.Train;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.Pair;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/ItemThresholdCondition.java b/src/main/java/com/simibubi/create/content/trains/schedule/condition/ItemThresholdCondition.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/ItemThresholdCondition.java
rename to src/main/java/com/simibubi/create/content/trains/schedule/condition/ItemThresholdCondition.java
index 81122ad73..8b71e2344 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/ItemThresholdCondition.java
+++ b/src/main/java/com/simibubi/create/content/trains/schedule/condition/ItemThresholdCondition.java
@@ -1,12 +1,12 @@
-package com.simibubi.create.content.logistics.trains.management.schedule.condition;
+package com.simibubi.create.content.trains.schedule.condition;
 
 import java.util.List;
 
 import com.google.common.collect.ImmutableList;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.item.filter.FilterItem;
-import com.simibubi.create.content.logistics.trains.entity.Carriage;
-import com.simibubi.create.content.logistics.trains.entity.Train;
+import com.simibubi.create.content.logistics.filter.FilterItem;
+import com.simibubi.create.content.trains.entity.Carriage;
+import com.simibubi.create.content.trains.entity.Train;
 import com.simibubi.create.foundation.gui.ModularGuiLineBuilder;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Lang;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/LazyTickedScheduleCondition.java b/src/main/java/com/simibubi/create/content/trains/schedule/condition/LazyTickedScheduleCondition.java
similarity index 81%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/LazyTickedScheduleCondition.java
rename to src/main/java/com/simibubi/create/content/trains/schedule/condition/LazyTickedScheduleCondition.java
index ce17a254a..6d2bce181 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/LazyTickedScheduleCondition.java
+++ b/src/main/java/com/simibubi/create/content/trains/schedule/condition/LazyTickedScheduleCondition.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.logistics.trains.management.schedule.condition;
+package com.simibubi.create.content.trains.schedule.condition;
 
-import com.simibubi.create.content.logistics.trains.entity.Train;
+import com.simibubi.create.content.trains.entity.Train;
 
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.level.Level;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/PlayerPassengerCondition.java b/src/main/java/com/simibubi/create/content/trains/schedule/condition/PlayerPassengerCondition.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/PlayerPassengerCondition.java
rename to src/main/java/com/simibubi/create/content/trains/schedule/condition/PlayerPassengerCondition.java
index b94d7c051..37cccce41 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/PlayerPassengerCondition.java
+++ b/src/main/java/com/simibubi/create/content/trains/schedule/condition/PlayerPassengerCondition.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.logistics.trains.management.schedule.condition;
+package com.simibubi.create.content.trains.schedule.condition;
 
 import java.util.List;
 
 import com.google.common.collect.ImmutableList;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.trains.entity.Train;
+import com.simibubi.create.content.trains.entity.Train;
 import com.simibubi.create.foundation.gui.ModularGuiLineBuilder;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Lang;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/RedstoneLinkCondition.java b/src/main/java/com/simibubi/create/content/trains/schedule/condition/RedstoneLinkCondition.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/RedstoneLinkCondition.java
rename to src/main/java/com/simibubi/create/content/trains/schedule/condition/RedstoneLinkCondition.java
index 896c9a23f..87b07f6e8 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/RedstoneLinkCondition.java
+++ b/src/main/java/com/simibubi/create/content/trains/schedule/condition/RedstoneLinkCondition.java
@@ -1,12 +1,12 @@
-package com.simibubi.create.content.logistics.trains.management.schedule.condition;
+package com.simibubi.create.content.trains.schedule.condition;
 
 import java.util.List;
 
 import com.google.common.collect.ImmutableList;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.RedstoneLinkNetworkHandler.Frequency;
-import com.simibubi.create.content.logistics.trains.entity.Train;
+import com.simibubi.create.content.redstone.link.RedstoneLinkNetworkHandler.Frequency;
+import com.simibubi.create.content.trains.entity.Train;
 import com.simibubi.create.foundation.gui.ModularGuiLineBuilder;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Couple;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/ScheduleWaitCondition.java b/src/main/java/com/simibubi/create/content/trains/schedule/condition/ScheduleWaitCondition.java
similarity index 84%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/ScheduleWaitCondition.java
rename to src/main/java/com/simibubi/create/content/trains/schedule/condition/ScheduleWaitCondition.java
index 7da150cce..e36d5de68 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/ScheduleWaitCondition.java
+++ b/src/main/java/com/simibubi/create/content/trains/schedule/condition/ScheduleWaitCondition.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.logistics.trains.management.schedule.condition;
+package com.simibubi.create.content.trains.schedule.condition;
 
 import java.util.function.Supplier;
 
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.trains.entity.Train;
-import com.simibubi.create.content.logistics.trains.management.schedule.Schedule;
-import com.simibubi.create.content.logistics.trains.management.schedule.ScheduleDataEntry;
+import com.simibubi.create.content.trains.entity.Train;
+import com.simibubi.create.content.trains.schedule.Schedule;
+import com.simibubi.create.content.trains.schedule.ScheduleDataEntry;
 import com.simibubi.create.foundation.utility.Pair;
 
 import net.minecraft.nbt.CompoundTag;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/ScheduledDelay.java b/src/main/java/com/simibubi/create/content/trains/schedule/condition/ScheduledDelay.java
similarity index 86%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/ScheduledDelay.java
rename to src/main/java/com/simibubi/create/content/trains/schedule/condition/ScheduledDelay.java
index 2b6b9cd15..87de19b40 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/ScheduledDelay.java
+++ b/src/main/java/com/simibubi/create/content/trains/schedule/condition/ScheduledDelay.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.content.logistics.trains.management.schedule.condition;
+package com.simibubi.create.content.trains.schedule.condition;
 
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.trains.entity.Train;
+import com.simibubi.create.content.trains.entity.Train;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.Pair;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/StationPoweredCondition.java b/src/main/java/com/simibubi/create/content/trains/schedule/condition/StationPoweredCondition.java
similarity index 88%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/StationPoweredCondition.java
rename to src/main/java/com/simibubi/create/content/trains/schedule/condition/StationPoweredCondition.java
index 708b4b563..c4ae0447b 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/StationPoweredCondition.java
+++ b/src/main/java/com/simibubi/create/content/trains/schedule/condition/StationPoweredCondition.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.logistics.trains.management.schedule.condition;
+package com.simibubi.create.content.trains.schedule.condition;
 
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.trains.entity.Train;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.station.GlobalStation;
+import com.simibubi.create.content.trains.entity.Train;
+import com.simibubi.create.content.trains.station.GlobalStation;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.Pair;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/StationUnloadedCondition.java b/src/main/java/com/simibubi/create/content/trains/schedule/condition/StationUnloadedCondition.java
similarity index 87%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/StationUnloadedCondition.java
rename to src/main/java/com/simibubi/create/content/trains/schedule/condition/StationUnloadedCondition.java
index 8b36e7328..ec957edd1 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/StationUnloadedCondition.java
+++ b/src/main/java/com/simibubi/create/content/trains/schedule/condition/StationUnloadedCondition.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.content.logistics.trains.management.schedule.condition;
+package com.simibubi.create.content.trains.schedule.condition;
 
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.trains.entity.Train;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.station.GlobalStation;
+import com.simibubi.create.content.trains.entity.Train;
+import com.simibubi.create.content.trains.station.GlobalStation;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.Pair;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/TimeOfDayCondition.java b/src/main/java/com/simibubi/create/content/trains/schedule/condition/TimeOfDayCondition.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/TimeOfDayCondition.java
rename to src/main/java/com/simibubi/create/content/trains/schedule/condition/TimeOfDayCondition.java
index 9d0a10b0a..1596b57f0 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/TimeOfDayCondition.java
+++ b/src/main/java/com/simibubi/create/content/trains/schedule/condition/TimeOfDayCondition.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.management.schedule.condition;
+package com.simibubi.create.content.trains.schedule.condition;
 
 import java.util.List;
 
@@ -8,7 +8,7 @@ import com.google.common.collect.ImmutableList;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.trains.entity.Train;
+import com.simibubi.create.content.trains.entity.Train;
 import com.simibubi.create.foundation.gui.ModularGuiLineBuilder;
 import com.simibubi.create.foundation.gui.widget.Label;
 import com.simibubi.create.foundation.gui.widget.ScrollInput;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/TimedWaitCondition.java b/src/main/java/com/simibubi/create/content/trains/schedule/condition/TimedWaitCondition.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/TimedWaitCondition.java
rename to src/main/java/com/simibubi/create/content/trains/schedule/condition/TimedWaitCondition.java
index 489d24e51..996d28352 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/TimedWaitCondition.java
+++ b/src/main/java/com/simibubi/create/content/trains/schedule/condition/TimedWaitCondition.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.logistics.trains.management.schedule.condition;
+package com.simibubi.create.content.trains.schedule.condition;
 
 import java.util.List;
 
 import com.google.common.collect.ImmutableList;
-import com.simibubi.create.content.logistics.trains.entity.Train;
+import com.simibubi.create.content.trains.entity.Train;
 import com.simibubi.create.foundation.gui.ModularGuiLineBuilder;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Lang;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/destination/ChangeThrottleInstruction.java b/src/main/java/com/simibubi/create/content/trains/schedule/destination/ChangeThrottleInstruction.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/destination/ChangeThrottleInstruction.java
rename to src/main/java/com/simibubi/create/content/trains/schedule/destination/ChangeThrottleInstruction.java
index f1941136d..1fd5a7f70 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/destination/ChangeThrottleInstruction.java
+++ b/src/main/java/com/simibubi/create/content/trains/schedule/destination/ChangeThrottleInstruction.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.management.schedule.destination;
+package com.simibubi.create.content.trains.schedule.destination;
 
 import java.util.List;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/destination/ChangeTitleInstruction.java b/src/main/java/com/simibubi/create/content/trains/schedule/destination/ChangeTitleInstruction.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/destination/ChangeTitleInstruction.java
rename to src/main/java/com/simibubi/create/content/trains/schedule/destination/ChangeTitleInstruction.java
index 92419fc59..2265014f1 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/destination/ChangeTitleInstruction.java
+++ b/src/main/java/com/simibubi/create/content/trains/schedule/destination/ChangeTitleInstruction.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.management.schedule.destination;
+package com.simibubi.create.content.trains.schedule.destination;
 
 import java.util.List;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/destination/DestinationInstruction.java b/src/main/java/com/simibubi/create/content/trains/schedule/destination/DestinationInstruction.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/destination/DestinationInstruction.java
rename to src/main/java/com/simibubi/create/content/trains/schedule/destination/DestinationInstruction.java
index d3b15cd41..ada430049 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/destination/DestinationInstruction.java
+++ b/src/main/java/com/simibubi/create/content/trains/schedule/destination/DestinationInstruction.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.management.schedule.destination;
+package com.simibubi.create.content.trains.schedule.destination;
 
 import java.util.List;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/destination/ScheduleInstruction.java b/src/main/java/com/simibubi/create/content/trains/schedule/destination/ScheduleInstruction.java
similarity index 84%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/destination/ScheduleInstruction.java
rename to src/main/java/com/simibubi/create/content/trains/schedule/destination/ScheduleInstruction.java
index 6e1e56354..2dd9571ca 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/destination/ScheduleInstruction.java
+++ b/src/main/java/com/simibubi/create/content/trains/schedule/destination/ScheduleInstruction.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.content.logistics.trains.management.schedule.destination;
+package com.simibubi.create.content.trains.schedule.destination;
 
 import java.util.function.Supplier;
 
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.trains.management.schedule.Schedule;
-import com.simibubi.create.content.logistics.trains.management.schedule.ScheduleDataEntry;
+import com.simibubi.create.content.trains.schedule.Schedule;
+import com.simibubi.create.content.trains.schedule.ScheduleDataEntry;
 import com.simibubi.create.foundation.utility.Pair;
 
 import net.minecraft.nbt.CompoundTag;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/destination/TextScheduleInstruction.java b/src/main/java/com/simibubi/create/content/trains/schedule/destination/TextScheduleInstruction.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/destination/TextScheduleInstruction.java
rename to src/main/java/com/simibubi/create/content/trains/schedule/destination/TextScheduleInstruction.java
index 42abcbf11..c18ca2702 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/destination/TextScheduleInstruction.java
+++ b/src/main/java/com/simibubi/create/content/trains/schedule/destination/TextScheduleInstruction.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.management.schedule.destination;
+package com.simibubi.create.content.trains.schedule.destination;
 
 import java.util.List;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/signal/EdgeGroupColor.java b/src/main/java/com/simibubi/create/content/trains/signal/EdgeGroupColor.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/signal/EdgeGroupColor.java
rename to src/main/java/com/simibubi/create/content/trains/signal/EdgeGroupColor.java
index 6c0161ec1..6d3d4c1f0 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/signal/EdgeGroupColor.java
+++ b/src/main/java/com/simibubi/create/content/trains/signal/EdgeGroupColor.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.management.edgePoint.signal;
+package com.simibubi.create.content.trains.signal;
 
 import com.simibubi.create.foundation.utility.Color;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/signal/SignalBlock.java b/src/main/java/com/simibubi/create/content/trains/signal/SignalBlock.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/signal/SignalBlock.java
rename to src/main/java/com/simibubi/create/content/trains/signal/SignalBlock.java
index d6c9baa44..eca416bb9 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/signal/SignalBlock.java
+++ b/src/main/java/com/simibubi/create/content/trains/signal/SignalBlock.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.content.logistics.trains.management.edgePoint.signal;
+package com.simibubi.create.content.trains.signal;
 
 import javax.annotation.Nullable;
 
 import com.simibubi.create.AllBlockEntityTypes;
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
 import com.simibubi.create.foundation.block.IBE;
 import com.simibubi.create.foundation.utility.Lang;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/signal/SignalBlockEntity.java b/src/main/java/com/simibubi/create/content/trains/signal/SignalBlockEntity.java
similarity index 86%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/signal/SignalBlockEntity.java
rename to src/main/java/com/simibubi/create/content/trains/signal/SignalBlockEntity.java
index 6c8e31210..bfae67e6f 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/signal/SignalBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/trains/signal/SignalBlockEntity.java
@@ -1,16 +1,16 @@
-package com.simibubi.create.content.logistics.trains.management.edgePoint.signal;
+package com.simibubi.create.content.trains.signal;
 
 import java.util.List;
 
 import javax.annotation.Nullable;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.ITransformableBlockEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.StructureTransform;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.EdgePointType;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.TrackTargetingBehaviour;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.SignalBlock.SignalType;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.contraptions.ITransformableBlockEntity;
+import com.simibubi.create.content.contraptions.StructureTransform;
+import com.simibubi.create.content.trains.graph.EdgePointType;
+import com.simibubi.create.content.trains.signal.SignalBlock.SignalType;
+import com.simibubi.create.content.trains.track.TrackTargetingBehaviour;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.NBTHelper;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/signal/SignalBoundary.java b/src/main/java/com/simibubi/create/content/trains/signal/SignalBoundary.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/signal/SignalBoundary.java
rename to src/main/java/com/simibubi/create/content/trains/signal/SignalBoundary.java
index 7e52b47b3..327b525c2 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/signal/SignalBoundary.java
+++ b/src/main/java/com/simibubi/create/content/trains/signal/SignalBoundary.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.management.edgePoint.signal;
+package com.simibubi.create.content.trains.signal;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -7,13 +7,13 @@ import java.util.UUID;
 
 import com.google.common.base.Objects;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.trains.DimensionPalette;
-import com.simibubi.create.content.logistics.trains.TrackGraph;
-import com.simibubi.create.content.logistics.trains.TrackNode;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.EdgePointType;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.SignalBlock.SignalType;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.SignalBlockEntity.OverlayState;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.SignalBlockEntity.SignalState;
+import com.simibubi.create.content.trains.graph.DimensionPalette;
+import com.simibubi.create.content.trains.graph.EdgePointType;
+import com.simibubi.create.content.trains.graph.TrackGraph;
+import com.simibubi.create.content.trains.graph.TrackNode;
+import com.simibubi.create.content.trains.signal.SignalBlock.SignalType;
+import com.simibubi.create.content.trains.signal.SignalBlockEntity.OverlayState;
+import com.simibubi.create.content.trains.signal.SignalBlockEntity.SignalState;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.NBTHelper;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/signal/SignalEdgeGroup.java b/src/main/java/com/simibubi/create/content/trains/signal/SignalEdgeGroup.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/signal/SignalEdgeGroup.java
rename to src/main/java/com/simibubi/create/content/trains/signal/SignalEdgeGroup.java
index 3f84a6f47..9f38ffb71 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/signal/SignalEdgeGroup.java
+++ b/src/main/java/com/simibubi/create/content/trains/signal/SignalEdgeGroup.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.management.edgePoint.signal;
+package com.simibubi.create.content.trains.signal;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -12,7 +12,7 @@ import org.apache.commons.lang3.mutable.MutableInt;
 
 import com.google.common.base.Predicates;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.trains.entity.Train;
+import com.simibubi.create.content.trains.entity.Train;
 import com.simibubi.create.foundation.utility.NBTHelper;
 
 import net.minecraft.nbt.CompoundTag;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/signal/SignalEdgeGroupPacket.java b/src/main/java/com/simibubi/create/content/trains/signal/SignalEdgeGroupPacket.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/signal/SignalEdgeGroupPacket.java
rename to src/main/java/com/simibubi/create/content/trains/signal/SignalEdgeGroupPacket.java
index 54c4863a4..4b6b2c999 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/signal/SignalEdgeGroupPacket.java
+++ b/src/main/java/com/simibubi/create/content/trains/signal/SignalEdgeGroupPacket.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.management.edgePoint.signal;
+package com.simibubi.create.content.trains.signal;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/signal/SignalPropagator.java b/src/main/java/com/simibubi/create/content/trains/signal/SignalPropagator.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/signal/SignalPropagator.java
rename to src/main/java/com/simibubi/create/content/trains/signal/SignalPropagator.java
index 6eaf4319f..33e8b8509 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/signal/SignalPropagator.java
+++ b/src/main/java/com/simibubi/create/content/trains/signal/SignalPropagator.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.management.edgePoint.signal;
+package com.simibubi.create.content.trains.signal;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -12,14 +12,14 @@ import java.util.function.Predicate;
 
 import com.google.common.base.Predicates;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.trains.TrackEdge;
-import com.simibubi.create.content.logistics.trains.TrackGraph;
-import com.simibubi.create.content.logistics.trains.TrackGraphSync;
-import com.simibubi.create.content.logistics.trains.TrackNode;
-import com.simibubi.create.content.logistics.trains.TrackNodeLocation;
-import com.simibubi.create.content.logistics.trains.entity.Train;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.EdgeData;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.EdgePointType;
+import com.simibubi.create.content.trains.entity.Train;
+import com.simibubi.create.content.trains.graph.EdgeData;
+import com.simibubi.create.content.trains.graph.EdgePointType;
+import com.simibubi.create.content.trains.graph.TrackEdge;
+import com.simibubi.create.content.trains.graph.TrackGraph;
+import com.simibubi.create.content.trains.graph.TrackGraphSync;
+import com.simibubi.create.content.trains.graph.TrackNode;
+import com.simibubi.create.content.trains.graph.TrackNodeLocation;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.Pair;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/signal/SignalRenderer.java b/src/main/java/com/simibubi/create/content/trains/signal/SignalRenderer.java
similarity index 79%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/signal/SignalRenderer.java
rename to src/main/java/com/simibubi/create/content/trains/signal/SignalRenderer.java
index 373f94ce7..6d5bb09eb 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/signal/SignalRenderer.java
+++ b/src/main/java/com/simibubi/create/content/trains/signal/SignalRenderer.java
@@ -1,13 +1,13 @@
-package com.simibubi.create.content.logistics.trains.management.edgePoint.signal;
+package com.simibubi.create.content.trains.signal;
 
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.logistics.trains.ITrackBlock;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.TrackTargetingBehaviour;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.TrackTargetingBehaviour.RenderedTrackOverlayType;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.SignalBlockEntity.OverlayState;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.SignalBlockEntity.SignalState;
+import com.simibubi.create.content.trains.signal.SignalBlockEntity.OverlayState;
+import com.simibubi.create.content.trains.signal.SignalBlockEntity.SignalState;
+import com.simibubi.create.content.trains.track.ITrackBlock;
+import com.simibubi.create.content.trains.track.TrackTargetingBehaviour;
+import com.simibubi.create.content.trains.track.TrackTargetingBehaviour.RenderedTrackOverlayType;
 import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/signal/SingleBlockEntityEdgePoint.java b/src/main/java/com/simibubi/create/content/trains/signal/SingleBlockEntityEdgePoint.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/signal/SingleBlockEntityEdgePoint.java
rename to src/main/java/com/simibubi/create/content/trains/signal/SingleBlockEntityEdgePoint.java
index f40e58f75..096a03b90 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/signal/SingleBlockEntityEdgePoint.java
+++ b/src/main/java/com/simibubi/create/content/trains/signal/SingleBlockEntityEdgePoint.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.logistics.trains.management.edgePoint.signal;
+package com.simibubi.create.content.trains.signal;
 
-import com.simibubi.create.content.logistics.trains.DimensionPalette;
+import com.simibubi.create.content.trains.graph.DimensionPalette;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/signal/TrackEdgePoint.java b/src/main/java/com/simibubi/create/content/trains/signal/TrackEdgePoint.java
similarity index 83%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/signal/TrackEdgePoint.java
rename to src/main/java/com/simibubi/create/content/trains/signal/TrackEdgePoint.java
index 356bd388b..5b9e1c5e2 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/signal/TrackEdgePoint.java
+++ b/src/main/java/com/simibubi/create/content/trains/signal/TrackEdgePoint.java
@@ -1,16 +1,16 @@
-package com.simibubi.create.content.logistics.trains.management.edgePoint.signal;
+package com.simibubi.create.content.trains.signal;
 
 import java.util.UUID;
 
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.trains.DimensionPalette;
-import com.simibubi.create.content.logistics.trains.TrackEdge;
-import com.simibubi.create.content.logistics.trains.TrackGraph;
-import com.simibubi.create.content.logistics.trains.TrackNode;
-import com.simibubi.create.content.logistics.trains.TrackNodeLocation;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.EdgePointType;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.TrackTargetingBehaviour;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.trains.graph.DimensionPalette;
+import com.simibubi.create.content.trains.graph.EdgePointType;
+import com.simibubi.create.content.trains.graph.TrackEdge;
+import com.simibubi.create.content.trains.graph.TrackGraph;
+import com.simibubi.create.content.trains.graph.TrackNode;
+import com.simibubi.create.content.trains.graph.TrackNodeLocation;
+import com.simibubi.create.content.trains.track.TrackTargetingBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.Couple;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/AbstractStationScreen.java b/src/main/java/com/simibubi/create/content/trains/station/AbstractStationScreen.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/AbstractStationScreen.java
rename to src/main/java/com/simibubi/create/content/trains/station/AbstractStationScreen.java
index 2db8e7cdc..40fe26487 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/AbstractStationScreen.java
+++ b/src/main/java/com/simibubi/create/content/trains/station/AbstractStationScreen.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.management.edgePoint.station;
+package com.simibubi.create.content.trains.station;
 
 import java.lang.ref.WeakReference;
 import java.util.List;
@@ -8,9 +8,9 @@ import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.CreateClient;
 import com.simibubi.create.compat.computercraft.ComputerScreen;
-import com.simibubi.create.content.logistics.trains.entity.Carriage;
-import com.simibubi.create.content.logistics.trains.entity.Train;
-import com.simibubi.create.content.logistics.trains.entity.TrainIconType;
+import com.simibubi.create.content.trains.entity.Carriage;
+import com.simibubi.create.content.trains.entity.Train;
+import com.simibubi.create.content.trains.entity.TrainIconType;
 import com.simibubi.create.foundation.gui.AbstractSimiScreen;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
 import com.simibubi.create.foundation.gui.AllIcons;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/AssemblyScreen.java b/src/main/java/com/simibubi/create/content/trains/station/AssemblyScreen.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/AssemblyScreen.java
rename to src/main/java/com/simibubi/create/content/trains/station/AssemblyScreen.java
index 82ce98601..08109734e 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/AssemblyScreen.java
+++ b/src/main/java/com/simibubi/create/content/trains/station/AssemblyScreen.java
@@ -1,20 +1,20 @@
-package com.simibubi.create.content.logistics.trains.management.edgePoint.station;
+package com.simibubi.create.content.trains.station;
 
 import java.lang.ref.WeakReference;
 import java.util.List;
 
 import com.jozufozu.flywheel.core.PartialModel;
 import com.mojang.blaze3d.vertex.PoseStack;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.components.structureMovement.AssemblyException;
-import com.simibubi.create.content.logistics.trains.entity.Carriage;
-import com.simibubi.create.content.logistics.trains.entity.Train;
-import com.simibubi.create.content.logistics.trains.entity.TrainIconType;
+import com.simibubi.create.content.contraptions.AssemblyException;
+import com.simibubi.create.content.trains.entity.Carriage;
+import com.simibubi.create.content.trains.entity.Train;
+import com.simibubi.create.content.trains.entity.TrainIconType;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
 import com.simibubi.create.foundation.gui.AllIcons;
 import com.simibubi.create.foundation.gui.widget.IconButton;
 import com.simibubi.create.foundation.gui.widget.ScrollInput;
-import com.simibubi.create.foundation.networking.AllPackets;
 import com.simibubi.create.foundation.utility.Lang;
 
 import net.minecraft.client.gui.components.Widget;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/GlobalStation.java b/src/main/java/com/simibubi/create/content/trains/station/GlobalStation.java
similarity index 89%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/GlobalStation.java
rename to src/main/java/com/simibubi/create/content/trains/station/GlobalStation.java
index 7f3466803..bc025316c 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/GlobalStation.java
+++ b/src/main/java/com/simibubi/create/content/trains/station/GlobalStation.java
@@ -1,13 +1,13 @@
-package com.simibubi.create.content.logistics.trains.management.edgePoint.station;
+package com.simibubi.create.content.trains.station;
 
 import java.lang.ref.WeakReference;
 
 import javax.annotation.Nullable;
 
-import com.simibubi.create.content.logistics.trains.DimensionPalette;
-import com.simibubi.create.content.logistics.trains.TrackNode;
-import com.simibubi.create.content.logistics.trains.entity.Train;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.SingleBlockEntityEdgePoint;
+import com.simibubi.create.content.trains.entity.Train;
+import com.simibubi.create.content.trains.graph.DimensionPalette;
+import com.simibubi.create.content.trains.graph.TrackNode;
+import com.simibubi.create.content.trains.signal.SingleBlockEntityEdgePoint;
 
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.FriendlyByteBuf;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/NoShadowFontWrapper.java b/src/main/java/com/simibubi/create/content/trains/station/NoShadowFontWrapper.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/NoShadowFontWrapper.java
rename to src/main/java/com/simibubi/create/content/trains/station/NoShadowFontWrapper.java
index cc6b3b452..d05265282 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/NoShadowFontWrapper.java
+++ b/src/main/java/com/simibubi/create/content/trains/station/NoShadowFontWrapper.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.management.edgePoint.station;
+package com.simibubi.create.content.trains.station;
 
 import java.util.List;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationBlock.java b/src/main/java/com/simibubi/create/content/trains/station/StationBlock.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationBlock.java
rename to src/main/java/com/simibubi/create/content/trains/station/StationBlock.java
index afe1925ec..162deff9c 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationBlock.java
+++ b/src/main/java/com/simibubi/create/content/trains/station/StationBlock.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.logistics.trains.management.edgePoint.station;
+package com.simibubi.create.content.trains.station;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllItems;
 import com.simibubi.create.AllShapes;
 import com.simibubi.create.AllSoundEvents;
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
-import com.simibubi.create.content.logistics.block.depot.SharedDepotBlockMethods;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
+import com.simibubi.create.content.logistics.depot.SharedDepotBlockMethods;
 import com.simibubi.create.foundation.advancement.AdvancementBehaviour;
 import com.simibubi.create.foundation.block.IBE;
 import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationBlockEntity.java b/src/main/java/com/simibubi/create/content/trains/station/StationBlockEntity.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationBlockEntity.java
rename to src/main/java/com/simibubi/create/content/trains/station/StationBlockEntity.java
index f809c156d..a915ae21d 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/trains/station/StationBlockEntity.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.management.edgePoint.station;
+package com.simibubi.create.content.trains.station;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -17,41 +17,40 @@ import org.jetbrains.annotations.NotNull;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.AllSoundEvents;
 import com.simibubi.create.Create;
 import com.simibubi.create.compat.computercraft.AbstractComputerBehaviour;
 import com.simibubi.create.compat.computercraft.ComputerCraftProxy;
-import com.simibubi.create.content.contraptions.components.actors.DoorControlBehaviour;
-import com.simibubi.create.content.contraptions.components.structureMovement.AssemblyException;
-import com.simibubi.create.content.contraptions.components.structureMovement.ITransformableBlockEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.StructureTransform;
-import com.simibubi.create.content.logistics.block.depot.DepotBehaviour;
-import com.simibubi.create.content.logistics.block.display.DisplayLinkBlock;
-import com.simibubi.create.content.logistics.trains.AbstractBogeyBlock;
-import com.simibubi.create.content.logistics.trains.GraphLocation;
-import com.simibubi.create.content.logistics.trains.ITrackBlock;
-import com.simibubi.create.content.logistics.trains.TrackEdge;
-import com.simibubi.create.content.logistics.trains.TrackGraph;
-import com.simibubi.create.content.logistics.trains.TrackNode;
-import com.simibubi.create.content.logistics.trains.TrackNodeLocation;
-import com.simibubi.create.content.logistics.trains.TrackNodeLocation.DiscoveredLocation;
-import com.simibubi.create.content.logistics.trains.entity.Carriage;
-import com.simibubi.create.content.logistics.trains.entity.CarriageBogey;
-import com.simibubi.create.content.logistics.trains.entity.CarriageContraption;
-import com.simibubi.create.content.logistics.trains.entity.Train;
-import com.simibubi.create.content.logistics.trains.entity.TrainPacket;
-import com.simibubi.create.content.logistics.trains.entity.TravellingPoint;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.EdgePointType;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.TrackTargetingBehaviour;
-import com.simibubi.create.content.logistics.trains.management.schedule.Schedule;
-import com.simibubi.create.content.logistics.trains.management.schedule.ScheduleItem;
-import com.simibubi.create.content.logistics.trains.track.AbstractBogeyBlockEntity;
+import com.simibubi.create.content.contraptions.AssemblyException;
+import com.simibubi.create.content.contraptions.ITransformableBlockEntity;
+import com.simibubi.create.content.contraptions.StructureTransform;
+import com.simibubi.create.content.decoration.slidingDoor.DoorControlBehaviour;
+import com.simibubi.create.content.logistics.depot.DepotBehaviour;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkBlock;
+import com.simibubi.create.content.trains.bogey.AbstractBogeyBlock;
+import com.simibubi.create.content.trains.bogey.AbstractBogeyBlockEntity;
+import com.simibubi.create.content.trains.entity.Carriage;
+import com.simibubi.create.content.trains.entity.CarriageBogey;
+import com.simibubi.create.content.trains.entity.CarriageContraption;
+import com.simibubi.create.content.trains.entity.Train;
+import com.simibubi.create.content.trains.entity.TrainPacket;
+import com.simibubi.create.content.trains.entity.TravellingPoint;
+import com.simibubi.create.content.trains.graph.TrackGraphLocation;
+import com.simibubi.create.content.trains.graph.EdgePointType;
+import com.simibubi.create.content.trains.graph.TrackEdge;
+import com.simibubi.create.content.trains.graph.TrackGraph;
+import com.simibubi.create.content.trains.graph.TrackNode;
+import com.simibubi.create.content.trains.graph.TrackNodeLocation;
+import com.simibubi.create.content.trains.graph.TrackNodeLocation.DiscoveredLocation;
+import com.simibubi.create.content.trains.schedule.Schedule;
+import com.simibubi.create.content.trains.schedule.ScheduleItem;
+import com.simibubi.create.content.trains.track.ITrackBlock;
+import com.simibubi.create.content.trains.track.TrackTargetingBehaviour;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
 import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
-import com.simibubi.create.foundation.config.AllConfigs;
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.NBTHelper;
@@ -59,6 +58,7 @@ import com.simibubi.create.foundation.utility.VecHelper;
 import com.simibubi.create.foundation.utility.WorldAttached;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat.Chaser;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.ChatFormatting;
 import net.minecraft.core.BlockPos;
@@ -464,7 +464,7 @@ public class StationBlockEntity extends SmartBlockEntity implements ITransformab
 
 	private boolean updateStationState(Consumer<GlobalStation> updateState) {
 		GlobalStation station = getStation();
-		GraphLocation graphLocation = edgePoint.determineGraphLocation();
+		TrackGraphLocation graphLocation = edgePoint.determineGraphLocation();
 		if (station == null || graphLocation == null)
 			return false;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationEditPacket.java b/src/main/java/com/simibubi/create/content/trains/station/StationEditPacket.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationEditPacket.java
rename to src/main/java/com/simibubi/create/content/trains/station/StationEditPacket.java
index 7b3bee2f0..ca13624f9 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationEditPacket.java
+++ b/src/main/java/com/simibubi/create/content/trains/station/StationEditPacket.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.logistics.trains.management.edgePoint.station;
+package com.simibubi.create.content.trains.station;
 
-import com.simibubi.create.content.contraptions.components.actors.DoorControl;
+import com.simibubi.create.content.decoration.slidingDoor.DoorControl;
 import com.simibubi.create.foundation.networking.BlockEntityConfigurationPacket;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationMapData.java b/src/main/java/com/simibubi/create/content/trains/station/StationMapData.java
similarity index 76%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationMapData.java
rename to src/main/java/com/simibubi/create/content/trains/station/StationMapData.java
index 55d386205..308506ee8 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationMapData.java
+++ b/src/main/java/com/simibubi/create/content/trains/station/StationMapData.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.management.edgePoint.station;
+package com.simibubi.create.content.trains.station;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.LevelAccessor;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationMarker.java b/src/main/java/com/simibubi/create/content/trains/station/StationMarker.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationMarker.java
rename to src/main/java/com/simibubi/create/content/trains/station/StationMarker.java
index c37b56bc9..0f46ddf9d 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationMarker.java
+++ b/src/main/java/com/simibubi/create/content/trains/station/StationMarker.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.management.edgePoint.station;
+package com.simibubi.create.content.trains.station;
 
 import java.util.Objects;
 import java.util.Optional;
@@ -8,8 +8,8 @@ import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.mojang.math.Matrix4f;
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.TrackTargetingBehaviour;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.trains.track.TrackTargetingBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.map.CustomRenderedMapDecoration;
 import com.simibubi.create.foundation.utility.Components;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationRenderer.java b/src/main/java/com/simibubi/create/content/trains/station/StationRenderer.java
similarity index 92%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationRenderer.java
rename to src/main/java/com/simibubi/create/content/trains/station/StationRenderer.java
index e519331bd..c76a0d493 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationRenderer.java
+++ b/src/main/java/com/simibubi/create/content/trains/station/StationRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.management.edgePoint.station;
+package com.simibubi.create.content.trains.station;
 
 import com.jozufozu.flywheel.core.PartialModel;
 import com.jozufozu.flywheel.util.transform.Transform;
@@ -6,10 +6,10 @@ import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.logistics.block.depot.DepotRenderer;
-import com.simibubi.create.content.logistics.trains.ITrackBlock;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.TrackTargetingBehaviour;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.TrackTargetingBehaviour.RenderedTrackOverlayType;
+import com.simibubi.create.content.logistics.depot.DepotRenderer;
+import com.simibubi.create.content.trains.track.ITrackBlock;
+import com.simibubi.create.content.trains.track.TrackTargetingBehaviour;
+import com.simibubi.create.content.trains.track.TrackTargetingBehaviour.RenderedTrackOverlayType;
 import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationScreen.java b/src/main/java/com/simibubi/create/content/trains/station/StationScreen.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationScreen.java
rename to src/main/java/com/simibubi/create/content/trains/station/StationScreen.java
index 560726e4a..5ee8eae45 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationScreen.java
+++ b/src/main/java/com/simibubi/create/content/trains/station/StationScreen.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.management.edgePoint.station;
+package com.simibubi.create.content.trains.station;
 
 import java.lang.ref.WeakReference;
 import java.util.List;
@@ -9,18 +9,18 @@ import com.mojang.blaze3d.platform.InputConstants;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllBlocks;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.contraptions.components.actors.DoorControl;
-import com.simibubi.create.content.logistics.trains.entity.Carriage;
-import com.simibubi.create.content.logistics.trains.entity.Train;
-import com.simibubi.create.content.logistics.trains.entity.TrainIconType;
+import com.simibubi.create.content.decoration.slidingDoor.DoorControl;
+import com.simibubi.create.content.trains.entity.Carriage;
+import com.simibubi.create.content.trains.entity.Train;
+import com.simibubi.create.content.trains.entity.TrainIconType;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
 import com.simibubi.create.foundation.gui.AllIcons;
 import com.simibubi.create.foundation.gui.UIRenderHelper;
 import com.simibubi.create.foundation.gui.widget.IconButton;
 import com.simibubi.create.foundation.gui.widget.Label;
 import com.simibubi.create.foundation.gui.widget.ScrollInput;
-import com.simibubi.create.foundation.networking.AllPackets;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.Pair;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/TrainEditPacket.java b/src/main/java/com/simibubi/create/content/trains/station/TrainEditPacket.java
similarity index 86%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/TrainEditPacket.java
rename to src/main/java/com/simibubi/create/content/trains/station/TrainEditPacket.java
index 854105251..41365547f 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/TrainEditPacket.java
+++ b/src/main/java/com/simibubi/create/content/trains/station/TrainEditPacket.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.content.logistics.trains.management.edgePoint.station;
+package com.simibubi.create.content.trains.station;
 
 import java.util.UUID;
 
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.trains.entity.Train;
-import com.simibubi.create.content.logistics.trains.entity.TrainIconType;
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.content.trains.entity.Train;
+import com.simibubi.create.content.trains.entity.TrainIconType;
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 import com.simibubi.create.foundation.utility.Components;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/WideIconButton.java b/src/main/java/com/simibubi/create/content/trains/station/WideIconButton.java
similarity index 87%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/WideIconButton.java
rename to src/main/java/com/simibubi/create/content/trains/station/WideIconButton.java
index 1ea17f939..91cb71a6f 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/WideIconButton.java
+++ b/src/main/java/com/simibubi/create/content/trains/station/WideIconButton.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.management.edgePoint.station;
+package com.simibubi.create.content.trains.station;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/BezierConnection.java b/src/main/java/com/simibubi/create/content/trains/track/BezierConnection.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/logistics/trains/BezierConnection.java
rename to src/main/java/com/simibubi/create/content/trains/track/BezierConnection.java
index bff06392f..8bce70138 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/BezierConnection.java
+++ b/src/main/java/com/simibubi/create/content/trains/track/BezierConnection.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains;
+package com.simibubi.create.content.trains.track;
 
 import java.util.Iterator;
 
@@ -6,8 +6,6 @@ import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.PoseStack.Pose;
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.logistics.trains.track.TrackBlockEntityTilt;
-import com.simibubi.create.content.logistics.trains.track.TrackRenderer;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.NBTHelper;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/track/BezierTrackPointLocation.java b/src/main/java/com/simibubi/create/content/trains/track/BezierTrackPointLocation.java
similarity index 65%
rename from src/main/java/com/simibubi/create/content/logistics/trains/track/BezierTrackPointLocation.java
rename to src/main/java/com/simibubi/create/content/trains/track/BezierTrackPointLocation.java
index c087ed6a1..67b9047b1 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/track/BezierTrackPointLocation.java
+++ b/src/main/java/com/simibubi/create/content/trains/track/BezierTrackPointLocation.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.track;
+package com.simibubi.create.content.trains.track;
 
 import net.minecraft.core.BlockPos;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/track/CurvedTrackDestroyPacket.java b/src/main/java/com/simibubi/create/content/trains/track/CurvedTrackDestroyPacket.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/logistics/trains/track/CurvedTrackDestroyPacket.java
rename to src/main/java/com/simibubi/create/content/trains/track/CurvedTrackDestroyPacket.java
index 6f8ce2356..35282aad9 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/track/CurvedTrackDestroyPacket.java
+++ b/src/main/java/com/simibubi/create/content/trains/track/CurvedTrackDestroyPacket.java
@@ -1,11 +1,9 @@
-package com.simibubi.create.content.logistics.trains.track;
+package com.simibubi.create.content.trains.track;
 
 import com.simibubi.create.AllSoundEvents;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.trains.BezierConnection;
-import com.simibubi.create.content.logistics.trains.TrackPropagator;
-import com.simibubi.create.foundation.config.AllConfigs;
 import com.simibubi.create.foundation.networking.BlockEntityConfigurationPacket;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.FriendlyByteBuf;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/track/CurvedTrackInteraction.java b/src/main/java/com/simibubi/create/content/trains/track/CurvedTrackInteraction.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/logistics/trains/track/CurvedTrackInteraction.java
rename to src/main/java/com/simibubi/create/content/trains/track/CurvedTrackInteraction.java
index b29acbd29..152213484 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/track/CurvedTrackInteraction.java
+++ b/src/main/java/com/simibubi/create/content/trains/track/CurvedTrackInteraction.java
@@ -1,10 +1,9 @@
-package com.simibubi.create.content.logistics.trains.track;
+package com.simibubi.create.content.trains.track;
 
 import com.simibubi.create.AllItems;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.AllTags;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.TrackTargetingBlockItem;
-import com.simibubi.create.content.logistics.trains.track.TrackBlockOutline.BezierPointSelection;
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.content.trains.track.TrackBlockOutline.BezierPointSelection;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.VecHelper;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/CurvedTrackSelectionPacket.java b/src/main/java/com/simibubi/create/content/trains/track/CurvedTrackSelectionPacket.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/CurvedTrackSelectionPacket.java
rename to src/main/java/com/simibubi/create/content/trains/track/CurvedTrackSelectionPacket.java
index 5ccf37373..b8d5aac03 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/CurvedTrackSelectionPacket.java
+++ b/src/main/java/com/simibubi/create/content/trains/track/CurvedTrackSelectionPacket.java
@@ -1,12 +1,11 @@
-package com.simibubi.create.content.logistics.trains.management.edgePoint;
+package com.simibubi.create.content.trains.track;
 
 import org.apache.commons.lang3.mutable.MutableObject;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllSoundEvents;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.TrackTargetingBlockItem.OverlapResult;
-import com.simibubi.create.content.logistics.trains.track.BezierTrackPointLocation;
-import com.simibubi.create.content.logistics.trains.track.TrackBlockEntity;
+import com.simibubi.create.content.trains.graph.EdgePointType;
+import com.simibubi.create.content.trains.track.TrackTargetingBlockItem.OverlapResult;
 import com.simibubi.create.foundation.networking.BlockEntityConfigurationPacket;
 import com.simibubi.create.foundation.utility.Lang;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/track/FakeTrackBlock.java b/src/main/java/com/simibubi/create/content/trains/track/FakeTrackBlock.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/logistics/trains/track/FakeTrackBlock.java
rename to src/main/java/com/simibubi/create/content/trains/track/FakeTrackBlock.java
index 47424780f..38136eef4 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/track/FakeTrackBlock.java
+++ b/src/main/java/com/simibubi/create/content/trains/track/FakeTrackBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.track;
+package com.simibubi.create.content.trains.track;
 
 import org.jetbrains.annotations.Nullable;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/track/FakeTrackBlockEntity.java b/src/main/java/com/simibubi/create/content/trains/track/FakeTrackBlockEntity.java
similarity index 91%
rename from src/main/java/com/simibubi/create/content/logistics/trains/track/FakeTrackBlockEntity.java
rename to src/main/java/com/simibubi/create/content/trains/track/FakeTrackBlockEntity.java
index 9174b8e67..17cd9f1f4 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/track/FakeTrackBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/trains/track/FakeTrackBlockEntity.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.track;
+package com.simibubi.create.content.trains.track;
 
 import com.simibubi.create.foundation.blockEntity.SyncedBlockEntity;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/ITrackBlock.java b/src/main/java/com/simibubi/create/content/trains/track/ITrackBlock.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/logistics/trains/ITrackBlock.java
rename to src/main/java/com/simibubi/create/content/trains/track/ITrackBlock.java
index eef6530ca..cfa41eb44 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/ITrackBlock.java
+++ b/src/main/java/com/simibubi/create/content/trains/track/ITrackBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains;
+package com.simibubi.create.content.trains.track;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -10,11 +10,9 @@ import javax.annotation.Nullable;
 
 import com.jozufozu.flywheel.core.PartialModel;
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.simibubi.create.content.logistics.trains.TrackNodeLocation.DiscoveredLocation;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.TrackTargetingBehaviour.RenderedTrackOverlayType;
-import com.simibubi.create.content.logistics.trains.track.BezierTrackPointLocation;
-import com.simibubi.create.content.logistics.trains.track.TrackBlock;
-import com.simibubi.create.content.logistics.trains.track.TrackShape;
+import com.simibubi.create.content.trains.graph.TrackNodeLocation;
+import com.simibubi.create.content.trains.graph.TrackNodeLocation.DiscoveredLocation;
+import com.simibubi.create.content.trains.track.TrackTargetingBehaviour.RenderedTrackOverlayType;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.Pair;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/track/PlaceExtendedCurvePacket.java b/src/main/java/com/simibubi/create/content/trains/track/PlaceExtendedCurvePacket.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/logistics/trains/track/PlaceExtendedCurvePacket.java
rename to src/main/java/com/simibubi/create/content/trains/track/PlaceExtendedCurvePacket.java
index a833dd67a..6fe153c66 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/track/PlaceExtendedCurvePacket.java
+++ b/src/main/java/com/simibubi/create/content/trains/track/PlaceExtendedCurvePacket.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.track;
+package com.simibubi.create.content.trains.track;
 
 import com.simibubi.create.AllTags;
 import com.simibubi.create.foundation.networking.SimplePacketBase;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackBlock.java b/src/main/java/com/simibubi/create/content/trains/track/TrackBlock.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/logistics/trains/track/TrackBlock.java
rename to src/main/java/com/simibubi/create/content/trains/track/TrackBlock.java
index a4ab87f75..e08f5cfb5 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackBlock.java
+++ b/src/main/java/com/simibubi/create/content/trains/track/TrackBlock.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.track;
+package com.simibubi.create.content.trains.track;
 
 import static com.simibubi.create.AllShapes.TRACK_ASC;
 import static com.simibubi.create.AllShapes.TRACK_CROSS;
@@ -30,21 +30,17 @@ import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllPartialModels;
 import com.simibubi.create.AllShapes;
 import com.simibubi.create.AllTags;
-import com.simibubi.create.content.contraptions.components.structureMovement.glue.SuperGlueEntity;
-import com.simibubi.create.content.contraptions.particle.CubeParticleData;
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
-import com.simibubi.create.content.curiosities.girder.GirderBlock;
-import com.simibubi.create.content.logistics.trains.BezierConnection;
-import com.simibubi.create.content.logistics.trains.ITrackBlock;
-import com.simibubi.create.content.logistics.trains.TrackMaterial;
-import com.simibubi.create.content.logistics.trains.TrackNodeLocation;
-import com.simibubi.create.content.logistics.trains.TrackNodeLocation.DiscoveredLocation;
-import com.simibubi.create.content.logistics.trains.TrackPropagator;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.TrackTargetingBehaviour.RenderedTrackOverlayType;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.station.StationBlockEntity;
-import com.simibubi.create.content.schematics.ISpecialBlockItemRequirement;
-import com.simibubi.create.content.schematics.ItemRequirement;
-import com.simibubi.create.content.schematics.ItemRequirement.ItemUseType;
+import com.simibubi.create.content.contraptions.glue.SuperGlueEntity;
+import com.simibubi.create.content.decoration.girder.GirderBlock;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
+import com.simibubi.create.content.schematics.requirement.ISpecialBlockItemRequirement;
+import com.simibubi.create.content.schematics.requirement.ItemRequirement;
+import com.simibubi.create.content.schematics.requirement.ItemRequirement.ItemUseType;
+import com.simibubi.create.content.trains.CubeParticleData;
+import com.simibubi.create.content.trains.graph.TrackNodeLocation;
+import com.simibubi.create.content.trains.graph.TrackNodeLocation.DiscoveredLocation;
+import com.simibubi.create.content.trains.station.StationBlockEntity;
+import com.simibubi.create.content.trains.track.TrackTargetingBehaviour.RenderedTrackOverlayType;
 import com.simibubi.create.foundation.block.IBE;
 import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
 import com.simibubi.create.foundation.block.render.MultiPosDestructionHandler;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackBlockEntity.java b/src/main/java/com/simibubi/create/content/trains/track/TrackBlockEntity.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/trains/track/TrackBlockEntity.java
rename to src/main/java/com/simibubi/create/content/trains/track/TrackBlockEntity.java
index 7a62a94ac..b284431e6 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/trains/track/TrackBlockEntity.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.track;
+package com.simibubi.create.content.trains.track;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -10,18 +10,16 @@ import java.util.Set;
 
 import com.jozufozu.flywheel.backend.instancing.InstancedRenderDispatcher;
 import com.simibubi.create.AllBlocks;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.AllTags;
-import com.simibubi.create.content.contraptions.components.structureMovement.ITransformableBlockEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.StructureTransform;
-import com.simibubi.create.content.logistics.trains.BezierConnection;
-import com.simibubi.create.content.logistics.trains.ITrackBlock;
-import com.simibubi.create.content.logistics.trains.TrackNodeLocation;
+import com.simibubi.create.content.contraptions.ITransformableBlockEntity;
+import com.simibubi.create.content.contraptions.StructureTransform;
+import com.simibubi.create.content.trains.graph.TrackNodeLocation;
 import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.IMergeableBE;
 import com.simibubi.create.foundation.blockEntity.RemoveBlockEntityPacket;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.Pair;
 import com.simibubi.create.foundation.utility.VecHelper;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackBlockEntityTilt.java b/src/main/java/com/simibubi/create/content/trains/track/TrackBlockEntityTilt.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/logistics/trains/track/TrackBlockEntityTilt.java
rename to src/main/java/com/simibubi/create/content/trains/track/TrackBlockEntityTilt.java
index 62970d24f..847929bc1 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackBlockEntityTilt.java
+++ b/src/main/java/com/simibubi/create/content/trains/track/TrackBlockEntityTilt.java
@@ -1,14 +1,11 @@
-package com.simibubi.create.content.logistics.trains.track;
+package com.simibubi.create.content.trains.track;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 
-import com.simibubi.create.content.logistics.trains.BezierConnection;
-import com.simibubi.create.content.logistics.trains.ITrackBlock;
-import com.simibubi.create.content.logistics.trains.TrackNodeLocation;
-import com.simibubi.create.content.logistics.trains.TrackPropagator;
+import com.simibubi.create.content.trains.graph.TrackNodeLocation;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.Pair;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackBlockItem.java b/src/main/java/com/simibubi/create/content/trains/track/TrackBlockItem.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/logistics/trains/track/TrackBlockItem.java
rename to src/main/java/com/simibubi/create/content/trains/track/TrackBlockItem.java
index 36af97662..70b72764e 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackBlockItem.java
+++ b/src/main/java/com/simibubi/create/content/trains/track/TrackBlockItem.java
@@ -1,11 +1,10 @@
-package com.simibubi.create.content.logistics.trains.track;
+package com.simibubi.create.content.trains.track;
 
 import com.simibubi.create.AllBlocks;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.AllSoundEvents;
 import com.simibubi.create.AllTags;
-import com.simibubi.create.content.logistics.trains.ITrackBlock;
-import com.simibubi.create.content.logistics.trains.track.TrackPlacement.PlacementInfo;
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.content.trains.track.TrackPlacement.PlacementInfo;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.Pair;
 import com.simibubi.create.foundation.utility.VecHelper;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackBlockOutline.java b/src/main/java/com/simibubi/create/content/trains/track/TrackBlockOutline.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/logistics/trains/track/TrackBlockOutline.java
rename to src/main/java/com/simibubi/create/content/trains/track/TrackBlockOutline.java
index fd8472f6e..cf50be35c 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackBlockOutline.java
+++ b/src/main/java/com/simibubi/create/content/trains/track/TrackBlockOutline.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.track;
+package com.simibubi.create.content.trains.track;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -10,7 +10,6 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.simibubi.create.AllShapes;
 import com.simibubi.create.AllTags;
-import com.simibubi.create.content.logistics.trains.BezierConnection;
 import com.simibubi.create.foundation.utility.AngleHelper;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 import com.simibubi.create.foundation.utility.Iterate;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackBlockStateGenerator.java b/src/main/java/com/simibubi/create/content/trains/track/TrackBlockStateGenerator.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/logistics/trains/track/TrackBlockStateGenerator.java
rename to src/main/java/com/simibubi/create/content/trains/track/TrackBlockStateGenerator.java
index a14da5a73..81e1931c1 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackBlockStateGenerator.java
+++ b/src/main/java/com/simibubi/create/content/trains/track/TrackBlockStateGenerator.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.track;
+package com.simibubi.create.content.trains.track;
 
 import com.simibubi.create.Create;
 import com.simibubi.create.foundation.data.SpecialBlockStateGen;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackInstance.java b/src/main/java/com/simibubi/create/content/trains/track/TrackInstance.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/logistics/trains/track/TrackInstance.java
rename to src/main/java/com/simibubi/create/content/trains/track/TrackInstance.java
index e84014455..fd785c560 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackInstance.java
+++ b/src/main/java/com/simibubi/create/content/trains/track/TrackInstance.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.track;
+package com.simibubi.create.content.trains.track;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -17,10 +17,8 @@ import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.PoseStack.Pose;
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.logistics.trains.BezierConnection;
-import com.simibubi.create.content.logistics.trains.BezierConnection.GirderAngles;
-import com.simibubi.create.content.logistics.trains.BezierConnection.SegmentAngles;
-import com.simibubi.create.content.logistics.trains.TrackMaterial;
+import com.simibubi.create.content.trains.track.BezierConnection.GirderAngles;
+import com.simibubi.create.content.trains.track.BezierConnection.SegmentAngles;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.Iterate;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/TrackMaterial.java b/src/main/java/com/simibubi/create/content/trains/track/TrackMaterial.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/trains/TrackMaterial.java
rename to src/main/java/com/simibubi/create/content/trains/track/TrackMaterial.java
index 8d8d35a38..0c8a3a10c 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/TrackMaterial.java
+++ b/src/main/java/com/simibubi/create/content/trains/track/TrackMaterial.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.content.logistics.trains;
+package com.simibubi.create.content.trains.track;
 
-import static com.simibubi.create.content.logistics.trains.TrackMaterialFactory.make;
+import static com.simibubi.create.content.trains.track.TrackMaterialFactory.make;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -14,7 +14,6 @@ import com.jozufozu.flywheel.core.PartialModel;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllPartialModels;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.trains.track.TrackBlock;
 import com.tterrag.registrate.util.nullness.NonNullSupplier;
 
 import net.minecraft.resources.ResourceLocation;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/TrackMaterialFactory.java b/src/main/java/com/simibubi/create/content/trains/track/TrackMaterialFactory.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/logistics/trains/TrackMaterialFactory.java
rename to src/main/java/com/simibubi/create/content/trains/track/TrackMaterialFactory.java
index 19c15180c..67e048caa 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/TrackMaterialFactory.java
+++ b/src/main/java/com/simibubi/create/content/trains/track/TrackMaterialFactory.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains;
+package com.simibubi.create.content.trains.track;
 
 import java.util.function.Supplier;
 import java.util.stream.Stream;
@@ -7,7 +7,6 @@ import org.jetbrains.annotations.Nullable;
 
 import com.jozufozu.flywheel.core.PartialModel;
 import com.simibubi.create.AllTags;
-import com.simibubi.create.content.logistics.trains.track.TrackBlock;
 import com.tterrag.registrate.util.nullness.NonNullSupplier;
 
 import net.minecraft.resources.ResourceLocation;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackModel.java b/src/main/java/com/simibubi/create/content/trains/track/TrackModel.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/logistics/trains/track/TrackModel.java
rename to src/main/java/com/simibubi/create/content/trains/track/TrackModel.java
index 2c1ee1ca8..308998258 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackModel.java
+++ b/src/main/java/com/simibubi/create/content/trains/track/TrackModel.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.track;
+package com.simibubi.create.content.trains.track;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackPaver.java b/src/main/java/com/simibubi/create/content/trains/track/TrackPaver.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/logistics/trains/track/TrackPaver.java
rename to src/main/java/com/simibubi/create/content/trains/track/TrackPaver.java
index 9c70d7ca6..cf1e25569 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackPaver.java
+++ b/src/main/java/com/simibubi/create/content/trains/track/TrackPaver.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.track;
+package com.simibubi.create.content.trains.track;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -7,8 +7,7 @@ import java.util.Map.Entry;
 import java.util.Set;
 
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.curiosities.girder.GirderBlock;
-import com.simibubi.create.content.logistics.trains.BezierConnection;
+import com.simibubi.create.content.decoration.girder.GirderBlock;
 import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.Pair;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackPlacement.java b/src/main/java/com/simibubi/create/content/trains/track/TrackPlacement.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/logistics/trains/track/TrackPlacement.java
rename to src/main/java/com/simibubi/create/content/trains/track/TrackPlacement.java
index 779791afa..7c73f9da3 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackPlacement.java
+++ b/src/main/java/com/simibubi/create/content/trains/track/TrackPlacement.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.track;
+package com.simibubi.create.content.trains.track;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -10,12 +10,8 @@ import com.jozufozu.flywheel.util.Color;
 import com.simibubi.create.AllSpecialTextures;
 import com.simibubi.create.AllTags;
 import com.simibubi.create.CreateClient;
-import com.simibubi.create.content.curiosities.tools.BlueprintOverlayRenderer;
-import com.simibubi.create.content.logistics.trains.BezierConnection;
-import com.simibubi.create.content.logistics.trains.ITrackBlock;
-import com.simibubi.create.content.logistics.trains.TrackMaterial;
+import com.simibubi.create.content.equipment.blueprint.BlueprintOverlayRenderer;
 import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
-import com.simibubi.create.foundation.config.AllConfigs;
 import com.simibubi.create.foundation.utility.AngleHelper;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.Iterate;
@@ -24,6 +20,7 @@ import com.simibubi.create.foundation.utility.Pair;
 import com.simibubi.create.foundation.utility.VecHelper;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat.Chaser;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackPlacementOverlay.java b/src/main/java/com/simibubi/create/content/trains/track/TrackPlacementOverlay.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/logistics/trains/track/TrackPlacementOverlay.java
rename to src/main/java/com/simibubi/create/content/trains/track/TrackPlacementOverlay.java
index aa9cd9d8e..eacda223d 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackPlacementOverlay.java
+++ b/src/main/java/com/simibubi/create/content/trains/track/TrackPlacementOverlay.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.track;
+package com.simibubi.create.content.trains.track;
 
 import com.mojang.blaze3d.platform.Window;
 import com.mojang.blaze3d.vertex.PoseStack;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/TrackPropagator.java b/src/main/java/com/simibubi/create/content/trains/track/TrackPropagator.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/logistics/trains/TrackPropagator.java
rename to src/main/java/com/simibubi/create/content/trains/track/TrackPropagator.java
index e401a04cf..c94c8014e 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/TrackPropagator.java
+++ b/src/main/java/com/simibubi/create/content/trains/track/TrackPropagator.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains;
+package com.simibubi.create.content.trains.track;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -9,8 +9,12 @@ import java.util.Set;
 
 import com.simibubi.create.Create;
 import com.simibubi.create.api.event.TrackGraphMergeEvent;
-import com.simibubi.create.content.logistics.trains.TrackNodeLocation.DiscoveredLocation;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.SignalPropagator;
+import com.simibubi.create.content.trains.GlobalRailwayManager;
+import com.simibubi.create.content.trains.graph.TrackGraph;
+import com.simibubi.create.content.trains.graph.TrackGraphSync;
+import com.simibubi.create.content.trains.graph.TrackNode;
+import com.simibubi.create.content.trains.graph.TrackNodeLocation.DiscoveredLocation;
+import com.simibubi.create.content.trains.signal.SignalPropagator;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.util.Mth;
@@ -243,7 +247,7 @@ public class TrackPropagator {
 			.anyMatch(DiscoveredLocation::shouldForceNode))
 			return true;
 
-		Vec3 direction = location.direction;
+		Vec3 direction = location.getDirection();
 		if (direction != null && next.stream()
 			.anyMatch(dl -> dl.notInLineWith(direction)))
 			return true;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackRenderer.java b/src/main/java/com/simibubi/create/content/trains/track/TrackRenderer.java
similarity index 93%
rename from src/main/java/com/simibubi/create/content/logistics/trains/track/TrackRenderer.java
rename to src/main/java/com/simibubi/create/content/trains/track/TrackRenderer.java
index de4bbff2c..65ef7ea1e 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackRenderer.java
+++ b/src/main/java/com/simibubi/create/content/trains/track/TrackRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.track;
+package com.simibubi.create.content.trains.track;
 
 import static com.simibubi.create.AllPartialModels.GIRDER_SEGMENT_BOTTOM;
 import static com.simibubi.create.AllPartialModels.GIRDER_SEGMENT_MIDDLE;
@@ -8,10 +8,8 @@ import com.jozufozu.flywheel.backend.Backend;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.PoseStack.Pose;
 import com.mojang.blaze3d.vertex.VertexConsumer;
-import com.simibubi.create.content.logistics.trains.BezierConnection;
-import com.simibubi.create.content.logistics.trains.BezierConnection.GirderAngles;
-import com.simibubi.create.content.logistics.trains.BezierConnection.SegmentAngles;
-import com.simibubi.create.content.logistics.trains.TrackMaterial;
+import com.simibubi.create.content.trains.track.BezierConnection.GirderAngles;
+import com.simibubi.create.content.trains.track.BezierConnection.SegmentAngles;
 import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.utility.AngleHelper;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackShape.java b/src/main/java/com/simibubi/create/content/trains/track/TrackShape.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/logistics/trains/track/TrackShape.java
rename to src/main/java/com/simibubi/create/content/trains/track/TrackShape.java
index 0c3e2332b..660db94ce 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackShape.java
+++ b/src/main/java/com/simibubi/create/content/trains/track/TrackShape.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.track;
+package com.simibubi.create.content.trains.track;
 
 import java.util.EnumMap;
 import java.util.List;
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/TrackTargetingBehaviour.java b/src/main/java/com/simibubi/create/content/trains/track/TrackTargetingBehaviour.java
similarity index 89%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/TrackTargetingBehaviour.java
rename to src/main/java/com/simibubi/create/content/trains/track/TrackTargetingBehaviour.java
index c7f8c2a39..5f190cf5c 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/TrackTargetingBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/trains/track/TrackTargetingBehaviour.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.management.edgePoint;
+package com.simibubi.create.content.trains.track;
 
 import java.util.List;
 import java.util.UUID;
@@ -8,23 +8,21 @@ import javax.annotation.Nullable;
 import com.jozufozu.flywheel.core.PartialModel;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.contraptions.components.structureMovement.StructureTransform;
-import com.simibubi.create.content.logistics.trains.BezierConnection;
-import com.simibubi.create.content.logistics.trains.DimensionPalette;
-import com.simibubi.create.content.logistics.trains.GraphLocation;
-import com.simibubi.create.content.logistics.trains.ITrackBlock;
-import com.simibubi.create.content.logistics.trains.TrackEdge;
-import com.simibubi.create.content.logistics.trains.TrackGraph;
-import com.simibubi.create.content.logistics.trains.TrackGraphHelper;
-import com.simibubi.create.content.logistics.trains.TrackNode;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.SingleBlockEntityEdgePoint;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.TrackEdgePoint;
-import com.simibubi.create.content.logistics.trains.track.BezierTrackPointLocation;
-import com.simibubi.create.content.logistics.trains.track.TrackBlockEntity;
+import com.simibubi.create.content.contraptions.StructureTransform;
 import com.simibubi.create.content.schematics.SchematicWorld;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.trains.graph.DimensionPalette;
+import com.simibubi.create.content.trains.graph.EdgeData;
+import com.simibubi.create.content.trains.graph.EdgePointType;
+import com.simibubi.create.content.trains.graph.TrackEdge;
+import com.simibubi.create.content.trains.graph.TrackGraph;
+import com.simibubi.create.content.trains.graph.TrackGraphHelper;
+import com.simibubi.create.content.trains.graph.TrackGraphLocation;
+import com.simibubi.create.content.trains.graph.TrackNode;
+import com.simibubi.create.content.trains.signal.SingleBlockEntityEdgePoint;
+import com.simibubi.create.content.trains.signal.TrackEdgePoint;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
 import com.simibubi.create.foundation.blockEntity.behaviour.BehaviourType;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.ponder.PonderWorld;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.utility.Iterate;
@@ -159,7 +157,7 @@ public class TrackTargetingBehaviour<T extends TrackEdgePoint> extends BlockEnti
 			return null;
 		if (!hasValidTrack())
 			return null;
-		GraphLocation loc = determineGraphLocation();
+		TrackGraphLocation loc = determineGraphLocation();
 		if (loc == null)
 			return null;
 
@@ -292,7 +290,7 @@ public class TrackTargetingBehaviour<T extends TrackEdgePoint> extends BlockEnti
 		return targetBezier;
 	}
 
-	public GraphLocation determineGraphLocation() {
+	public TrackGraphLocation determineGraphLocation() {
 		Level level = getWorld();
 		BlockPos pos = getGlobalPosition();
 		BlockState state = getTrackBlockState();
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/TrackTargetingBlockItem.java b/src/main/java/com/simibubi/create/content/trains/track/TrackTargetingBlockItem.java
similarity index 89%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/TrackTargetingBlockItem.java
rename to src/main/java/com/simibubi/create/content/trains/track/TrackTargetingBlockItem.java
index 9fc22e228..bae77d799 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/TrackTargetingBlockItem.java
+++ b/src/main/java/com/simibubi/create/content/trains/track/TrackTargetingBlockItem.java
@@ -1,22 +1,21 @@
-package com.simibubi.create.content.logistics.trains.management.edgePoint;
+package com.simibubi.create.content.trains.track;
 
 import java.util.List;
 import java.util.function.BiConsumer;
 
 import org.apache.commons.lang3.mutable.MutableObject;
 
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.AllSoundEvents;
-import com.simibubi.create.content.logistics.trains.GraphLocation;
-import com.simibubi.create.content.logistics.trains.ITrackBlock;
-import com.simibubi.create.content.logistics.trains.TrackEdge;
-import com.simibubi.create.content.logistics.trains.TrackGraphHelper;
-import com.simibubi.create.content.logistics.trains.TrackNode;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.TrackEdgePoint;
-import com.simibubi.create.content.logistics.trains.track.BezierTrackPointLocation;
-import com.simibubi.create.content.logistics.trains.track.TrackBlockEntity;
-import com.simibubi.create.content.logistics.trains.track.TrackBlockOutline.BezierPointSelection;
+import com.simibubi.create.content.trains.graph.EdgeData;
+import com.simibubi.create.content.trains.graph.EdgePointType;
+import com.simibubi.create.content.trains.graph.TrackEdge;
+import com.simibubi.create.content.trains.graph.TrackGraphHelper;
+import com.simibubi.create.content.trains.graph.TrackGraphLocation;
+import com.simibubi.create.content.trains.graph.TrackNode;
+import com.simibubi.create.content.trains.signal.TrackEdgePoint;
+import com.simibubi.create.content.trains.track.TrackBlockOutline.BezierPointSelection;
 import com.simibubi.create.foundation.advancement.AllAdvancements;
-import com.simibubi.create.foundation.networking.AllPackets;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.Lang;
 import com.tterrag.registrate.util.nullness.NonNullBiFunction;
@@ -185,7 +184,7 @@ public class TrackTargetingBlockItem extends BlockItem {
 
 	public static void withGraphLocation(Level level, BlockPos pos, boolean front,
 		BezierTrackPointLocation targetBezier, EdgePointType<?> type,
-		BiConsumer<OverlapResult, GraphLocation> callback) {
+		BiConsumer<OverlapResult, TrackGraphLocation> callback) {
 
 		BlockState state = level.getBlockState(pos);
 
@@ -201,7 +200,7 @@ public class TrackTargetingBlockItem extends BlockItem {
 		}
 
 		AxisDirection targetDirection = front ? AxisDirection.POSITIVE : AxisDirection.NEGATIVE;
-		GraphLocation location =
+		TrackGraphLocation location =
 			targetBezier != null ? TrackGraphHelper.getBezierGraphLocationAt(level, pos, targetDirection, targetBezier)
 				: TrackGraphHelper.getGraphLocationAt(level, pos, targetDirection, trackAxes.get(0));
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/TrackTargetingClient.java b/src/main/java/com/simibubi/create/content/trains/track/TrackTargetingClient.java
similarity index 85%
rename from src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/TrackTargetingClient.java
rename to src/main/java/com/simibubi/create/content/trains/track/TrackTargetingClient.java
index 02d36eae1..26fc72bdb 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/TrackTargetingClient.java
+++ b/src/main/java/com/simibubi/create/content/trains/track/TrackTargetingClient.java
@@ -1,16 +1,14 @@
-package com.simibubi.create.content.logistics.trains.management.edgePoint;
+package com.simibubi.create.content.trains.track;
 
 import com.google.common.base.Objects;
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.trains.GraphLocation;
-import com.simibubi.create.content.logistics.trains.ITrackBlock;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.TrackTargetingBehaviour.RenderedTrackOverlayType;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.TrackTargetingBlockItem.OverlapResult;
-import com.simibubi.create.content.logistics.trains.track.BezierTrackPointLocation;
-import com.simibubi.create.content.logistics.trains.track.TrackBlockOutline;
-import com.simibubi.create.content.logistics.trains.track.TrackBlockOutline.BezierPointSelection;
+import com.simibubi.create.content.trains.graph.EdgePointType;
+import com.simibubi.create.content.trains.graph.TrackGraphLocation;
+import com.simibubi.create.content.trains.track.TrackBlockOutline.BezierPointSelection;
+import com.simibubi.create.content.trains.track.TrackTargetingBehaviour.RenderedTrackOverlayType;
+import com.simibubi.create.content.trains.track.TrackTargetingBlockItem.OverlapResult;
 import com.simibubi.create.foundation.render.SuperRenderTypeBuffer;
 
 import net.minecraft.client.Minecraft;
@@ -36,7 +34,7 @@ public class TrackTargetingClient {
 	static BezierTrackPointLocation lastHoveredBezierSegment;
 
 	static OverlapResult lastResult;
-	static GraphLocation lastLocation;
+	static TrackGraphLocation lastLocation;
 
 	public static void clientTick() {
 		Minecraft mc = Minecraft.getInstance();
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackVoxelShapes.java b/src/main/java/com/simibubi/create/content/trains/track/TrackVoxelShapes.java
similarity index 96%
rename from src/main/java/com/simibubi/create/content/logistics/trains/track/TrackVoxelShapes.java
rename to src/main/java/com/simibubi/create/content/trains/track/TrackVoxelShapes.java
index 653de6e45..38bdd2350 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackVoxelShapes.java
+++ b/src/main/java/com/simibubi/create/content/trains/track/TrackVoxelShapes.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.logistics.trains.track;
+package com.simibubi.create.content.trains.track;
 
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.phys.shapes.BooleanOp;
diff --git a/src/main/java/com/simibubi/create/foundation/advancement/AdvancementBehaviour.java b/src/main/java/com/simibubi/create/foundation/advancement/AdvancementBehaviour.java
index 60f273095..f52bd1453 100644
--- a/src/main/java/com/simibubi/create/foundation/advancement/AdvancementBehaviour.java
+++ b/src/main/java/com/simibubi/create/foundation/advancement/AdvancementBehaviour.java
@@ -4,9 +4,9 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.UUID;
 
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
 import com.simibubi.create.foundation.blockEntity.behaviour.BehaviourType;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
diff --git a/src/main/java/com/simibubi/create/foundation/block/BigOutlines.java b/src/main/java/com/simibubi/create/foundation/block/BigOutlines.java
index c5414b80c..25f9319f5 100644
--- a/src/main/java/com/simibubi/create/foundation/block/BigOutlines.java
+++ b/src/main/java/com/simibubi/create/foundation/block/BigOutlines.java
@@ -1,7 +1,7 @@
 package com.simibubi.create.foundation.block;
 
-import com.simibubi.create.content.curiosities.deco.SlidingDoorBlock;
-import com.simibubi.create.content.logistics.trains.track.TrackBlock;
+import com.simibubi.create.content.decoration.slidingDoor.SlidingDoorBlock;
+import com.simibubi.create.content.trains.track.TrackBlock;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 import com.simibubi.create.foundation.utility.RaycastHelper;
 import com.simibubi.create.foundation.utility.VecHelper;
diff --git a/src/main/java/com/simibubi/create/foundation/block/WrenchableDirectionalBlock.java b/src/main/java/com/simibubi/create/foundation/block/WrenchableDirectionalBlock.java
index 7d8820886..03edbb8d4 100644
--- a/src/main/java/com/simibubi/create/foundation/block/WrenchableDirectionalBlock.java
+++ b/src/main/java/com/simibubi/create/foundation/block/WrenchableDirectionalBlock.java
@@ -1,6 +1,6 @@
 package com.simibubi.create.foundation.block;
 
-import com.simibubi.create.content.contraptions.wrench.IWrenchable;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
 
 import net.minecraft.core.Direction;
 import net.minecraft.world.item.context.BlockPlaceContext;
diff --git a/src/main/java/com/simibubi/create/foundation/block/connected/CTModel.java b/src/main/java/com/simibubi/create/foundation/block/connected/CTModel.java
index ba8ff5d27..a9ef18947 100644
--- a/src/main/java/com/simibubi/create/foundation/block/connected/CTModel.java
+++ b/src/main/java/com/simibubi/create/foundation/block/connected/CTModel.java
@@ -4,7 +4,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import com.simibubi.create.content.curiosities.frames.CopycatBlock;
+import com.simibubi.create.content.decoration.copycat.CopycatBlock;
 import com.simibubi.create.foundation.block.connected.ConnectedTextureBehaviour.CTContext;
 import com.simibubi.create.foundation.model.BakedModelWrapperWithData;
 import com.simibubi.create.foundation.model.BakedQuadHelper;
diff --git a/src/main/java/com/simibubi/create/foundation/block/connected/RotatedPillarCTBehaviour.java b/src/main/java/com/simibubi/create/foundation/block/connected/RotatedPillarCTBehaviour.java
index 6bfa51dde..b6e5e70ae 100644
--- a/src/main/java/com/simibubi/create/foundation/block/connected/RotatedPillarCTBehaviour.java
+++ b/src/main/java/com/simibubi/create/foundation/block/connected/RotatedPillarCTBehaviour.java
@@ -1,8 +1,8 @@
 package com.simibubi.create.foundation.block.connected;
 
-import com.simibubi.create.content.curiosities.frames.CopycatBlock;
-import com.simibubi.create.content.palettes.ConnectedPillarBlock;
-import com.simibubi.create.content.palettes.LayeredBlock;
+import com.simibubi.create.content.decoration.copycat.CopycatBlock;
+import com.simibubi.create.content.decoration.palettes.ConnectedPillarBlock;
+import com.simibubi.create.content.decoration.palettes.LayeredBlock;
 
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/ComparatorUtil.java b/src/main/java/com/simibubi/create/foundation/blockEntity/ComparatorUtil.java
index c1015fdf0..344e1f46e 100644
--- a/src/main/java/com/simibubi/create/foundation/blockEntity/ComparatorUtil.java
+++ b/src/main/java/com/simibubi/create/foundation/blockEntity/ComparatorUtil.java
@@ -1,5 +1,6 @@
 package com.simibubi.create.foundation.blockEntity;
 
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour;
 import com.simibubi.create.foundation.fluid.SmartFluidTank;
 
diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/SmartBlockEntity.java b/src/main/java/com/simibubi/create/foundation/blockEntity/SmartBlockEntity.java
index b3924e081..0e3931ad0 100644
--- a/src/main/java/com/simibubi/create/foundation/blockEntity/SmartBlockEntity.java
+++ b/src/main/java/com/simibubi/create/foundation/blockEntity/SmartBlockEntity.java
@@ -8,11 +8,12 @@ import java.util.Map;
 import java.util.function.Consumer;
 
 import com.simibubi.create.api.event.BlockEntityBehaviourEvent;
-import com.simibubi.create.content.schematics.ISpecialBlockEntityItemRequirement;
-import com.simibubi.create.content.schematics.ItemRequirement;
+import com.simibubi.create.content.schematics.requirement.ISpecialBlockEntityItemRequirement;
+import com.simibubi.create.content.schematics.requirement.ItemRequirement;
 import com.simibubi.create.foundation.advancement.AdvancementBehaviour;
 import com.simibubi.create.foundation.advancement.CreateAdvancement;
 import com.simibubi.create.foundation.blockEntity.behaviour.BehaviourType;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.IInteractionChecker;
 import com.simibubi.create.foundation.utility.IPartialSafeNBT;
 
diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/BehaviourType.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/BehaviourType.java
index af0e016b6..4ef84aa6e 100644
--- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/BehaviourType.java
+++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/BehaviourType.java
@@ -1,7 +1,5 @@
 package com.simibubi.create.foundation.blockEntity.behaviour;
 
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
-
 public class BehaviourType<T extends BlockEntityBehaviour> {
 
 	private String name;
diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/BlockEntityBehaviour.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/BlockEntityBehaviour.java
similarity index 91%
rename from src/main/java/com/simibubi/create/foundation/blockEntity/BlockEntityBehaviour.java
rename to src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/BlockEntityBehaviour.java
index e4bcb6772..d52125dea 100644
--- a/src/main/java/com/simibubi/create/foundation/blockEntity/BlockEntityBehaviour.java
+++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/BlockEntityBehaviour.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.foundation.blockEntity;
+package com.simibubi.create.foundation.blockEntity.behaviour;
 
 import java.util.ConcurrentModificationException;
 
-import com.simibubi.create.content.schematics.ItemRequirement;
-import com.simibubi.create.foundation.blockEntity.behaviour.BehaviourType;
+import com.simibubi.create.content.schematics.requirement.ItemRequirement;
+import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueBox.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueBox.java
index 81296fca4..95b3cc5bb 100644
--- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueBox.java
+++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueBox.java
@@ -1,13 +1,13 @@
 package com.simibubi.create.foundation.blockEntity.behaviour;
 
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.simibubi.create.content.logistics.item.filter.FilterItem;
+import com.simibubi.create.content.logistics.filter.FilterItem;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform.Sided;
-import com.simibubi.create.foundation.blockEntity.behaviour.scrollvalue.INamedIconOptions;
+import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.INamedIconOptions;
 import com.simibubi.create.foundation.gui.AllIcons;
+import com.simibubi.create.foundation.outliner.ChasingAABBOutline;
 import com.simibubi.create.foundation.render.SuperRenderTypeBuffer;
 import com.simibubi.create.foundation.utility.Components;
-import com.simibubi.create.foundation.utility.outliner.ChasingAABBOutline;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueBoxRenderer.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueBoxRenderer.java
index 13f933fca..224ade1ef 100644
--- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueBoxRenderer.java
+++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueBoxRenderer.java
@@ -3,7 +3,7 @@ package com.simibubi.create.foundation.blockEntity.behaviour;
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Matrix3f;
-import com.simibubi.create.content.contraptions.relays.elementary.AbstractSimpleShaftBlock;
+import com.simibubi.create.content.kinetics.simpleRelays.AbstractSimpleShaftBlock;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.MultiBufferSource;
diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsBehaviour.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsBehaviour.java
index 91dda5332..4ab54ddf1 100644
--- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsBehaviour.java
+++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsBehaviour.java
@@ -1,7 +1,6 @@
 package com.simibubi.create.foundation.blockEntity.behaviour;
 
-import com.simibubi.create.content.curiosities.clipboard.ClipboardCloneable;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.equipment.clipboard.ClipboardCloneable;
 import com.simibubi.create.foundation.utility.Lang;
 
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsClient.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsClient.java
index 29b61146c..3d4214a8b 100644
--- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsClient.java
+++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsClient.java
@@ -4,9 +4,8 @@ import java.util.List;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.foundation.gui.ScreenOpener;
-import com.simibubi.create.foundation.networking.AllPackets;
 import com.simibubi.create.foundation.utility.Color;
 
 import net.minecraft.client.Minecraft;
diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsFormatter.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsFormatter.java
index d62cac2bf..c8151c9f2 100644
--- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsFormatter.java
+++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsFormatter.java
@@ -3,7 +3,7 @@ package com.simibubi.create.foundation.blockEntity.behaviour;
 import java.util.function.Function;
 
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsBehaviour.ValueSettings;
-import com.simibubi.create.foundation.blockEntity.behaviour.scrollvalue.INamedIconOptions;
+import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.INamedIconOptions;
 import com.simibubi.create.foundation.gui.AllIcons;
 import com.simibubi.create.foundation.utility.Lang;
 
diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsInputHandler.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsInputHandler.java
index 415cae889..5ab4fd684 100644
--- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsInputHandler.java
+++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsInputHandler.java
@@ -3,7 +3,6 @@ package com.simibubi.create.foundation.blockEntity.behaviour;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllTags.AllItemTags;
 import com.simibubi.create.CreateClient;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
 import com.simibubi.create.foundation.blockEntity.behaviour.filtering.SidedFilteringBehaviour;
 import com.simibubi.create.foundation.utility.RaycastHelper;
diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsPacket.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsPacket.java
index 8a4a4720d..27638e80d 100644
--- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsPacket.java
+++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsPacket.java
@@ -2,7 +2,6 @@ package com.simibubi.create.foundation.blockEntity.behaviour;
 
 import javax.annotation.Nullable;
 
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsBehaviour.ValueSettings;
 import com.simibubi.create.foundation.networking.BlockEntityConfigurationPacket;
diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsScreen.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsScreen.java
index cb7c76a70..c14cf14c1 100644
--- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsScreen.java
+++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsScreen.java
@@ -7,15 +7,15 @@ import org.lwjgl.glfw.GLFW;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllKeys;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.AllSoundEvents;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsBehaviour.ValueSettings;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsFormatter.ScrollOptionSettingsFormatter;
-import com.simibubi.create.foundation.blockEntity.behaviour.scrollvalue.ScrollValueHandler;
+import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollValueHandler;
 import com.simibubi.create.foundation.gui.AbstractSimiScreen;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
 import com.simibubi.create.foundation.gui.AllIcons;
 import com.simibubi.create.foundation.gui.UIRenderHelper;
-import com.simibubi.create.foundation.networking.AllPackets;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Lang;
diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/edgeInteraction/EdgeInteractionBehaviour.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/edgeInteraction/EdgeInteractionBehaviour.java
index 6c4529328..9adb39e0c 100644
--- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/edgeInteraction/EdgeInteractionBehaviour.java
+++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/edgeInteraction/EdgeInteractionBehaviour.java
@@ -2,9 +2,9 @@ package com.simibubi.create.foundation.blockEntity.behaviour.edgeInteraction;
 
 import java.util.Optional;
 
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
 import com.simibubi.create.foundation.blockEntity.behaviour.BehaviourType;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/edgeInteraction/EdgeInteractionHandler.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/edgeInteraction/EdgeInteractionHandler.java
index 8774b8e7c..ee72e8c30 100644
--- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/edgeInteraction/EdgeInteractionHandler.java
+++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/edgeInteraction/EdgeInteractionHandler.java
@@ -3,7 +3,7 @@ package com.simibubi.create.foundation.blockEntity.behaviour.edgeInteraction;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.utility.BlockHelper;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.RaycastHelper;
diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/edgeInteraction/EdgeInteractionRenderer.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/edgeInteraction/EdgeInteractionRenderer.java
index 312de95b7..39b55ea7c 100644
--- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/edgeInteraction/EdgeInteractionRenderer.java
+++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/edgeInteraction/EdgeInteractionRenderer.java
@@ -5,8 +5,8 @@ import java.util.List;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.CreateClient;
-import com.simibubi.create.content.contraptions.components.crafter.CrafterHelper;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.kinetics.crafter.CrafterHelper;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBox;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform;
 import com.simibubi.create.foundation.utility.Components;
diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/filtering/FilteringBehaviour.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/filtering/FilteringBehaviour.java
index f4d4b0330..08ff69b61 100644
--- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/filtering/FilteringBehaviour.java
+++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/filtering/FilteringBehaviour.java
@@ -7,11 +7,11 @@ import java.util.function.Supplier;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
 import com.simibubi.create.AllSoundEvents;
-import com.simibubi.create.content.logistics.item.filter.FilterItem;
-import com.simibubi.create.content.schematics.ItemRequirement;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.logistics.filter.FilterItem;
+import com.simibubi.create.content.schematics.requirement.ItemRequirement;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
 import com.simibubi.create.foundation.blockEntity.behaviour.BehaviourType;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsBoard;
diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/filtering/FilteringRenderer.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/filtering/FilteringRenderer.java
index 87a302b76..4a6c25756 100644
--- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/filtering/FilteringRenderer.java
+++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/filtering/FilteringRenderer.java
@@ -7,19 +7,19 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllSpecialTextures;
 import com.simibubi.create.CreateClient;
-import com.simibubi.create.content.logistics.item.filter.FilterItem;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.logistics.filter.FilterItem;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBox;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBox.ItemValueBox;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxRenderer;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform.Sided;
-import com.simibubi.create.foundation.config.AllConfigs;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.Pair;
 import com.simibubi.create.foundation.utility.VecHelper;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ClientLevel;
diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/filtering/SidedFilteringBehaviour.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/filtering/SidedFilteringBehaviour.java
index ac2d1354a..d770f8b36 100644
--- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/filtering/SidedFilteringBehaviour.java
+++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/filtering/SidedFilteringBehaviour.java
@@ -7,7 +7,7 @@ import java.util.Set;
 import java.util.function.BiFunction;
 import java.util.function.Predicate;
 
-import com.simibubi.create.content.schematics.ItemRequirement;
+import com.simibubi.create.content.schematics.requirement.ItemRequirement;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform.Sided;
diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/fluid/SmartFluidTankBehaviour.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/fluid/SmartFluidTankBehaviour.java
index 06cb9957e..4b10c7fd1 100644
--- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/fluid/SmartFluidTankBehaviour.java
+++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/fluid/SmartFluidTankBehaviour.java
@@ -4,9 +4,9 @@ import java.util.function.Consumer;
 
 import org.apache.commons.lang3.mutable.MutableInt;
 
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
 import com.simibubi.create.foundation.blockEntity.behaviour.BehaviourType;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.fluid.CombinedTankWrapper;
 import com.simibubi.create.foundation.fluid.SmartFluidTank;
 import com.simibubi.create.foundation.utility.NBTHelper;
diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/inventory/CapManipulationBehaviourBase.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/inventory/CapManipulationBehaviourBase.java
index 39043877d..79953f71f 100644
--- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/inventory/CapManipulationBehaviourBase.java
+++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/inventory/CapManipulationBehaviourBase.java
@@ -2,8 +2,8 @@ package com.simibubi.create.foundation.blockEntity.behaviour.inventory;
 
 import javax.annotation.Nullable;
 
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour;
 import com.simibubi.create.foundation.item.ItemHelper.ExtractionCountMode;
 import com.simibubi.create.foundation.utility.BlockFace;
diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollvalue/BulkScrollValueBehaviour.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/BulkScrollValueBehaviour.java
similarity index 99%
rename from src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollvalue/BulkScrollValueBehaviour.java
rename to src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/BulkScrollValueBehaviour.java
index e65584a21..685c24bed 100644
--- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollvalue/BulkScrollValueBehaviour.java
+++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/BulkScrollValueBehaviour.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.blockEntity.behaviour.scrollvalue;
+package com.simibubi.create.foundation.blockEntity.behaviour.scrollValue;
 
 import java.util.List;
 import java.util.function.Function;
diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollvalue/INamedIconOptions.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/INamedIconOptions.java
similarity index 95%
rename from src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollvalue/INamedIconOptions.java
rename to src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/INamedIconOptions.java
index 221647133..821d3ec2a 100644
--- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollvalue/INamedIconOptions.java
+++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/INamedIconOptions.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.blockEntity.behaviour.scrollvalue;
+package com.simibubi.create.foundation.blockEntity.behaviour.scrollValue;
 
 import com.simibubi.create.foundation.gui.AllIcons;
 
diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollvalue/ScrollOptionBehaviour.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollOptionBehaviour.java
similarity index 99%
rename from src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollvalue/ScrollOptionBehaviour.java
rename to src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollOptionBehaviour.java
index eb0233e1c..262ff9673 100644
--- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollvalue/ScrollOptionBehaviour.java
+++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollOptionBehaviour.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.blockEntity.behaviour.scrollvalue;
+package com.simibubi.create.foundation.blockEntity.behaviour.scrollValue;
 
 import com.google.common.collect.ImmutableList;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollvalue/ScrollValueBehaviour.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollValueBehaviour.java
similarity index 98%
rename from src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollvalue/ScrollValueBehaviour.java
rename to src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollValueBehaviour.java
index d8ff66483..093ad4c9c 100644
--- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollvalue/ScrollValueBehaviour.java
+++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollValueBehaviour.java
@@ -1,13 +1,13 @@
-package com.simibubi.create.foundation.blockEntity.behaviour.scrollvalue;
+package com.simibubi.create.foundation.blockEntity.behaviour.scrollValue;
 
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
 import com.google.common.collect.ImmutableList;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
 import com.simibubi.create.foundation.blockEntity.behaviour.BehaviourType;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsBoard;
diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollvalue/ScrollValueHandler.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollValueHandler.java
similarity index 98%
rename from src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollvalue/ScrollValueHandler.java
rename to src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollValueHandler.java
index d3d9ce827..11b820c1d 100644
--- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollvalue/ScrollValueHandler.java
+++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollValueHandler.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.blockEntity.behaviour.scrollvalue;
+package com.simibubi.create.foundation.blockEntity.behaviour.scrollValue;
 
 import com.simibubi.create.foundation.utility.animation.PhysicalFloat;
 
diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollvalue/ScrollValueRenderer.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollValueRenderer.java
similarity index 97%
rename from src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollvalue/ScrollValueRenderer.java
rename to src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollValueRenderer.java
index 41ac57a26..e4878b173 100644
--- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollvalue/ScrollValueRenderer.java
+++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollValueRenderer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.blockEntity.behaviour.scrollvalue;
+package com.simibubi.create.foundation.blockEntity.behaviour.scrollValue;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -7,8 +7,8 @@ import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
 import com.simibubi.create.AllKeys;
 import com.simibubi.create.CreateClient;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBox;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBox.IconValueBox;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBox.TextValueBox;
diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/simple/DeferralBehaviour.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/simple/DeferralBehaviour.java
index 300fecc9b..3e23d96e1 100644
--- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/simple/DeferralBehaviour.java
+++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/simple/DeferralBehaviour.java
@@ -2,9 +2,9 @@ package com.simibubi.create.foundation.blockEntity.behaviour.simple;
 
 import java.util.function.Supplier;
 
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
 import com.simibubi.create.foundation.blockEntity.behaviour.BehaviourType;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 
 import net.minecraft.nbt.CompoundTag;
 
diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/renderer/SmartBlockEntityRenderer.java b/src/main/java/com/simibubi/create/foundation/blockEntity/renderer/SmartBlockEntityRenderer.java
index 647616385..041c97d17 100644
--- a/src/main/java/com/simibubi/create/foundation/blockEntity/renderer/SmartBlockEntityRenderer.java
+++ b/src/main/java/com/simibubi/create/foundation/blockEntity/renderer/SmartBlockEntityRenderer.java
@@ -1,9 +1,9 @@
 package com.simibubi.create.foundation.blockEntity.renderer;
 
 import com.mojang.blaze3d.vertex.PoseStack;
+import com.simibubi.create.content.redstone.link.LinkRenderer;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
 import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringRenderer;
-import com.simibubi.create.foundation.blockEntity.behaviour.linked.LinkRenderer;
 
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
diff --git a/src/main/java/com/simibubi/create/foundation/config/ConfigBase.java b/src/main/java/com/simibubi/create/foundation/config/ConfigBase.java
index 5559a8db4..e8921fbf7 100644
--- a/src/main/java/com/simibubi/create/foundation/config/ConfigBase.java
+++ b/src/main/java/com/simibubi/create/foundation/config/ConfigBase.java
@@ -21,7 +21,7 @@ public abstract class ConfigBase {
 	protected List<CValue<?, ?>> allValues;
 	protected List<ConfigBase> children;
 
-	protected void registerAll(final ForgeConfigSpec.Builder builder) {
+	public void registerAll(final ForgeConfigSpec.Builder builder) {
 		for (CValue<?, ?> cValue : allValues)
 			cValue.register(builder);
 	}
diff --git a/src/main/java/com/simibubi/create/foundation/config/ui/BaseConfigScreen.java b/src/main/java/com/simibubi/create/foundation/config/ui/BaseConfigScreen.java
index 4237e4d63..af135847f 100644
--- a/src/main/java/com/simibubi/create/foundation/config/ui/BaseConfigScreen.java
+++ b/src/main/java/com/simibubi/create/foundation/config/ui/BaseConfigScreen.java
@@ -12,7 +12,6 @@ import org.lwjgl.glfw.GLFW;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.Create;
-import com.simibubi.create.foundation.config.AllConfigs;
 import com.simibubi.create.foundation.gui.AllIcons;
 import com.simibubi.create.foundation.gui.ScreenOpener;
 import com.simibubi.create.foundation.gui.Theme;
@@ -23,6 +22,7 @@ import com.simibubi.create.foundation.gui.widget.BoxWidget;
 import com.simibubi.create.foundation.item.TooltipHelper;
 import com.simibubi.create.foundation.item.TooltipHelper.Palette;
 import com.simibubi.create.foundation.utility.Components;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraftforge.common.ForgeConfigSpec;
diff --git a/src/main/java/com/simibubi/create/foundation/config/ui/ConfigHelper.java b/src/main/java/com/simibubi/create/foundation/config/ui/ConfigHelper.java
index af0e38450..2a9cc509a 100644
--- a/src/main/java/com/simibubi/create/foundation/config/ui/ConfigHelper.java
+++ b/src/main/java/com/simibubi/create/foundation/config/ui/ConfigHelper.java
@@ -19,8 +19,8 @@ import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
 import com.simibubi.create.Create;
-import com.simibubi.create.foundation.config.AllConfigs;
 import com.simibubi.create.foundation.utility.Pair;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraftforge.common.ForgeConfigSpec;
 import net.minecraftforge.fml.ModContainer;
diff --git a/src/main/java/com/simibubi/create/foundation/config/ui/ConfigScreen.java b/src/main/java/com/simibubi/create/foundation/config/ui/ConfigScreen.java
index fa0f94bfb..585c2a03d 100644
--- a/src/main/java/com/simibubi/create/foundation/config/ui/ConfigScreen.java
+++ b/src/main/java/com/simibubi/create/foundation/config/ui/ConfigScreen.java
@@ -15,14 +15,14 @@ import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.relays.elementary.CogWheelBlock;
+import com.simibubi.create.content.kinetics.simpleRelays.CogWheelBlock;
 import com.simibubi.create.foundation.gui.AbstractSimiScreen;
-import com.simibubi.create.foundation.gui.CreateMainMenuScreen;
 import com.simibubi.create.foundation.gui.UIRenderHelper;
 import com.simibubi.create.foundation.gui.element.GuiGameElement;
 import com.simibubi.create.foundation.gui.element.StencilElement;
 import com.simibubi.create.foundation.utility.animation.Force;
 import com.simibubi.create.foundation.utility.animation.PhysicalFloat;
+import com.simibubi.create.infrastructure.gui.CreateMainMenuScreen;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
diff --git a/src/main/java/com/simibubi/create/foundation/config/ui/SubMenuConfigScreen.java b/src/main/java/com/simibubi/create/foundation/config/ui/SubMenuConfigScreen.java
index d66a95f48..48879b3ee 100644
--- a/src/main/java/com/simibubi/create/foundation/config/ui/SubMenuConfigScreen.java
+++ b/src/main/java/com/simibubi/create/foundation/config/ui/SubMenuConfigScreen.java
@@ -20,6 +20,7 @@ import com.electronwill.nightconfig.core.AbstractConfig;
 import com.electronwill.nightconfig.core.UnmodifiableConfig;
 import com.google.common.collect.Lists;
 import com.mojang.blaze3d.vertex.PoseStack;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.foundation.config.ui.ConfigScreenList.LabeledEntry;
 import com.simibubi.create.foundation.config.ui.entries.BooleanEntry;
 import com.simibubi.create.foundation.config.ui.entries.EnumEntry;
@@ -36,7 +37,6 @@ import com.simibubi.create.foundation.gui.element.DelegatedStencilElement;
 import com.simibubi.create.foundation.gui.widget.BoxWidget;
 import com.simibubi.create.foundation.item.TooltipHelper;
 import com.simibubi.create.foundation.item.TooltipHelper.Palette;
-import com.simibubi.create.foundation.networking.AllPackets;
 import com.simibubi.create.foundation.utility.Color;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Couple;
diff --git a/src/main/java/com/simibubi/create/foundation/data/BlockStateGen.java b/src/main/java/com/simibubi/create/foundation/data/BlockStateGen.java
index 06d40622e..e29e0dbeb 100644
--- a/src/main/java/com/simibubi/create/foundation/data/BlockStateGen.java
+++ b/src/main/java/com/simibubi/create/foundation/data/BlockStateGen.java
@@ -14,17 +14,17 @@ import org.apache.commons.lang3.tuple.Pair;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.contraptions.base.DirectionalAxisKineticBlock;
-import com.simibubi.create.content.contraptions.components.steam.whistle.WhistleBlock.WhistleSize;
-import com.simibubi.create.content.contraptions.components.steam.whistle.WhistleExtenderBlock;
-import com.simibubi.create.content.contraptions.components.steam.whistle.WhistleExtenderBlock.WhistleExtenderShape;
-import com.simibubi.create.content.contraptions.components.structureMovement.chassis.LinearChassisBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.chassis.RadialChassisBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.mounted.CartAssembleRailType;
-import com.simibubi.create.content.contraptions.components.structureMovement.mounted.CartAssemblerBlock;
-import com.simibubi.create.content.contraptions.fluids.pipes.EncasedPipeBlock;
-import com.simibubi.create.content.contraptions.fluids.pipes.FluidPipeBlock;
-import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock;
+import com.simibubi.create.content.contraptions.chassis.LinearChassisBlock;
+import com.simibubi.create.content.contraptions.chassis.RadialChassisBlock;
+import com.simibubi.create.content.contraptions.mounted.CartAssembleRailType;
+import com.simibubi.create.content.contraptions.mounted.CartAssemblerBlock;
+import com.simibubi.create.content.decoration.steamWhistle.WhistleBlock.WhistleSize;
+import com.simibubi.create.content.decoration.steamWhistle.WhistleExtenderBlock;
+import com.simibubi.create.content.decoration.steamWhistle.WhistleExtenderBlock.WhistleExtenderShape;
+import com.simibubi.create.content.fluids.pipes.EncasedPipeBlock;
+import com.simibubi.create.content.fluids.pipes.FluidPipeBlock;
+import com.simibubi.create.content.kinetics.base.DirectionalAxisKineticBlock;
+import com.simibubi.create.content.processing.burner.BlazeBurnerBlock;
 import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.Pointing;
 import com.tterrag.registrate.providers.DataGenContext;
diff --git a/src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java b/src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java
index 0f0dcc916..96a7f246c 100644
--- a/src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java
+++ b/src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java
@@ -18,28 +18,28 @@ import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllTags.AllBlockTags;
 import com.simibubi.create.AllTags.AllItemTags;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.contraptions.base.CasingBlock;
-import com.simibubi.create.content.contraptions.base.RotatedPillarKineticBlock;
-import com.simibubi.create.content.contraptions.components.crank.ValveHandleBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.interaction.DoorMovingInteraction;
-import com.simibubi.create.content.contraptions.components.structureMovement.interaction.TrapdoorMovingInteraction;
-import com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonGenerator;
-import com.simibubi.create.content.contraptions.relays.encased.EncasedCTBehaviour;
-import com.simibubi.create.content.contraptions.relays.encased.EncasedCogCTBehaviour;
-import com.simibubi.create.content.contraptions.relays.encased.EncasedCogwheelBlock;
-import com.simibubi.create.content.contraptions.relays.encased.EncasedShaftBlock;
-import com.simibubi.create.content.curiosities.deco.MetalScaffoldingBlock;
-import com.simibubi.create.content.curiosities.deco.MetalScaffoldingBlockItem;
-import com.simibubi.create.content.curiosities.deco.MetalScaffoldingCTBehaviour;
-import com.simibubi.create.content.curiosities.deco.SlidingDoorBlock;
-import com.simibubi.create.content.curiosities.deco.SlidingDoorMovementBehaviour;
-import com.simibubi.create.content.curiosities.frames.CopycatBlock;
-import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelBlock;
-import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelBlock.Shape;
-import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelItem;
-import com.simibubi.create.content.logistics.trains.AbstractBogeyBlock;
-import com.simibubi.create.content.logistics.trains.track.StandardBogeyBlock;
-import com.simibubi.create.foundation.block.BlockStressDefaults;
+import com.simibubi.create.content.contraptions.behaviour.DoorMovingInteraction;
+import com.simibubi.create.content.contraptions.behaviour.TrapdoorMovingInteraction;
+import com.simibubi.create.content.contraptions.piston.MechanicalPistonGenerator;
+import com.simibubi.create.content.decoration.MetalScaffoldingBlock;
+import com.simibubi.create.content.decoration.MetalScaffoldingBlockItem;
+import com.simibubi.create.content.decoration.MetalScaffoldingCTBehaviour;
+import com.simibubi.create.content.decoration.copycat.CopycatBlock;
+import com.simibubi.create.content.decoration.encasing.CasingBlock;
+import com.simibubi.create.content.decoration.encasing.EncasedCTBehaviour;
+import com.simibubi.create.content.decoration.slidingDoor.SlidingDoorBlock;
+import com.simibubi.create.content.decoration.slidingDoor.SlidingDoorMovementBehaviour;
+import com.simibubi.create.content.kinetics.BlockStressDefaults;
+import com.simibubi.create.content.kinetics.base.RotatedPillarKineticBlock;
+import com.simibubi.create.content.kinetics.crank.ValveHandleBlock;
+import com.simibubi.create.content.kinetics.simpleRelays.encased.EncasedCogCTBehaviour;
+import com.simibubi.create.content.kinetics.simpleRelays.encased.EncasedCogwheelBlock;
+import com.simibubi.create.content.kinetics.simpleRelays.encased.EncasedShaftBlock;
+import com.simibubi.create.content.logistics.tunnel.BeltTunnelBlock;
+import com.simibubi.create.content.logistics.tunnel.BeltTunnelBlock.Shape;
+import com.simibubi.create.content.logistics.tunnel.BeltTunnelItem;
+import com.simibubi.create.content.trains.bogey.AbstractBogeyBlock;
+import com.simibubi.create.content.trains.bogey.StandardBogeyBlock;
 import com.simibubi.create.foundation.block.ItemUseOverrides;
 import com.simibubi.create.foundation.block.connected.CTSpriteShiftEntry;
 import com.simibubi.create.foundation.block.connected.HorizontalCTBehaviour;
diff --git a/src/main/java/com/simibubi/create/foundation/data/CreateRegistrate.java b/src/main/java/com/simibubi/create/foundation/data/CreateRegistrate.java
index 68922cbe4..970f55c37 100644
--- a/src/main/java/com/simibubi/create/foundation/data/CreateRegistrate.java
+++ b/src/main/java/com/simibubi/create/foundation/data/CreateRegistrate.java
@@ -11,8 +11,8 @@ import org.jetbrains.annotations.Nullable;
 
 import com.simibubi.create.Create;
 import com.simibubi.create.CreateClient;
-import com.simibubi.create.content.contraptions.fluids.VirtualFluid;
-import com.simibubi.create.content.contraptions.relays.encased.CasingConnectivity;
+import com.simibubi.create.content.decoration.encasing.CasingConnectivity;
+import com.simibubi.create.content.fluids.VirtualFluid;
 import com.simibubi.create.foundation.block.connected.CTModel;
 import com.simibubi.create.foundation.block.connected.ConnectedTextureBehaviour;
 import com.simibubi.create.foundation.item.TooltipModifier;
diff --git a/src/main/java/com/simibubi/create/foundation/data/DirectionalAxisBlockStateGen.java b/src/main/java/com/simibubi/create/foundation/data/DirectionalAxisBlockStateGen.java
index 0905608cc..3103cf4d5 100644
--- a/src/main/java/com/simibubi/create/foundation/data/DirectionalAxisBlockStateGen.java
+++ b/src/main/java/com/simibubi/create/foundation/data/DirectionalAxisBlockStateGen.java
@@ -1,6 +1,6 @@
 package com.simibubi.create.foundation.data;
 
-import com.simibubi.create.content.contraptions.relays.gauge.GaugeBlock;
+import com.simibubi.create.content.kinetics.gauge.GaugeBlock;
 import com.tterrag.registrate.providers.DataGenContext;
 import com.tterrag.registrate.providers.RegistrateBlockstateProvider;
 
diff --git a/src/main/java/com/simibubi/create/foundation/data/WindowGen.java b/src/main/java/com/simibubi/create/foundation/data/WindowGen.java
index f6f414258..518b1f7d4 100644
--- a/src/main/java/com/simibubi/create/foundation/data/WindowGen.java
+++ b/src/main/java/com/simibubi/create/foundation/data/WindowGen.java
@@ -8,10 +8,10 @@ import java.util.function.Supplier;
 
 import com.simibubi.create.AllSpriteShifts;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.palettes.ConnectedGlassBlock;
-import com.simibubi.create.content.palettes.ConnectedGlassPaneBlock;
-import com.simibubi.create.content.palettes.GlassPaneBlock;
-import com.simibubi.create.content.palettes.WindowBlock;
+import com.simibubi.create.content.decoration.palettes.ConnectedGlassBlock;
+import com.simibubi.create.content.decoration.palettes.ConnectedGlassPaneBlock;
+import com.simibubi.create.content.decoration.palettes.GlassPaneBlock;
+import com.simibubi.create.content.decoration.palettes.WindowBlock;
 import com.simibubi.create.foundation.block.connected.CTSpriteShiftEntry;
 import com.simibubi.create.foundation.block.connected.ConnectedTextureBehaviour;
 import com.simibubi.create.foundation.block.connected.GlassPaneCTBehaviour;
diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java
index f9e299167..b99bfbdae 100644
--- a/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java
+++ b/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java
@@ -17,9 +17,9 @@ import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
 import com.simibubi.create.AllRecipeTypes;
 import com.simibubi.create.AllTags;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipe;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipeBuilder;
-import com.simibubi.create.content.palettes.AllPaletteStoneTypes;
+import com.simibubi.create.content.decoration.palettes.AllPaletteStoneTypes;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipe;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder;
 import com.simibubi.create.foundation.utility.Lang;
 
 import net.minecraft.data.DataGenerator;
diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/FillingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/FillingRecipeGen.java
index 3cdbdc831..dbcd606b0 100644
--- a/src/main/java/com/simibubi/create/foundation/data/recipe/FillingRecipeGen.java
+++ b/src/main/java/com/simibubi/create/foundation/data/recipe/FillingRecipeGen.java
@@ -4,7 +4,7 @@ import com.simibubi.create.AllFluids;
 import com.simibubi.create.AllItems;
 import com.simibubi.create.AllRecipeTypes;
 import com.simibubi.create.AllTags.AllFluidTags;
-import com.simibubi.create.content.contraptions.fluids.potion.PotionFluidHandler;
+import com.simibubi.create.content.fluids.potion.PotionFluidHandler;
 
 import net.minecraft.data.DataGenerator;
 import net.minecraft.world.item.Items;
diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/LogStrippingFakeRecipes.java b/src/main/java/com/simibubi/create/foundation/data/recipe/LogStrippingFakeRecipes.java
index 73ec671ce..0c5525676 100644
--- a/src/main/java/com/simibubi/create/foundation/data/recipe/LogStrippingFakeRecipes.java
+++ b/src/main/java/com/simibubi/create/foundation/data/recipe/LogStrippingFakeRecipes.java
@@ -3,11 +3,11 @@ package com.simibubi.create.foundation.data.recipe;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.simibubi.create.content.contraptions.components.deployer.ManualApplicationRecipe;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipeBuilder;
-import com.simibubi.create.foundation.config.AllConfigs;
+import com.simibubi.create.content.kinetics.deployer.ManualApplicationRecipe;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.RegisteredObjects;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.ItemTags;
diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/MixingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/MixingRecipeGen.java
index d19c71e9b..53244922a 100644
--- a/src/main/java/com/simibubi/create/foundation/data/recipe/MixingRecipeGen.java
+++ b/src/main/java/com/simibubi/create/foundation/data/recipe/MixingRecipeGen.java
@@ -3,8 +3,8 @@ package com.simibubi.create.foundation.data.recipe;
 import com.simibubi.create.AllFluids;
 import com.simibubi.create.AllItems;
 import com.simibubi.create.AllRecipeTypes;
-import com.simibubi.create.content.contraptions.processing.HeatCondition;
-import com.simibubi.create.foundation.utility.recipe.BlockTagIngredient;
+import com.simibubi.create.content.processing.recipe.HeatCondition;
+import com.simibubi.create.foundation.recipe.BlockTagIngredient;
 
 import net.minecraft.data.DataGenerator;
 import net.minecraft.tags.BlockTags;
diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/ProcessingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/ProcessingRecipeGen.java
index 7d3533323..891952cff 100644
--- a/src/main/java/com/simibubi/create/foundation/data/recipe/ProcessingRecipeGen.java
+++ b/src/main/java/com/simibubi/create/foundation/data/recipe/ProcessingRecipeGen.java
@@ -7,11 +7,11 @@ import java.util.function.Supplier;
 import java.util.function.UnaryOperator;
 
 import com.simibubi.create.Create;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipe;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipeBuilder;
-import com.simibubi.create.content.contraptions.processing.ProcessingRecipeSerializer;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipe;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipeSerializer;
+import com.simibubi.create.foundation.recipe.IRecipeTypeInfo;
 import com.simibubi.create.foundation.utility.RegisteredObjects;
-import com.simibubi.create.foundation.utility.recipe.IRecipeTypeInfo;
 
 import net.minecraft.data.CachedOutput;
 import net.minecraft.data.DataGenerator;
diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/SequencedAssemblyRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/SequencedAssemblyRecipeGen.java
index 8a26855b5..fdfbae03d 100644
--- a/src/main/java/com/simibubi/create/foundation/data/recipe/SequencedAssemblyRecipeGen.java
+++ b/src/main/java/com/simibubi/create/foundation/data/recipe/SequencedAssemblyRecipeGen.java
@@ -7,10 +7,10 @@ import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
 import com.simibubi.create.AllTags.AllItemTags;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.contraptions.components.deployer.DeployerApplicationRecipe;
-import com.simibubi.create.content.contraptions.components.press.PressingRecipe;
-import com.simibubi.create.content.contraptions.fluids.actors.FillingRecipe;
-import com.simibubi.create.content.contraptions.itemAssembly.SequencedAssemblyRecipeBuilder;
+import com.simibubi.create.content.fluids.transfer.FillingRecipe;
+import com.simibubi.create.content.kinetics.deployer.DeployerApplicationRecipe;
+import com.simibubi.create.content.kinetics.press.PressingRecipe;
+import com.simibubi.create.content.processing.sequenced.SequencedAssemblyRecipeBuilder;
 
 import net.minecraft.data.DataGenerator;
 import net.minecraft.world.item.Items;
diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java
index 0120a318c..27b8dfc7c 100644
--- a/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java
+++ b/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java
@@ -24,8 +24,8 @@ import com.simibubi.create.AllRecipeTypes;
 import com.simibubi.create.AllTags;
 import com.simibubi.create.AllTags.AllItemTags;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.palettes.AllPaletteBlocks;
-import com.simibubi.create.content.palettes.AllPaletteStoneTypes;
+import com.simibubi.create.content.decoration.palettes.AllPaletteBlocks;
+import com.simibubi.create.content.decoration.palettes.AllPaletteStoneTypes;
 import com.simibubi.create.foundation.utility.RegisteredObjects;
 import com.tterrag.registrate.util.entry.BlockEntry;
 import com.tterrag.registrate.util.entry.ItemEntry;
@@ -102,6 +102,17 @@ public class StandardRecipeGen extends CreateRecipeProvider {
 				.pattern("CCC")
 				.pattern("CCC")),
 
+		EXPERIENCE_FROM_BLOCK = create(AllItems.EXP_NUGGET).withSuffix("_from_block")
+			.returns(9)
+			.unlockedBy(AllItems.EXP_NUGGET::get)
+			.viaShapeless(b -> b.requires(AllBlocks.EXPERIENCE_BLOCK.get())),
+
+		EXPERIENCE_BLOCK = create(AllBlocks.EXPERIENCE_BLOCK).unlockedBy(AllItems.EXP_NUGGET::get)
+			.viaShaped(b -> b.define('C', AllItems.EXP_NUGGET.get())
+				.pattern("CCC")
+				.pattern("CCC")
+				.pattern("CCC")),
+
 		BRASS_COMPACTING =
 			metalCompacting(ImmutableList.of(AllItems.BRASS_NUGGET, AllItems.BRASS_INGOT, AllBlocks.BRASS_BLOCK),
 				ImmutableList.of(I::brassNugget, I::brass, I::brassBlock)),
diff --git a/src/main/java/com/simibubi/create/events/ClientEvents.java b/src/main/java/com/simibubi/create/foundation/events/ClientEvents.java
similarity index 77%
rename from src/main/java/com/simibubi/create/events/ClientEvents.java
rename to src/main/java/com/simibubi/create/foundation/events/ClientEvents.java
index 9b6747132..45f480a03 100644
--- a/src/main/java/com/simibubi/create/events/ClientEvents.java
+++ b/src/main/java/com/simibubi/create/foundation/events/ClientEvents.java
@@ -1,70 +1,70 @@
-package com.simibubi.create.events;
+package com.simibubi.create.foundation.events;
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllFluids;
 import com.simibubi.create.AllItems;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.Create;
 import com.simibubi.create.CreateClient;
-import com.simibubi.create.content.contraptions.KineticDebugger;
-import com.simibubi.create.content.contraptions.components.fan.AirCurrent;
-import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionHandler;
-import com.simibubi.create.content.contraptions.components.structureMovement.chassis.ChassisRangeDisplay;
-import com.simibubi.create.content.contraptions.components.structureMovement.interaction.controls.ControlsHandler;
-import com.simibubi.create.content.contraptions.components.structureMovement.interaction.controls.TrainHUD;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionRenderDispatcher;
-import com.simibubi.create.content.contraptions.components.structureMovement.train.CouplingHandlerClient;
-import com.simibubi.create.content.contraptions.components.structureMovement.train.CouplingPhysics;
-import com.simibubi.create.content.contraptions.components.structureMovement.train.CouplingRenderer;
-import com.simibubi.create.content.contraptions.components.structureMovement.train.capability.CapabilityMinecartController;
-import com.simibubi.create.content.contraptions.components.turntable.TurntableHandler;
-import com.simibubi.create.content.contraptions.goggles.GoggleOverlayRenderer;
-import com.simibubi.create.content.contraptions.itemAssembly.SequencedAssemblyRecipe;
-import com.simibubi.create.content.contraptions.relays.belt.item.BeltConnectorHandler;
-import com.simibubi.create.content.curiosities.armor.BacktankArmorLayer;
-import com.simibubi.create.content.curiosities.armor.DivingHelmetItem;
-import com.simibubi.create.content.curiosities.armor.NetheriteBacktankFirstPersonRenderer;
-import com.simibubi.create.content.curiosities.armor.RemainingAirOverlay;
-import com.simibubi.create.content.curiosities.clipboard.ClipboardValueSettingsHandler;
-import com.simibubi.create.content.curiosities.girder.GirderWrenchBehavior;
-import com.simibubi.create.content.curiosities.toolbox.ToolboxHandlerClient;
-import com.simibubi.create.content.curiosities.tools.BlueprintOverlayRenderer;
-import com.simibubi.create.content.curiosities.tools.ExtendoGripRenderHandler;
-import com.simibubi.create.content.curiosities.zapper.ZapperItem;
-import com.simibubi.create.content.curiosities.zapper.terrainzapper.WorldshaperRenderHandler;
-import com.simibubi.create.content.logistics.block.depot.EjectorTargetHandler;
-import com.simibubi.create.content.logistics.block.display.DisplayLinkBlockItem;
-import com.simibubi.create.content.logistics.block.mechanicalArm.ArmInteractionPointHandler;
-import com.simibubi.create.content.logistics.item.LinkedControllerClientHandler;
-import com.simibubi.create.content.logistics.trains.CameraDistanceModifier;
-import com.simibubi.create.content.logistics.trains.entity.CarriageContraptionEntity;
-import com.simibubi.create.content.logistics.trains.entity.CarriageCouplingRenderer;
-import com.simibubi.create.content.logistics.trains.entity.TrainRelocator;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.TrackTargetingClient;
-import com.simibubi.create.content.logistics.trains.management.schedule.TrainHatArmorLayer;
-import com.simibubi.create.content.logistics.trains.track.CurvedTrackInteraction;
-import com.simibubi.create.content.logistics.trains.track.TrackBlockOutline;
-import com.simibubi.create.content.logistics.trains.track.TrackPlacement;
-import com.simibubi.create.content.logistics.trains.track.TrackPlacementOverlay;
+import com.simibubi.create.content.contraptions.ContraptionHandler;
+import com.simibubi.create.content.contraptions.actors.trainControls.ControlsHandler;
+import com.simibubi.create.content.contraptions.chassis.ChassisRangeDisplay;
+import com.simibubi.create.content.contraptions.minecart.CouplingHandlerClient;
+import com.simibubi.create.content.contraptions.minecart.CouplingPhysics;
+import com.simibubi.create.content.contraptions.minecart.CouplingRenderer;
+import com.simibubi.create.content.contraptions.minecart.capability.CapabilityMinecartController;
+import com.simibubi.create.content.contraptions.render.ContraptionRenderDispatcher;
+import com.simibubi.create.content.decoration.girder.GirderWrenchBehavior;
+import com.simibubi.create.content.equipment.armor.BacktankArmorLayer;
+import com.simibubi.create.content.equipment.armor.DivingHelmetItem;
+import com.simibubi.create.content.equipment.armor.NetheriteBacktankFirstPersonRenderer;
+import com.simibubi.create.content.equipment.armor.RemainingAirOverlay;
+import com.simibubi.create.content.equipment.blueprint.BlueprintOverlayRenderer;
+import com.simibubi.create.content.equipment.clipboard.ClipboardValueSettingsHandler;
+import com.simibubi.create.content.equipment.extendoGrip.ExtendoGripRenderHandler;
+import com.simibubi.create.content.equipment.goggles.GoggleOverlayRenderer;
+import com.simibubi.create.content.equipment.toolbox.ToolboxHandlerClient;
+import com.simibubi.create.content.equipment.zapper.ZapperItem;
+import com.simibubi.create.content.equipment.zapper.terrainzapper.WorldshaperRenderHandler;
+import com.simibubi.create.content.kinetics.KineticDebugger;
+import com.simibubi.create.content.kinetics.belt.item.BeltConnectorHandler;
+import com.simibubi.create.content.kinetics.fan.AirCurrent;
+import com.simibubi.create.content.kinetics.mechanicalArm.ArmInteractionPointHandler;
+import com.simibubi.create.content.kinetics.turntable.TurntableHandler;
+import com.simibubi.create.content.logistics.depot.EjectorTargetHandler;
+import com.simibubi.create.content.processing.sequenced.SequencedAssemblyRecipe;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkBlockItem;
+import com.simibubi.create.content.redstone.link.LinkRenderer;
+import com.simibubi.create.content.redstone.link.controller.LinkedControllerClientHandler;
+import com.simibubi.create.content.trains.CameraDistanceModifier;
+import com.simibubi.create.content.trains.TrainHUD;
+import com.simibubi.create.content.trains.entity.CarriageContraptionEntity;
+import com.simibubi.create.content.trains.entity.CarriageCouplingRenderer;
+import com.simibubi.create.content.trains.entity.TrainRelocator;
+import com.simibubi.create.content.trains.schedule.TrainHatArmorLayer;
+import com.simibubi.create.content.trains.track.CurvedTrackInteraction;
+import com.simibubi.create.content.trains.track.TrackBlockOutline;
+import com.simibubi.create.content.trains.track.TrackPlacement;
+import com.simibubi.create.content.trains.track.TrackPlacementOverlay;
+import com.simibubi.create.content.trains.track.TrackTargetingClient;
 import com.simibubi.create.foundation.blockEntity.behaviour.edgeInteraction.EdgeInteractionRenderer;
 import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringRenderer;
-import com.simibubi.create.foundation.blockEntity.behaviour.linked.LinkRenderer;
-import com.simibubi.create.foundation.blockEntity.behaviour.scrollvalue.ScrollValueHandler;
-import com.simibubi.create.foundation.blockEntity.behaviour.scrollvalue.ScrollValueRenderer;
-import com.simibubi.create.foundation.config.AllConfigs;
+import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollValueHandler;
+import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollValueRenderer;
 import com.simibubi.create.foundation.config.ui.BaseConfigScreen;
 import com.simibubi.create.foundation.fluid.FluidHelper;
 import com.simibubi.create.foundation.item.TooltipModifier;
-import com.simibubi.create.foundation.networking.AllPackets;
 import com.simibubi.create.foundation.networking.LeftClickPacket;
+import com.simibubi.create.foundation.placement.PlacementHelpers;
 import com.simibubi.create.foundation.ponder.PonderTooltipHandler;
 import com.simibubi.create.foundation.render.SuperRenderTypeBuffer;
 import com.simibubi.create.foundation.sound.SoundScapes;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 import com.simibubi.create.foundation.utility.CameraAngleAnimationService;
 import com.simibubi.create.foundation.utility.ServerSpeedProvider;
-import com.simibubi.create.foundation.utility.placement.PlacementHelpers;
 import com.simibubi.create.foundation.utility.worldWrappers.WrappedClientWorld;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.client.Camera;
 import net.minecraft.client.Minecraft;
diff --git a/src/main/java/com/simibubi/create/events/CommonEvents.java b/src/main/java/com/simibubi/create/foundation/events/CommonEvents.java
similarity index 85%
rename from src/main/java/com/simibubi/create/events/CommonEvents.java
rename to src/main/java/com/simibubi/create/foundation/events/CommonEvents.java
index 5b4bbc499..4b88a360b 100644
--- a/src/main/java/com/simibubi/create/events/CommonEvents.java
+++ b/src/main/java/com/simibubi/create/foundation/events/CommonEvents.java
@@ -1,22 +1,22 @@
-package com.simibubi.create.events;
+package com.simibubi.create.foundation.events;
 
 import com.simibubi.create.Create;
-import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionHandler;
-import com.simibubi.create.content.contraptions.components.structureMovement.interaction.controls.ControlsServerHandler;
-import com.simibubi.create.content.contraptions.components.structureMovement.train.CouplingPhysics;
-import com.simibubi.create.content.contraptions.components.structureMovement.train.capability.CapabilityMinecartController;
-import com.simibubi.create.content.contraptions.wrench.WrenchItem;
-import com.simibubi.create.content.curiosities.toolbox.ToolboxHandler;
-import com.simibubi.create.content.curiosities.weapons.PotatoProjectileTypeManager;
-import com.simibubi.create.content.curiosities.zapper.ZapperInteractionHandler;
-import com.simibubi.create.content.curiosities.zapper.ZapperItem;
-import com.simibubi.create.content.logistics.item.LinkedControllerServerHandler;
-import com.simibubi.create.content.logistics.trains.entity.CarriageEntityHandler;
+import com.simibubi.create.content.contraptions.ContraptionHandler;
+import com.simibubi.create.content.contraptions.actors.trainControls.ControlsServerHandler;
+import com.simibubi.create.content.contraptions.minecart.CouplingPhysics;
+import com.simibubi.create.content.contraptions.minecart.capability.CapabilityMinecartController;
+import com.simibubi.create.content.equipment.potatoCannon.PotatoProjectileTypeManager;
+import com.simibubi.create.content.equipment.toolbox.ToolboxHandler;
+import com.simibubi.create.content.equipment.wrench.WrenchItem;
+import com.simibubi.create.content.equipment.zapper.ZapperInteractionHandler;
+import com.simibubi.create.content.equipment.zapper.ZapperItem;
+import com.simibubi.create.content.redstone.link.controller.LinkedControllerServerHandler;
+import com.simibubi.create.content.trains.entity.CarriageEntityHandler;
 import com.simibubi.create.foundation.ModFilePackResources;
-import com.simibubi.create.foundation.command.AllCommands;
+import com.simibubi.create.foundation.recipe.RecipeFinder;
 import com.simibubi.create.foundation.utility.ServerSpeedProvider;
 import com.simibubi.create.foundation.utility.WorldAttached;
-import com.simibubi.create.foundation.utility.recipe.RecipeFinder;
+import com.simibubi.create.infrastructure.command.AllCommands;
 
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.packs.PackType;
@@ -50,11 +50,9 @@ import net.minecraftforge.event.server.ServerStoppingEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.LogicalSide;
 import net.minecraftforge.fml.ModList;
-import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
 import net.minecraftforge.forgespi.language.IModFileInfo;
 import net.minecraftforge.forgespi.locating.IModFile;
-import net.minecraftforge.registries.NewRegistryEvent;
 
 @EventBusSubscriber
 public class CommonEvents {
diff --git a/src/main/java/com/simibubi/create/events/InputEvents.java b/src/main/java/com/simibubi/create/foundation/events/InputEvents.java
similarity index 80%
rename from src/main/java/com/simibubi/create/events/InputEvents.java
rename to src/main/java/com/simibubi/create/foundation/events/InputEvents.java
index 75c00a898..f5a524fcb 100644
--- a/src/main/java/com/simibubi/create/events/InputEvents.java
+++ b/src/main/java/com/simibubi/create/foundation/events/InputEvents.java
@@ -1,12 +1,12 @@
-package com.simibubi.create.events;
+package com.simibubi.create.foundation.events;
 
 import com.simibubi.create.CreateClient;
-import com.simibubi.create.content.contraptions.components.structureMovement.elevator.ElevatorControlsHandler;
-import com.simibubi.create.content.contraptions.components.structureMovement.interaction.controls.TrainHUD;
-import com.simibubi.create.content.curiosities.toolbox.ToolboxHandlerClient;
-import com.simibubi.create.content.logistics.item.LinkedControllerClientHandler;
-import com.simibubi.create.content.logistics.trains.entity.TrainRelocator;
-import com.simibubi.create.content.logistics.trains.track.CurvedTrackInteraction;
+import com.simibubi.create.content.contraptions.elevator.ElevatorControlsHandler;
+import com.simibubi.create.content.equipment.toolbox.ToolboxHandlerClient;
+import com.simibubi.create.content.redstone.link.controller.LinkedControllerClientHandler;
+import com.simibubi.create.content.trains.TrainHUD;
+import com.simibubi.create.content.trains.entity.TrainRelocator;
+import com.simibubi.create.content.trains.track.CurvedTrackInteraction;
 
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
diff --git a/src/main/java/com/simibubi/create/foundation/fluid/FluidHelper.java b/src/main/java/com/simibubi/create/foundation/fluid/FluidHelper.java
index 9de3cb627..850a87893 100644
--- a/src/main/java/com/simibubi/create/foundation/fluid/FluidHelper.java
+++ b/src/main/java/com/simibubi/create/foundation/fluid/FluidHelper.java
@@ -7,9 +7,9 @@ import com.google.gson.JsonObject;
 import com.google.gson.JsonSyntaxException;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.contraptions.fluids.actors.GenericItemFilling;
-import com.simibubi.create.content.contraptions.fluids.tank.CreativeFluidTankBlockEntity;
-import com.simibubi.create.content.contraptions.processing.EmptyingByBasin;
+import com.simibubi.create.content.fluids.tank.CreativeFluidTankBlockEntity;
+import com.simibubi.create.content.fluids.transfer.GenericItemEmptying;
+import com.simibubi.create.content.fluids.transfer.GenericItemFilling;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
 import com.simibubi.create.foundation.utility.Pair;
 import com.simibubi.create.foundation.utility.RegisteredObjects;
@@ -157,12 +157,12 @@ public class FluidHelper {
 		return stack;
 	}
 
-	public static boolean tryEmptyItemIntoTE(Level worldIn, Player player, InteractionHand handIn, ItemStack heldItem,
+	public static boolean tryEmptyItemIntoBE(Level worldIn, Player player, InteractionHand handIn, ItemStack heldItem,
 		SmartBlockEntity be) {
-		if (!EmptyingByBasin.canItemBeEmptied(worldIn, heldItem))
+		if (!GenericItemEmptying.canItemBeEmptied(worldIn, heldItem))
 			return false;
 
-		Pair<FluidStack, ItemStack> emptyingResult = EmptyingByBasin.emptyItem(worldIn, heldItem, true);
+		Pair<FluidStack, ItemStack> emptyingResult = GenericItemEmptying.emptyItem(worldIn, heldItem, true);
 		LazyOptional<IFluidHandler> capability = be.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY);
 		IFluidHandler tank = capability.orElse(null);
 		FluidStack fluidStack = emptyingResult.getFirst();
@@ -173,7 +173,7 @@ public class FluidHelper {
 			return true;
 
 		ItemStack copyOfHeld = heldItem.copy();
-		emptyingResult = EmptyingByBasin.emptyItem(worldIn, copyOfHeld, false);
+		emptyingResult = GenericItemEmptying.emptyItem(worldIn, copyOfHeld, false);
 		tank.fill(fluidStack, FluidAction.EXECUTE);
 
 		if (!player.isCreative() && !(be instanceof CreativeFluidTankBlockEntity)) {
@@ -188,7 +188,7 @@ public class FluidHelper {
 		return true;
 	}
 
-	public static boolean tryFillItemFromTE(Level world, Player player, InteractionHand handIn, ItemStack heldItem,
+	public static boolean tryFillItemFromBE(Level world, Player player, InteractionHand handIn, ItemStack heldItem,
 		SmartBlockEntity be) {
 		if (!GenericItemFilling.canItemBeFilled(world, heldItem))
 			return false;
diff --git a/src/main/java/com/simibubi/create/foundation/gui/menu/IClearableMenu.java b/src/main/java/com/simibubi/create/foundation/gui/menu/IClearableMenu.java
index 2c49e915c..b9d8431be 100644
--- a/src/main/java/com/simibubi/create/foundation/gui/menu/IClearableMenu.java
+++ b/src/main/java/com/simibubi/create/foundation/gui/menu/IClearableMenu.java
@@ -1,6 +1,6 @@
 package com.simibubi.create.foundation.gui.menu;
 
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.AllPackets;
 
 public interface IClearableMenu {
 
diff --git a/src/main/java/com/simibubi/create/foundation/gui/widget/ScrollInput.java b/src/main/java/com/simibubi/create/foundation/gui/widget/ScrollInput.java
index 98a78ed5e..cb8a3e42d 100644
--- a/src/main/java/com/simibubi/create/foundation/gui/widget/ScrollInput.java
+++ b/src/main/java/com/simibubi/create/foundation/gui/widget/ScrollInput.java
@@ -5,7 +5,7 @@ import java.util.function.Function;
 
 import com.simibubi.create.AllKeys;
 import com.simibubi.create.AllSoundEvents;
-import com.simibubi.create.foundation.blockEntity.behaviour.scrollvalue.ScrollValueBehaviour.StepContext;
+import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollValueBehaviour.StepContext;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Lang;
 
diff --git a/src/main/java/com/simibubi/create/content/curiosities/CombustibleItem.java b/src/main/java/com/simibubi/create/foundation/item/CombustibleItem.java
similarity index 90%
rename from src/main/java/com/simibubi/create/content/curiosities/CombustibleItem.java
rename to src/main/java/com/simibubi/create/foundation/item/CombustibleItem.java
index 0ec268443..95330e609 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/CombustibleItem.java
+++ b/src/main/java/com/simibubi/create/foundation/item/CombustibleItem.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.curiosities;
+package com.simibubi.create.foundation.item;
 
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
diff --git a/src/main/java/com/simibubi/create/foundation/item/KineticStats.java b/src/main/java/com/simibubi/create/foundation/item/KineticStats.java
index f59a268f6..5cf6656c4 100644
--- a/src/main/java/com/simibubi/create/foundation/item/KineticStats.java
+++ b/src/main/java/com/simibubi/create/foundation/item/KineticStats.java
@@ -9,18 +9,18 @@ import java.util.List;
 import org.jetbrains.annotations.Nullable;
 
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.base.IRotate;
-import com.simibubi.create.content.contraptions.base.IRotate.StressImpact;
-import com.simibubi.create.content.contraptions.components.crank.ValveHandleBlock;
-import com.simibubi.create.content.contraptions.components.steam.SteamEngineBlock;
-import com.simibubi.create.content.contraptions.goggles.GogglesItem;
-import com.simibubi.create.foundation.block.BlockStressValues;
-import com.simibubi.create.foundation.config.AllConfigs;
-import com.simibubi.create.foundation.config.CKinetics;
+import com.simibubi.create.content.equipment.goggles.GogglesItem;
+import com.simibubi.create.content.kinetics.BlockStressValues;
+import com.simibubi.create.content.kinetics.base.IRotate;
+import com.simibubi.create.content.kinetics.base.IRotate.StressImpact;
+import com.simibubi.create.content.kinetics.crank.ValveHandleBlock;
+import com.simibubi.create.content.kinetics.steamEngine.SteamEngineBlock;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.LangBuilder;
+import com.simibubi.create.infrastructure.config.AllConfigs;
+import com.simibubi.create.infrastructure.config.CKinetics;
 
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Player;
diff --git a/src/main/java/com/simibubi/create/foundation/item/TooltipHelper.java b/src/main/java/com/simibubi/create/foundation/item/TooltipHelper.java
index ead41a7bf..e8611df71 100644
--- a/src/main/java/com/simibubi/create/foundation/item/TooltipHelper.java
+++ b/src/main/java/com/simibubi/create/foundation/item/TooltipHelper.java
@@ -6,7 +6,7 @@ import java.util.LinkedList;
 import java.util.List;
 
 import com.google.common.base.Strings;
-import com.simibubi.create.content.contraptions.goggles.IHaveGoggleInformation;
+import com.simibubi.create.content.equipment.goggles.IHaveGoggleInformation;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.Lang;
diff --git a/src/main/java/com/simibubi/create/foundation/mixin/ClientboundMapItemDataPacketMixin.java b/src/main/java/com/simibubi/create/foundation/mixin/ClientboundMapItemDataPacketMixin.java
index 95f162ef2..22442da9d 100644
--- a/src/main/java/com/simibubi/create/foundation/mixin/ClientboundMapItemDataPacketMixin.java
+++ b/src/main/java/com/simibubi/create/foundation/mixin/ClientboundMapItemDataPacketMixin.java
@@ -13,7 +13,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import com.simibubi.create.content.logistics.trains.management.edgePoint.station.StationMarker;
+import com.simibubi.create.content.trains.station.StationMarker;
 
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 import it.unimi.dsi.fastutil.ints.IntList;
diff --git a/src/main/java/com/simibubi/create/foundation/mixin/ContraptionDriverInteractMixin.java b/src/main/java/com/simibubi/create/foundation/mixin/ContraptionDriverInteractMixin.java
index 76b372e9b..b575a7de5 100644
--- a/src/main/java/com/simibubi/create/foundation/mixin/ContraptionDriverInteractMixin.java
+++ b/src/main/java/com/simibubi/create/foundation/mixin/ContraptionDriverInteractMixin.java
@@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.Intrinsic;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
 
 import net.minecraft.world.entity.Entity;
 import net.minecraftforge.common.capabilities.CapabilityProvider;
diff --git a/src/main/java/com/simibubi/create/foundation/mixin/EntityMixin.java b/src/main/java/com/simibubi/create/foundation/mixin/EntityMixin.java
index a191be82f..1ad6e1fb4 100644
--- a/src/main/java/com/simibubi/create/foundation/mixin/EntityMixin.java
+++ b/src/main/java/com/simibubi/create/foundation/mixin/EntityMixin.java
@@ -5,7 +5,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import com.simibubi.create.content.curiosities.armor.NetheriteDivingHandler;
+import com.simibubi.create.content.equipment.armor.NetheriteDivingHandler;
 
 import net.minecraft.world.entity.Entity;
 
diff --git a/src/main/java/com/simibubi/create/foundation/mixin/LavaSwimmingMixin.java b/src/main/java/com/simibubi/create/foundation/mixin/LavaSwimmingMixin.java
index 921bdad48..6156c68b8 100644
--- a/src/main/java/com/simibubi/create/foundation/mixin/LavaSwimmingMixin.java
+++ b/src/main/java/com/simibubi/create/foundation/mixin/LavaSwimmingMixin.java
@@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.Slice;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.curiosities.armor.DivingBootsItem;
+import com.simibubi.create.content.equipment.armor.DivingBootsItem;
 
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
diff --git a/src/main/java/com/simibubi/create/foundation/mixin/MainMixin.java b/src/main/java/com/simibubi/create/foundation/mixin/MainMixin.java
index 5bdcd354a..99994733a 100644
--- a/src/main/java/com/simibubi/create/foundation/mixin/MainMixin.java
+++ b/src/main/java/com/simibubi/create/foundation/mixin/MainMixin.java
@@ -1,22 +1,20 @@
 package com.simibubi.create.foundation.mixin;
 
+import java.util.Collection;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyVariable;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.gametest.framework.GameTestRegistry;
 import net.minecraft.gametest.framework.GameTestRunner;
 import net.minecraft.gametest.framework.GameTestServer;
 import net.minecraft.server.Main;
-
 import net.minecraft.server.MinecraftServer;
-
 import net.minecraft.server.packs.repository.PackRepository;
 import net.minecraft.world.level.storage.LevelStorageSource.LevelStorageAccess;
 
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.ModifyVariable;
-
-import java.util.Collection;
-
 @Mixin(Main.class)
 public class MainMixin {
 	/**
diff --git a/src/main/java/com/simibubi/create/foundation/mixin/MapItemSavedDataMixin.java b/src/main/java/com/simibubi/create/foundation/mixin/MapItemSavedDataMixin.java
index 1e0c8386b..27cfeba7f 100644
--- a/src/main/java/com/simibubi/create/foundation/mixin/MapItemSavedDataMixin.java
+++ b/src/main/java/com/simibubi/create/foundation/mixin/MapItemSavedDataMixin.java
@@ -15,9 +15,9 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import com.google.common.collect.Maps;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.station.StationBlockEntity;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.station.StationMapData;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.station.StationMarker;
+import com.simibubi.create.content.trains.station.StationBlockEntity;
+import com.simibubi.create.content.trains.station.StationMapData;
+import com.simibubi.create.content.trains.station.StationMarker;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
diff --git a/src/main/java/com/simibubi/create/foundation/mixin/TestCommandMixin.java b/src/main/java/com/simibubi/create/foundation/mixin/TestCommandMixin.java
index 0afcc3a1e..b9cc72e4d 100644
--- a/src/main/java/com/simibubi/create/foundation/mixin/TestCommandMixin.java
+++ b/src/main/java/com/simibubi/create/foundation/mixin/TestCommandMixin.java
@@ -1,25 +1,22 @@
 package com.simibubi.create.foundation.mixin;
 
-import com.simibubi.create.gametest.infrastructure.CreateTestFunction;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.gametest.framework.GameTestRegistry;
-import net.minecraft.gametest.framework.MultipleTestTracker;
-import net.minecraft.gametest.framework.TestCommand;
-
-import net.minecraft.gametest.framework.TestFunction;
-
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.Tag;
-import net.minecraft.server.level.ServerLevel;
-
-import net.minecraft.world.level.block.entity.StructureBlockEntity;
+import javax.annotation.Nullable;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
-import javax.annotation.Nullable;
+import com.simibubi.create.infrastructure.gametest.CreateTestFunction;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.gametest.framework.GameTestRegistry;
+import net.minecraft.gametest.framework.MultipleTestTracker;
+import net.minecraft.gametest.framework.TestCommand;
+import net.minecraft.gametest.framework.TestFunction;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.Tag;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.block.entity.StructureBlockEntity;
 
 @Mixin(TestCommand.class)
 public class TestCommandMixin {
diff --git a/src/main/java/com/simibubi/create/foundation/mixin/WaterWheelFluidSpreadMixin.java b/src/main/java/com/simibubi/create/foundation/mixin/WaterWheelFluidSpreadMixin.java
index 80f386189..d398815e6 100644
--- a/src/main/java/com/simibubi/create/foundation/mixin/WaterWheelFluidSpreadMixin.java
+++ b/src/main/java/com/simibubi/create/foundation/mixin/WaterWheelFluidSpreadMixin.java
@@ -6,8 +6,8 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.base.IRotate;
-import com.simibubi.create.content.contraptions.components.waterwheel.WaterWheelStructuralBlock;
+import com.simibubi.create.content.kinetics.base.IRotate;
+import com.simibubi.create.content.kinetics.waterwheel.WaterWheelStructuralBlock;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/simibubi/create/foundation/mixin/accessor/GameTestHelperAccessor.java b/src/main/java/com/simibubi/create/foundation/mixin/accessor/GameTestHelperAccessor.java
index 3c3c280d6..5079c9f51 100644
--- a/src/main/java/com/simibubi/create/foundation/mixin/accessor/GameTestHelperAccessor.java
+++ b/src/main/java/com/simibubi/create/foundation/mixin/accessor/GameTestHelperAccessor.java
@@ -1,11 +1,11 @@
 package com.simibubi.create.foundation.mixin.accessor;
 
-import net.minecraft.gametest.framework.GameTestHelper;
-import net.minecraft.gametest.framework.GameTestInfo;
-
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
+import net.minecraft.gametest.framework.GameTestHelper;
+import net.minecraft.gametest.framework.GameTestInfo;
+
 @Mixin(GameTestHelper.class)
 public interface GameTestHelperAccessor {
 	@Accessor
diff --git a/src/main/java/com/simibubi/create/foundation/mixin/client/CameraMixin.java b/src/main/java/com/simibubi/create/foundation/mixin/client/CameraMixin.java
index bd06cb404..2422a2d1c 100644
--- a/src/main/java/com/simibubi/create/foundation/mixin/client/CameraMixin.java
+++ b/src/main/java/com/simibubi/create/foundation/mixin/client/CameraMixin.java
@@ -4,7 +4,7 @@ import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.ModifyArg;
 
-import com.simibubi.create.content.logistics.trains.CameraDistanceModifier;
+import com.simibubi.create.content.trains.CameraDistanceModifier;
 
 import net.minecraft.client.Camera;
 
diff --git a/src/main/java/com/simibubi/create/foundation/mixin/client/EntityContraptionInteractionMixin.java b/src/main/java/com/simibubi/create/foundation/mixin/client/EntityContraptionInteractionMixin.java
index 6248d4cd6..d57e7f093 100644
--- a/src/main/java/com/simibubi/create/foundation/mixin/client/EntityContraptionInteractionMixin.java
+++ b/src/main/java/com/simibubi/create/foundation/mixin/client/EntityContraptionInteractionMixin.java
@@ -16,10 +16,10 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.Contraption;
-import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionCollider;
-import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionHandler;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.Contraption;
+import com.simibubi.create.content.contraptions.ContraptionCollider;
+import com.simibubi.create.content.contraptions.ContraptionHandler;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.particles.BlockParticleOption;
diff --git a/src/main/java/com/simibubi/create/foundation/mixin/client/GameRendererMixin.java b/src/main/java/com/simibubi/create/foundation/mixin/client/GameRendererMixin.java
index 2e3766687..2e615810c 100644
--- a/src/main/java/com/simibubi/create/foundation/mixin/client/GameRendererMixin.java
+++ b/src/main/java/com/simibubi/create/foundation/mixin/client/GameRendererMixin.java
@@ -5,7 +5,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import com.simibubi.create.content.logistics.trains.track.TrackBlockOutline;
+import com.simibubi.create.content.trains.track.TrackBlockOutline;
 import com.simibubi.create.foundation.block.BigOutlines;
 
 import net.minecraft.client.renderer.GameRenderer;
diff --git a/src/main/java/com/simibubi/create/foundation/networking/ISyncPersistentData.java b/src/main/java/com/simibubi/create/foundation/networking/ISyncPersistentData.java
index b3d5531f2..f8c0cd86b 100644
--- a/src/main/java/com/simibubi/create/foundation/networking/ISyncPersistentData.java
+++ b/src/main/java/com/simibubi/create/foundation/networking/ISyncPersistentData.java
@@ -2,6 +2,8 @@ package com.simibubi.create.foundation.networking;
 
 import java.util.HashSet;
 
+import com.simibubi.create.AllPackets;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.FriendlyByteBuf;
diff --git a/src/main/java/com/simibubi/create/foundation/networking/LeftClickPacket.java b/src/main/java/com/simibubi/create/foundation/networking/LeftClickPacket.java
index bcd60c1fe..c9a6b6fb6 100644
--- a/src/main/java/com/simibubi/create/foundation/networking/LeftClickPacket.java
+++ b/src/main/java/com/simibubi/create/foundation/networking/LeftClickPacket.java
@@ -1,6 +1,6 @@
 package com.simibubi.create.foundation.networking;
 
-import com.simibubi.create.events.CommonEvents;
+import com.simibubi.create.foundation.events.CommonEvents;
 
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraftforge.network.NetworkDirection;
@@ -10,7 +10,7 @@ public class LeftClickPacket extends SimplePacketBase {
 
 	public LeftClickPacket() {}
 
-	LeftClickPacket(FriendlyByteBuf buffer) {}
+	public LeftClickPacket(FriendlyByteBuf buffer) {}
 
 	@Override
 	public void write(FriendlyByteBuf buffer) {}
diff --git a/src/main/java/com/simibubi/create/foundation/utility/outliner/AABBOutline.java b/src/main/java/com/simibubi/create/foundation/outliner/AABBOutline.java
similarity index 99%
rename from src/main/java/com/simibubi/create/foundation/utility/outliner/AABBOutline.java
rename to src/main/java/com/simibubi/create/foundation/outliner/AABBOutline.java
index aa31a3f73..1508a7fa0 100644
--- a/src/main/java/com/simibubi/create/foundation/utility/outliner/AABBOutline.java
+++ b/src/main/java/com/simibubi/create/foundation/outliner/AABBOutline.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.utility.outliner;
+package com.simibubi.create.foundation.outliner;
 
 import java.util.Optional;
 
diff --git a/src/main/java/com/simibubi/create/foundation/utility/outliner/BlockClusterOutline.java b/src/main/java/com/simibubi/create/foundation/outliner/BlockClusterOutline.java
similarity index 99%
rename from src/main/java/com/simibubi/create/foundation/utility/outliner/BlockClusterOutline.java
rename to src/main/java/com/simibubi/create/foundation/outliner/BlockClusterOutline.java
index ca117a5d4..e5467a8a7 100644
--- a/src/main/java/com/simibubi/create/foundation/utility/outliner/BlockClusterOutline.java
+++ b/src/main/java/com/simibubi/create/foundation/outliner/BlockClusterOutline.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.utility.outliner;
+package com.simibubi.create.foundation.outliner;
 
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/src/main/java/com/simibubi/create/foundation/utility/outliner/ChasingAABBOutline.java b/src/main/java/com/simibubi/create/foundation/outliner/ChasingAABBOutline.java
similarity index 95%
rename from src/main/java/com/simibubi/create/foundation/utility/outliner/ChasingAABBOutline.java
rename to src/main/java/com/simibubi/create/foundation/outliner/ChasingAABBOutline.java
index d8cfe13e7..4fcb02c3e 100644
--- a/src/main/java/com/simibubi/create/foundation/utility/outliner/ChasingAABBOutline.java
+++ b/src/main/java/com/simibubi/create/foundation/outliner/ChasingAABBOutline.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.utility.outliner;
+package com.simibubi.create.foundation.outliner;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Vector4f;
diff --git a/src/main/java/com/simibubi/create/foundation/utility/outliner/ItemOutline.java b/src/main/java/com/simibubi/create/foundation/outliner/ItemOutline.java
similarity index 67%
rename from src/main/java/com/simibubi/create/foundation/utility/outliner/ItemOutline.java
rename to src/main/java/com/simibubi/create/foundation/outliner/ItemOutline.java
index 7f974cabb..85b0665cd 100644
--- a/src/main/java/com/simibubi/create/foundation/utility/outliner/ItemOutline.java
+++ b/src/main/java/com/simibubi/create/foundation/outliner/ItemOutline.java
@@ -1,28 +1,16 @@
-package com.simibubi.create.foundation.utility.outliner;
+package com.simibubi.create.foundation.outliner;
 
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.blaze3d.vertex.VertexConsumer;
-import com.simibubi.create.AllSpecialTextures;
-import com.simibubi.create.foundation.render.RenderTypes;
 import com.simibubi.create.foundation.render.SuperRenderTypeBuffer;
-import com.simibubi.create.foundation.utility.Iterate;
-import com.simibubi.create.foundation.utility.VecHelper;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.LightTexture;
-import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.block.model.ItemTransforms;
 import net.minecraft.client.renderer.texture.OverlayTexture;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.core.Direction.Axis;
-import net.minecraft.core.Direction.AxisDirection;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.phys.Vec3;
 
-import java.util.*;
-
 public class ItemOutline extends Outline {
 
 	protected Vec3 pos;
diff --git a/src/main/java/com/simibubi/create/foundation/utility/outliner/LineOutline.java b/src/main/java/com/simibubi/create/foundation/outliner/LineOutline.java
similarity index 97%
rename from src/main/java/com/simibubi/create/foundation/utility/outliner/LineOutline.java
rename to src/main/java/com/simibubi/create/foundation/outliner/LineOutline.java
index da0921bac..b0805ae80 100644
--- a/src/main/java/com/simibubi/create/foundation/utility/outliner/LineOutline.java
+++ b/src/main/java/com/simibubi/create/foundation/outliner/LineOutline.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.utility.outliner;
+package com.simibubi.create.foundation.outliner;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
diff --git a/src/main/java/com/simibubi/create/foundation/utility/outliner/Outline.java b/src/main/java/com/simibubi/create/foundation/outliner/Outline.java
similarity index 99%
rename from src/main/java/com/simibubi/create/foundation/utility/outliner/Outline.java
rename to src/main/java/com/simibubi/create/foundation/outliner/Outline.java
index cd5c5e91f..9d9ee7b86 100644
--- a/src/main/java/com/simibubi/create/foundation/utility/outliner/Outline.java
+++ b/src/main/java/com/simibubi/create/foundation/outliner/Outline.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.utility.outliner;
+package com.simibubi.create.foundation.outliner;
 
 import java.util.Optional;
 
diff --git a/src/main/java/com/simibubi/create/foundation/utility/outliner/Outliner.java b/src/main/java/com/simibubi/create/foundation/outliner/Outliner.java
similarity index 96%
rename from src/main/java/com/simibubi/create/foundation/utility/outliner/Outliner.java
rename to src/main/java/com/simibubi/create/foundation/outliner/Outliner.java
index ac6f32699..9f052188d 100644
--- a/src/main/java/com/simibubi/create/foundation/utility/outliner/Outliner.java
+++ b/src/main/java/com/simibubi/create/foundation/outliner/Outliner.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.utility.outliner;
+package com.simibubi.create.foundation.outliner;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -8,9 +8,9 @@ import java.util.Optional;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBox;
+import com.simibubi.create.foundation.outliner.LineOutline.EndChasingLineOutline;
+import com.simibubi.create.foundation.outliner.Outline.OutlineParams;
 import com.simibubi.create.foundation.render.SuperRenderTypeBuffer;
-import com.simibubi.create.foundation.utility.outliner.LineOutline.EndChasingLineOutline;
-import com.simibubi.create.foundation.utility.outliner.Outline.OutlineParams;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.util.Mth;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/particle/AirParticle.java b/src/main/java/com/simibubi/create/foundation/particle/AirParticle.java
similarity index 98%
rename from src/main/java/com/simibubi/create/content/contraptions/particle/AirParticle.java
rename to src/main/java/com/simibubi/create/foundation/particle/AirParticle.java
index 1959fd31e..dca95d497 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/particle/AirParticle.java
+++ b/src/main/java/com/simibubi/create/foundation/particle/AirParticle.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.particle;
+package com.simibubi.create.foundation.particle;
 
 import com.simibubi.create.Create;
 import com.simibubi.create.foundation.utility.VecHelper;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/particle/AirParticleData.java b/src/main/java/com/simibubi/create/foundation/particle/AirParticleData.java
similarity index 97%
rename from src/main/java/com/simibubi/create/content/contraptions/particle/AirParticleData.java
rename to src/main/java/com/simibubi/create/foundation/particle/AirParticleData.java
index 295834325..011c00177 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/particle/AirParticleData.java
+++ b/src/main/java/com/simibubi/create/foundation/particle/AirParticleData.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.particle;
+package com.simibubi.create.foundation.particle;
 
 import java.util.Locale;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/particle/ICustomParticleData.java b/src/main/java/com/simibubi/create/foundation/particle/ICustomParticleData.java
similarity index 94%
rename from src/main/java/com/simibubi/create/content/contraptions/particle/ICustomParticleData.java
rename to src/main/java/com/simibubi/create/foundation/particle/ICustomParticleData.java
index 560502d41..d75f3b35e 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/particle/ICustomParticleData.java
+++ b/src/main/java/com/simibubi/create/foundation/particle/ICustomParticleData.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.particle;
+package com.simibubi.create.foundation.particle;
 
 import com.mojang.serialization.Codec;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/particle/ICustomParticleDataWithSprite.java b/src/main/java/com/simibubi/create/foundation/particle/ICustomParticleDataWithSprite.java
similarity index 95%
rename from src/main/java/com/simibubi/create/content/contraptions/particle/ICustomParticleDataWithSprite.java
rename to src/main/java/com/simibubi/create/foundation/particle/ICustomParticleDataWithSprite.java
index 6a6e2909a..5afedf7d4 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/particle/ICustomParticleDataWithSprite.java
+++ b/src/main/java/com/simibubi/create/foundation/particle/ICustomParticleDataWithSprite.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.content.contraptions.particle;
+package com.simibubi.create.foundation.particle;
 
 import com.mojang.serialization.Codec;
 
diff --git a/src/main/java/com/simibubi/create/foundation/utility/placement/IPlacementHelper.java b/src/main/java/com/simibubi/create/foundation/placement/IPlacementHelper.java
similarity index 99%
rename from src/main/java/com/simibubi/create/foundation/utility/placement/IPlacementHelper.java
rename to src/main/java/com/simibubi/create/foundation/placement/IPlacementHelper.java
index 9689da935..b36e22263 100644
--- a/src/main/java/com/simibubi/create/foundation/utility/placement/IPlacementHelper.java
+++ b/src/main/java/com/simibubi/create/foundation/placement/IPlacementHelper.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.utility.placement;
+package com.simibubi.create.foundation.placement;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/src/main/java/com/simibubi/create/foundation/utility/placement/PlacementHelpers.java b/src/main/java/com/simibubi/create/foundation/placement/PlacementHelpers.java
similarity index 98%
rename from src/main/java/com/simibubi/create/foundation/utility/placement/PlacementHelpers.java
rename to src/main/java/com/simibubi/create/foundation/placement/PlacementHelpers.java
index 9303d1eba..58233f95a 100644
--- a/src/main/java/com/simibubi/create/foundation/utility/placement/PlacementHelpers.java
+++ b/src/main/java/com/simibubi/create/foundation/placement/PlacementHelpers.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.utility.placement;
+package com.simibubi.create.foundation.placement;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -13,13 +13,13 @@ import com.mojang.blaze3d.vertex.Tesselator;
 import com.mojang.blaze3d.vertex.VertexFormat;
 import com.mojang.math.Matrix4f;
 import com.mojang.math.Vector3f;
-import com.simibubi.create.foundation.config.AllConfigs;
-import com.simibubi.create.foundation.config.CClient;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
 import com.simibubi.create.foundation.utility.AngleHelper;
 import com.simibubi.create.foundation.utility.VecHelper;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat.Chaser;
+import com.simibubi.create.infrastructure.config.AllConfigs;
+import com.simibubi.create.infrastructure.config.CClient;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ClientLevel;
diff --git a/src/main/java/com/simibubi/create/foundation/utility/placement/PlacementOffset.java b/src/main/java/com/simibubi/create/foundation/placement/PlacementOffset.java
similarity index 98%
rename from src/main/java/com/simibubi/create/foundation/utility/placement/PlacementOffset.java
rename to src/main/java/com/simibubi/create/foundation/placement/PlacementOffset.java
index 7603b5d1f..8fd19c9b5 100644
--- a/src/main/java/com/simibubi/create/foundation/utility/placement/PlacementOffset.java
+++ b/src/main/java/com/simibubi/create/foundation/placement/PlacementOffset.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.utility.placement;
+package com.simibubi.create.foundation.placement;
 
 import java.util.function.Function;
 
diff --git a/src/main/java/com/simibubi/create/foundation/utility/placement/util/PoleHelper.java b/src/main/java/com/simibubi/create/foundation/placement/PoleHelper.java
similarity index 86%
rename from src/main/java/com/simibubi/create/foundation/utility/placement/util/PoleHelper.java
rename to src/main/java/com/simibubi/create/foundation/placement/PoleHelper.java
index 458eb7952..3536a03fb 100644
--- a/src/main/java/com/simibubi/create/foundation/utility/placement/util/PoleHelper.java
+++ b/src/main/java/com/simibubi/create/foundation/placement/PoleHelper.java
@@ -1,13 +1,11 @@
-package com.simibubi.create.foundation.utility.placement.util;
+package com.simibubi.create.foundation.placement;
 
 import java.util.List;
 import java.util.function.Function;
 import java.util.function.Predicate;
 
-import com.simibubi.create.content.curiosities.tools.ExtendoGripItem;
-import com.simibubi.create.foundation.config.AllConfigs;
-import com.simibubi.create.foundation.utility.placement.IPlacementHelper;
-import com.simibubi.create.foundation.utility.placement.PlacementOffset;
+import com.simibubi.create.content.equipment.extendoGrip.ExtendoGripItem;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.core.BlockPos;
@@ -61,7 +59,7 @@ public abstract class PoleHelper<T extends Comparable<T>> implements IPlacementH
 	public PlacementOffset getOffset(Player player, Level world, BlockState state, BlockPos pos, BlockHitResult ray) {
 		List<Direction> directions = IPlacementHelper.orderedByDistance(pos, ray.getLocation(), dir -> dir.getAxis() == axisFunction.apply(state));
 		for (Direction dir : directions) {
-			int range = AllConfigs.server().curiosities.placementAssistRange.get();
+			int range = AllConfigs.server().equipment.placementAssistRange.get();
 			if (player != null) {
 				AttributeInstance reach = player.getAttribute(ForgeMod.REACH_DISTANCE.get());
 				if (reach != null && reach.hasModifier(ExtendoGripItem.singleRangeAttributeModifier))
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/PonderLocalization.java b/src/main/java/com/simibubi/create/foundation/ponder/PonderLocalization.java
index 51b931397..69c3e918f 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/PonderLocalization.java
+++ b/src/main/java/com/simibubi/create/foundation/ponder/PonderLocalization.java
@@ -6,12 +6,13 @@ import java.util.Map;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.simibubi.create.Create;
-import com.simibubi.create.foundation.ponder.content.PonderIndex;
-import com.simibubi.create.foundation.ponder.content.SharedText;
 import com.simibubi.create.foundation.ponder.ui.PonderTagIndexScreen;
 import com.simibubi.create.foundation.ponder.ui.PonderTagScreen;
 import com.simibubi.create.foundation.ponder.ui.PonderUI;
 import com.simibubi.create.foundation.utility.Couple;
+import com.simibubi.create.infrastructure.ponder.AllPonderTags;
+import com.simibubi.create.infrastructure.ponder.PonderIndex;
+import com.simibubi.create.infrastructure.ponder.SharedText;
 import com.tterrag.registrate.AbstractRegistrate;
 
 import net.minecraft.client.resources.language.I18n;
@@ -156,7 +157,7 @@ public class PonderLocalization {
 	 */
 	public static JsonObject provideLangEntries() {
 		SharedText.gatherText();
-		PonderTag.register();
+		AllPonderTags.register();
 		PonderIndex.register();
 
 		generateSceneLang();
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/PonderRegistry.java b/src/main/java/com/simibubi/create/foundation/ponder/PonderRegistry.java
index 218a22bc8..a4f65ad3b 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/PonderRegistry.java
+++ b/src/main/java/com/simibubi/create/foundation/ponder/PonderRegistry.java
@@ -13,8 +13,8 @@ import java.util.Optional;
 import java.util.zip.GZIPInputStream;
 
 import com.simibubi.create.Create;
-import com.simibubi.create.foundation.ponder.content.PonderIndex;
-import com.simibubi.create.foundation.ponder.content.SharedText;
+import com.simibubi.create.infrastructure.ponder.PonderIndex;
+import com.simibubi.create.infrastructure.ponder.SharedText;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/PonderScene.java b/src/main/java/com/simibubi/create/foundation/ponder/PonderScene.java
index 6d740ff12..8a1403363 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/PonderScene.java
+++ b/src/main/java/com/simibubi/create/foundation/ponder/PonderScene.java
@@ -24,7 +24,7 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Matrix4f;
 import com.mojang.math.Vector4f;
 import com.simibubi.create.foundation.gui.UIRenderHelper;
-import com.simibubi.create.foundation.ponder.content.PonderIndex;
+import com.simibubi.create.foundation.outliner.Outliner;
 import com.simibubi.create.foundation.ponder.element.PonderElement;
 import com.simibubi.create.foundation.ponder.element.PonderOverlayElement;
 import com.simibubi.create.foundation.ponder.element.PonderSceneElement;
@@ -38,7 +38,7 @@ import com.simibubi.create.foundation.utility.AnimationTickHolder;
 import com.simibubi.create.foundation.utility.Pair;
 import com.simibubi.create.foundation.utility.VecHelper;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat;
-import com.simibubi.create.foundation.utility.outliner.Outliner;
+import com.simibubi.create.infrastructure.ponder.PonderIndex;
 
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 import it.unimi.dsi.fastutil.ints.IntList;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/PonderStoryBoardEntry.java b/src/main/java/com/simibubi/create/foundation/ponder/PonderStoryBoardEntry.java
index 5936c4483..fd159a5b8 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/PonderStoryBoardEntry.java
+++ b/src/main/java/com/simibubi/create/foundation/ponder/PonderStoryBoardEntry.java
@@ -59,7 +59,7 @@ public class PonderStoryBoardEntry {
 	}
 
 	public PonderStoryBoardEntry highlightAllTags() {
-		tags.add(PonderTag.Highlight.ALL);
+		tags.add(PonderTag.HIGHLIGHT_ALL);
 		return this;
 	}
 
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/PonderTag.java b/src/main/java/com/simibubi/create/foundation/ponder/PonderTag.java
index 5c03e397d..c02e0277c 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/PonderTag.java
+++ b/src/main/java/com/simibubi/create/foundation/ponder/PonderTag.java
@@ -2,8 +2,6 @@ package com.simibubi.create.foundation.ponder;
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.simibubi.create.AllBlocks;
-import com.simibubi.create.AllItems;
 import com.simibubi.create.Create;
 import com.simibubi.create.foundation.gui.element.GuiGameElement;
 import com.simibubi.create.foundation.gui.element.ScreenElement;
@@ -11,90 +9,13 @@ import com.simibubi.create.foundation.gui.element.ScreenElement;
 import net.minecraft.client.gui.GuiComponent;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.Items;
 import net.minecraft.world.level.ItemLike;
-import net.minecraft.world.level.block.Blocks;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 
 public class PonderTag implements ScreenElement {
 
-	public static final PonderTag
-
-	KINETIC_RELAYS = create("kinetic_relays").item(AllBlocks.COGWHEEL.get())
-		.defaultLang("Kinetic Blocks", "Components which help relaying Rotational Force elsewhere")
-		.addToIndex(),
-
-		KINETIC_SOURCES = create("kinetic_sources").item(AllBlocks.WATER_WHEEL.get())
-			.defaultLang("Kinetic Sources", "Components which generate Rotational Force")
-			.addToIndex(),
-
-		KINETIC_APPLIANCES = create("kinetic_appliances").item(AllBlocks.MECHANICAL_PRESS.get())
-			.defaultLang("Kinetic Appliances", "Components which make use of Rotational Force")
-			.addToIndex(),
-
-		FLUIDS = create("fluids").item(AllBlocks.FLUID_PIPE.get())
-			.defaultLang("Fluid Manipulators", "Components which help relaying and making use of Fluids")
-			.addToIndex(),
-
-		LOGISTICS = create("logistics").item(Blocks.CHEST)
-			.defaultLang("Item Transportation", "Components which help moving items around")
-			.addToIndex(),
-
-		REDSTONE = create("redstone").item(Items.REDSTONE)
-			.defaultLang("Logic Components", "Components which help with redstone engineering")
-			.addToIndex(),
-
-		DECORATION = create("decoration").item(Items.ROSE_BUSH)
-			.defaultLang("Aesthetics", "Components used mostly for decorative purposes"),
-
-		CREATIVE = create("creative").item(AllBlocks.CREATIVE_CRATE.get())
-			.defaultLang("Creative Mode", "Components not usually available for Survival Mode")
-			.addToIndex(),
-
-		MOVEMENT_ANCHOR = create("movement_anchor").item(AllBlocks.MECHANICAL_PISTON.get())
-			.defaultLang("Movement Anchors",
-				"Components which allow the creation of moving contraptions, animating an attached structure in a variety of ways")
-			.addToIndex(),
-
-		CONTRAPTION_ACTOR = create("contraption_actor").item(AllBlocks.MECHANICAL_HARVESTER.get())
-			.defaultLang("Contraption Actors",
-				"Components which expose special behaviour when attached to a moving contraption")
-			.addToIndex(),
-
-		CONTRAPTION_ASSEMBLY = create("contraption_assembly").item(AllItems.SUPER_GLUE.get())
-			.defaultLang("Block Attachment Utility",
-				"Tools and Components used to assemble structures moved as an animated Contraption")
-			.addToIndex(),
-
-		SAILS = create("windmill_sails").item(AllBlocks.WINDMILL_BEARING.get(), true, true)
-			.defaultLang("Sails for Windmill Bearings",
-				"Blocks that count towards the strength of a Windmill Contraption when assembled. Each of these have equal efficiency in doing so."),
-
-		ARM_TARGETS = create("arm_targets").item(AllBlocks.MECHANICAL_ARM.get(), true, true)
-			.defaultLang("Targets for Mechanical Arms",
-				"Components which can be selected as inputs or outputs to the Mechanical Arm"),
-
-		TRAIN_RELATED = create("train_related").item(AllBlocks.TRACK.get())
-			.defaultLang("Railway Equipment", "Components used in the construction or management of Train Contraptions")
-			.addToIndex(),
-
-		RECENTLY_UPDATED = create("recently_updated").item(AllBlocks.CLIPBOARD.get())
-			.defaultLang("Recent Changes",
-				"Components that have been added or changed significantly in the latest versions of Create")
-			.addToIndex(),
-
-		DISPLAY_SOURCES = create("display_sources").item(AllBlocks.DISPLAY_LINK.get(), true, true)
-			.defaultLang("Sources for Display Links",
-				"Components or Blocks which offer some data that can be read with a Display Link"),
-
-		DISPLAY_TARGETS = create("display_targets").item(AllBlocks.DISPLAY_LINK.get(), true, true)
-			.defaultLang("Targets for Display Links",
-				"Components or Blocks which can process and display the data received from a Display Link");
-
-	public static class Highlight {
-		public static final PonderTag ALL = create("_all");
-	}
+	public static final PonderTag HIGHLIGHT_ALL = new PonderTag(Create.asResource("_all"));
 
 	private final ResourceLocation id;
 	private ResourceLocation icon;
@@ -177,11 +98,4 @@ public class PonderTag implements ScreenElement {
 		ms.popPose();
 	}
 
-	private static PonderTag create(String id) {
-		return new PonderTag(Create.asResource(id));
-	}
-
-	// Load class
-	public static void register() {}
-
 }
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/PonderWorld.java b/src/main/java/com/simibubi/create/foundation/ponder/PonderWorld.java
index 37cea3bc5..c719fa374 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/PonderWorld.java
+++ b/src/main/java/com/simibubi/create/foundation/ponder/PonderWorld.java
@@ -11,8 +11,8 @@ import javax.annotation.Nullable;
 
 import com.google.common.base.Suppliers;
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.simibubi.create.content.contraptions.relays.belt.BeltBlock;
-import com.simibubi.create.content.contraptions.relays.belt.BeltBlockEntity;
+import com.simibubi.create.content.kinetics.belt.BeltBlock;
+import com.simibubi.create.content.kinetics.belt.BeltBlockEntity;
 import com.simibubi.create.content.schematics.SchematicWorld;
 import com.simibubi.create.foundation.blockEntity.IMultiBlockEntityContainer;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/SceneBuilder.java b/src/main/java/com/simibubi/create/foundation/ponder/SceneBuilder.java
index f5db20afb..dd150d664 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/SceneBuilder.java
+++ b/src/main/java/com/simibubi/create/foundation/ponder/SceneBuilder.java
@@ -8,29 +8,29 @@ import java.util.function.Supplier;
 import java.util.function.UnaryOperator;
 
 import com.mojang.math.Vector3f;
-import com.simibubi.create.content.contraptions.base.IRotate.SpeedLevel;
-import com.simibubi.create.content.contraptions.base.KineticBlock;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
-import com.simibubi.create.content.contraptions.components.crafter.ConnectedInputHandler;
-import com.simibubi.create.content.contraptions.components.crafter.MechanicalCrafterBlockEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.glue.SuperGlueItem;
-import com.simibubi.create.content.contraptions.components.structureMovement.interaction.controls.ControlsBlock;
-import com.simibubi.create.content.contraptions.fluids.PumpBlockEntity;
-import com.simibubi.create.content.contraptions.particle.RotationIndicatorParticleData;
-import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlockEntity;
-import com.simibubi.create.content.contraptions.relays.belt.BeltBlockEntity;
-import com.simibubi.create.content.contraptions.relays.gauge.SpeedGaugeBlockEntity;
-import com.simibubi.create.content.logistics.block.display.DisplayLinkBlockEntity;
-import com.simibubi.create.content.logistics.block.funnel.FunnelBlockEntity;
-import com.simibubi.create.content.logistics.block.mechanicalArm.ArmBlockEntity;
-import com.simibubi.create.content.logistics.trains.management.display.FlapDisplayBlockEntity;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.SignalBlockEntity;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.SignalBlockEntity.SignalState;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.station.StationBlockEntity;
+import com.simibubi.create.content.contraptions.actors.trainControls.ControlsBlock;
+import com.simibubi.create.content.contraptions.glue.SuperGlueItem;
+import com.simibubi.create.content.fluids.pump.PumpBlockEntity;
+import com.simibubi.create.content.kinetics.base.IRotate.SpeedLevel;
+import com.simibubi.create.content.kinetics.base.KineticBlock;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.base.RotationIndicatorParticleData;
+import com.simibubi.create.content.kinetics.belt.BeltBlockEntity;
+import com.simibubi.create.content.kinetics.belt.behaviour.DirectBeltInputBehaviour;
+import com.simibubi.create.content.kinetics.belt.behaviour.TransportedItemStackHandlerBehaviour;
+import com.simibubi.create.content.kinetics.belt.behaviour.TransportedItemStackHandlerBehaviour.TransportedResult;
+import com.simibubi.create.content.kinetics.crafter.ConnectedInputHandler;
+import com.simibubi.create.content.kinetics.crafter.MechanicalCrafterBlockEntity;
+import com.simibubi.create.content.kinetics.gauge.SpeedGaugeBlockEntity;
+import com.simibubi.create.content.kinetics.mechanicalArm.ArmBlockEntity;
+import com.simibubi.create.content.logistics.funnel.FunnelBlockEntity;
+import com.simibubi.create.content.processing.burner.BlazeBurnerBlockEntity;
+import com.simibubi.create.content.redstone.displayLink.DisplayLinkBlockEntity;
+import com.simibubi.create.content.trains.display.FlapDisplayBlockEntity;
+import com.simibubi.create.content.trains.signal.SignalBlockEntity;
+import com.simibubi.create.content.trains.signal.SignalBlockEntity.SignalState;
+import com.simibubi.create.content.trains.station.StationBlockEntity;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.DirectBeltInputBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.TransportedItemStackHandlerBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.belt.TransportedItemStackHandlerBehaviour.TransportedResult;
 import com.simibubi.create.foundation.ponder.element.AnimatedSceneElement;
 import com.simibubi.create.foundation.ponder.element.BeltItemElement;
 import com.simibubi.create.foundation.ponder.element.EntityElement;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/Selection.java b/src/main/java/com/simibubi/create/foundation/ponder/Selection.java
index de4e32d5b..bb7ae5e9a 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/Selection.java
+++ b/src/main/java/com/simibubi/create/foundation/ponder/Selection.java
@@ -5,8 +5,8 @@ import java.util.Set;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
-import com.simibubi.create.foundation.utility.outliner.Outline.OutlineParams;
-import com.simibubi.create.foundation.utility.outliner.Outliner;
+import com.simibubi.create.foundation.outliner.Outline.OutlineParams;
+import com.simibubi.create.foundation.outliner.Outliner;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.levelgen.structure.BoundingBox;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/element/BeltItemElement.java b/src/main/java/com/simibubi/create/foundation/ponder/element/BeltItemElement.java
index 79640d5bc..e262c9e06 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/element/BeltItemElement.java
+++ b/src/main/java/com/simibubi/create/foundation/ponder/element/BeltItemElement.java
@@ -1,6 +1,6 @@
 package com.simibubi.create.foundation.ponder.element;
 
-import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack;
+import com.simibubi.create.content.kinetics.belt.transport.TransportedItemStack;
 
 public class BeltItemElement extends TrackedElement<TransportedItemStack> {
 
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/element/OutlinerElement.java b/src/main/java/com/simibubi/create/foundation/ponder/element/OutlinerElement.java
index 894397474..7e71f854f 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/element/OutlinerElement.java
+++ b/src/main/java/com/simibubi/create/foundation/ponder/element/OutlinerElement.java
@@ -2,9 +2,9 @@ package com.simibubi.create.foundation.ponder.element;
 
 import java.util.function.Function;
 
+import com.simibubi.create.foundation.outliner.Outline.OutlineParams;
+import com.simibubi.create.foundation.outliner.Outliner;
 import com.simibubi.create.foundation.ponder.PonderScene;
-import com.simibubi.create.foundation.utility.outliner.Outline.OutlineParams;
-import com.simibubi.create.foundation.utility.outliner.Outliner;
 
 public class OutlinerElement extends AnimatedSceneElement {
 	
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/element/ParrotElement.java b/src/main/java/com/simibubi/create/foundation/ponder/element/ParrotElement.java
index 74683c1fb..b4eda8597 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/element/ParrotElement.java
+++ b/src/main/java/com/simibubi/create/foundation/ponder/element/ParrotElement.java
@@ -6,7 +6,7 @@ import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.platform.Window;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
 import com.simibubi.create.foundation.ponder.PonderScene;
 import com.simibubi.create.foundation.ponder.PonderWorld;
 import com.simibubi.create.foundation.ponder.ui.PonderUI;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/element/WorldSectionElement.java b/src/main/java/com/simibubi/create/foundation/ponder/element/WorldSectionElement.java
index 5f05a7cb5..b5d8fd68b 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/element/WorldSectionElement.java
+++ b/src/main/java/com/simibubi/create/foundation/ponder/element/WorldSectionElement.java
@@ -17,6 +17,7 @@ import com.mojang.blaze3d.vertex.SheetedDecalTextureGenerator;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.mojang.blaze3d.vertex.VertexFormat;
 import com.simibubi.create.CreateClient;
+import com.simibubi.create.foundation.outliner.AABBOutline;
 import com.simibubi.create.foundation.ponder.PonderScene;
 import com.simibubi.create.foundation.ponder.PonderWorld;
 import com.simibubi.create.foundation.ponder.Selection;
@@ -27,7 +28,6 @@ import com.simibubi.create.foundation.render.SuperRenderTypeBuffer;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 import com.simibubi.create.foundation.utility.Pair;
 import com.simibubi.create.foundation.utility.VecHelper;
-import com.simibubi.create.foundation.utility.outliner.AABBOutline;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.ItemBlockRenderTypes;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/instruction/AnimateBlockEntityInstruction.java b/src/main/java/com/simibubi/create/foundation/ponder/instruction/AnimateBlockEntityInstruction.java
index 8eb15e148..655971827 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/instruction/AnimateBlockEntityInstruction.java
+++ b/src/main/java/com/simibubi/create/foundation/ponder/instruction/AnimateBlockEntityInstruction.java
@@ -4,10 +4,10 @@ import java.util.Optional;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 
-import com.simibubi.create.content.contraptions.components.deployer.DeployerBlockEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.bearing.IBearingBlockEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.pulley.PulleyBlockEntity;
-import com.simibubi.create.content.logistics.trains.track.AbstractBogeyBlockEntity;
+import com.simibubi.create.content.contraptions.bearing.IBearingBlockEntity;
+import com.simibubi.create.content.contraptions.pulley.PulleyBlockEntity;
+import com.simibubi.create.content.kinetics.deployer.DeployerBlockEntity;
+import com.simibubi.create.content.trains.bogey.AbstractBogeyBlockEntity;
 import com.simibubi.create.foundation.ponder.PonderScene;
 import com.simibubi.create.foundation.ponder.PonderWorld;
 
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/instruction/DisplayWorldSectionInstruction.java b/src/main/java/com/simibubi/create/foundation/ponder/instruction/DisplayWorldSectionInstruction.java
index b809239de..109bcfe4f 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/instruction/DisplayWorldSectionInstruction.java
+++ b/src/main/java/com/simibubi/create/foundation/ponder/instruction/DisplayWorldSectionInstruction.java
@@ -5,7 +5,7 @@ import java.util.function.Supplier;
 
 import javax.annotation.Nullable;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.glue.SuperGlueItem;
+import com.simibubi.create.content.contraptions.glue.SuperGlueItem;
 import com.simibubi.create.foundation.ponder.PonderScene;
 import com.simibubi.create.foundation.ponder.Selection;
 import com.simibubi.create.foundation.ponder.element.WorldSectionElement;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/ui/PonderIndexScreen.java b/src/main/java/com/simibubi/create/foundation/ponder/ui/PonderIndexScreen.java
index 22fcd732d..a9661edbc 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/ui/PonderIndexScreen.java
+++ b/src/main/java/com/simibubi/create/foundation/ponder/ui/PonderIndexScreen.java
@@ -8,7 +8,7 @@ import com.mojang.blaze3d.platform.Window;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.contraptions.components.crank.ValveHandleBlock;
+import com.simibubi.create.content.kinetics.crank.ValveHandleBlock;
 import com.simibubi.create.foundation.gui.ScreenOpener;
 import com.simibubi.create.foundation.gui.Theme;
 import com.simibubi.create.foundation.gui.UIRenderHelper;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/ui/PonderUI.java b/src/main/java/com/simibubi/create/foundation/ponder/ui/PonderUI.java
index 5cd28b0cc..472024458 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/ui/PonderUI.java
+++ b/src/main/java/com/simibubi/create/foundation/ponder/ui/PonderUI.java
@@ -14,7 +14,6 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Matrix4f;
 import com.mojang.math.Vector3f;
 import com.simibubi.create.Create;
-import com.simibubi.create.foundation.config.AllConfigs;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
 import com.simibubi.create.foundation.gui.AllIcons;
 import com.simibubi.create.foundation.gui.ScreenOpener;
@@ -29,8 +28,6 @@ import com.simibubi.create.foundation.ponder.PonderScene.SceneTransform;
 import com.simibubi.create.foundation.ponder.PonderStoryBoardEntry;
 import com.simibubi.create.foundation.ponder.PonderTag;
 import com.simibubi.create.foundation.ponder.PonderWorld;
-import com.simibubi.create.foundation.ponder.content.DebugScenes;
-import com.simibubi.create.foundation.ponder.content.PonderIndex;
 import com.simibubi.create.foundation.ponder.element.TextWindowElement;
 import com.simibubi.create.foundation.render.SuperRenderTypeBuffer;
 import com.simibubi.create.foundation.utility.Color;
@@ -44,6 +41,9 @@ import com.simibubi.create.foundation.utility.Pointing;
 import com.simibubi.create.foundation.utility.RegisteredObjects;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat.Chaser;
+import com.simibubi.create.infrastructure.config.AllConfigs;
+import com.simibubi.create.infrastructure.ponder.DebugScenes;
+import com.simibubi.create.infrastructure.ponder.PonderIndex;
 
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
@@ -655,7 +655,7 @@ public class PonderUI extends NavigatableSimiScreen {
 	protected void renderPonderTags(PoseStack ms, int mouseX, int mouseY, float partialTicks, float fade, PonderScene activeScene) {
 		// Tags
 		List<PonderTag> sceneTags = activeScene.getTags();
-		boolean highlightAll = sceneTags.contains(PonderTag.Highlight.ALL);
+		boolean highlightAll = sceneTags.contains(PonderTag.HIGHLIGHT_ALL);
 		double s = Minecraft.getInstance()
 			.getWindow()
 			.getGuiScale();
diff --git a/src/main/java/com/simibubi/create/foundation/utility/recipe/AllIngredients.java b/src/main/java/com/simibubi/create/foundation/recipe/AllIngredients.java
similarity index 92%
rename from src/main/java/com/simibubi/create/foundation/utility/recipe/AllIngredients.java
rename to src/main/java/com/simibubi/create/foundation/recipe/AllIngredients.java
index 0067c2c9f..4a495e80e 100644
--- a/src/main/java/com/simibubi/create/foundation/utility/recipe/AllIngredients.java
+++ b/src/main/java/com/simibubi/create/foundation/recipe/AllIngredients.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.utility.recipe;
+package com.simibubi.create.foundation.recipe;
 
 import com.simibubi.create.Create;
 
diff --git a/src/main/java/com/simibubi/create/foundation/utility/recipe/BlockTagIngredient.java b/src/main/java/com/simibubi/create/foundation/recipe/BlockTagIngredient.java
similarity index 98%
rename from src/main/java/com/simibubi/create/foundation/utility/recipe/BlockTagIngredient.java
rename to src/main/java/com/simibubi/create/foundation/recipe/BlockTagIngredient.java
index 67749c284..b067224e5 100644
--- a/src/main/java/com/simibubi/create/foundation/utility/recipe/BlockTagIngredient.java
+++ b/src/main/java/com/simibubi/create/foundation/recipe/BlockTagIngredient.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.utility.recipe;
+package com.simibubi.create.foundation.recipe;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/simibubi/create/foundation/utility/recipe/DummyCraftingContainer.java b/src/main/java/com/simibubi/create/foundation/recipe/DummyCraftingContainer.java
similarity index 97%
rename from src/main/java/com/simibubi/create/foundation/utility/recipe/DummyCraftingContainer.java
rename to src/main/java/com/simibubi/create/foundation/recipe/DummyCraftingContainer.java
index 8b3c74b4e..b8b70342e 100644
--- a/src/main/java/com/simibubi/create/foundation/utility/recipe/DummyCraftingContainer.java
+++ b/src/main/java/com/simibubi/create/foundation/recipe/DummyCraftingContainer.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.utility.recipe;
+package com.simibubi.create.foundation.recipe;
 
 import org.jetbrains.annotations.NotNull;
 
diff --git a/src/main/java/com/simibubi/create/foundation/utility/recipe/IRecipeTypeInfo.java b/src/main/java/com/simibubi/create/foundation/recipe/IRecipeTypeInfo.java
similarity index 85%
rename from src/main/java/com/simibubi/create/foundation/utility/recipe/IRecipeTypeInfo.java
rename to src/main/java/com/simibubi/create/foundation/recipe/IRecipeTypeInfo.java
index b69cb1822..94ba6a87f 100644
--- a/src/main/java/com/simibubi/create/foundation/utility/recipe/IRecipeTypeInfo.java
+++ b/src/main/java/com/simibubi/create/foundation/recipe/IRecipeTypeInfo.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.utility.recipe;
+package com.simibubi.create.foundation.recipe;
 
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.crafting.RecipeSerializer;
diff --git a/src/main/java/com/simibubi/create/foundation/recipe/RecipeApplier.java b/src/main/java/com/simibubi/create/foundation/recipe/RecipeApplier.java
new file mode 100644
index 000000000..0745d212f
--- /dev/null
+++ b/src/main/java/com/simibubi/create/foundation/recipe/RecipeApplier.java
@@ -0,0 +1,67 @@
+package com.simibubi.create.foundation.recipe;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.simibubi.create.content.kinetics.deployer.ManualApplicationRecipe;
+import com.simibubi.create.content.processing.recipe.ProcessingOutput;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipe;
+import com.simibubi.create.foundation.item.ItemHelper;
+
+import net.minecraft.world.entity.item.ItemEntity;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.crafting.Recipe;
+import net.minecraftforge.items.ItemHandlerHelper;
+
+public class RecipeApplier {
+	public static void applyRecipeOn(ItemEntity entity, Recipe<?> recipe) {
+		List<ItemStack> stacks = applyRecipeOn(entity.getItem(), recipe);
+		if (stacks == null)
+			return;
+		if (stacks.isEmpty()) {
+			entity.discard();
+			return;
+		}
+		entity.setItem(stacks.remove(0));
+		for (ItemStack additional : stacks) {
+			ItemEntity entityIn = new ItemEntity(entity.level, entity.getX(), entity.getY(), entity.getZ(), additional);
+			entityIn.setDeltaMovement(entity.getDeltaMovement());
+			entity.level.addFreshEntity(entityIn);
+		}
+	}
+
+	public static List<ItemStack> applyRecipeOn(ItemStack stackIn, Recipe<?> recipe) {
+		List<ItemStack> stacks;
+
+		if (recipe instanceof ProcessingRecipe<?> pr) {
+			stacks = new ArrayList<>();
+			for (int i = 0; i < stackIn.getCount(); i++) {
+				List<ProcessingOutput> outputs =
+					pr instanceof ManualApplicationRecipe mar ? mar.getRollableResults() : pr.getRollableResults();
+				for (ItemStack stack : pr.rollResults(outputs)) {
+					for (ItemStack previouslyRolled : stacks) {
+						if (stack.isEmpty())
+							continue;
+						if (!ItemHandlerHelper.canItemStacksStack(stack, previouslyRolled))
+							continue;
+						int amount = Math.min(previouslyRolled.getMaxStackSize() - previouslyRolled.getCount(),
+							stack.getCount());
+						previouslyRolled.grow(amount);
+						stack.shrink(amount);
+					}
+
+					if (stack.isEmpty())
+						continue;
+
+					stacks.add(stack);
+				}
+			}
+		} else {
+			ItemStack out = recipe.getResultItem()
+				.copy();
+			stacks = ItemHelper.multipliedOutput(stackIn, out);
+		}
+
+		return stacks;
+	}
+}
diff --git a/src/main/java/com/simibubi/create/foundation/utility/recipe/RecipeConditions.java b/src/main/java/com/simibubi/create/foundation/recipe/RecipeConditions.java
similarity index 94%
rename from src/main/java/com/simibubi/create/foundation/utility/recipe/RecipeConditions.java
rename to src/main/java/com/simibubi/create/foundation/recipe/RecipeConditions.java
index d605b09f9..41073e4a2 100644
--- a/src/main/java/com/simibubi/create/foundation/utility/recipe/RecipeConditions.java
+++ b/src/main/java/com/simibubi/create/foundation/recipe/RecipeConditions.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.utility.recipe;
+package com.simibubi.create.foundation.recipe;
 
 import java.util.function.Predicate;
 
diff --git a/src/main/java/com/simibubi/create/foundation/utility/recipe/RecipeFinder.java b/src/main/java/com/simibubi/create/foundation/recipe/RecipeFinder.java
similarity index 97%
rename from src/main/java/com/simibubi/create/foundation/utility/recipe/RecipeFinder.java
rename to src/main/java/com/simibubi/create/foundation/recipe/RecipeFinder.java
index aa699fc83..1d4950c59 100644
--- a/src/main/java/com/simibubi/create/foundation/utility/recipe/RecipeFinder.java
+++ b/src/main/java/com/simibubi/create/foundation/recipe/RecipeFinder.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.utility.recipe;
+package com.simibubi.create.foundation.recipe;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/src/main/java/com/simibubi/create/foundation/render/AllMaterialSpecs.java b/src/main/java/com/simibubi/create/foundation/render/AllMaterialSpecs.java
index bcf82d29d..706d1284a 100644
--- a/src/main/java/com/simibubi/create/foundation/render/AllMaterialSpecs.java
+++ b/src/main/java/com/simibubi/create/foundation/render/AllMaterialSpecs.java
@@ -2,14 +2,14 @@ package com.simibubi.create.foundation.render;
 
 import com.jozufozu.flywheel.api.struct.StructType;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.contraptions.base.flwdata.BeltData;
-import com.simibubi.create.content.contraptions.base.flwdata.BeltType;
-import com.simibubi.create.content.contraptions.base.flwdata.RotatingData;
-import com.simibubi.create.content.contraptions.base.flwdata.RotatingType;
-import com.simibubi.create.content.contraptions.components.actors.flwdata.ActorData;
-import com.simibubi.create.content.contraptions.components.actors.flwdata.ActorType;
-import com.simibubi.create.content.logistics.block.flap.FlapData;
-import com.simibubi.create.content.logistics.block.flap.FlapType;
+import com.simibubi.create.content.contraptions.actors.flwdata.ActorData;
+import com.simibubi.create.content.contraptions.actors.flwdata.ActorType;
+import com.simibubi.create.content.kinetics.base.flwdata.BeltData;
+import com.simibubi.create.content.kinetics.base.flwdata.BeltType;
+import com.simibubi.create.content.kinetics.base.flwdata.RotatingData;
+import com.simibubi.create.content.kinetics.base.flwdata.RotatingType;
+import com.simibubi.create.content.logistics.flwdata.FlapData;
+import com.simibubi.create.content.logistics.flwdata.FlapType;
 
 import net.minecraft.resources.ResourceLocation;
 import net.minecraftforge.api.distmarker.Dist;
diff --git a/src/main/java/com/simibubi/create/foundation/render/BlockEntityRenderHelper.java b/src/main/java/com/simibubi/create/foundation/render/BlockEntityRenderHelper.java
index c69446b11..139b61984 100644
--- a/src/main/java/com/simibubi/create/foundation/render/BlockEntityRenderHelper.java
+++ b/src/main/java/com/simibubi/create/foundation/render/BlockEntityRenderHelper.java
@@ -13,9 +13,9 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Matrix4f;
 import com.mojang.math.Vector4f;
 import com.simibubi.create.Create;
-import com.simibubi.create.foundation.config.AllConfigs;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 import com.simibubi.create.foundation.utility.RegisteredObjects;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.LevelRenderer;
diff --git a/src/main/java/com/simibubi/create/foundation/render/CreateContexts.java b/src/main/java/com/simibubi/create/foundation/render/CreateContexts.java
index 75e9a4798..bb651c843 100644
--- a/src/main/java/com/simibubi/create/foundation/render/CreateContexts.java
+++ b/src/main/java/com/simibubi/create/foundation/render/CreateContexts.java
@@ -8,7 +8,7 @@ import com.jozufozu.flywheel.core.source.Resolver;
 import com.jozufozu.flywheel.event.GatherContextEvent;
 import com.jozufozu.flywheel.util.ResourceUtil;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionProgram;
+import com.simibubi.create.content.contraptions.render.ContraptionProgram;
 
 import net.minecraft.resources.ResourceLocation;
 import net.minecraftforge.api.distmarker.Dist;
diff --git a/src/main/java/com/simibubi/create/foundation/render/RainbowDebugStateProvider.java b/src/main/java/com/simibubi/create/foundation/render/RainbowDebugStateProvider.java
index e36af21e3..621260225 100644
--- a/src/main/java/com/simibubi/create/foundation/render/RainbowDebugStateProvider.java
+++ b/src/main/java/com/simibubi/create/foundation/render/RainbowDebugStateProvider.java
@@ -4,7 +4,7 @@ import javax.annotation.Nonnull;
 
 import com.jozufozu.flywheel.core.shader.GameStateProvider;
 import com.jozufozu.flywheel.core.shader.ShaderConstants;
-import com.simibubi.create.content.contraptions.KineticDebugger;
+import com.simibubi.create.content.kinetics.KineticDebugger;
 
 public enum RainbowDebugStateProvider implements GameStateProvider {
 	INSTANCE;
diff --git a/src/main/java/com/simibubi/create/foundation/sound/SoundScape.java b/src/main/java/com/simibubi/create/foundation/sound/SoundScape.java
index a67c323d7..f4b04e1b5 100644
--- a/src/main/java/com/simibubi/create/foundation/sound/SoundScape.java
+++ b/src/main/java/com/simibubi/create/foundation/sound/SoundScape.java
@@ -3,11 +3,11 @@ package com.simibubi.create.foundation.sound;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.simibubi.create.foundation.config.AllConfigs;
 import com.simibubi.create.foundation.sound.SoundScapes.AmbienceGroup;
 import com.simibubi.create.foundation.sound.SoundScapes.PitchGroup;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 import com.simibubi.create.foundation.utility.VecHelper;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/foundation/sound/SoundScapes.java b/src/main/java/com/simibubi/create/foundation/sound/SoundScapes.java
index 1e9a75221..c382ed174 100644
--- a/src/main/java/com/simibubi/create/foundation/sound/SoundScapes.java
+++ b/src/main/java/com/simibubi/create/foundation/sound/SoundScapes.java
@@ -11,9 +11,9 @@ import java.util.Set;
 import java.util.function.BiFunction;
 
 import com.simibubi.create.AllSoundEvents;
-import com.simibubi.create.foundation.config.AllConfigs;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 import com.simibubi.create.foundation.utility.Pair;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java b/src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java
index 7b98eff2a..c8092e577 100644
--- a/src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java
+++ b/src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java
@@ -5,7 +5,7 @@ import java.util.function.Consumer;
 import javax.annotation.Nullable;
 
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
+import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
 import com.simibubi.create.foundation.blockEntity.IMergeableBE;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/foundation/utility/RemapHelper.java b/src/main/java/com/simibubi/create/foundation/utility/RemapHelper.java
index 9fdc917e8..978d8239b 100644
--- a/src/main/java/com/simibubi/create/foundation/utility/RemapHelper.java
+++ b/src/main/java/com/simibubi/create/foundation/utility/RemapHelper.java
@@ -35,26 +35,27 @@ import static com.simibubi.create.AllItems.WAND_OF_SYMMETRY;
 import static com.simibubi.create.AllItems.WHEAT_FLOUR;
 import static com.simibubi.create.AllItems.WORLDSHAPER;
 import static com.simibubi.create.Create.asResource;
-import static com.simibubi.create.content.palettes.AllPaletteBlocks.ACACIA_WINDOW;
-import static com.simibubi.create.content.palettes.AllPaletteBlocks.ACACIA_WINDOW_PANE;
-import static com.simibubi.create.content.palettes.AllPaletteBlocks.BIRCH_WINDOW;
-import static com.simibubi.create.content.palettes.AllPaletteBlocks.BIRCH_WINDOW_PANE;
-import static com.simibubi.create.content.palettes.AllPaletteBlocks.DARK_OAK_WINDOW;
-import static com.simibubi.create.content.palettes.AllPaletteBlocks.DARK_OAK_WINDOW_PANE;
-import static com.simibubi.create.content.palettes.AllPaletteBlocks.JUNGLE_WINDOW;
-import static com.simibubi.create.content.palettes.AllPaletteBlocks.JUNGLE_WINDOW_PANE;
-import static com.simibubi.create.content.palettes.AllPaletteBlocks.OAK_WINDOW;
-import static com.simibubi.create.content.palettes.AllPaletteBlocks.OAK_WINDOW_PANE;
-import static com.simibubi.create.content.palettes.AllPaletteBlocks.ORNATE_IRON_WINDOW;
-import static com.simibubi.create.content.palettes.AllPaletteBlocks.ORNATE_IRON_WINDOW_PANE;
-import static com.simibubi.create.content.palettes.AllPaletteBlocks.SPRUCE_WINDOW;
-import static com.simibubi.create.content.palettes.AllPaletteBlocks.SPRUCE_WINDOW_PANE;
+import static com.simibubi.create.content.decoration.palettes.AllPaletteBlocks.ACACIA_WINDOW;
+import static com.simibubi.create.content.decoration.palettes.AllPaletteBlocks.ACACIA_WINDOW_PANE;
+import static com.simibubi.create.content.decoration.palettes.AllPaletteBlocks.BIRCH_WINDOW;
+import static com.simibubi.create.content.decoration.palettes.AllPaletteBlocks.BIRCH_WINDOW_PANE;
+import static com.simibubi.create.content.decoration.palettes.AllPaletteBlocks.DARK_OAK_WINDOW;
+import static com.simibubi.create.content.decoration.palettes.AllPaletteBlocks.DARK_OAK_WINDOW_PANE;
+import static com.simibubi.create.content.decoration.palettes.AllPaletteBlocks.JUNGLE_WINDOW;
+import static com.simibubi.create.content.decoration.palettes.AllPaletteBlocks.JUNGLE_WINDOW_PANE;
+import static com.simibubi.create.content.decoration.palettes.AllPaletteBlocks.OAK_WINDOW;
+import static com.simibubi.create.content.decoration.palettes.AllPaletteBlocks.OAK_WINDOW_PANE;
+import static com.simibubi.create.content.decoration.palettes.AllPaletteBlocks.ORNATE_IRON_WINDOW;
+import static com.simibubi.create.content.decoration.palettes.AllPaletteBlocks.ORNATE_IRON_WINDOW_PANE;
+import static com.simibubi.create.content.decoration.palettes.AllPaletteBlocks.SPRUCE_WINDOW;
+import static com.simibubi.create.content.decoration.palettes.AllPaletteBlocks.SPRUCE_WINDOW_PANE;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.Create;
+import com.simibubi.create.foundation.data.recipe.CompatMetals;
 
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
@@ -186,6 +187,13 @@ public class RemapHelper {
 		reMap.put("obsidian_dust", POWDERED_OBSIDIAN.getId());
 		reMap.put("diving_helmet", COPPER_DIVING_HELMET.getId());
 		reMap.put("diving_boots", COPPER_DIVING_BOOTS.getId());
+
+		// 1.18 crushed ores
+		for (String metal : new String[] { "iron", "gold", "copper", "zinc" })
+			reMap.put("crushed_" + metal + "_ore", Create.asResource("crushed_raw_" + metal));
+		for (CompatMetals compatMetal : CompatMetals.values())
+			reMap.put("crushed_" + compatMetal.getName() + "_ore",
+				Create.asResource("crushed_raw_" + compatMetal.getName()));
 	}
 
 	private static void remapPaletteBlock(String type, String newType, boolean vanilla) {
@@ -289,6 +297,8 @@ public class RemapHelper {
 
 			if (path.equals("copper_backtank")) {
 				mapping.remap(AllBlockEntityTypes.BACKTANK.get());
+			} else if (path.equals("adjustable_pulley")) {
+				mapping.remap(AllBlockEntityTypes.ADJUSTABLE_CHAIN_GEARSHIFT.get());
 			}
 		}
 	}
diff --git a/src/main/java/com/simibubi/create/foundation/utility/ServerSpeedProvider.java b/src/main/java/com/simibubi/create/foundation/utility/ServerSpeedProvider.java
index a9ba88169..b55192516 100644
--- a/src/main/java/com/simibubi/create/foundation/utility/ServerSpeedProvider.java
+++ b/src/main/java/com/simibubi/create/foundation/utility/ServerSpeedProvider.java
@@ -1,10 +1,10 @@
 package com.simibubi.create.foundation.utility;
 
-import com.simibubi.create.foundation.config.AllConfigs;
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.foundation.networking.SimplePacketBase;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat;
 import com.simibubi.create.foundation.utility.animation.LerpedFloat.Chaser;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.network.FriendlyByteBuf;
diff --git a/src/main/java/com/simibubi/create/foundation/utility/ghost/GhostBlockRenderer.java b/src/main/java/com/simibubi/create/foundation/utility/ghost/GhostBlockRenderer.java
index e8152f55d..8c6a341e9 100644
--- a/src/main/java/com/simibubi/create/foundation/utility/ghost/GhostBlockRenderer.java
+++ b/src/main/java/com/simibubi/create/foundation/utility/ghost/GhostBlockRenderer.java
@@ -7,8 +7,8 @@ import javax.annotation.Nullable;
 import com.jozufozu.flywheel.core.model.ModelUtil;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
+import com.simibubi.create.foundation.placement.PlacementHelpers;
 import com.simibubi.create.foundation.render.SuperRenderTypeBuffer;
-import com.simibubi.create.foundation.utility.placement.PlacementHelpers;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.LevelRenderer;
diff --git a/src/main/java/com/simibubi/create/foundation/command/AllCommands.java b/src/main/java/com/simibubi/create/infrastructure/command/AllCommands.java
similarity index 98%
rename from src/main/java/com/simibubi/create/foundation/command/AllCommands.java
rename to src/main/java/com/simibubi/create/infrastructure/command/AllCommands.java
index 5c532a142..ce5809dee 100644
--- a/src/main/java/com/simibubi/create/foundation/command/AllCommands.java
+++ b/src/main/java/com/simibubi/create/infrastructure/command/AllCommands.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.command;
+package com.simibubi.create.infrastructure.command;
 
 import java.util.Collections;
 import java.util.function.Predicate;
diff --git a/src/main/java/com/simibubi/create/foundation/command/CameraAngleCommand.java b/src/main/java/com/simibubi/create/infrastructure/command/CameraAngleCommand.java
similarity index 97%
rename from src/main/java/com/simibubi/create/foundation/command/CameraAngleCommand.java
rename to src/main/java/com/simibubi/create/infrastructure/command/CameraAngleCommand.java
index bb4709c5c..e49456886 100644
--- a/src/main/java/com/simibubi/create/foundation/command/CameraAngleCommand.java
+++ b/src/main/java/com/simibubi/create/infrastructure/command/CameraAngleCommand.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.command;
+package com.simibubi.create.infrastructure.command;
 
 import java.util.Collection;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -7,7 +7,7 @@ import com.mojang.brigadier.arguments.FloatArgumentType;
 import com.mojang.brigadier.builder.ArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.foundation.utility.CameraAngleAnimationService;
 
 import net.minecraft.commands.CommandSourceStack;
diff --git a/src/main/java/com/simibubi/create/foundation/command/CameraDistanceCommand.java b/src/main/java/com/simibubi/create/infrastructure/command/CameraDistanceCommand.java
similarity index 92%
rename from src/main/java/com/simibubi/create/foundation/command/CameraDistanceCommand.java
rename to src/main/java/com/simibubi/create/infrastructure/command/CameraDistanceCommand.java
index ebcc3a419..875710ec0 100644
--- a/src/main/java/com/simibubi/create/foundation/command/CameraDistanceCommand.java
+++ b/src/main/java/com/simibubi/create/infrastructure/command/CameraDistanceCommand.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.foundation.command;
+package com.simibubi.create.infrastructure.command;
 
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.arguments.FloatArgumentType;
 import com.mojang.brigadier.builder.ArgumentBuilder;
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.AllPackets;
 
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;
diff --git a/src/main/java/com/simibubi/create/foundation/command/ClearBufferCacheCommand.java b/src/main/java/com/simibubi/create/infrastructure/command/ClearBufferCacheCommand.java
similarity index 94%
rename from src/main/java/com/simibubi/create/foundation/command/ClearBufferCacheCommand.java
rename to src/main/java/com/simibubi/create/infrastructure/command/ClearBufferCacheCommand.java
index f000634db..3c921eefd 100644
--- a/src/main/java/com/simibubi/create/foundation/command/ClearBufferCacheCommand.java
+++ b/src/main/java/com/simibubi/create/infrastructure/command/ClearBufferCacheCommand.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.command;
+package com.simibubi.create.infrastructure.command;
 
 import com.mojang.brigadier.builder.ArgumentBuilder;
 import com.simibubi.create.CreateClient;
diff --git a/src/main/java/com/simibubi/create/foundation/command/CloneCommand.java b/src/main/java/com/simibubi/create/infrastructure/command/CloneCommand.java
similarity index 97%
rename from src/main/java/com/simibubi/create/foundation/command/CloneCommand.java
rename to src/main/java/com/simibubi/create/infrastructure/command/CloneCommand.java
index d9b6cdbeb..81832597f 100644
--- a/src/main/java/com/simibubi/create/foundation/command/CloneCommand.java
+++ b/src/main/java/com/simibubi/create/infrastructure/command/CloneCommand.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.command;
+package com.simibubi.create.infrastructure.command;
 
 import java.util.List;
 
@@ -7,7 +7,7 @@ import com.mojang.brigadier.Command;
 import com.mojang.brigadier.builder.ArgumentBuilder;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.exceptions.Dynamic2CommandExceptionType;
-import com.simibubi.create.content.contraptions.components.structureMovement.glue.SuperGlueEntity;
+import com.simibubi.create.content.contraptions.glue.SuperGlueEntity;
 import com.simibubi.create.foundation.utility.Components;
 
 import net.minecraft.commands.CommandSourceStack;
diff --git a/src/main/java/com/simibubi/create/foundation/command/ConfigCommand.java b/src/main/java/com/simibubi/create/infrastructure/command/ConfigCommand.java
similarity index 96%
rename from src/main/java/com/simibubi/create/foundation/command/ConfigCommand.java
rename to src/main/java/com/simibubi/create/infrastructure/command/ConfigCommand.java
index 4f25004ac..a673129a5 100644
--- a/src/main/java/com/simibubi/create/foundation/command/ConfigCommand.java
+++ b/src/main/java/com/simibubi/create/infrastructure/command/ConfigCommand.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.foundation.command;
+package com.simibubi.create.infrastructure.command;
 
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.builder.ArgumentBuilder;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.Create;
 import com.simibubi.create.foundation.config.ui.ConfigHelper;
-import com.simibubi.create.foundation.networking.AllPackets;
 import com.simibubi.create.foundation.utility.Components;
 
 import net.minecraft.commands.CommandSourceStack;
diff --git a/src/main/java/com/simibubi/create/foundation/command/ConfigureConfigCommand.java b/src/main/java/com/simibubi/create/infrastructure/command/ConfigureConfigCommand.java
similarity index 95%
rename from src/main/java/com/simibubi/create/foundation/command/ConfigureConfigCommand.java
rename to src/main/java/com/simibubi/create/infrastructure/command/ConfigureConfigCommand.java
index e35fbfeb4..5c6d4d6f5 100644
--- a/src/main/java/com/simibubi/create/foundation/command/ConfigureConfigCommand.java
+++ b/src/main/java/com/simibubi/create/infrastructure/command/ConfigureConfigCommand.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.command;
+package com.simibubi.create.infrastructure.command;
 
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.builder.ArgumentBuilder;
diff --git a/src/main/java/com/simibubi/create/foundation/command/CouplingCommand.java b/src/main/java/com/simibubi/create/infrastructure/command/CouplingCommand.java
similarity index 94%
rename from src/main/java/com/simibubi/create/foundation/command/CouplingCommand.java
rename to src/main/java/com/simibubi/create/infrastructure/command/CouplingCommand.java
index 2a4d282e8..c653ac600 100644
--- a/src/main/java/com/simibubi/create/foundation/command/CouplingCommand.java
+++ b/src/main/java/com/simibubi/create/infrastructure/command/CouplingCommand.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.command;
+package com.simibubi.create.infrastructure.command;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -9,9 +9,9 @@ import com.mojang.brigadier.Command;
 import com.mojang.brigadier.builder.ArgumentBuilder;
 import com.mojang.brigadier.exceptions.DynamicCommandExceptionType;
 import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
-import com.simibubi.create.content.contraptions.components.structureMovement.train.CouplingHandler;
-import com.simibubi.create.content.contraptions.components.structureMovement.train.capability.CapabilityMinecartController;
-import com.simibubi.create.content.contraptions.components.structureMovement.train.capability.MinecartController;
+import com.simibubi.create.content.contraptions.minecart.CouplingHandler;
+import com.simibubi.create.content.contraptions.minecart.capability.CapabilityMinecartController;
+import com.simibubi.create.content.contraptions.minecart.capability.MinecartController;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Iterate;
 
diff --git a/src/main/java/com/simibubi/create/foundation/command/CreateTestCommand.java b/src/main/java/com/simibubi/create/infrastructure/command/CreateTestCommand.java
similarity index 98%
rename from src/main/java/com/simibubi/create/foundation/command/CreateTestCommand.java
rename to src/main/java/com/simibubi/create/infrastructure/command/CreateTestCommand.java
index f42edbed2..6650eac18 100644
--- a/src/main/java/com/simibubi/create/foundation/command/CreateTestCommand.java
+++ b/src/main/java/com/simibubi/create/infrastructure/command/CreateTestCommand.java
@@ -1,26 +1,7 @@
-package com.simibubi.create.foundation.command;
+package com.simibubi.create.infrastructure.command;
 
-import com.mojang.brigadier.arguments.StringArgumentType;
-import com.mojang.brigadier.builder.ArgumentBuilder;
-
-import com.mojang.brigadier.context.CommandContext;
-import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import com.mojang.brigadier.suggestion.Suggestions;
-
-import com.mojang.brigadier.suggestion.SuggestionsBuilder;
-
-import com.simibubi.create.CreateClient;
-
-import com.simibubi.create.content.schematics.SchematicExport;
-import com.simibubi.create.content.schematics.SchematicExport.SchematicExportResult;
-import com.simibubi.create.content.schematics.client.SchematicAndQuillHandler;
-
-import com.simibubi.create.foundation.utility.Components;
-
-import net.minecraft.ChatFormatting;
-import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraftforge.fml.loading.FMLPaths;
+import static net.minecraft.commands.Commands.argument;
+import static net.minecraft.commands.Commands.literal;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -28,8 +9,22 @@ import java.nio.file.Path;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Stream;
 
-import static net.minecraft.commands.Commands.argument;
-import static net.minecraft.commands.Commands.literal;
+import com.mojang.brigadier.arguments.StringArgumentType;
+import com.mojang.brigadier.builder.ArgumentBuilder;
+import com.mojang.brigadier.context.CommandContext;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import com.mojang.brigadier.suggestion.Suggestions;
+import com.mojang.brigadier.suggestion.SuggestionsBuilder;
+import com.simibubi.create.CreateClient;
+import com.simibubi.create.content.schematics.SchematicExport;
+import com.simibubi.create.content.schematics.SchematicExport.SchematicExportResult;
+import com.simibubi.create.content.schematics.client.SchematicAndQuillHandler;
+import com.simibubi.create.foundation.utility.Components;
+
+import net.minecraft.ChatFormatting;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraftforge.fml.loading.FMLPaths;
 
 /**
  * This command allows for quick exporting of GameTests.
diff --git a/src/main/java/com/simibubi/create/foundation/command/DebugValueCommand.java b/src/main/java/com/simibubi/create/infrastructure/command/DebugValueCommand.java
similarity index 52%
rename from src/main/java/com/simibubi/create/foundation/command/DebugValueCommand.java
rename to src/main/java/com/simibubi/create/infrastructure/command/DebugValueCommand.java
index 5272bdc59..86e2f5ac9 100644
--- a/src/main/java/com/simibubi/create/foundation/command/DebugValueCommand.java
+++ b/src/main/java/com/simibubi/create/infrastructure/command/DebugValueCommand.java
@@ -1,27 +1,11 @@
-package com.simibubi.create.foundation.command;
+package com.simibubi.create.infrastructure.command;
 
 import com.mojang.brigadier.arguments.FloatArgumentType;
-
-import com.simibubi.create.Create;
-
-import net.minecraft.SharedConstants;
-
-import org.apache.commons.lang3.mutable.MutableInt;
-
-import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.builder.ArgumentBuilder;
 import com.simibubi.create.foundation.utility.Components;
 
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;
-import net.minecraft.commands.arguments.coordinates.BlockPosArgument;
-import net.minecraft.core.BlockPos;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.level.BaseCommandBlock;
-import net.minecraft.world.level.block.CommandBlock;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.entity.CommandBlockEntity;
-import net.minecraft.world.level.block.state.BlockState;
 
 public class DebugValueCommand {
 
diff --git a/src/main/java/com/simibubi/create/foundation/command/DumpRailwaysCommand.java b/src/main/java/com/simibubi/create/infrastructure/command/DumpRailwaysCommand.java
similarity index 89%
rename from src/main/java/com/simibubi/create/foundation/command/DumpRailwaysCommand.java
rename to src/main/java/com/simibubi/create/infrastructure/command/DumpRailwaysCommand.java
index 90fa16b04..68ec98c7c 100644
--- a/src/main/java/com/simibubi/create/foundation/command/DumpRailwaysCommand.java
+++ b/src/main/java/com/simibubi/create/infrastructure/command/DumpRailwaysCommand.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.command;
+package com.simibubi.create.infrastructure.command;
 
 import java.util.Collection;
 import java.util.List;
@@ -7,13 +7,13 @@ import java.util.function.Consumer;
 
 import com.mojang.brigadier.builder.ArgumentBuilder;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.trains.GlobalRailwayManager;
-import com.simibubi.create.content.logistics.trains.TrackGraph;
-import com.simibubi.create.content.logistics.trains.entity.Train;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.EdgePointType;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.SignalBoundary;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.station.GlobalStation;
-import com.simibubi.create.content.logistics.trains.management.schedule.ScheduleRuntime;
+import com.simibubi.create.content.trains.GlobalRailwayManager;
+import com.simibubi.create.content.trains.entity.Train;
+import com.simibubi.create.content.trains.graph.EdgePointType;
+import com.simibubi.create.content.trains.graph.TrackGraph;
+import com.simibubi.create.content.trains.schedule.ScheduleRuntime;
+import com.simibubi.create.content.trains.signal.SignalBoundary;
+import com.simibubi.create.content.trains.station.GlobalStation;
 import com.simibubi.create.foundation.utility.Components;
 
 import net.minecraft.ChatFormatting;
diff --git a/src/main/java/com/simibubi/create/foundation/command/FabulousWarningCommand.java b/src/main/java/com/simibubi/create/infrastructure/command/FabulousWarningCommand.java
similarity index 88%
rename from src/main/java/com/simibubi/create/foundation/command/FabulousWarningCommand.java
rename to src/main/java/com/simibubi/create/infrastructure/command/FabulousWarningCommand.java
index c5156e7f0..101a1b4ad 100644
--- a/src/main/java/com/simibubi/create/foundation/command/FabulousWarningCommand.java
+++ b/src/main/java/com/simibubi/create/infrastructure/command/FabulousWarningCommand.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.foundation.command;
+package com.simibubi.create.infrastructure.command;
 
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.builder.ArgumentBuilder;
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.AllPackets;
 
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;
diff --git a/src/main/java/com/simibubi/create/foundation/command/FixLightingCommand.java b/src/main/java/com/simibubi/create/infrastructure/command/FixLightingCommand.java
similarity index 89%
rename from src/main/java/com/simibubi/create/foundation/command/FixLightingCommand.java
rename to src/main/java/com/simibubi/create/infrastructure/command/FixLightingCommand.java
index 017e612de..8b6fce3fb 100644
--- a/src/main/java/com/simibubi/create/foundation/command/FixLightingCommand.java
+++ b/src/main/java/com/simibubi/create/infrastructure/command/FixLightingCommand.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.foundation.command;
+package com.simibubi.create.infrastructure.command;
 
 import com.mojang.brigadier.builder.ArgumentBuilder;
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.foundation.utility.Components;
 
 import net.minecraft.commands.CommandSourceStack;
diff --git a/src/main/java/com/simibubi/create/foundation/command/FlySpeedCommand.java b/src/main/java/com/simibubi/create/infrastructure/command/FlySpeedCommand.java
similarity index 97%
rename from src/main/java/com/simibubi/create/foundation/command/FlySpeedCommand.java
rename to src/main/java/com/simibubi/create/infrastructure/command/FlySpeedCommand.java
index 288ef50aa..abe63297b 100644
--- a/src/main/java/com/simibubi/create/foundation/command/FlySpeedCommand.java
+++ b/src/main/java/com/simibubi/create/infrastructure/command/FlySpeedCommand.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.command;
+package com.simibubi.create.infrastructure.command;
 
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.arguments.FloatArgumentType;
diff --git a/src/main/java/com/simibubi/create/foundation/command/GlueCommand.java b/src/main/java/com/simibubi/create/infrastructure/command/GlueCommand.java
similarity index 87%
rename from src/main/java/com/simibubi/create/foundation/command/GlueCommand.java
rename to src/main/java/com/simibubi/create/infrastructure/command/GlueCommand.java
index 461fff603..71c92d117 100644
--- a/src/main/java/com/simibubi/create/foundation/command/GlueCommand.java
+++ b/src/main/java/com/simibubi/create/infrastructure/command/GlueCommand.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.foundation.command;
+package com.simibubi.create.infrastructure.command;
 
 import com.mojang.brigadier.builder.ArgumentBuilder;
-import com.simibubi.create.content.contraptions.components.structureMovement.glue.SuperGlueEntity;
+import com.simibubi.create.content.contraptions.glue.SuperGlueEntity;
 
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;
diff --git a/src/main/java/com/simibubi/create/foundation/command/HighlightCommand.java b/src/main/java/com/simibubi/create/infrastructure/command/HighlightCommand.java
similarity index 92%
rename from src/main/java/com/simibubi/create/foundation/command/HighlightCommand.java
rename to src/main/java/com/simibubi/create/infrastructure/command/HighlightCommand.java
index 4b06ddfca..abf17563c 100644
--- a/src/main/java/com/simibubi/create/foundation/command/HighlightCommand.java
+++ b/src/main/java/com/simibubi/create/infrastructure/command/HighlightCommand.java
@@ -1,12 +1,12 @@
-package com.simibubi.create.foundation.command;
+package com.simibubi.create.infrastructure.command;
 
 import java.util.Collection;
 
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.builder.ArgumentBuilder;
-import com.simibubi.create.content.contraptions.components.structureMovement.AssemblyException;
-import com.simibubi.create.content.contraptions.components.structureMovement.IDisplayAssemblyExceptions;
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.AllPackets;
+import com.simibubi.create.content.contraptions.AssemblyException;
+import com.simibubi.create.content.contraptions.IDisplayAssemblyExceptions;
 import com.simibubi.create.foundation.utility.Components;
 
 import net.minecraft.commands.CommandSourceStack;
diff --git a/src/main/java/com/simibubi/create/foundation/command/HighlightPacket.java b/src/main/java/com/simibubi/create/infrastructure/command/HighlightPacket.java
similarity index 96%
rename from src/main/java/com/simibubi/create/foundation/command/HighlightPacket.java
rename to src/main/java/com/simibubi/create/infrastructure/command/HighlightPacket.java
index 4ca7e3d39..8c88e8fb0 100644
--- a/src/main/java/com/simibubi/create/foundation/command/HighlightPacket.java
+++ b/src/main/java/com/simibubi/create/infrastructure/command/HighlightPacket.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.command;
+package com.simibubi.create.infrastructure.command;
 
 import com.simibubi.create.AllSpecialTextures;
 import com.simibubi.create.CreateClient;
diff --git a/src/main/java/com/simibubi/create/foundation/command/KillTPSCommand.java b/src/main/java/com/simibubi/create/infrastructure/command/KillTPSCommand.java
similarity index 98%
rename from src/main/java/com/simibubi/create/foundation/command/KillTPSCommand.java
rename to src/main/java/com/simibubi/create/infrastructure/command/KillTPSCommand.java
index 1486be151..fafc48b77 100644
--- a/src/main/java/com/simibubi/create/foundation/command/KillTPSCommand.java
+++ b/src/main/java/com/simibubi/create/infrastructure/command/KillTPSCommand.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.command;
+package com.simibubi.create.infrastructure.command;
 
 import com.mojang.brigadier.arguments.IntegerArgumentType;
 import com.mojang.brigadier.builder.ArgumentBuilder;
diff --git a/src/main/java/com/simibubi/create/foundation/command/KillTrainCommand.java b/src/main/java/com/simibubi/create/infrastructure/command/KillTrainCommand.java
similarity index 90%
rename from src/main/java/com/simibubi/create/foundation/command/KillTrainCommand.java
rename to src/main/java/com/simibubi/create/infrastructure/command/KillTrainCommand.java
index 62303acca..0fcdfa278 100644
--- a/src/main/java/com/simibubi/create/foundation/command/KillTrainCommand.java
+++ b/src/main/java/com/simibubi/create/infrastructure/command/KillTrainCommand.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.foundation.command;
+package com.simibubi.create.infrastructure.command;
 
 import java.util.UUID;
 
 import com.mojang.brigadier.builder.ArgumentBuilder;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.logistics.trains.entity.Train;
+import com.simibubi.create.content.trains.entity.Train;
 import com.simibubi.create.foundation.utility.Components;
 
 import net.minecraft.commands.CommandSourceStack;
diff --git a/src/main/java/com/simibubi/create/foundation/command/OverlayConfigCommand.java b/src/main/java/com/simibubi/create/infrastructure/command/OverlayConfigCommand.java
similarity index 94%
rename from src/main/java/com/simibubi/create/foundation/command/OverlayConfigCommand.java
rename to src/main/java/com/simibubi/create/infrastructure/command/OverlayConfigCommand.java
index 18a53bf81..f2b61a47e 100644
--- a/src/main/java/com/simibubi/create/foundation/command/OverlayConfigCommand.java
+++ b/src/main/java/com/simibubi/create/infrastructure/command/OverlayConfigCommand.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.foundation.command;
+package com.simibubi.create.infrastructure.command;
 
 import com.mojang.brigadier.builder.ArgumentBuilder;
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.foundation.utility.Components;
 
 import net.minecraft.commands.CommandSourceStack;
diff --git a/src/main/java/com/simibubi/create/foundation/command/PassengerCommand.java b/src/main/java/com/simibubi/create/infrastructure/command/PassengerCommand.java
similarity index 81%
rename from src/main/java/com/simibubi/create/foundation/command/PassengerCommand.java
rename to src/main/java/com/simibubi/create/infrastructure/command/PassengerCommand.java
index 218aa0aba..79189839c 100644
--- a/src/main/java/com/simibubi/create/foundation/command/PassengerCommand.java
+++ b/src/main/java/com/simibubi/create/infrastructure/command/PassengerCommand.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.foundation.command;
+package com.simibubi.create.infrastructure.command;
 
 import com.mojang.brigadier.arguments.IntegerArgumentType;
 import com.mojang.brigadier.builder.ArgumentBuilder;
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.ControlledContraptionEntity;
-import com.simibubi.create.content.logistics.trains.entity.CarriageContraptionEntity;
+import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
+import com.simibubi.create.content.contraptions.ControlledContraptionEntity;
+import com.simibubi.create.content.trains.entity.CarriageContraptionEntity;
 
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;
diff --git a/src/main/java/com/simibubi/create/foundation/command/PonderCommand.java b/src/main/java/com/simibubi/create/infrastructure/command/PonderCommand.java
similarity index 95%
rename from src/main/java/com/simibubi/create/foundation/command/PonderCommand.java
rename to src/main/java/com/simibubi/create/infrastructure/command/PonderCommand.java
index 8863a08e6..1e89b122a 100644
--- a/src/main/java/com/simibubi/create/foundation/command/PonderCommand.java
+++ b/src/main/java/com/simibubi/create/infrastructure/command/PonderCommand.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.command;
+package com.simibubi.create.infrastructure.command;
 
 import java.util.Collection;
 
@@ -6,7 +6,7 @@ import com.google.common.collect.ImmutableList;
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.builder.ArgumentBuilder;
 import com.mojang.brigadier.suggestion.SuggestionProvider;
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.AllPackets;
 import com.simibubi.create.foundation.ponder.PonderRegistry;
 
 import net.minecraft.commands.CommandSourceStack;
diff --git a/src/main/java/com/simibubi/create/foundation/command/ReplaceInCommandBlocksCommand.java b/src/main/java/com/simibubi/create/infrastructure/command/ReplaceInCommandBlocksCommand.java
similarity index 98%
rename from src/main/java/com/simibubi/create/foundation/command/ReplaceInCommandBlocksCommand.java
rename to src/main/java/com/simibubi/create/infrastructure/command/ReplaceInCommandBlocksCommand.java
index eae61cac6..867940b09 100644
--- a/src/main/java/com/simibubi/create/foundation/command/ReplaceInCommandBlocksCommand.java
+++ b/src/main/java/com/simibubi/create/infrastructure/command/ReplaceInCommandBlocksCommand.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.command;
+package com.simibubi.create.infrastructure.command;
 
 import org.apache.commons.lang3.mutable.MutableInt;
 
diff --git a/src/main/java/com/simibubi/create/foundation/command/SConfigureConfigPacket.java b/src/main/java/com/simibubi/create/infrastructure/command/SConfigureConfigPacket.java
similarity index 97%
rename from src/main/java/com/simibubi/create/foundation/command/SConfigureConfigPacket.java
rename to src/main/java/com/simibubi/create/infrastructure/command/SConfigureConfigPacket.java
index 218f84c96..c5dbeeb07 100644
--- a/src/main/java/com/simibubi/create/foundation/command/SConfigureConfigPacket.java
+++ b/src/main/java/com/simibubi/create/infrastructure/command/SConfigureConfigPacket.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.command;
+package com.simibubi.create.infrastructure.command;
 
 import java.util.function.Consumer;
 import java.util.function.Supplier;
@@ -7,9 +7,8 @@ import org.slf4j.Logger;
 
 import com.mojang.logging.LogUtils;
 import com.simibubi.create.Create;
-import com.simibubi.create.content.contraptions.goggles.GoggleConfigScreen;
-import com.simibubi.create.content.logistics.trains.CameraDistanceModifier;
-import com.simibubi.create.foundation.config.AllConfigs;
+import com.simibubi.create.content.equipment.goggles.GoggleConfigScreen;
+import com.simibubi.create.content.trains.CameraDistanceModifier;
 import com.simibubi.create.foundation.config.ui.BaseConfigScreen;
 import com.simibubi.create.foundation.config.ui.ConfigHelper;
 import com.simibubi.create.foundation.config.ui.SubMenuConfigScreen;
@@ -20,6 +19,7 @@ import com.simibubi.create.foundation.ponder.ui.PonderIndexScreen;
 import com.simibubi.create.foundation.ponder.ui.PonderUI;
 import com.simibubi.create.foundation.utility.CameraAngleAnimationService;
 import com.simibubi.create.foundation.utility.Components;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
diff --git a/src/main/java/com/simibubi/create/foundation/command/ServerLagger.java b/src/main/java/com/simibubi/create/infrastructure/command/ServerLagger.java
similarity index 91%
rename from src/main/java/com/simibubi/create/foundation/command/ServerLagger.java
rename to src/main/java/com/simibubi/create/infrastructure/command/ServerLagger.java
index 5ab858221..d8f32860c 100644
--- a/src/main/java/com/simibubi/create/foundation/command/ServerLagger.java
+++ b/src/main/java/com/simibubi/create/infrastructure/command/ServerLagger.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.command;
+package com.simibubi.create.infrastructure.command;
 
 public class ServerLagger {
 
diff --git a/src/main/java/com/simibubi/create/foundation/command/ToggleDebugCommand.java b/src/main/java/com/simibubi/create/infrastructure/command/ToggleDebugCommand.java
similarity index 81%
rename from src/main/java/com/simibubi/create/foundation/command/ToggleDebugCommand.java
rename to src/main/java/com/simibubi/create/infrastructure/command/ToggleDebugCommand.java
index ea30262f9..324b08b46 100644
--- a/src/main/java/com/simibubi/create/foundation/command/ToggleDebugCommand.java
+++ b/src/main/java/com/simibubi/create/infrastructure/command/ToggleDebugCommand.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.foundation.command;
+package com.simibubi.create.infrastructure.command;
 
-import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.AllPackets;
 
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraftforge.network.PacketDistributor;
diff --git a/src/main/java/com/simibubi/create/foundation/config/AllConfigs.java b/src/main/java/com/simibubi/create/infrastructure/config/AllConfigs.java
similarity index 93%
rename from src/main/java/com/simibubi/create/foundation/config/AllConfigs.java
rename to src/main/java/com/simibubi/create/infrastructure/config/AllConfigs.java
index 414d9b7ac..d37342037 100644
--- a/src/main/java/com/simibubi/create/foundation/config/AllConfigs.java
+++ b/src/main/java/com/simibubi/create/infrastructure/config/AllConfigs.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.config;
+package com.simibubi.create.infrastructure.config;
 
 import java.util.EnumMap;
 import java.util.Map;
@@ -7,7 +7,8 @@ import java.util.function.Supplier;
 
 import org.apache.commons.lang3.tuple.Pair;
 
-import com.simibubi.create.foundation.block.BlockStressValues;
+import com.simibubi.create.content.kinetics.BlockStressValues;
+import com.simibubi.create.foundation.config.ConfigBase;
 
 import net.minecraftforge.common.ForgeConfigSpec;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
diff --git a/src/main/java/com/simibubi/create/foundation/config/CClient.java b/src/main/java/com/simibubi/create/infrastructure/config/CClient.java
similarity index 98%
rename from src/main/java/com/simibubi/create/foundation/config/CClient.java
rename to src/main/java/com/simibubi/create/infrastructure/config/CClient.java
index 1b0c8cb7e..f864101f5 100644
--- a/src/main/java/com/simibubi/create/foundation/config/CClient.java
+++ b/src/main/java/com/simibubi/create/infrastructure/config/CClient.java
@@ -1,5 +1,6 @@
-package com.simibubi.create.foundation.config;
+package com.simibubi.create.infrastructure.config;
 
+import com.simibubi.create.foundation.config.ConfigBase;
 import com.simibubi.create.foundation.config.ui.ConfigAnnotations;
 
 public class CClient extends ConfigBase {
diff --git a/src/main/java/com/simibubi/create/foundation/config/CCommon.java b/src/main/java/com/simibubi/create/infrastructure/config/CCommon.java
similarity index 73%
rename from src/main/java/com/simibubi/create/foundation/config/CCommon.java
rename to src/main/java/com/simibubi/create/infrastructure/config/CCommon.java
index 13847bc11..0e6cd76a3 100644
--- a/src/main/java/com/simibubi/create/foundation/config/CCommon.java
+++ b/src/main/java/com/simibubi/create/infrastructure/config/CCommon.java
@@ -1,4 +1,6 @@
-package com.simibubi.create.foundation.config;
+package com.simibubi.create.infrastructure.config;
+
+import com.simibubi.create.foundation.config.ConfigBase;
 
 public class CCommon extends ConfigBase {
 
diff --git a/src/main/java/com/simibubi/create/foundation/config/CCuriosities.java b/src/main/java/com/simibubi/create/infrastructure/config/CEquipment.java
similarity index 92%
rename from src/main/java/com/simibubi/create/foundation/config/CCuriosities.java
rename to src/main/java/com/simibubi/create/infrastructure/config/CEquipment.java
index 14ddacd56..21ecf6d79 100644
--- a/src/main/java/com/simibubi/create/foundation/config/CCuriosities.java
+++ b/src/main/java/com/simibubi/create/infrastructure/config/CEquipment.java
@@ -1,6 +1,8 @@
-package com.simibubi.create.foundation.config;
+package com.simibubi.create.infrastructure.config;
 
-public class CCuriosities extends ConfigBase {
+import com.simibubi.create.foundation.config.ConfigBase;
+
+public class CEquipment extends ConfigBase {
 
 	public final ConfigInt maxSymmetryWandRange = i(50, 10, "maxSymmetryWandRange", Comments.symmetryRange);
 	public final ConfigInt placementAssistRange = i(12, 3, "placementAssistRange", Comments.placementRange);
@@ -15,7 +17,7 @@ public class CCuriosities extends ConfigBase {
 
 	@Override
 	public String getName() {
-		return "curiosities";
+		return "equipment";
 	}
 
 	private static class Comments {
diff --git a/src/main/java/com/simibubi/create/foundation/config/CFluids.java b/src/main/java/com/simibubi/create/infrastructure/config/CFluids.java
similarity index 91%
rename from src/main/java/com/simibubi/create/foundation/config/CFluids.java
rename to src/main/java/com/simibubi/create/infrastructure/config/CFluids.java
index 7f7d65f61..0a8d82cd0 100644
--- a/src/main/java/com/simibubi/create/foundation/config/CFluids.java
+++ b/src/main/java/com/simibubi/create/infrastructure/config/CFluids.java
@@ -1,6 +1,7 @@
-package com.simibubi.create.foundation.config;
+package com.simibubi.create.infrastructure.config;
 
-import com.simibubi.create.content.contraptions.fluids.actors.FluidManipulationBehaviour.BottomlessFluidMode;
+import com.simibubi.create.content.fluids.transfer.FluidManipulationBehaviour.BottomlessFluidMode;
+import com.simibubi.create.foundation.config.ConfigBase;
 
 public class CFluids extends ConfigBase {
 
diff --git a/src/main/java/com/simibubi/create/foundation/config/CKinetics.java b/src/main/java/com/simibubi/create/infrastructure/config/CKinetics.java
similarity index 95%
rename from src/main/java/com/simibubi/create/foundation/config/CKinetics.java
rename to src/main/java/com/simibubi/create/infrastructure/config/CKinetics.java
index 7948f5c8e..2b163cd9c 100644
--- a/src/main/java/com/simibubi/create/foundation/config/CKinetics.java
+++ b/src/main/java/com/simibubi/create/infrastructure/config/CKinetics.java
@@ -1,6 +1,8 @@
-package com.simibubi.create.foundation.config;
+package com.simibubi.create.infrastructure.config;
 
-import com.simibubi.create.foundation.utility.ContraptionData;
+import com.simibubi.create.content.contraptions.ContraptionData;
+import com.simibubi.create.content.contraptions.ContraptionMovementSetting;
+import com.simibubi.create.foundation.config.ConfigBase;
 
 public class CKinetics extends ConfigBase {
 
@@ -23,7 +25,7 @@ public class CKinetics extends ConfigBase {
 	public final ConfigInt fanPullDistance = i(20, 5, "fanPullDistance", Comments.fanPullDistance);
 	public final ConfigInt fanBlockCheckRate = i(30, 10, "fanBlockCheckRate", Comments.fanBlockCheckRate);
 	public final ConfigInt fanRotationArgmax = i(256, 64, "fanRotationArgmax", Comments.rpm, Comments.fanRotationArgmax);
-	public final ConfigInt inWorldProcessingTime = i(150, 0, "inWorldProcessingTime", Comments.inWorldProcessingTime);
+	public final ConfigInt fanProcessingTime = i(150, 0, "fanProcessingTime", Comments.fanProcessingTime);
 
 	public final ConfigGroup contraptions = group(1, "contraptions", "Moving Contraptions");
 	public final ConfigInt maxBlocksMoved = i(2048, 1, "maxBlocksMoved", Comments.maxBlocksMoved);
@@ -73,7 +75,7 @@ public class CKinetics extends ConfigBase {
 		static String fanPullDistance = "Maximum distance in blocks from where Fans can pull entities.";
 		static String fanBlockCheckRate = "Game ticks between Fans checking for anything blocking their air flow.";
 		static String fanRotationArgmax = "Rotation speed at which the maximum stats of fans are reached.";
-		static String inWorldProcessingTime = "Game ticks required for a Fan-based processing recipe to take effect.";
+		static String fanProcessingTime = "Game ticks required for a Fan-based processing recipe to take effect.";
 		static String crankHungerMultiplier =
 			"multiplier used for calculating exhaustion from speed when a crank is turned.";
 		static String maxBlocksMoved =
diff --git a/src/main/java/com/simibubi/create/foundation/config/CLogistics.java b/src/main/java/com/simibubi/create/infrastructure/config/CLogistics.java
similarity index 93%
rename from src/main/java/com/simibubi/create/foundation/config/CLogistics.java
rename to src/main/java/com/simibubi/create/infrastructure/config/CLogistics.java
index 97435638f..0d08b264e 100644
--- a/src/main/java/com/simibubi/create/foundation/config/CLogistics.java
+++ b/src/main/java/com/simibubi/create/infrastructure/config/CLogistics.java
@@ -1,4 +1,6 @@
-package com.simibubi.create.foundation.config;
+package com.simibubi.create.infrastructure.config;
+
+import com.simibubi.create.foundation.config.ConfigBase;
 
 public class CLogistics extends ConfigBase {
 
diff --git a/src/main/java/com/simibubi/create/foundation/config/CRecipes.java b/src/main/java/com/simibubi/create/infrastructure/config/CRecipes.java
similarity index 96%
rename from src/main/java/com/simibubi/create/foundation/config/CRecipes.java
rename to src/main/java/com/simibubi/create/infrastructure/config/CRecipes.java
index 3f29ecced..73948f913 100644
--- a/src/main/java/com/simibubi/create/foundation/config/CRecipes.java
+++ b/src/main/java/com/simibubi/create/infrastructure/config/CRecipes.java
@@ -1,4 +1,6 @@
-package com.simibubi.create.foundation.config;
+package com.simibubi.create.infrastructure.config;
+
+import com.simibubi.create.foundation.config.ConfigBase;
 
 public class CRecipes extends ConfigBase {
 
diff --git a/src/main/java/com/simibubi/create/foundation/config/CSchematics.java b/src/main/java/com/simibubi/create/infrastructure/config/CSchematics.java
similarity index 94%
rename from src/main/java/com/simibubi/create/foundation/config/CSchematics.java
rename to src/main/java/com/simibubi/create/infrastructure/config/CSchematics.java
index 81d3e8b98..d047f20a2 100644
--- a/src/main/java/com/simibubi/create/foundation/config/CSchematics.java
+++ b/src/main/java/com/simibubi/create/infrastructure/config/CSchematics.java
@@ -1,4 +1,6 @@
-package com.simibubi.create.foundation.config;
+package com.simibubi.create.infrastructure.config;
+
+import com.simibubi.create.foundation.config.ConfigBase;
 
 public class CSchematics extends ConfigBase {
 
diff --git a/src/main/java/com/simibubi/create/foundation/config/CServer.java b/src/main/java/com/simibubi/create/infrastructure/config/CServer.java
similarity index 85%
rename from src/main/java/com/simibubi/create/foundation/config/CServer.java
rename to src/main/java/com/simibubi/create/infrastructure/config/CServer.java
index af9212651..1b8f3bced 100644
--- a/src/main/java/com/simibubi/create/foundation/config/CServer.java
+++ b/src/main/java/com/simibubi/create/infrastructure/config/CServer.java
@@ -1,4 +1,6 @@
-package com.simibubi.create.foundation.config;
+package com.simibubi.create.infrastructure.config;
+
+import com.simibubi.create.foundation.config.ConfigBase;
 
 public class CServer extends ConfigBase {
 
@@ -11,7 +13,7 @@ public class CServer extends ConfigBase {
 	public final CFluids fluids = nested(0, CFluids::new, Comments.fluids);
 	public final CLogistics logistics = nested(0, CLogistics::new, Comments.logistics);
 	public final CSchematics schematics = nested(0, CSchematics::new, Comments.schematics);
-	public final CCuriosities curiosities = nested(0, CCuriosities::new, Comments.curiosities);
+	public final CEquipment equipment = nested(0, CEquipment::new, Comments.equipment);
 	public final CTrains trains = nested(0, CTrains::new, Comments.trains);
 
 	@Override
@@ -25,7 +27,7 @@ public class CServer extends ConfigBase {
 		static String kinetics = "Parameters and abilities of Create's kinetic mechanisms";
 		static String fluids = "Create's liquid manipulation tools";
 		static String logistics = "Tweaks for logistical components";
-		static String curiosities = "Gadgets and other Shenanigans added by Create";
+		static String equipment = "Equipment and gadgets added by Create";
 		static String trains = "Create's builtin Railway systems";
 		static String infrastructure = "The Backbone of Create";
 		static String tickrateSyncTimer =
diff --git a/src/main/java/com/simibubi/create/foundation/config/CStress.java b/src/main/java/com/simibubi/create/infrastructure/config/CStress.java
similarity index 91%
rename from src/main/java/com/simibubi/create/foundation/config/CStress.java
rename to src/main/java/com/simibubi/create/infrastructure/config/CStress.java
index bfc15855b..52bb872a3 100644
--- a/src/main/java/com/simibubi/create/foundation/config/CStress.java
+++ b/src/main/java/com/simibubi/create/infrastructure/config/CStress.java
@@ -1,12 +1,13 @@
-package com.simibubi.create.foundation.config;
+package com.simibubi.create.infrastructure.config;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Supplier;
 
 import com.simibubi.create.Create;
-import com.simibubi.create.foundation.block.BlockStressDefaults;
-import com.simibubi.create.foundation.block.BlockStressValues.IStressValueProvider;
+import com.simibubi.create.content.kinetics.BlockStressDefaults;
+import com.simibubi.create.content.kinetics.BlockStressValues.IStressValueProvider;
+import com.simibubi.create.foundation.config.ConfigBase;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.RegisteredObjects;
 
@@ -21,7 +22,7 @@ public class CStress extends ConfigBase implements IStressValueProvider {
 	private final Map<ResourceLocation, ConfigValue<Double>> impacts = new HashMap<>();
 
 	@Override
-	protected void registerAll(Builder builder) {
+	public void registerAll(Builder builder) {
 		builder.comment(".", Comments.su, Comments.impact)
 			.push("impact");
 		BlockStressDefaults.DEFAULT_IMPACTS.forEach((r, i) -> {
diff --git a/src/main/java/com/simibubi/create/foundation/config/CTrains.java b/src/main/java/com/simibubi/create/infrastructure/config/CTrains.java
similarity index 96%
rename from src/main/java/com/simibubi/create/foundation/config/CTrains.java
rename to src/main/java/com/simibubi/create/infrastructure/config/CTrains.java
index ad11fa18b..4154137fc 100644
--- a/src/main/java/com/simibubi/create/foundation/config/CTrains.java
+++ b/src/main/java/com/simibubi/create/infrastructure/config/CTrains.java
@@ -1,4 +1,6 @@
-package com.simibubi.create.foundation.config;
+package com.simibubi.create.infrastructure.config;
+
+import com.simibubi.create.foundation.config.ConfigBase;
 
 public class CTrains extends ConfigBase {
 
diff --git a/src/main/java/com/simibubi/create/foundation/config/CWorldGen.java b/src/main/java/com/simibubi/create/infrastructure/config/CWorldGen.java
similarity index 77%
rename from src/main/java/com/simibubi/create/foundation/config/CWorldGen.java
rename to src/main/java/com/simibubi/create/infrastructure/config/CWorldGen.java
index 6f03e44c5..58c535975 100644
--- a/src/main/java/com/simibubi/create/foundation/config/CWorldGen.java
+++ b/src/main/java/com/simibubi/create/infrastructure/config/CWorldGen.java
@@ -1,7 +1,8 @@
-package com.simibubi.create.foundation.config;
+package com.simibubi.create.infrastructure.config;
 
 import com.simibubi.create.Create;
-import com.simibubi.create.foundation.worldgen.AllOreFeatureConfigEntries;
+import com.simibubi.create.foundation.config.ConfigBase;
+import com.simibubi.create.infrastructure.worldgen.AllOreFeatureConfigEntries;
 
 import net.minecraftforge.common.ForgeConfigSpec.Builder;
 
@@ -17,7 +18,7 @@ public class CWorldGen extends ConfigBase {
 	public final ConfigBool disable = b(false, "disableWorldGen", Comments.disable);
 
 	@Override
-	protected void registerAll(Builder builder) {
+	public void registerAll(Builder builder) {
 		super.registerAll(builder);
 		AllOreFeatureConfigEntries.fillConfig(builder, Create.ID);
 	}
diff --git a/src/main/java/com/simibubi/create/gametest/infrastructure/CreateGameTestHelper.java b/src/main/java/com/simibubi/create/infrastructure/gametest/CreateGameTestHelper.java
similarity index 97%
rename from src/main/java/com/simibubi/create/gametest/infrastructure/CreateGameTestHelper.java
rename to src/main/java/com/simibubi/create/infrastructure/gametest/CreateGameTestHelper.java
index 9a3a27162..de3df9a88 100644
--- a/src/main/java/com/simibubi/create/gametest/infrastructure/CreateGameTestHelper.java
+++ b/src/main/java/com/simibubi/create/infrastructure/gametest/CreateGameTestHelper.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.gametest.infrastructure;
+package com.simibubi.create.infrastructure.gametest;
 
 import java.util.Arrays;
 import java.util.List;
@@ -8,13 +8,13 @@ import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 
 import com.simibubi.create.AllBlockEntityTypes;
-import com.simibubi.create.content.logistics.block.belts.tunnel.BrassTunnelBlockEntity.SelectionMode;
-import com.simibubi.create.content.logistics.block.redstone.NixieTubeBlockEntity;
-import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
+import com.simibubi.create.content.logistics.tunnel.BrassTunnelBlockEntity.SelectionMode;
+import com.simibubi.create.content.redstone.nixieTube.NixieTubeBlockEntity;
 import com.simibubi.create.foundation.blockEntity.IMultiBlockEntityContainer;
 import com.simibubi.create.foundation.blockEntity.behaviour.BehaviourType;
-import com.simibubi.create.foundation.blockEntity.behaviour.scrollvalue.ScrollOptionBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.scrollvalue.ScrollValueBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollOptionBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollValueBehaviour;
 import com.simibubi.create.foundation.item.ItemHelper;
 import com.simibubi.create.foundation.mixin.accessor.GameTestHelperAccessor;
 import com.simibubi.create.foundation.utility.RegisteredObjects;
diff --git a/src/main/java/com/simibubi/create/gametest/CreateGameTests.java b/src/main/java/com/simibubi/create/infrastructure/gametest/CreateGameTests.java
similarity index 68%
rename from src/main/java/com/simibubi/create/gametest/CreateGameTests.java
rename to src/main/java/com/simibubi/create/infrastructure/gametest/CreateGameTests.java
index f50450caa..3120a6b84 100644
--- a/src/main/java/com/simibubi/create/gametest/CreateGameTests.java
+++ b/src/main/java/com/simibubi/create/infrastructure/gametest/CreateGameTests.java
@@ -1,14 +1,12 @@
-package com.simibubi.create.gametest;
+package com.simibubi.create.infrastructure.gametest;
 
 import java.util.Collection;
 
-import com.simibubi.create.gametest.infrastructure.CreateTestFunction;
-
-import com.simibubi.create.gametest.tests.TestContraptions;
-import com.simibubi.create.gametest.tests.TestFluids;
-import com.simibubi.create.gametest.tests.TestItems;
-import com.simibubi.create.gametest.tests.TestMisc;
-import com.simibubi.create.gametest.tests.TestProcessing;
+import com.simibubi.create.infrastructure.gametest.tests.TestContraptions;
+import com.simibubi.create.infrastructure.gametest.tests.TestFluids;
+import com.simibubi.create.infrastructure.gametest.tests.TestItems;
+import com.simibubi.create.infrastructure.gametest.tests.TestMisc;
+import com.simibubi.create.infrastructure.gametest.tests.TestProcessing;
 
 import net.minecraft.gametest.framework.GameTestGenerator;
 import net.minecraft.gametest.framework.TestFunction;
diff --git a/src/main/java/com/simibubi/create/gametest/infrastructure/CreateTestFunction.java b/src/main/java/com/simibubi/create/infrastructure/gametest/CreateTestFunction.java
similarity index 98%
rename from src/main/java/com/simibubi/create/gametest/infrastructure/CreateTestFunction.java
rename to src/main/java/com/simibubi/create/infrastructure/gametest/CreateTestFunction.java
index 88d4edcf2..75ad63e4c 100644
--- a/src/main/java/com/simibubi/create/gametest/infrastructure/CreateTestFunction.java
+++ b/src/main/java/com/simibubi/create/infrastructure/gametest/CreateTestFunction.java
@@ -1,18 +1,4 @@
-package com.simibubi.create.gametest.infrastructure;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.gametest.framework.GameTest;
-import net.minecraft.gametest.framework.GameTestGenerator;
-import net.minecraft.gametest.framework.GameTestHelper;
-import net.minecraft.gametest.framework.StructureUtils;
-import net.minecraft.gametest.framework.TestFunction;
-import net.minecraft.world.level.block.Rotation;
-
-import net.minecraft.world.level.block.entity.StructureBlockEntity;
-
-import org.jetbrains.annotations.NotNull;
-
-import javax.annotation.Nullable;
+package com.simibubi.create.infrastructure.gametest;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -25,6 +11,19 @@ import java.util.Objects;
 import java.util.function.Consumer;
 import java.util.stream.Stream;
 
+import javax.annotation.Nullable;
+
+import org.jetbrains.annotations.NotNull;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.gametest.framework.GameTest;
+import net.minecraft.gametest.framework.GameTestGenerator;
+import net.minecraft.gametest.framework.GameTestHelper;
+import net.minecraft.gametest.framework.StructureUtils;
+import net.minecraft.gametest.framework.TestFunction;
+import net.minecraft.world.level.block.Rotation;
+import net.minecraft.world.level.block.entity.StructureBlockEntity;
+
 /**
  * An extension to game tests implementing functionality for {@link CreateGameTestHelper} and {@link GameTestGroup}.
  * To use, create a {@link GameTestGenerator} that provides tests using {@link #getTestsFrom(Class[])}.
diff --git a/src/main/java/com/simibubi/create/gametest/infrastructure/GameTestGroup.java b/src/main/java/com/simibubi/create/infrastructure/gametest/GameTestGroup.java
similarity index 91%
rename from src/main/java/com/simibubi/create/gametest/infrastructure/GameTestGroup.java
rename to src/main/java/com/simibubi/create/infrastructure/gametest/GameTestGroup.java
index cb24dc5ce..bdecf716e 100644
--- a/src/main/java/com/simibubi/create/gametest/infrastructure/GameTestGroup.java
+++ b/src/main/java/com/simibubi/create/infrastructure/gametest/GameTestGroup.java
@@ -1,12 +1,12 @@
-package com.simibubi.create.gametest.infrastructure;
-
-import com.simibubi.create.Create;
+package com.simibubi.create.infrastructure.gametest;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import com.simibubi.create.Create;
+
 /**
  * Allows for test method declarations to be concise by moving subdirectories and namespaces to the class level.
  */
diff --git a/src/main/java/com/simibubi/create/gametest/TESTING.md b/src/main/java/com/simibubi/create/infrastructure/gametest/TESTING.md
similarity index 100%
rename from src/main/java/com/simibubi/create/gametest/TESTING.md
rename to src/main/java/com/simibubi/create/infrastructure/gametest/TESTING.md
diff --git a/src/main/java/com/simibubi/create/gametest/tests/TestContraptions.java b/src/main/java/com/simibubi/create/infrastructure/gametest/tests/TestContraptions.java
similarity index 95%
rename from src/main/java/com/simibubi/create/gametest/tests/TestContraptions.java
rename to src/main/java/com/simibubi/create/infrastructure/gametest/tests/TestContraptions.java
index 524475898..6fdba39a1 100644
--- a/src/main/java/com/simibubi/create/gametest/tests/TestContraptions.java
+++ b/src/main/java/com/simibubi/create/infrastructure/gametest/tests/TestContraptions.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.gametest.tests;
+package com.simibubi.create.infrastructure.gametest.tests;
 
 import java.util.List;
 
-import com.simibubi.create.gametest.infrastructure.CreateGameTestHelper;
-import com.simibubi.create.gametest.infrastructure.GameTestGroup;
+import com.simibubi.create.infrastructure.gametest.CreateGameTestHelper;
+import com.simibubi.create.infrastructure.gametest.GameTestGroup;
 
 import it.unimi.dsi.fastutil.objects.Object2LongMap;
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/simibubi/create/gametest/tests/TestFluids.java b/src/main/java/com/simibubi/create/infrastructure/gametest/tests/TestFluids.java
similarity index 93%
rename from src/main/java/com/simibubi/create/gametest/tests/TestFluids.java
rename to src/main/java/com/simibubi/create/infrastructure/gametest/tests/TestFluids.java
index deff50a42..ee97c0bd8 100644
--- a/src/main/java/com/simibubi/create/gametest/tests/TestFluids.java
+++ b/src/main/java/com/simibubi/create/infrastructure/gametest/tests/TestFluids.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.gametest.tests;
+package com.simibubi.create.infrastructure.gametest.tests;
 
 import com.simibubi.create.AllBlockEntityTypes;
-import com.simibubi.create.content.contraptions.fluids.actors.HosePulleyFluidHandler;
-import com.simibubi.create.content.contraptions.relays.gauge.SpeedGaugeBlockEntity;
-import com.simibubi.create.content.contraptions.relays.gauge.StressGaugeBlockEntity;
-import com.simibubi.create.gametest.infrastructure.CreateGameTestHelper;
-import com.simibubi.create.gametest.infrastructure.GameTestGroup;
+import com.simibubi.create.content.fluids.hosePulley.HosePulleyFluidHandler;
+import com.simibubi.create.content.kinetics.gauge.SpeedGaugeBlockEntity;
+import com.simibubi.create.content.kinetics.gauge.StressGaugeBlockEntity;
+import com.simibubi.create.infrastructure.gametest.CreateGameTestHelper;
+import com.simibubi.create.infrastructure.gametest.GameTestGroup;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.gametest.framework.GameTest;
diff --git a/src/main/java/com/simibubi/create/gametest/tests/TestItems.java b/src/main/java/com/simibubi/create/infrastructure/gametest/tests/TestItems.java
similarity index 94%
rename from src/main/java/com/simibubi/create/gametest/tests/TestItems.java
rename to src/main/java/com/simibubi/create/infrastructure/gametest/tests/TestItems.java
index fe41664e7..5fdf5e0fa 100644
--- a/src/main/java/com/simibubi/create/gametest/tests/TestItems.java
+++ b/src/main/java/com/simibubi/create/infrastructure/gametest/tests/TestItems.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.gametest.tests;
+package com.simibubi.create.infrastructure.gametest.tests;
 
 import java.util.List;
 import java.util.Locale;
@@ -8,15 +8,15 @@ import java.util.stream.Stream;
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.logistics.block.belts.tunnel.BrassTunnelBlockEntity.SelectionMode;
-import com.simibubi.create.content.logistics.block.depot.DepotBlockEntity;
-import com.simibubi.create.content.logistics.block.redstone.NixieTubeBlockEntity;
-import com.simibubi.create.content.logistics.trains.management.display.FlapDisplayBlockEntity;
-import com.simibubi.create.content.logistics.trains.management.display.FlapDisplayLayout;
-import com.simibubi.create.content.logistics.trains.management.display.FlapDisplaySection;
+import com.simibubi.create.content.logistics.depot.DepotBlockEntity;
+import com.simibubi.create.content.logistics.tunnel.BrassTunnelBlockEntity.SelectionMode;
+import com.simibubi.create.content.redstone.nixieTube.NixieTubeBlockEntity;
+import com.simibubi.create.content.trains.display.FlapDisplayBlockEntity;
+import com.simibubi.create.content.trains.display.FlapDisplayLayout;
+import com.simibubi.create.content.trains.display.FlapDisplaySection;
 import com.simibubi.create.foundation.utility.Components;
-import com.simibubi.create.gametest.infrastructure.CreateGameTestHelper;
-import com.simibubi.create.gametest.infrastructure.GameTestGroup;
+import com.simibubi.create.infrastructure.gametest.CreateGameTestHelper;
+import com.simibubi.create.infrastructure.gametest.GameTestGroup;
 
 import it.unimi.dsi.fastutil.objects.Object2LongMap;
 import net.minecraft.Util;
diff --git a/src/main/java/com/simibubi/create/gametest/tests/TestMisc.java b/src/main/java/com/simibubi/create/infrastructure/gametest/tests/TestMisc.java
similarity index 83%
rename from src/main/java/com/simibubi/create/gametest/tests/TestMisc.java
rename to src/main/java/com/simibubi/create/infrastructure/gametest/tests/TestMisc.java
index cfd3209c9..a858508d2 100644
--- a/src/main/java/com/simibubi/create/gametest/tests/TestMisc.java
+++ b/src/main/java/com/simibubi/create/infrastructure/gametest/tests/TestMisc.java
@@ -1,14 +1,14 @@
-package com.simibubi.create.gametest.tests;
+package com.simibubi.create.infrastructure.gametest.tests;
 
-import static com.simibubi.create.gametest.infrastructure.CreateGameTestHelper.FIFTEEN_SECONDS;
+import static com.simibubi.create.infrastructure.gametest.CreateGameTestHelper.FIFTEEN_SECONDS;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.content.schematics.SchematicExport;
-import com.simibubi.create.content.schematics.block.SchematicannonBlockEntity;
-import com.simibubi.create.content.schematics.block.SchematicannonBlockEntity.State;
-import com.simibubi.create.content.schematics.item.SchematicItem;
-import com.simibubi.create.gametest.infrastructure.CreateGameTestHelper;
-import com.simibubi.create.gametest.infrastructure.GameTestGroup;
+import com.simibubi.create.content.schematics.SchematicItem;
+import com.simibubi.create.content.schematics.cannon.SchematicannonBlockEntity;
+import com.simibubi.create.content.schematics.cannon.SchematicannonBlockEntity.State;
+import com.simibubi.create.infrastructure.gametest.CreateGameTestHelper;
+import com.simibubi.create.infrastructure.gametest.GameTestGroup;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.gametest.framework.GameTest;
diff --git a/src/main/java/com/simibubi/create/gametest/tests/TestProcessing.java b/src/main/java/com/simibubi/create/infrastructure/gametest/tests/TestProcessing.java
similarity index 93%
rename from src/main/java/com/simibubi/create/gametest/tests/TestProcessing.java
rename to src/main/java/com/simibubi/create/infrastructure/gametest/tests/TestProcessing.java
index ca2767c7d..f339d01d0 100644
--- a/src/main/java/com/simibubi/create/gametest/tests/TestProcessing.java
+++ b/src/main/java/com/simibubi/create/infrastructure/gametest/tests/TestProcessing.java
@@ -1,16 +1,15 @@
-package com.simibubi.create.gametest.tests;
+package com.simibubi.create.infrastructure.gametest.tests;
 
 import java.util.List;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
-
 import com.simibubi.create.Create;
-import com.simibubi.create.content.contraptions.itemAssembly.SequencedAssemblyRecipe;
-import com.simibubi.create.content.contraptions.processing.ProcessingOutput;
-import com.simibubi.create.gametest.infrastructure.CreateGameTestHelper;
-import com.simibubi.create.gametest.infrastructure.GameTestGroup;
+import com.simibubi.create.content.processing.recipe.ProcessingOutput;
+import com.simibubi.create.content.processing.sequenced.SequencedAssemblyRecipe;
 import com.simibubi.create.foundation.item.ItemHelper;
+import com.simibubi.create.infrastructure.gametest.CreateGameTestHelper;
+import com.simibubi.create.infrastructure.gametest.GameTestGroup;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.gametest.framework.GameTest;
diff --git a/src/main/java/com/simibubi/create/foundation/gui/CreateMainMenuScreen.java b/src/main/java/com/simibubi/create/infrastructure/gui/CreateMainMenuScreen.java
similarity index 97%
rename from src/main/java/com/simibubi/create/foundation/gui/CreateMainMenuScreen.java
rename to src/main/java/com/simibubi/create/infrastructure/gui/CreateMainMenuScreen.java
index 5f4ec443f..dbd8fa9f4 100644
--- a/src/main/java/com/simibubi/create/foundation/gui/CreateMainMenuScreen.java
+++ b/src/main/java/com/simibubi/create/infrastructure/gui/CreateMainMenuScreen.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.gui;
+package com.simibubi.create.infrastructure.gui;
 
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.platform.GlStateManager;
@@ -7,6 +7,9 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.Create;
 import com.simibubi.create.foundation.config.ui.BaseConfigScreen;
+import com.simibubi.create.foundation.gui.AbstractSimiScreen;
+import com.simibubi.create.foundation.gui.AllGuiTextures;
+import com.simibubi.create.foundation.gui.ScreenOpener;
 import com.simibubi.create.foundation.gui.element.BoxElement;
 import com.simibubi.create.foundation.gui.element.GuiGameElement;
 import com.simibubi.create.foundation.item.TooltipHelper;
diff --git a/src/main/java/com/simibubi/create/foundation/config/ui/OpenCreateMenuButton.java b/src/main/java/com/simibubi/create/infrastructure/gui/OpenCreateMenuButton.java
similarity index 96%
rename from src/main/java/com/simibubi/create/foundation/config/ui/OpenCreateMenuButton.java
rename to src/main/java/com/simibubi/create/infrastructure/gui/OpenCreateMenuButton.java
index ab1a51d08..c8b0b1b7f 100644
--- a/src/main/java/com/simibubi/create/foundation/config/ui/OpenCreateMenuButton.java
+++ b/src/main/java/com/simibubi/create/infrastructure/gui/OpenCreateMenuButton.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.config.ui;
+package com.simibubi.create.infrastructure.gui;
 
 import java.util.Arrays;
 import java.util.List;
@@ -8,10 +8,9 @@ import org.apache.commons.lang3.mutable.MutableObject;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllItems;
-import com.simibubi.create.foundation.config.AllConfigs;
-import com.simibubi.create.foundation.gui.CreateMainMenuScreen;
 import com.simibubi.create.foundation.gui.ScreenOpener;
 import com.simibubi.create.foundation.utility.Components;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.components.AbstractWidget;
diff --git a/src/main/java/com/simibubi/create/foundation/item/BaseCreativeModeTab.java b/src/main/java/com/simibubi/create/infrastructure/item/BaseCreativeModeTab.java
similarity index 85%
rename from src/main/java/com/simibubi/create/foundation/item/BaseCreativeModeTab.java
rename to src/main/java/com/simibubi/create/infrastructure/item/BaseCreativeModeTab.java
index 9e96c3d85..6a63b66be 100644
--- a/src/main/java/com/simibubi/create/foundation/item/BaseCreativeModeTab.java
+++ b/src/main/java/com/simibubi/create/infrastructure/item/BaseCreativeModeTab.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.item;
+package com.simibubi.create.infrastructure.item;
 
 import com.simibubi.create.AllBlocks;
 
diff --git a/src/main/java/com/simibubi/create/foundation/item/CreateCreativeModeTab.java b/src/main/java/com/simibubi/create/infrastructure/item/CreateCreativeModeTab.java
similarity index 97%
rename from src/main/java/com/simibubi/create/foundation/item/CreateCreativeModeTab.java
rename to src/main/java/com/simibubi/create/infrastructure/item/CreateCreativeModeTab.java
index b6d044554..98bf84b1d 100644
--- a/src/main/java/com/simibubi/create/foundation/item/CreateCreativeModeTab.java
+++ b/src/main/java/com/simibubi/create/infrastructure/item/CreateCreativeModeTab.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.item;
+package com.simibubi.create.infrastructure.item;
 
 import java.util.Collection;
 
diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/AllPonderTags.java b/src/main/java/com/simibubi/create/infrastructure/ponder/AllPonderTags.java
new file mode 100644
index 000000000..ed99bdc0c
--- /dev/null
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/AllPonderTags.java
@@ -0,0 +1,330 @@
+package com.simibubi.create.infrastructure.ponder;
+
+import com.simibubi.create.AllBlocks;
+import com.simibubi.create.AllItems;
+import com.simibubi.create.Create;
+import com.simibubi.create.compat.Mods;
+import com.simibubi.create.foundation.ponder.PonderRegistry;
+import com.simibubi.create.foundation.ponder.PonderTag;
+
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.DyeColor;
+import net.minecraft.world.item.Items;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraftforge.registries.ForgeRegistries;
+
+public class AllPonderTags {
+
+	public static final PonderTag
+
+	KINETIC_RELAYS = create("kinetic_relays").item(AllBlocks.COGWHEEL.get())
+		.defaultLang("Kinetic Blocks", "Components which help relaying Rotational Force elsewhere")
+		.addToIndex(),
+
+		KINETIC_SOURCES = create("kinetic_sources").item(AllBlocks.WATER_WHEEL.get())
+			.defaultLang("Kinetic Sources", "Components which generate Rotational Force")
+			.addToIndex(),
+
+		KINETIC_APPLIANCES = create("kinetic_appliances").item(AllBlocks.MECHANICAL_PRESS.get())
+			.defaultLang("Kinetic Appliances", "Components which make use of Rotational Force")
+			.addToIndex(),
+
+		FLUIDS = create("fluids").item(AllBlocks.FLUID_PIPE.get())
+			.defaultLang("Fluid Manipulators", "Components which help relaying and making use of Fluids")
+			.addToIndex(),
+
+		LOGISTICS = create("logistics").item(Blocks.CHEST)
+			.defaultLang("Item Transportation", "Components which help moving items around")
+			.addToIndex(),
+
+		REDSTONE = create("redstone").item(Items.REDSTONE)
+			.defaultLang("Logic Components", "Components which help with redstone engineering")
+			.addToIndex(),
+
+		DECORATION = create("decoration").item(Items.ROSE_BUSH)
+			.defaultLang("Aesthetics", "Components used mostly for decorative purposes"),
+
+		CREATIVE = create("creative").item(AllBlocks.CREATIVE_CRATE.get())
+			.defaultLang("Creative Mode", "Components not usually available for Survival Mode")
+			.addToIndex(),
+
+		MOVEMENT_ANCHOR = create("movement_anchor").item(AllBlocks.MECHANICAL_PISTON.get())
+			.defaultLang("Movement Anchors",
+				"Components which allow the creation of moving contraptions, animating an attached structure in a variety of ways")
+			.addToIndex(),
+
+		CONTRAPTION_ACTOR = create("contraption_actor").item(AllBlocks.MECHANICAL_HARVESTER.get())
+			.defaultLang("Contraption Actors",
+				"Components which expose special behaviour when attached to a moving contraption")
+			.addToIndex(),
+
+		CONTRAPTION_ASSEMBLY = create("contraption_assembly").item(AllItems.SUPER_GLUE.get())
+			.defaultLang("Block Attachment Utility",
+				"Tools and Components used to assemble structures moved as an animated Contraption")
+			.addToIndex(),
+
+		SAILS = create("windmill_sails").item(AllBlocks.WINDMILL_BEARING.get(), true, true)
+			.defaultLang("Sails for Windmill Bearings",
+				"Blocks that count towards the strength of a Windmill Contraption when assembled. Each of these have equal efficiency in doing so."),
+
+		ARM_TARGETS = create("arm_targets").item(AllBlocks.MECHANICAL_ARM.get(), true, true)
+			.defaultLang("Targets for Mechanical Arms",
+				"Components which can be selected as inputs or outputs to the Mechanical Arm"),
+
+		TRAIN_RELATED = create("train_related").item(AllBlocks.TRACK.get())
+			.defaultLang("Railway Equipment", "Components used in the construction or management of Train Contraptions")
+			.addToIndex(),
+
+		RECENTLY_UPDATED = create("recently_updated").item(AllBlocks.CLIPBOARD.get())
+			.defaultLang("Recent Changes",
+				"Components that have been added or changed significantly in the latest versions of Create")
+			.addToIndex(),
+
+		DISPLAY_SOURCES = create("display_sources").item(AllBlocks.DISPLAY_LINK.get(), true, true)
+			.defaultLang("Sources for Display Links",
+				"Components or Blocks which offer some data that can be read with a Display Link"),
+
+		DISPLAY_TARGETS = create("display_targets").item(AllBlocks.DISPLAY_LINK.get(), true, true)
+			.defaultLang("Targets for Display Links",
+				"Components or Blocks which can process and display the data received from a Display Link");
+
+	private static PonderTag create(String id) {
+		return new PonderTag(Create.asResource(id));
+	}
+
+	public static void register() {
+		// Add items to tags here
+
+		PonderRegistry.TAGS.forTag(RECENTLY_UPDATED)
+			.add(AllBlocks.WATER_WHEEL)
+			.add(AllBlocks.LARGE_WATER_WHEEL)
+			.add(AllBlocks.COPPER_VALVE_HANDLE)
+			.add(AllBlocks.ELEVATOR_PULLEY)
+			.add(AllBlocks.CONTRAPTION_CONTROLS)
+			.add(AllBlocks.MECHANICAL_ROLLER)
+			.add(AllBlocks.MECHANICAL_PUMP)
+			.add(AllBlocks.SMART_OBSERVER)
+			.add(AllBlocks.THRESHOLD_SWITCH)
+			.add(AllItems.NETHERITE_BACKTANK)
+			.add(AllBlocks.COPYCAT_PANEL)
+			.add(AllBlocks.COPYCAT_STEP);
+
+		PonderRegistry.TAGS.forTag(KINETIC_RELAYS)
+			.add(AllBlocks.SHAFT)
+			.add(AllBlocks.COGWHEEL)
+			.add(AllBlocks.LARGE_COGWHEEL)
+			.add(AllItems.BELT_CONNECTOR)
+			.add(AllBlocks.GEARBOX)
+			.add(AllBlocks.CLUTCH)
+			.add(AllBlocks.GEARSHIFT)
+			.add(AllBlocks.ENCASED_CHAIN_DRIVE)
+			.add(AllBlocks.ADJUSTABLE_CHAIN_GEARSHIFT)
+			.add(AllBlocks.SEQUENCED_GEARSHIFT)
+			.add(AllBlocks.ROTATION_SPEED_CONTROLLER);
+
+		PonderRegistry.TAGS.forTag(KINETIC_SOURCES)
+			.add(AllBlocks.HAND_CRANK)
+			.add(AllBlocks.COPPER_VALVE_HANDLE)
+			.add(AllBlocks.WATER_WHEEL)
+			.add(AllBlocks.LARGE_WATER_WHEEL)
+			.add(AllBlocks.WINDMILL_BEARING)
+			.add(AllBlocks.STEAM_ENGINE)
+			.add(AllBlocks.CREATIVE_MOTOR);
+
+		PonderRegistry.TAGS.forTag(TRAIN_RELATED)
+			.add(AllBlocks.TRACK)
+			.add(AllBlocks.TRACK_STATION)
+			.add(AllBlocks.TRACK_SIGNAL)
+			.add(AllBlocks.TRACK_OBSERVER)
+			.add(AllBlocks.TRAIN_CONTROLS)
+			.add(AllItems.SCHEDULE)
+			.add(AllBlocks.TRAIN_DOOR)
+			.add(AllBlocks.TRAIN_TRAPDOOR)
+			.add(AllBlocks.RAILWAY_CASING);
+
+		PonderRegistry.TAGS.forTag(KINETIC_APPLIANCES)
+			.add(AllBlocks.MILLSTONE)
+			.add(AllBlocks.TURNTABLE)
+			.add(AllBlocks.ENCASED_FAN)
+			.add(AllBlocks.CUCKOO_CLOCK)
+			.add(AllBlocks.MECHANICAL_PRESS)
+			.add(AllBlocks.MECHANICAL_MIXER)
+			.add(AllBlocks.MECHANICAL_CRAFTER)
+			.add(AllBlocks.MECHANICAL_DRILL)
+			.add(AllBlocks.MECHANICAL_SAW)
+			.add(AllBlocks.DEPLOYER)
+			.add(AllBlocks.MECHANICAL_PUMP)
+			.add(AllBlocks.MECHANICAL_ARM)
+			.add(AllBlocks.MECHANICAL_PISTON)
+			.add(AllBlocks.ROPE_PULLEY)
+			.add(AllBlocks.ELEVATOR_PULLEY)
+			.add(AllBlocks.MECHANICAL_BEARING)
+			.add(AllBlocks.GANTRY_SHAFT)
+			.add(AllBlocks.GANTRY_CARRIAGE)
+			.add(AllBlocks.CLOCKWORK_BEARING)
+			.add(AllBlocks.DISPLAY_BOARD)
+			.add(AllBlocks.CRUSHING_WHEEL);
+
+		PonderRegistry.TAGS.forTag(FLUIDS)
+			.add(AllBlocks.FLUID_PIPE)
+			.add(AllBlocks.MECHANICAL_PUMP)
+			.add(AllBlocks.FLUID_VALVE)
+			.add(AllBlocks.SMART_FLUID_PIPE)
+			.add(AllBlocks.HOSE_PULLEY)
+			.add(AllBlocks.ITEM_DRAIN)
+			.add(AllBlocks.SPOUT)
+			.add(AllBlocks.PORTABLE_FLUID_INTERFACE)
+			.add(AllBlocks.FLUID_TANK)
+			.add(AllBlocks.CREATIVE_FLUID_TANK);
+
+		PonderRegistry.TAGS.forTag(ARM_TARGETS)
+			.add(AllBlocks.MECHANICAL_ARM)
+			.add(AllItems.BELT_CONNECTOR)
+			.add(AllBlocks.CHUTE)
+			.add(AllBlocks.DEPOT)
+			.add(AllBlocks.WEIGHTED_EJECTOR)
+			.add(AllBlocks.BASIN)
+			.add(AllBlocks.ANDESITE_FUNNEL)
+			.add(AllBlocks.BRASS_FUNNEL)
+			.add(AllBlocks.MECHANICAL_CRAFTER)
+			.add(AllBlocks.MILLSTONE)
+			.add(AllBlocks.DEPLOYER)
+			.add(AllBlocks.MECHANICAL_SAW)
+			.add(AllBlocks.BLAZE_BURNER)
+			.add(AllBlocks.CRUSHING_WHEEL)
+			.add(AllBlocks.TRACK_STATION)
+			.add(Blocks.COMPOSTER)
+			.add(Blocks.JUKEBOX)
+			.add(Blocks.CAMPFIRE)
+			.add(Blocks.SOUL_CAMPFIRE)
+			.add(Blocks.RESPAWN_ANCHOR);
+
+		PonderRegistry.TAGS.forTag(LOGISTICS)
+			.add(AllItems.BELT_CONNECTOR)
+			.add(AllItems.FILTER)
+			.add(AllItems.ATTRIBUTE_FILTER)
+			.add(AllBlocks.CHUTE)
+			.add(AllBlocks.SMART_CHUTE)
+			.add(AllBlocks.ITEM_VAULT)
+			.add(AllBlocks.DEPOT)
+			.add(AllBlocks.WEIGHTED_EJECTOR)
+			.add(AllBlocks.MECHANICAL_ARM)
+			.add(AllBlocks.ANDESITE_FUNNEL)
+			.add(AllBlocks.BRASS_FUNNEL)
+			.add(AllBlocks.ANDESITE_TUNNEL)
+			.add(AllBlocks.BRASS_TUNNEL)
+			.add(AllBlocks.SMART_OBSERVER)
+			.add(AllBlocks.THRESHOLD_SWITCH)
+			.add(AllBlocks.CREATIVE_CRATE)
+			.add(AllBlocks.PORTABLE_STORAGE_INTERFACE);
+
+		PonderRegistry.TAGS.forTag(DECORATION)
+			.add(AllBlocks.ORANGE_NIXIE_TUBE)
+			.add(AllBlocks.DISPLAY_BOARD)
+			.add(AllBlocks.CUCKOO_CLOCK)
+			.add(AllBlocks.WOODEN_BRACKET)
+			.add(AllBlocks.METAL_BRACKET)
+			.add(AllBlocks.METAL_GIRDER)
+			.add(AllBlocks.ANDESITE_CASING)
+			.add(AllBlocks.BRASS_CASING)
+			.add(AllBlocks.COPPER_CASING)
+			.add(AllBlocks.RAILWAY_CASING);
+
+		PonderRegistry.TAGS.forTag(CREATIVE)
+			.add(AllBlocks.CREATIVE_CRATE)
+			.add(AllBlocks.CREATIVE_FLUID_TANK)
+			.add(AllBlocks.CREATIVE_MOTOR);
+
+		PonderRegistry.TAGS.forTag(SAILS)
+			.add(AllBlocks.SAIL)
+			.add(AllBlocks.SAIL_FRAME)
+			.add(Blocks.WHITE_WOOL);
+
+		PonderRegistry.TAGS.forTag(REDSTONE)
+			.add(AllBlocks.SMART_OBSERVER)
+			.add(AllBlocks.THRESHOLD_SWITCH)
+			.add(AllBlocks.ORANGE_NIXIE_TUBE)
+			.add(AllBlocks.REDSTONE_CONTACT)
+			.add(AllBlocks.ANALOG_LEVER)
+			.add(AllBlocks.REDSTONE_LINK)
+			.add(AllBlocks.PULSE_EXTENDER)
+			.add(AllBlocks.PULSE_REPEATER)
+			.add(AllBlocks.POWERED_LATCH)
+			.add(AllBlocks.POWERED_TOGGLE_LATCH)
+			.add(AllBlocks.ROSE_QUARTZ_LAMP);
+
+		PonderRegistry.TAGS.forTag(MOVEMENT_ANCHOR)
+			.add(AllBlocks.MECHANICAL_PISTON)
+			.add(AllBlocks.WINDMILL_BEARING)
+			.add(AllBlocks.MECHANICAL_BEARING)
+			.add(AllBlocks.CLOCKWORK_BEARING)
+			.add(AllBlocks.ROPE_PULLEY)
+			.add(AllBlocks.ELEVATOR_PULLEY)
+			.add(AllBlocks.GANTRY_CARRIAGE)
+			.add(AllBlocks.CART_ASSEMBLER)
+			.add(AllBlocks.TRACK_STATION);
+
+		PonderRegistry.TAGS.forTag(CONTRAPTION_ASSEMBLY)
+			.add(AllBlocks.LINEAR_CHASSIS)
+			.add(AllBlocks.SECONDARY_LINEAR_CHASSIS)
+			.add(AllBlocks.RADIAL_CHASSIS)
+			.add(AllItems.SUPER_GLUE)
+			.add(AllBlocks.STICKER)
+			.add(Blocks.SLIME_BLOCK)
+			.add(Blocks.HONEY_BLOCK);
+
+		PonderRegistry.TAGS.forTag(CONTRAPTION_ACTOR)
+			.add(AllBlocks.MECHANICAL_HARVESTER)
+			.add(AllBlocks.MECHANICAL_PLOUGH)
+			.add(AllBlocks.MECHANICAL_DRILL)
+			.add(AllBlocks.MECHANICAL_SAW)
+			.add(AllBlocks.DEPLOYER)
+			.add(AllBlocks.PORTABLE_STORAGE_INTERFACE)
+			.add(AllBlocks.PORTABLE_FLUID_INTERFACE)
+			.add(AllBlocks.MECHANICAL_BEARING)
+			.add(AllBlocks.ANDESITE_FUNNEL)
+			.add(AllBlocks.BRASS_FUNNEL)
+			.add(AllBlocks.SEATS.get(DyeColor.WHITE))
+			.add(AllBlocks.TRAIN_CONTROLS)
+			.add(AllBlocks.CONTRAPTION_CONTROLS)
+			.add(AllBlocks.REDSTONE_CONTACT)
+			.add(Blocks.BELL)
+			.add(Blocks.DISPENSER)
+			.add(Blocks.DROPPER);
+
+		PonderRegistry.TAGS.forTag(DISPLAY_SOURCES)
+			.add(AllBlocks.SEATS.get(DyeColor.WHITE))
+			.add(AllBlocks.ORANGE_NIXIE_TUBE)
+			.add(AllBlocks.THRESHOLD_SWITCH)
+			.add(AllBlocks.SMART_OBSERVER)
+			.add(AllBlocks.ANDESITE_TUNNEL)
+			.add(AllBlocks.TRACK_OBSERVER)
+			.add(AllBlocks.TRACK_STATION)
+			.add(AllBlocks.DISPLAY_LINK)
+			.add(AllBlocks.BRASS_TUNNEL)
+			.add(AllBlocks.CUCKOO_CLOCK)
+			.add(AllBlocks.STRESSOMETER)
+			.add(AllBlocks.SPEEDOMETER)
+			.add(AllBlocks.FLUID_TANK)
+			.add(AllItems.BELT_CONNECTOR)
+			.add(Blocks.ENCHANTING_TABLE)
+			.add(Blocks.RESPAWN_ANCHOR)
+			.add(Blocks.COMMAND_BLOCK)
+			.add(Blocks.TARGET);
+
+		Mods.COMPUTERCRAFT.executeIfInstalled(() -> () -> {
+			Block computer = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(Mods.COMPUTERCRAFT.asId(), "computer_advanced"));
+			if (computer != null)
+				PonderRegistry.TAGS.forTag(DISPLAY_SOURCES).add(computer);
+		});
+
+		PonderRegistry.TAGS.forTag(DISPLAY_TARGETS)
+			.add(AllBlocks.ORANGE_NIXIE_TUBE)
+			.add(AllBlocks.DISPLAY_BOARD)
+			.add(AllBlocks.DISPLAY_LINK)
+			.add(Blocks.OAK_SIGN)
+			.add(Blocks.LECTERN);
+	}
+
+}
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/DebugScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/DebugScenes.java
similarity index 98%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/DebugScenes.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/DebugScenes.java
index 196bb65a6..2e432c4e8 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/DebugScenes.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/DebugScenes.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.foundation.ponder.content;
+package com.simibubi.create.infrastructure.ponder;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.contraptions.base.IRotate.SpeedLevel;
-import com.simibubi.create.content.contraptions.particle.RotationIndicatorParticleData;
+import com.simibubi.create.content.kinetics.base.IRotate.SpeedLevel;
+import com.simibubi.create.content.kinetics.base.RotationIndicatorParticleData;
 import com.simibubi.create.foundation.ponder.ElementLink;
 import com.simibubi.create.foundation.ponder.PonderPalette;
 import com.simibubi.create.foundation.ponder.PonderStoryBoardEntry.PonderStoryBoard;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/PonderIndex.java b/src/main/java/com/simibubi/create/infrastructure/ponder/PonderIndex.java
similarity index 57%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/PonderIndex.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/PonderIndex.java
index 47864bd01..d658a25ed 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/PonderIndex.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/PonderIndex.java
@@ -1,33 +1,55 @@
-package com.simibubi.create.foundation.ponder.content;
+package com.simibubi.create.infrastructure.ponder;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
 import com.simibubi.create.Create;
-import com.simibubi.create.compat.Mods;
-import com.simibubi.create.content.logistics.trains.TrackMaterial;
-import com.simibubi.create.content.logistics.trains.track.TrackBlock;
-import com.simibubi.create.foundation.config.AllConfigs;
+import com.simibubi.create.content.trains.track.TrackBlock;
+import com.simibubi.create.content.trains.track.TrackMaterial;
 import com.simibubi.create.foundation.ponder.PonderRegistrationHelper;
-import com.simibubi.create.foundation.ponder.PonderRegistry;
-import com.simibubi.create.foundation.ponder.PonderTag;
-import com.simibubi.create.foundation.ponder.content.fluid.DrainScenes;
-import com.simibubi.create.foundation.ponder.content.fluid.FluidMovementActorScenes;
-import com.simibubi.create.foundation.ponder.content.fluid.FluidTankScenes;
-import com.simibubi.create.foundation.ponder.content.fluid.HosePulleyScenes;
-import com.simibubi.create.foundation.ponder.content.fluid.PipeScenes;
-import com.simibubi.create.foundation.ponder.content.fluid.PumpScenes;
-import com.simibubi.create.foundation.ponder.content.fluid.SpoutScenes;
-import com.simibubi.create.foundation.ponder.content.trains.TrackObserverScenes;
-import com.simibubi.create.foundation.ponder.content.trains.TrackScenes;
-import com.simibubi.create.foundation.ponder.content.trains.TrainScenes;
-import com.simibubi.create.foundation.ponder.content.trains.TrainSignalScenes;
-import com.simibubi.create.foundation.ponder.content.trains.TrainStationScenes;
+import com.simibubi.create.infrastructure.config.AllConfigs;
+import com.simibubi.create.infrastructure.ponder.scenes.ArmScenes;
+import com.simibubi.create.infrastructure.ponder.scenes.BearingScenes;
+import com.simibubi.create.infrastructure.ponder.scenes.BeltScenes;
+import com.simibubi.create.infrastructure.ponder.scenes.CartAssemblerScenes;
+import com.simibubi.create.infrastructure.ponder.scenes.ChainDriveScenes;
+import com.simibubi.create.infrastructure.ponder.scenes.ChassisScenes;
+import com.simibubi.create.infrastructure.ponder.scenes.ChuteScenes;
+import com.simibubi.create.infrastructure.ponder.scenes.CrafterScenes;
+import com.simibubi.create.infrastructure.ponder.scenes.DeployerScenes;
+import com.simibubi.create.infrastructure.ponder.scenes.DetectorScenes;
+import com.simibubi.create.infrastructure.ponder.scenes.DisplayScenes;
+import com.simibubi.create.infrastructure.ponder.scenes.EjectorScenes;
+import com.simibubi.create.infrastructure.ponder.scenes.ElevatorScenes;
+import com.simibubi.create.infrastructure.ponder.scenes.FanScenes;
+import com.simibubi.create.infrastructure.ponder.scenes.FunnelScenes;
+import com.simibubi.create.infrastructure.ponder.scenes.GantryScenes;
+import com.simibubi.create.infrastructure.ponder.scenes.ItemVaultScenes;
+import com.simibubi.create.infrastructure.ponder.scenes.KineticsScenes;
+import com.simibubi.create.infrastructure.ponder.scenes.MechanicalDrillScenes;
+import com.simibubi.create.infrastructure.ponder.scenes.MechanicalSawScenes;
+import com.simibubi.create.infrastructure.ponder.scenes.MovementActorScenes;
+import com.simibubi.create.infrastructure.ponder.scenes.PistonScenes;
+import com.simibubi.create.infrastructure.ponder.scenes.ProcessingScenes;
+import com.simibubi.create.infrastructure.ponder.scenes.PulleyScenes;
+import com.simibubi.create.infrastructure.ponder.scenes.RedstoneScenes;
+import com.simibubi.create.infrastructure.ponder.scenes.RedstoneScenes2;
+import com.simibubi.create.infrastructure.ponder.scenes.RollerScenes;
+import com.simibubi.create.infrastructure.ponder.scenes.SteamScenes;
+import com.simibubi.create.infrastructure.ponder.scenes.TunnelScenes;
+import com.simibubi.create.infrastructure.ponder.scenes.fluid.DrainScenes;
+import com.simibubi.create.infrastructure.ponder.scenes.fluid.FluidMovementActorScenes;
+import com.simibubi.create.infrastructure.ponder.scenes.fluid.FluidTankScenes;
+import com.simibubi.create.infrastructure.ponder.scenes.fluid.HosePulleyScenes;
+import com.simibubi.create.infrastructure.ponder.scenes.fluid.PipeScenes;
+import com.simibubi.create.infrastructure.ponder.scenes.fluid.PumpScenes;
+import com.simibubi.create.infrastructure.ponder.scenes.fluid.SpoutScenes;
+import com.simibubi.create.infrastructure.ponder.scenes.trains.TrackObserverScenes;
+import com.simibubi.create.infrastructure.ponder.scenes.trains.TrackScenes;
+import com.simibubi.create.infrastructure.ponder.scenes.trains.TrainScenes;
+import com.simibubi.create.infrastructure.ponder.scenes.trains.TrainSignalScenes;
+import com.simibubi.create.infrastructure.ponder.scenes.trains.TrainStationScenes;
 import com.tterrag.registrate.util.entry.BlockEntry;
 
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.DyeColor;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.Blocks;
 import net.minecraftforge.registries.ForgeRegistries;
 import net.minecraftforge.registries.RegistryObject;
 
@@ -43,24 +65,24 @@ public class PonderIndex {
 		// (!) Modifications inside storyboard methods only require re-opening the ui
 
 		HELPER.forComponents(AllBlocks.SHAFT)
-			.addStoryBoard("shaft/relay", KineticsScenes::shaftAsRelay, PonderTag.KINETIC_RELAYS);
+			.addStoryBoard("shaft/relay", KineticsScenes::shaftAsRelay, AllPonderTags.KINETIC_RELAYS);
 		HELPER.forComponents(AllBlocks.SHAFT, AllBlocks.ANDESITE_ENCASED_SHAFT, AllBlocks.BRASS_ENCASED_SHAFT)
 			.addStoryBoard("shaft/encasing", KineticsScenes::shaftsCanBeEncased);
 
 		HELPER.forComponents(AllBlocks.COGWHEEL)
-			.addStoryBoard("cog/small", KineticsScenes::cogAsRelay, PonderTag.KINETIC_RELAYS)
+			.addStoryBoard("cog/small", KineticsScenes::cogAsRelay, AllPonderTags.KINETIC_RELAYS)
 			.addStoryBoard("cog/speedup", KineticsScenes::cogsSpeedUp)
 			.addStoryBoard("cog/encasing", KineticsScenes::cogwheelsCanBeEncased);
 
 		HELPER.forComponents(AllBlocks.LARGE_COGWHEEL)
 			.addStoryBoard("cog/speedup", KineticsScenes::cogsSpeedUp)
-			.addStoryBoard("cog/large", KineticsScenes::largeCogAsRelay, PonderTag.KINETIC_RELAYS)
+			.addStoryBoard("cog/large", KineticsScenes::largeCogAsRelay, AllPonderTags.KINETIC_RELAYS)
 			.addStoryBoard("cog/encasing", KineticsScenes::cogwheelsCanBeEncased);
 
 		HELPER.forComponents(AllItems.BELT_CONNECTOR)
-			.addStoryBoard("belt/connect", BeltScenes::beltConnector, PonderTag.KINETIC_RELAYS)
+			.addStoryBoard("belt/connect", BeltScenes::beltConnector, AllPonderTags.KINETIC_RELAYS)
 			.addStoryBoard("belt/directions", BeltScenes::directions)
-			.addStoryBoard("belt/transport", BeltScenes::transport, PonderTag.LOGISTICS)
+			.addStoryBoard("belt/transport", BeltScenes::transport, AllPonderTags.LOGISTICS)
 			.addStoryBoard("belt/encasing", BeltScenes::beltsCanBeEncased);
 
 		HELPER.forComponents(AllBlocks.ANDESITE_CASING, AllBlocks.BRASS_CASING)
@@ -68,35 +90,35 @@ public class PonderIndex {
 			.addStoryBoard("belt/encasing", BeltScenes::beltsCanBeEncased);
 
 		HELPER.forComponents(AllBlocks.GEARBOX, AllItems.VERTICAL_GEARBOX)
-			.addStoryBoard("gearbox", KineticsScenes::gearbox, PonderTag.KINETIC_RELAYS);
+			.addStoryBoard("gearbox", KineticsScenes::gearbox, AllPonderTags.KINETIC_RELAYS);
 
-		HELPER.addStoryBoard(AllBlocks.CLUTCH, "clutch", KineticsScenes::clutch, PonderTag.KINETIC_RELAYS);
-		HELPER.addStoryBoard(AllBlocks.GEARSHIFT, "gearshift", KineticsScenes::gearshift, PonderTag.KINETIC_RELAYS);
+		HELPER.addStoryBoard(AllBlocks.CLUTCH, "clutch", KineticsScenes::clutch, AllPonderTags.KINETIC_RELAYS);
+		HELPER.addStoryBoard(AllBlocks.GEARSHIFT, "gearshift", KineticsScenes::gearshift, AllPonderTags.KINETIC_RELAYS);
 
 		HELPER.forComponents(AllBlocks.SEQUENCED_GEARSHIFT)
 			.addStoryBoard("sequenced_gearshift", KineticsScenes::sequencedGearshift);
 
 		HELPER.forComponents(AllBlocks.ENCASED_FAN)
-			.addStoryBoard("fan/direction", FanScenes::direction, PonderTag.KINETIC_APPLIANCES)
+			.addStoryBoard("fan/direction", FanScenes::direction, AllPonderTags.KINETIC_APPLIANCES)
 			.addStoryBoard("fan/processing", FanScenes::processing);
 
 		HELPER.forComponents(AllBlocks.CREATIVE_MOTOR)
-			.addStoryBoard("creative_motor", KineticsScenes::creativeMotor, PonderTag.KINETIC_SOURCES)
+			.addStoryBoard("creative_motor", KineticsScenes::creativeMotor, AllPonderTags.KINETIC_SOURCES)
 			.addStoryBoard("creative_motor_mojang", KineticsScenes::creativeMotorMojang);
 		HELPER.addStoryBoard(AllBlocks.WATER_WHEEL, "water_wheel", KineticsScenes::waterWheel,
-			PonderTag.KINETIC_SOURCES);
+			AllPonderTags.KINETIC_SOURCES);
 		HELPER.addStoryBoard(AllBlocks.LARGE_WATER_WHEEL, "large_water_wheel", KineticsScenes::largeWaterWheel,
-			PonderTag.KINETIC_SOURCES);
+			AllPonderTags.KINETIC_SOURCES);
 		
-		HELPER.addStoryBoard(AllBlocks.HAND_CRANK, "hand_crank", KineticsScenes::handCrank, PonderTag.KINETIC_SOURCES);
+		HELPER.addStoryBoard(AllBlocks.HAND_CRANK, "hand_crank", KineticsScenes::handCrank, AllPonderTags.KINETIC_SOURCES);
 
 		HELPER.addStoryBoard(AllBlocks.COPPER_VALVE_HANDLE, "valve_handle", KineticsScenes::valveHandle,
-			PonderTag.KINETIC_SOURCES);
+			AllPonderTags.KINETIC_SOURCES);
 		HELPER.forComponents(AllBlocks.DYED_VALVE_HANDLES.toArray())
 			.addStoryBoard("valve_handle", KineticsScenes::valveHandle);
 
 		HELPER.addStoryBoard(AllBlocks.ENCASED_CHAIN_DRIVE, "chain_drive/relay", ChainDriveScenes::chainDriveAsRelay,
-			PonderTag.KINETIC_RELAYS);
+			AllPonderTags.KINETIC_RELAYS);
 		HELPER.forComponents(AllBlocks.ENCASED_CHAIN_DRIVE, AllBlocks.ADJUSTABLE_CHAIN_GEARSHIFT)
 			.addStoryBoard("chain_drive/gearshift", ChainDriveScenes::adjustableChainGearshift);
 
@@ -135,12 +157,12 @@ public class PonderIndex {
 
 		// Vaults
 		HELPER.forComponents(AllBlocks.ITEM_VAULT)
-			.addStoryBoard("item_vault/storage", ItemVaultScenes::storage, PonderTag.LOGISTICS)
+			.addStoryBoard("item_vault/storage", ItemVaultScenes::storage, AllPonderTags.LOGISTICS)
 			.addStoryBoard("item_vault/sizes", ItemVaultScenes::sizes);
 
 		// Chutes
 		HELPER.forComponents(AllBlocks.CHUTE)
-			.addStoryBoard("chute/downward", ChuteScenes::downward, PonderTag.LOGISTICS)
+			.addStoryBoard("chute/downward", ChuteScenes::downward, AllPonderTags.LOGISTICS)
 			.addStoryBoard("chute/upward", ChuteScenes::upward);
 		HELPER.forComponents(AllBlocks.CHUTE, AllBlocks.SMART_CHUTE)
 			.addStoryBoard("chute/smart", ChuteScenes::smart);
@@ -148,7 +170,7 @@ public class PonderIndex {
 		// Funnels
 		HELPER.addStoryBoard(AllBlocks.BRASS_FUNNEL, "funnels/brass", FunnelScenes::brass);
 		HELPER.forComponents(AllBlocks.ANDESITE_FUNNEL, AllBlocks.BRASS_FUNNEL)
-			.addStoryBoard("funnels/intro", FunnelScenes::intro, PonderTag.LOGISTICS)
+			.addStoryBoard("funnels/intro", FunnelScenes::intro, AllPonderTags.LOGISTICS)
 			.addStoryBoard("funnels/direction", FunnelScenes::directionality)
 			.addStoryBoard("funnels/compat", FunnelScenes::compat)
 			.addStoryBoard("funnels/redstone", FunnelScenes::redstone)
@@ -163,26 +185,26 @@ public class PonderIndex {
 
 		// Chassis & Super Glue
 		HELPER.forComponents(AllBlocks.LINEAR_CHASSIS, AllBlocks.SECONDARY_LINEAR_CHASSIS)
-			.addStoryBoard("chassis/linear_group", ChassisScenes::linearGroup, PonderTag.CONTRAPTION_ASSEMBLY)
+			.addStoryBoard("chassis/linear_group", ChassisScenes::linearGroup, AllPonderTags.CONTRAPTION_ASSEMBLY)
 			.addStoryBoard("chassis/linear_attachment", ChassisScenes::linearAttachement);
 		HELPER.forComponents(AllBlocks.RADIAL_CHASSIS)
-			.addStoryBoard("chassis/radial", ChassisScenes::radial, PonderTag.CONTRAPTION_ASSEMBLY);
+			.addStoryBoard("chassis/radial", ChassisScenes::radial, AllPonderTags.CONTRAPTION_ASSEMBLY);
 		HELPER.forComponents(AllItems.SUPER_GLUE)
-			.addStoryBoard("super_glue", ChassisScenes::superGlue, PonderTag.CONTRAPTION_ASSEMBLY);
+			.addStoryBoard("super_glue", ChassisScenes::superGlue, AllPonderTags.CONTRAPTION_ASSEMBLY);
 		HELPER.forComponents(AllBlocks.STICKER)
-			.addStoryBoard("sticker", RedstoneScenes::sticker, PonderTag.CONTRAPTION_ASSEMBLY);
+			.addStoryBoard("sticker", RedstoneScenes::sticker, AllPonderTags.CONTRAPTION_ASSEMBLY);
 
 		// Mechanical Arm
 		HELPER.forComponents(AllBlocks.MECHANICAL_ARM)
-			.addStoryBoard("mechanical_arm/setup", ArmScenes::setup, PonderTag.ARM_TARGETS)
+			.addStoryBoard("mechanical_arm/setup", ArmScenes::setup, AllPonderTags.ARM_TARGETS)
 			.addStoryBoard("mechanical_arm/filter", ArmScenes::filtering)
 			.addStoryBoard("mechanical_arm/modes", ArmScenes::modes)
 			.addStoryBoard("mechanical_arm/redstone", ArmScenes::redstone);
 
 		// Mechanical Piston
 		HELPER.forComponents(AllBlocks.MECHANICAL_PISTON, AllBlocks.STICKY_MECHANICAL_PISTON)
-			.addStoryBoard("mechanical_piston/anchor", PistonScenes::movement, PonderTag.KINETIC_APPLIANCES,
-				PonderTag.MOVEMENT_ANCHOR);
+			.addStoryBoard("mechanical_piston/anchor", PistonScenes::movement, AllPonderTags.KINETIC_APPLIANCES,
+				AllPonderTags.MOVEMENT_ANCHOR);
 		HELPER
 			.forComponents(AllBlocks.MECHANICAL_PISTON, AllBlocks.STICKY_MECHANICAL_PISTON,
 				AllBlocks.PISTON_EXTENSION_POLE)
@@ -192,8 +214,8 @@ public class PonderIndex {
 
 		// Pulleys
 		HELPER.forComponents(AllBlocks.ROPE_PULLEY)
-			.addStoryBoard("rope_pulley/anchor", PulleyScenes::movement, PonderTag.KINETIC_APPLIANCES,
-				PonderTag.MOVEMENT_ANCHOR)
+			.addStoryBoard("rope_pulley/anchor", PulleyScenes::movement, AllPonderTags.KINETIC_APPLIANCES,
+				AllPonderTags.MOVEMENT_ANCHOR)
 			.addStoryBoard("rope_pulley/modes", PulleyScenes::movementModes)
 			.addStoryBoard("rope_pulley/multi_rope", PulleyScenes::multiRope)
 			.addStoryBoard("rope_pulley/attachment", PulleyScenes::attachment);
@@ -203,9 +225,9 @@ public class PonderIndex {
 
 		// Windmill Bearing
 		HELPER.forComponents(AllBlocks.WINDMILL_BEARING)
-			.addStoryBoard("windmill_bearing/source", BearingScenes::windmillsAsSource, PonderTag.KINETIC_SOURCES)
+			.addStoryBoard("windmill_bearing/source", BearingScenes::windmillsAsSource, AllPonderTags.KINETIC_SOURCES)
 			.addStoryBoard("windmill_bearing/structure", BearingScenes::windmillsAnyStructure,
-				PonderTag.MOVEMENT_ANCHOR);
+				AllPonderTags.MOVEMENT_ANCHOR);
 		HELPER.forComponents(AllBlocks.SAIL)
 			.addStoryBoard("sail", BearingScenes::sail);
 		HELPER.forComponents(AllBlocks.SAIL_FRAME)
@@ -213,21 +235,21 @@ public class PonderIndex {
 
 		// Mechanical Bearing
 		HELPER.forComponents(AllBlocks.MECHANICAL_BEARING)
-			.addStoryBoard("mechanical_bearing/anchor", BearingScenes::mechanicalBearing, PonderTag.KINETIC_APPLIANCES,
-				PonderTag.MOVEMENT_ANCHOR)
+			.addStoryBoard("mechanical_bearing/anchor", BearingScenes::mechanicalBearing, AllPonderTags.KINETIC_APPLIANCES,
+				AllPonderTags.MOVEMENT_ANCHOR)
 			.addStoryBoard("mechanical_bearing/modes", BearingScenes::bearingModes)
 			.addStoryBoard("mechanical_bearing/stabilized", BearingScenes::stabilizedBearings,
-				PonderTag.CONTRAPTION_ACTOR);
+				AllPonderTags.CONTRAPTION_ACTOR);
 
 		// Clockwork Bearing
 		HELPER.addStoryBoard(AllBlocks.CLOCKWORK_BEARING, "clockwork_bearing", BearingScenes::clockwork,
-			PonderTag.KINETIC_APPLIANCES, PonderTag.MOVEMENT_ANCHOR);
+			AllPonderTags.KINETIC_APPLIANCES, AllPonderTags.MOVEMENT_ANCHOR);
 
 		// Gantries
 		HELPER.addStoryBoard(AllBlocks.GANTRY_SHAFT, "gantry/intro", GantryScenes::introForShaft,
-			PonderTag.KINETIC_APPLIANCES, PonderTag.MOVEMENT_ANCHOR);
+			AllPonderTags.KINETIC_APPLIANCES, AllPonderTags.MOVEMENT_ANCHOR);
 		HELPER.addStoryBoard(AllBlocks.GANTRY_CARRIAGE, "gantry/intro", GantryScenes::introForPinion,
-			PonderTag.KINETIC_APPLIANCES, PonderTag.MOVEMENT_ANCHOR);
+			AllPonderTags.KINETIC_APPLIANCES, AllPonderTags.MOVEMENT_ANCHOR);
 		HELPER.forComponents(AllBlocks.GANTRY_SHAFT, AllBlocks.GANTRY_CARRIAGE)
 			.addStoryBoard("gantry/redstone", GantryScenes::redstone)
 			.addStoryBoard("gantry/direction", GantryScenes::direction)
@@ -235,31 +257,31 @@ public class PonderIndex {
 
 		// Cart Assembler
 		HELPER.forComponents(AllBlocks.CART_ASSEMBLER)
-			.addStoryBoard("cart_assembler/anchor", CartAssemblerScenes::anchor, PonderTag.MOVEMENT_ANCHOR)
+			.addStoryBoard("cart_assembler/anchor", CartAssemblerScenes::anchor, AllPonderTags.MOVEMENT_ANCHOR)
 			.addStoryBoard("cart_assembler/modes", CartAssemblerScenes::modes)
 			.addStoryBoard("cart_assembler/dual", CartAssemblerScenes::dual)
 			.addStoryBoard("cart_assembler/rails", CartAssemblerScenes::rails);
 
 		// Movement Actors
 		HELPER.forComponents(AllBlocks.PORTABLE_STORAGE_INTERFACE)
-			.addStoryBoard("portable_interface/transfer", MovementActorScenes::psiTransfer, PonderTag.CONTRAPTION_ACTOR)
+			.addStoryBoard("portable_interface/transfer", MovementActorScenes::psiTransfer, AllPonderTags.CONTRAPTION_ACTOR)
 			.addStoryBoard("portable_interface/redstone", MovementActorScenes::psiRedstone);
 		HELPER.forComponents(AllBlocks.REDSTONE_CONTACT)
 			.addStoryBoard("redstone_contact", RedstoneScenes::contact);
 		HELPER.forComponents(AllBlocks.MECHANICAL_SAW)
-			.addStoryBoard("mechanical_saw/processing", MechanicalSawScenes::processing, PonderTag.KINETIC_APPLIANCES)
+			.addStoryBoard("mechanical_saw/processing", MechanicalSawScenes::processing, AllPonderTags.KINETIC_APPLIANCES)
 			.addStoryBoard("mechanical_saw/breaker", MechanicalSawScenes::treeCutting)
-			.addStoryBoard("mechanical_saw/contraption", MechanicalSawScenes::contraption, PonderTag.CONTRAPTION_ACTOR);
+			.addStoryBoard("mechanical_saw/contraption", MechanicalSawScenes::contraption, AllPonderTags.CONTRAPTION_ACTOR);
 		HELPER.forComponents(AllBlocks.MECHANICAL_DRILL)
-			.addStoryBoard("mechanical_drill/breaker", MechanicalDrillScenes::breaker, PonderTag.KINETIC_APPLIANCES)
+			.addStoryBoard("mechanical_drill/breaker", MechanicalDrillScenes::breaker, AllPonderTags.KINETIC_APPLIANCES)
 			.addStoryBoard("mechanical_drill/contraption", MechanicalDrillScenes::contraption,
-				PonderTag.CONTRAPTION_ACTOR);
+				AllPonderTags.CONTRAPTION_ACTOR);
 		HELPER.forComponents(AllBlocks.DEPLOYER)
-			.addStoryBoard("deployer/filter", DeployerScenes::filter, PonderTag.KINETIC_APPLIANCES)
+			.addStoryBoard("deployer/filter", DeployerScenes::filter, AllPonderTags.KINETIC_APPLIANCES)
 			.addStoryBoard("deployer/modes", DeployerScenes::modes)
 			.addStoryBoard("deployer/processing", DeployerScenes::processing)
 			.addStoryBoard("deployer/redstone", DeployerScenes::redstone)
-			.addStoryBoard("deployer/contraption", DeployerScenes::contraption, PonderTag.CONTRAPTION_ACTOR);
+			.addStoryBoard("deployer/contraption", DeployerScenes::contraption, AllPonderTags.CONTRAPTION_ACTOR);
 		HELPER.forComponents(AllBlocks.MECHANICAL_HARVESTER)
 			.addStoryBoard("harvester", MovementActorScenes::harvester);
 		HELPER.forComponents(AllBlocks.MECHANICAL_PLOUGH)
@@ -272,36 +294,36 @@ public class PonderIndex {
 
 		// Fluids
 		HELPER.forComponents(AllBlocks.FLUID_PIPE)
-			.addStoryBoard("fluid_pipe/flow", PipeScenes::flow, PonderTag.FLUIDS)
+			.addStoryBoard("fluid_pipe/flow", PipeScenes::flow, AllPonderTags.FLUIDS)
 			.addStoryBoard("fluid_pipe/interaction", PipeScenes::interaction)
 			.addStoryBoard("fluid_pipe/encasing", PipeScenes::encasing);
 		HELPER.forComponents(AllBlocks.COPPER_CASING)
 			.addStoryBoard("fluid_pipe/encasing", PipeScenes::encasing);
 		HELPER.forComponents(AllBlocks.MECHANICAL_PUMP)
-			.addStoryBoard("mechanical_pump/flow", PumpScenes::flow, PonderTag.FLUIDS, PonderTag.KINETIC_APPLIANCES)
+			.addStoryBoard("mechanical_pump/flow", PumpScenes::flow, AllPonderTags.FLUIDS, AllPonderTags.KINETIC_APPLIANCES)
 			.addStoryBoard("mechanical_pump/speed", PumpScenes::speed);
 		HELPER.forComponents(AllBlocks.FLUID_VALVE)
-			.addStoryBoard("fluid_valve", PipeScenes::valve, PonderTag.FLUIDS, PonderTag.KINETIC_APPLIANCES);
+			.addStoryBoard("fluid_valve", PipeScenes::valve, AllPonderTags.FLUIDS, AllPonderTags.KINETIC_APPLIANCES);
 		HELPER.forComponents(AllBlocks.SMART_FLUID_PIPE)
-			.addStoryBoard("smart_pipe", PipeScenes::smart, PonderTag.FLUIDS);
+			.addStoryBoard("smart_pipe", PipeScenes::smart, AllPonderTags.FLUIDS);
 		HELPER.forComponents(AllBlocks.FLUID_TANK)
-			.addStoryBoard("fluid_tank/storage", FluidTankScenes::storage, PonderTag.FLUIDS)
+			.addStoryBoard("fluid_tank/storage", FluidTankScenes::storage, AllPonderTags.FLUIDS)
 			.addStoryBoard("fluid_tank/sizes", FluidTankScenes::sizes);
 		HELPER.forComponents(AllBlocks.CREATIVE_FLUID_TANK)
-			.addStoryBoard("fluid_tank/storage_creative", FluidTankScenes::creative, PonderTag.FLUIDS,
-				PonderTag.CREATIVE)
+			.addStoryBoard("fluid_tank/storage_creative", FluidTankScenes::creative, AllPonderTags.FLUIDS,
+				AllPonderTags.CREATIVE)
 			.addStoryBoard("fluid_tank/sizes_creative", FluidTankScenes::sizes);
 		HELPER.forComponents(AllBlocks.HOSE_PULLEY)
-			.addStoryBoard("hose_pulley/intro", HosePulleyScenes::intro, PonderTag.FLUIDS, PonderTag.KINETIC_APPLIANCES)
+			.addStoryBoard("hose_pulley/intro", HosePulleyScenes::intro, AllPonderTags.FLUIDS, AllPonderTags.KINETIC_APPLIANCES)
 			.addStoryBoard("hose_pulley/level", HosePulleyScenes::level)
 			.addStoryBoard("hose_pulley/infinite", HosePulleyScenes::infinite);
 		HELPER.forComponents(AllBlocks.SPOUT)
-			.addStoryBoard("spout", SpoutScenes::filling, PonderTag.FLUIDS);
+			.addStoryBoard("spout", SpoutScenes::filling, AllPonderTags.FLUIDS);
 		HELPER.forComponents(AllBlocks.ITEM_DRAIN)
-			.addStoryBoard("item_drain", DrainScenes::emptying, PonderTag.FLUIDS);
+			.addStoryBoard("item_drain", DrainScenes::emptying, AllPonderTags.FLUIDS);
 		HELPER.forComponents(AllBlocks.PORTABLE_FLUID_INTERFACE)
-			.addStoryBoard("portable_interface/transfer_fluid", FluidMovementActorScenes::transfer, PonderTag.FLUIDS,
-				PonderTag.CONTRAPTION_ACTOR)
+			.addStoryBoard("portable_interface/transfer_fluid", FluidMovementActorScenes::transfer, AllPonderTags.FLUIDS,
+				AllPonderTags.CONTRAPTION_ACTOR)
 			.addStoryBoard("portable_interface/redstone_fluid", MovementActorScenes::psiRedstone);
 
 		// Redstone
@@ -380,238 +402,4 @@ public class PonderIndex {
 		return AllConfigs.client().editingMode.get();
 	}
 
-	public static void registerTags() {
-		// Add items to tags here
-
-		PonderRegistry.TAGS.forTag(PonderTag.RECENTLY_UPDATED)
-			.add(AllBlocks.WATER_WHEEL)
-			.add(AllBlocks.LARGE_WATER_WHEEL)
-			.add(AllBlocks.ELEVATOR_PULLEY)
-			.add(AllBlocks.CONTRAPTION_CONTROLS)
-			.add(AllBlocks.MECHANICAL_ROLLER)
-			.add(AllBlocks.MECHANICAL_PUMP)
-			.add(AllBlocks.SMART_OBSERVER)
-			.add(AllBlocks.THRESHOLD_SWITCH)
-			.add(AllItems.NETHERITE_BACKTANK)
-			.add(AllBlocks.COPYCAT_PANEL)
-			.add(AllBlocks.COPYCAT_STEP);
-
-		PonderRegistry.TAGS.forTag(PonderTag.KINETIC_RELAYS)
-			.add(AllBlocks.SHAFT)
-			.add(AllBlocks.COGWHEEL)
-			.add(AllBlocks.LARGE_COGWHEEL)
-			.add(AllItems.BELT_CONNECTOR)
-			.add(AllBlocks.GEARBOX)
-			.add(AllBlocks.CLUTCH)
-			.add(AllBlocks.GEARSHIFT)
-			.add(AllBlocks.ENCASED_CHAIN_DRIVE)
-			.add(AllBlocks.ADJUSTABLE_CHAIN_GEARSHIFT)
-			.add(AllBlocks.SEQUENCED_GEARSHIFT)
-			.add(AllBlocks.ROTATION_SPEED_CONTROLLER);
-
-		PonderRegistry.TAGS.forTag(PonderTag.KINETIC_SOURCES)
-			.add(AllBlocks.HAND_CRANK)
-			.add(AllBlocks.COPPER_VALVE_HANDLE)
-			.add(AllBlocks.WATER_WHEEL)
-			.add(AllBlocks.LARGE_WATER_WHEEL)
-			.add(AllBlocks.WINDMILL_BEARING)
-			.add(AllBlocks.STEAM_ENGINE)
-			.add(AllBlocks.CREATIVE_MOTOR);
-
-		PonderRegistry.TAGS.forTag(PonderTag.TRAIN_RELATED)
-			.add(AllBlocks.TRACK)
-			.add(AllBlocks.TRACK_STATION)
-			.add(AllBlocks.TRACK_SIGNAL)
-			.add(AllBlocks.TRACK_OBSERVER)
-			.add(AllBlocks.TRAIN_CONTROLS)
-			.add(AllItems.SCHEDULE)
-			.add(AllBlocks.TRAIN_DOOR)
-			.add(AllBlocks.TRAIN_TRAPDOOR)
-			.add(AllBlocks.RAILWAY_CASING);
-
-		PonderRegistry.TAGS.forTag(PonderTag.KINETIC_APPLIANCES)
-			.add(AllBlocks.MILLSTONE)
-			.add(AllBlocks.TURNTABLE)
-			.add(AllBlocks.ENCASED_FAN)
-			.add(AllBlocks.CUCKOO_CLOCK)
-			.add(AllBlocks.MECHANICAL_PRESS)
-			.add(AllBlocks.MECHANICAL_MIXER)
-			.add(AllBlocks.MECHANICAL_CRAFTER)
-			.add(AllBlocks.MECHANICAL_DRILL)
-			.add(AllBlocks.MECHANICAL_SAW)
-			.add(AllBlocks.DEPLOYER)
-			.add(AllBlocks.MECHANICAL_PUMP)
-			.add(AllBlocks.MECHANICAL_ARM)
-			.add(AllBlocks.MECHANICAL_PISTON)
-			.add(AllBlocks.ROPE_PULLEY)
-			.add(AllBlocks.ELEVATOR_PULLEY)
-			.add(AllBlocks.MECHANICAL_BEARING)
-			.add(AllBlocks.GANTRY_SHAFT)
-			.add(AllBlocks.GANTRY_CARRIAGE)
-			.add(AllBlocks.CLOCKWORK_BEARING)
-			.add(AllBlocks.DISPLAY_BOARD)
-			.add(AllBlocks.CRUSHING_WHEEL);
-
-		PonderRegistry.TAGS.forTag(PonderTag.FLUIDS)
-			.add(AllBlocks.FLUID_PIPE)
-			.add(AllBlocks.MECHANICAL_PUMP)
-			.add(AllBlocks.FLUID_VALVE)
-			.add(AllBlocks.SMART_FLUID_PIPE)
-			.add(AllBlocks.HOSE_PULLEY)
-			.add(AllBlocks.ITEM_DRAIN)
-			.add(AllBlocks.SPOUT)
-			.add(AllBlocks.PORTABLE_FLUID_INTERFACE)
-			.add(AllBlocks.FLUID_TANK)
-			.add(AllBlocks.CREATIVE_FLUID_TANK);
-
-		PonderRegistry.TAGS.forTag(PonderTag.ARM_TARGETS)
-			.add(AllBlocks.MECHANICAL_ARM)
-			.add(AllItems.BELT_CONNECTOR)
-			.add(AllBlocks.CHUTE)
-			.add(AllBlocks.DEPOT)
-			.add(AllBlocks.WEIGHTED_EJECTOR)
-			.add(AllBlocks.BASIN)
-			.add(AllBlocks.ANDESITE_FUNNEL)
-			.add(AllBlocks.BRASS_FUNNEL)
-			.add(AllBlocks.MECHANICAL_CRAFTER)
-			.add(AllBlocks.MILLSTONE)
-			.add(AllBlocks.DEPLOYER)
-			.add(AllBlocks.MECHANICAL_SAW)
-			.add(AllBlocks.BLAZE_BURNER)
-			.add(AllBlocks.CRUSHING_WHEEL)
-			.add(AllBlocks.TRACK_STATION)
-			.add(Blocks.COMPOSTER)
-			.add(Blocks.JUKEBOX)
-			.add(Blocks.CAMPFIRE)
-			.add(Blocks.SOUL_CAMPFIRE)
-			.add(Blocks.RESPAWN_ANCHOR);
-
-		PonderRegistry.TAGS.forTag(PonderTag.LOGISTICS)
-			.add(AllItems.BELT_CONNECTOR)
-			.add(AllItems.FILTER)
-			.add(AllItems.ATTRIBUTE_FILTER)
-			.add(AllBlocks.CHUTE)
-			.add(AllBlocks.SMART_CHUTE)
-			.add(AllBlocks.ITEM_VAULT)
-			.add(AllBlocks.DEPOT)
-			.add(AllBlocks.WEIGHTED_EJECTOR)
-			.add(AllBlocks.MECHANICAL_ARM)
-			.add(AllBlocks.ANDESITE_FUNNEL)
-			.add(AllBlocks.BRASS_FUNNEL)
-			.add(AllBlocks.ANDESITE_TUNNEL)
-			.add(AllBlocks.BRASS_TUNNEL)
-			.add(AllBlocks.SMART_OBSERVER)
-			.add(AllBlocks.THRESHOLD_SWITCH)
-			.add(AllBlocks.CREATIVE_CRATE)
-			.add(AllBlocks.PORTABLE_STORAGE_INTERFACE);
-
-		PonderRegistry.TAGS.forTag(PonderTag.DECORATION)
-			.add(AllBlocks.ORANGE_NIXIE_TUBE)
-			.add(AllBlocks.DISPLAY_BOARD)
-			.add(AllBlocks.CUCKOO_CLOCK)
-			.add(AllBlocks.WOODEN_BRACKET)
-			.add(AllBlocks.METAL_BRACKET)
-			.add(AllBlocks.METAL_GIRDER)
-			.add(AllBlocks.ANDESITE_CASING)
-			.add(AllBlocks.BRASS_CASING)
-			.add(AllBlocks.COPPER_CASING)
-			.add(AllBlocks.RAILWAY_CASING);
-
-		PonderRegistry.TAGS.forTag(PonderTag.CREATIVE)
-			.add(AllBlocks.CREATIVE_CRATE)
-			.add(AllBlocks.CREATIVE_FLUID_TANK)
-			.add(AllBlocks.CREATIVE_MOTOR);
-
-		PonderRegistry.TAGS.forTag(PonderTag.SAILS)
-			.add(AllBlocks.SAIL)
-			.add(AllBlocks.SAIL_FRAME)
-			.add(Blocks.WHITE_WOOL);
-
-		PonderRegistry.TAGS.forTag(PonderTag.REDSTONE)
-			.add(AllBlocks.SMART_OBSERVER)
-			.add(AllBlocks.THRESHOLD_SWITCH)
-			.add(AllBlocks.ORANGE_NIXIE_TUBE)
-			.add(AllBlocks.REDSTONE_CONTACT)
-			.add(AllBlocks.ANALOG_LEVER)
-			.add(AllBlocks.REDSTONE_LINK)
-			.add(AllBlocks.PULSE_EXTENDER)
-			.add(AllBlocks.PULSE_REPEATER)
-			.add(AllBlocks.POWERED_LATCH)
-			.add(AllBlocks.POWERED_TOGGLE_LATCH)
-			.add(AllBlocks.ROSE_QUARTZ_LAMP);
-
-		PonderRegistry.TAGS.forTag(PonderTag.MOVEMENT_ANCHOR)
-			.add(AllBlocks.MECHANICAL_PISTON)
-			.add(AllBlocks.WINDMILL_BEARING)
-			.add(AllBlocks.MECHANICAL_BEARING)
-			.add(AllBlocks.CLOCKWORK_BEARING)
-			.add(AllBlocks.ROPE_PULLEY)
-			.add(AllBlocks.ELEVATOR_PULLEY)
-			.add(AllBlocks.GANTRY_CARRIAGE)
-			.add(AllBlocks.CART_ASSEMBLER)
-			.add(AllBlocks.TRACK_STATION);
-
-		PonderRegistry.TAGS.forTag(PonderTag.CONTRAPTION_ASSEMBLY)
-			.add(AllBlocks.LINEAR_CHASSIS)
-			.add(AllBlocks.SECONDARY_LINEAR_CHASSIS)
-			.add(AllBlocks.RADIAL_CHASSIS)
-			.add(AllItems.SUPER_GLUE)
-			.add(AllBlocks.STICKER)
-			.add(Blocks.SLIME_BLOCK)
-			.add(Blocks.HONEY_BLOCK);
-
-		PonderRegistry.TAGS.forTag(PonderTag.CONTRAPTION_ACTOR)
-			.add(AllBlocks.MECHANICAL_HARVESTER)
-			.add(AllBlocks.MECHANICAL_PLOUGH)
-			.add(AllBlocks.MECHANICAL_DRILL)
-			.add(AllBlocks.MECHANICAL_SAW)
-			.add(AllBlocks.DEPLOYER)
-			.add(AllBlocks.PORTABLE_STORAGE_INTERFACE)
-			.add(AllBlocks.PORTABLE_FLUID_INTERFACE)
-			.add(AllBlocks.MECHANICAL_BEARING)
-			.add(AllBlocks.ANDESITE_FUNNEL)
-			.add(AllBlocks.BRASS_FUNNEL)
-			.add(AllBlocks.SEATS.get(DyeColor.WHITE))
-			.add(AllBlocks.TRAIN_CONTROLS)
-			.add(AllBlocks.CONTRAPTION_CONTROLS)
-			.add(AllBlocks.REDSTONE_CONTACT)
-			.add(Blocks.BELL)
-			.add(Blocks.DISPENSER)
-			.add(Blocks.DROPPER);
-
-		PonderRegistry.TAGS.forTag(PonderTag.DISPLAY_SOURCES)
-			.add(AllBlocks.SEATS.get(DyeColor.WHITE))
-			.add(AllBlocks.ORANGE_NIXIE_TUBE)
-			.add(AllBlocks.THRESHOLD_SWITCH)
-			.add(AllBlocks.SMART_OBSERVER)
-			.add(AllBlocks.ANDESITE_TUNNEL)
-			.add(AllBlocks.TRACK_OBSERVER)
-			.add(AllBlocks.TRACK_STATION)
-			.add(AllBlocks.DISPLAY_LINK)
-			.add(AllBlocks.BRASS_TUNNEL)
-			.add(AllBlocks.CUCKOO_CLOCK)
-			.add(AllBlocks.STRESSOMETER)
-			.add(AllBlocks.SPEEDOMETER)
-			.add(AllBlocks.FLUID_TANK)
-			.add(AllItems.BELT_CONNECTOR)
-			.add(Blocks.ENCHANTING_TABLE)
-			.add(Blocks.RESPAWN_ANCHOR)
-			.add(Blocks.COMMAND_BLOCK)
-			.add(Blocks.TARGET);
-
-		Mods.COMPUTERCRAFT.executeIfInstalled(() -> () -> {
-			Block computer = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(Mods.COMPUTERCRAFT.asId(), "computer_advanced"));
-			if (computer != null)
-				PonderRegistry.TAGS.forTag(PonderTag.DISPLAY_SOURCES).add(computer);
-		});
-
-		PonderRegistry.TAGS.forTag(PonderTag.DISPLAY_TARGETS)
-			.add(AllBlocks.ORANGE_NIXIE_TUBE)
-			.add(AllBlocks.DISPLAY_BOARD)
-			.add(AllBlocks.DISPLAY_LINK)
-			.add(Blocks.OAK_SIGN)
-			.add(Blocks.LECTERN);
-
-	}
-
 }
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/SharedText.java b/src/main/java/com/simibubi/create/infrastructure/ponder/SharedText.java
similarity index 95%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/SharedText.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/SharedText.java
index 3b1399616..241b5e186 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/SharedText.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/SharedText.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.ponder.content;
+package com.simibubi.create.infrastructure.ponder;
 
 import com.simibubi.create.Create;
 import com.simibubi.create.foundation.ponder.PonderLocalization;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/ArmScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ArmScenes.java
similarity index 98%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/ArmScenes.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ArmScenes.java
index 957ea284e..6ce2092e0 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/ArmScenes.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ArmScenes.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.foundation.ponder.content;
+package com.simibubi.create.infrastructure.ponder.scenes;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllShapes;
-import com.simibubi.create.content.contraptions.components.crafter.MechanicalCrafterBlockEntity;
-import com.simibubi.create.content.logistics.block.funnel.FunnelBlockEntity;
-import com.simibubi.create.content.logistics.block.mechanicalArm.ArmBlockEntity.Phase;
+import com.simibubi.create.content.kinetics.crafter.MechanicalCrafterBlockEntity;
+import com.simibubi.create.content.kinetics.mechanicalArm.ArmBlockEntity.Phase;
+import com.simibubi.create.content.logistics.funnel.FunnelBlockEntity;
 import com.simibubi.create.foundation.ponder.ElementLink;
 import com.simibubi.create.foundation.ponder.PonderPalette;
 import com.simibubi.create.foundation.ponder.SceneBuilder;
@@ -82,7 +82,7 @@ public class ArmScenes {
 		scene.overlay.chaseBoundingBoxOutline(PonderPalette.OUTPUT, second, depotBounds.move(0, 2, 1), 280);
 		scene.overlay.showText(70)
 			.colored(PonderPalette.OUTPUT)
-			.text("Right-Click again to toggle between Input (Blue) and Output (Orange)")
+			.text("Right-Click again to toggle between Input (Blue) and Output (Yellow)")
 			.pointAt(util.vector.blockSurface(outputDepot, Direction.WEST))
 			.placeNearTarget();
 
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/BearingScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/BearingScenes.java
similarity index 98%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/BearingScenes.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/scenes/BearingScenes.java
index 7add1d1b5..7bbe0f216 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/BearingScenes.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/BearingScenes.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.foundation.ponder.content;
+package com.simibubi.create.infrastructure.ponder.scenes;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.contraptions.components.actors.HarvesterBlockEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.bearing.SailBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.glue.SuperGlueEntity;
+import com.simibubi.create.content.contraptions.actors.harvester.HarvesterBlockEntity;
+import com.simibubi.create.content.contraptions.bearing.SailBlock;
+import com.simibubi.create.content.contraptions.glue.SuperGlueEntity;
 import com.simibubi.create.foundation.ponder.ElementLink;
 import com.simibubi.create.foundation.ponder.PonderPalette;
 import com.simibubi.create.foundation.ponder.SceneBuilder;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/BeltScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/BeltScenes.java
similarity index 97%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/BeltScenes.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/scenes/BeltScenes.java
index 8e464433b..bfce8d8f9 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/BeltScenes.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/BeltScenes.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.ponder.content;
+package com.simibubi.create.infrastructure.ponder.scenes;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -6,14 +6,14 @@ import java.util.List;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.contraptions.components.press.MechanicalPressBlockEntity;
-import com.simibubi.create.content.contraptions.components.press.PressingBehaviour.Mode;
-import com.simibubi.create.content.contraptions.fluids.actors.SpoutBlockEntity;
-import com.simibubi.create.content.contraptions.relays.belt.BeltBlock;
-import com.simibubi.create.content.contraptions.relays.belt.BeltBlockEntity;
-import com.simibubi.create.content.contraptions.relays.belt.BeltPart;
-import com.simibubi.create.content.contraptions.relays.elementary.ShaftBlock;
-import com.simibubi.create.content.logistics.block.mechanicalArm.ArmBlockEntity.Phase;
+import com.simibubi.create.content.fluids.spout.SpoutBlockEntity;
+import com.simibubi.create.content.kinetics.belt.BeltBlock;
+import com.simibubi.create.content.kinetics.belt.BeltBlockEntity;
+import com.simibubi.create.content.kinetics.belt.BeltPart;
+import com.simibubi.create.content.kinetics.mechanicalArm.ArmBlockEntity.Phase;
+import com.simibubi.create.content.kinetics.press.MechanicalPressBlockEntity;
+import com.simibubi.create.content.kinetics.press.PressingBehaviour.Mode;
+import com.simibubi.create.content.kinetics.simpleRelays.ShaftBlock;
 import com.simibubi.create.foundation.ponder.ElementLink;
 import com.simibubi.create.foundation.ponder.PonderPalette;
 import com.simibubi.create.foundation.ponder.SceneBuilder;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/CartAssemblerScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/CartAssemblerScenes.java
similarity index 98%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/CartAssemblerScenes.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/scenes/CartAssemblerScenes.java
index 9cbe2378d..7d2931cff 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/CartAssemblerScenes.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/CartAssemblerScenes.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.foundation.ponder.content;
+package com.simibubi.create.infrastructure.ponder.scenes;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.contraptions.components.structureMovement.mounted.CartAssembleRailType;
-import com.simibubi.create.content.contraptions.components.structureMovement.mounted.CartAssemblerBlock;
+import com.simibubi.create.content.contraptions.mounted.CartAssembleRailType;
+import com.simibubi.create.content.contraptions.mounted.CartAssemblerBlock;
 import com.simibubi.create.foundation.ponder.ElementLink;
 import com.simibubi.create.foundation.ponder.PonderPalette;
 import com.simibubi.create.foundation.ponder.SceneBuilder;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/ChainDriveScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ChainDriveScenes.java
similarity index 97%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/ChainDriveScenes.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ChainDriveScenes.java
index 2fbab78ac..ab7c0b73b 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/ChainDriveScenes.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ChainDriveScenes.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.foundation.ponder.content;
+package com.simibubi.create.infrastructure.ponder.scenes;
 
-import com.simibubi.create.content.contraptions.relays.encased.EncasedBeltBlock;
-import com.simibubi.create.content.logistics.block.redstone.AnalogLeverBlockEntity;
+import com.simibubi.create.content.kinetics.chainDrive.ChainDriveBlock;
+import com.simibubi.create.content.redstone.analogLever.AnalogLeverBlockEntity;
 import com.simibubi.create.foundation.ponder.ElementLink;
 import com.simibubi.create.foundation.ponder.PonderPalette;
 import com.simibubi.create.foundation.ponder.SceneBuilder;
@@ -78,7 +78,7 @@ public class ChainDriveScenes {
 		scene.overlay.showControls(new InputWindowElement(util.vector.topOf(rotatedECD), Pointing.DOWN).rightClick()
 			.withWrench(), 30);
 		scene.idle(7);
-		scene.world.modifyBlock(rotatedECD, s -> s.setValue(EncasedBeltBlock.AXIS, Axis.Y), true);
+		scene.world.modifyBlock(rotatedECD, s -> s.setValue(ChainDriveBlock.AXIS, Axis.Y), true);
 		scene.idle(40);
 
 		scene.world.showSection(verticalShaft, Direction.DOWN);
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/ChassisScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ChassisScenes.java
similarity index 98%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/ChassisScenes.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ChassisScenes.java
index 0bddd3d7b..3cf3cb1f9 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/ChassisScenes.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ChassisScenes.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.foundation.ponder.content;
+package com.simibubi.create.infrastructure.ponder.scenes;
 
 import org.apache.commons.lang3.mutable.MutableObject;
 
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.contraptions.components.structureMovement.chassis.LinearChassisBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.chassis.RadialChassisBlock;
+import com.simibubi.create.content.contraptions.chassis.LinearChassisBlock;
+import com.simibubi.create.content.contraptions.chassis.RadialChassisBlock;
 import com.simibubi.create.foundation.ponder.ElementLink;
 import com.simibubi.create.foundation.ponder.PonderPalette;
 import com.simibubi.create.foundation.ponder.SceneBuilder;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/ChuteScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ChuteScenes.java
similarity index 96%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/ChuteScenes.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ChuteScenes.java
index 6af13f8f6..f18072b2c 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/ChuteScenes.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ChuteScenes.java
@@ -1,12 +1,12 @@
-package com.simibubi.create.foundation.ponder.content;
+package com.simibubi.create.infrastructure.ponder.scenes;
 
-import static com.simibubi.create.content.logistics.block.chute.ChuteBlock.SHAPE;
+import static com.simibubi.create.content.logistics.chute.ChuteBlock.SHAPE;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.logistics.block.chute.ChuteBlock;
-import com.simibubi.create.content.logistics.block.chute.ChuteBlock.Shape;
-import com.simibubi.create.content.logistics.block.chute.SmartChuteBlockEntity;
+import com.simibubi.create.content.logistics.chute.ChuteBlock;
+import com.simibubi.create.content.logistics.chute.ChuteBlock.Shape;
+import com.simibubi.create.content.logistics.chute.SmartChuteBlockEntity;
 import com.simibubi.create.foundation.ponder.ElementLink;
 import com.simibubi.create.foundation.ponder.PonderPalette;
 import com.simibubi.create.foundation.ponder.SceneBuilder;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/CrafterScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/CrafterScenes.java
similarity index 98%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/CrafterScenes.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/scenes/CrafterScenes.java
index 52a48d434..0e934bbd8 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/CrafterScenes.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/CrafterScenes.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.foundation.ponder.content;
+package com.simibubi.create.infrastructure.ponder.scenes;
 
 import java.util.Collection;
 
 import com.google.common.collect.ImmutableList;
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.contraptions.components.crafter.MechanicalCrafterBlock;
-import com.simibubi.create.content.contraptions.components.crafter.MechanicalCrafterBlockEntity;
+import com.simibubi.create.content.kinetics.crafter.MechanicalCrafterBlock;
+import com.simibubi.create.content.kinetics.crafter.MechanicalCrafterBlockEntity;
 import com.simibubi.create.foundation.ponder.ElementLink;
 import com.simibubi.create.foundation.ponder.PonderPalette;
 import com.simibubi.create.foundation.ponder.SceneBuilder;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/DeployerScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/DeployerScenes.java
similarity index 98%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/DeployerScenes.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/scenes/DeployerScenes.java
index 12932087c..8ee70294f 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/DeployerScenes.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/DeployerScenes.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.foundation.ponder.content;
+package com.simibubi.create.infrastructure.ponder.scenes;
 
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.contraptions.components.deployer.DeployerBlock;
-import com.simibubi.create.content.contraptions.components.deployer.DeployerBlockEntity;
-import com.simibubi.create.content.curiosities.tools.SandPaperItem;
+import com.simibubi.create.content.equipment.sandPaper.SandPaperItem;
+import com.simibubi.create.content.kinetics.deployer.DeployerBlock;
+import com.simibubi.create.content.kinetics.deployer.DeployerBlockEntity;
 import com.simibubi.create.foundation.ponder.ElementLink;
 import com.simibubi.create.foundation.ponder.PonderPalette;
 import com.simibubi.create.foundation.ponder.SceneBuilder;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/DetectorScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/DetectorScenes.java
similarity index 98%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/DetectorScenes.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/scenes/DetectorScenes.java
index 97becf7f4..f8df756da 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/DetectorScenes.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/DetectorScenes.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.foundation.ponder.content;
+package com.simibubi.create.infrastructure.ponder.scenes;
 
-import com.simibubi.create.content.logistics.block.redstone.SmartObserverBlockEntity;
-import com.simibubi.create.content.logistics.block.redstone.ThresholdSwitchBlock;
+import com.simibubi.create.content.redstone.smartObserver.SmartObserverBlockEntity;
+import com.simibubi.create.content.redstone.thresholdSwitch.ThresholdSwitchBlock;
 import com.simibubi.create.foundation.ponder.ElementLink;
 import com.simibubi.create.foundation.ponder.PonderPalette;
 import com.simibubi.create.foundation.ponder.SceneBuilder;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/DisplayScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/DisplayScenes.java
similarity index 98%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/DisplayScenes.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/scenes/DisplayScenes.java
index 41f8d7572..498b132c4 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/DisplayScenes.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/DisplayScenes.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.foundation.ponder.content;
+package com.simibubi.create.infrastructure.ponder.scenes;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.curiosities.clipboard.ClipboardOverrides;
-import com.simibubi.create.content.curiosities.clipboard.ClipboardOverrides.ClipboardType;
+import com.simibubi.create.content.equipment.clipboard.ClipboardOverrides;
+import com.simibubi.create.content.equipment.clipboard.ClipboardOverrides.ClipboardType;
 import com.simibubi.create.foundation.ponder.ElementLink;
 import com.simibubi.create.foundation.ponder.PonderPalette;
 import com.simibubi.create.foundation.ponder.SceneBuilder;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/EjectorScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/EjectorScenes.java
similarity index 99%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/EjectorScenes.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/scenes/EjectorScenes.java
index e8e2588d9..9a10cd011 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/EjectorScenes.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/EjectorScenes.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.foundation.ponder.content;
+package com.simibubi.create.infrastructure.ponder.scenes;
 
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.logistics.block.depot.EjectorBlockEntity;
+import com.simibubi.create.content.logistics.depot.EjectorBlockEntity;
 import com.simibubi.create.foundation.gui.AllIcons;
 import com.simibubi.create.foundation.ponder.ElementLink;
 import com.simibubi.create.foundation.ponder.PonderPalette;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/ElevatorScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ElevatorScenes.java
similarity index 98%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/ElevatorScenes.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ElevatorScenes.java
index 5f48deda9..b10a2b96e 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/ElevatorScenes.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ElevatorScenes.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.foundation.ponder.content;
+package com.simibubi.create.infrastructure.ponder.scenes;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.contraptions.components.structureMovement.elevator.ElevatorContactBlock;
-import com.simibubi.create.content.curiosities.deco.SlidingDoorBlock;
-import com.simibubi.create.content.logistics.block.redstone.NixieTubeBlock;
-import com.simibubi.create.content.logistics.block.redstone.NixieTubeBlockEntity;
+import com.simibubi.create.content.contraptions.elevator.ElevatorContactBlock;
+import com.simibubi.create.content.decoration.slidingDoor.SlidingDoorBlock;
+import com.simibubi.create.content.redstone.nixieTube.NixieTubeBlock;
+import com.simibubi.create.content.redstone.nixieTube.NixieTubeBlockEntity;
 import com.simibubi.create.foundation.ponder.ElementLink;
 import com.simibubi.create.foundation.ponder.PonderPalette;
 import com.simibubi.create.foundation.ponder.SceneBuilder;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/FanScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/FanScenes.java
similarity index 98%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/FanScenes.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/scenes/FanScenes.java
index 9c0a90c7d..aec6626bf 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/FanScenes.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/FanScenes.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.foundation.ponder.content;
+package com.simibubi.create.infrastructure.ponder.scenes;
 
-import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack;
-import com.simibubi.create.content.logistics.block.depot.DepotBlockEntity;
+import com.simibubi.create.content.kinetics.belt.transport.TransportedItemStack;
+import com.simibubi.create.content.logistics.depot.DepotBlockEntity;
 import com.simibubi.create.foundation.ponder.ElementLink;
 import com.simibubi.create.foundation.ponder.PonderPalette;
 import com.simibubi.create.foundation.ponder.SceneBuilder;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/FunnelScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/FunnelScenes.java
similarity index 98%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/FunnelScenes.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/scenes/FunnelScenes.java
index 6fab18c56..55cf4fa8b 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/FunnelScenes.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/FunnelScenes.java
@@ -1,10 +1,10 @@
-package com.simibubi.create.foundation.ponder.content;
+package com.simibubi.create.infrastructure.ponder.scenes;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.logistics.block.funnel.BeltFunnelBlock;
-import com.simibubi.create.content.logistics.block.funnel.FunnelBlock;
-import com.simibubi.create.content.logistics.block.funnel.FunnelBlockEntity;
+import com.simibubi.create.content.logistics.funnel.BeltFunnelBlock;
+import com.simibubi.create.content.logistics.funnel.FunnelBlock;
+import com.simibubi.create.content.logistics.funnel.FunnelBlockEntity;
 import com.simibubi.create.foundation.ponder.ElementLink;
 import com.simibubi.create.foundation.ponder.PonderPalette;
 import com.simibubi.create.foundation.ponder.SceneBuilder;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/GantryScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/GantryScenes.java
similarity index 99%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/GantryScenes.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/scenes/GantryScenes.java
index 0df78ea17..19e14e8a3 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/GantryScenes.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/GantryScenes.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.ponder.content;
+package com.simibubi.create.infrastructure.ponder.scenes;
 
 import com.simibubi.create.AllItems;
 import com.simibubi.create.foundation.ponder.ElementLink;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/ItemVaultScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ItemVaultScenes.java
similarity index 99%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/ItemVaultScenes.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ItemVaultScenes.java
index 2f8bb4988..b580ca7be 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/ItemVaultScenes.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ItemVaultScenes.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.ponder.content;
+package com.simibubi.create.infrastructure.ponder.scenes;
 
 import com.simibubi.create.AllItems;
 import com.simibubi.create.foundation.gui.AllIcons;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/KineticsScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/KineticsScenes.java
similarity index 98%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/KineticsScenes.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/scenes/KineticsScenes.java
index f1e528d90..c1e3ca91b 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/KineticsScenes.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/KineticsScenes.java
@@ -1,19 +1,19 @@
-package com.simibubi.create.foundation.ponder.content;
+package com.simibubi.create.infrastructure.ponder.scenes;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.contraptions.components.crank.ValveHandleBlock;
-import com.simibubi.create.content.contraptions.components.crusher.CrushingWheelBlock;
-import com.simibubi.create.content.contraptions.components.waterwheel.WaterWheelBlockEntity;
-import com.simibubi.create.content.contraptions.relays.advanced.sequencer.SequencedGearshiftBlock;
-import com.simibubi.create.content.contraptions.relays.elementary.CogWheelBlock;
-import com.simibubi.create.content.contraptions.relays.elementary.ShaftBlock;
-import com.simibubi.create.content.contraptions.relays.encased.EncasedCogwheelBlock;
-import com.simibubi.create.content.contraptions.relays.encased.EncasedShaftBlock;
-import com.simibubi.create.content.contraptions.relays.gauge.GaugeBlock;
-import com.simibubi.create.content.contraptions.relays.gauge.StressGaugeBlockEntity;
-import com.simibubi.create.content.logistics.block.redstone.NixieTubeBlock;
-import com.simibubi.create.content.logistics.block.redstone.NixieTubeBlockEntity;
+import com.simibubi.create.content.kinetics.crank.ValveHandleBlock;
+import com.simibubi.create.content.kinetics.crusher.CrushingWheelBlock;
+import com.simibubi.create.content.kinetics.gauge.GaugeBlock;
+import com.simibubi.create.content.kinetics.gauge.StressGaugeBlockEntity;
+import com.simibubi.create.content.kinetics.simpleRelays.CogWheelBlock;
+import com.simibubi.create.content.kinetics.simpleRelays.ShaftBlock;
+import com.simibubi.create.content.kinetics.simpleRelays.encased.EncasedCogwheelBlock;
+import com.simibubi.create.content.kinetics.simpleRelays.encased.EncasedShaftBlock;
+import com.simibubi.create.content.kinetics.transmission.sequencer.SequencedGearshiftBlock;
+import com.simibubi.create.content.kinetics.waterwheel.WaterWheelBlockEntity;
+import com.simibubi.create.content.redstone.nixieTube.NixieTubeBlock;
+import com.simibubi.create.content.redstone.nixieTube.NixieTubeBlockEntity;
 import com.simibubi.create.foundation.ponder.ElementLink;
 import com.simibubi.create.foundation.ponder.PonderPalette;
 import com.simibubi.create.foundation.ponder.SceneBuilder;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/MechanicalDrillScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/MechanicalDrillScenes.java
similarity index 99%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/MechanicalDrillScenes.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/scenes/MechanicalDrillScenes.java
index 5399be267..9fbd04e74 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/MechanicalDrillScenes.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/MechanicalDrillScenes.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.ponder.content;
+package com.simibubi.create.infrastructure.ponder.scenes;
 
 import com.simibubi.create.foundation.ponder.ElementLink;
 import com.simibubi.create.foundation.ponder.SceneBuilder;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/MechanicalSawScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/MechanicalSawScenes.java
similarity index 98%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/MechanicalSawScenes.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/scenes/MechanicalSawScenes.java
index 4081357b9..0d846fc41 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/MechanicalSawScenes.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/MechanicalSawScenes.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.foundation.ponder.content;
+package com.simibubi.create.infrastructure.ponder.scenes;
 
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.components.saw.SawBlockEntity;
-import com.simibubi.create.content.contraptions.relays.elementary.ShaftBlock;
+import com.simibubi.create.content.kinetics.saw.SawBlockEntity;
+import com.simibubi.create.content.kinetics.simpleRelays.ShaftBlock;
 import com.simibubi.create.foundation.ponder.ElementLink;
 import com.simibubi.create.foundation.ponder.PonderPalette;
 import com.simibubi.create.foundation.ponder.SceneBuilder;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/MovementActorScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/MovementActorScenes.java
similarity index 98%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/MovementActorScenes.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/scenes/MovementActorScenes.java
index 311dee766..e694c032a 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/MovementActorScenes.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/MovementActorScenes.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.foundation.ponder.content;
+package com.simibubi.create.infrastructure.ponder.scenes;
 
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.components.actors.HarvesterBlockEntity;
-import com.simibubi.create.content.contraptions.components.actors.PortableItemInterfaceBlockEntity;
-import com.simibubi.create.content.contraptions.components.actors.PortableStorageInterfaceBlockEntity;
-import com.simibubi.create.content.contraptions.components.actors.controls.ContraptionControlsBlockEntity;
-import com.simibubi.create.content.contraptions.components.structureMovement.chassis.LinearChassisBlock;
+import com.simibubi.create.content.contraptions.actors.contraptionControls.ContraptionControlsBlockEntity;
+import com.simibubi.create.content.contraptions.actors.harvester.HarvesterBlockEntity;
+import com.simibubi.create.content.contraptions.actors.psi.PortableItemInterfaceBlockEntity;
+import com.simibubi.create.content.contraptions.actors.psi.PortableStorageInterfaceBlockEntity;
+import com.simibubi.create.content.contraptions.chassis.LinearChassisBlock;
 import com.simibubi.create.foundation.ponder.ElementLink;
 import com.simibubi.create.foundation.ponder.PonderPalette;
 import com.simibubi.create.foundation.ponder.SceneBuilder;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/PistonScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/PistonScenes.java
similarity index 98%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/PistonScenes.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/scenes/PistonScenes.java
index 5cccc6f18..b4579673f 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/PistonScenes.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/PistonScenes.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.foundation.ponder.content;
+package com.simibubi.create.infrastructure.ponder.scenes;
 
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonHeadBlock;
+import com.simibubi.create.content.contraptions.piston.MechanicalPistonHeadBlock;
 import com.simibubi.create.foundation.ponder.ElementLink;
 import com.simibubi.create.foundation.ponder.PonderPalette;
 import com.simibubi.create.foundation.ponder.SceneBuilder;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/ProcessingScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ProcessingScenes.java
similarity index 97%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/ProcessingScenes.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ProcessingScenes.java
index 812f24053..b72c76f88 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/ProcessingScenes.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ProcessingScenes.java
@@ -1,18 +1,18 @@
-package com.simibubi.create.foundation.ponder.content;
+package com.simibubi.create.infrastructure.ponder.scenes;
 
 import com.google.common.collect.ImmutableList;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.contraptions.components.deployer.DeployerBlockEntity;
-import com.simibubi.create.content.contraptions.components.millstone.MillstoneBlockEntity;
-import com.simibubi.create.content.contraptions.components.mixer.MechanicalMixerBlockEntity;
-import com.simibubi.create.content.contraptions.components.press.MechanicalPressBlockEntity;
-import com.simibubi.create.content.contraptions.components.press.PressingBehaviour.Mode;
-import com.simibubi.create.content.contraptions.processing.BasinBlock;
-import com.simibubi.create.content.contraptions.processing.BasinBlockEntity;
-import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock;
-import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock.HeatLevel;
-import com.simibubi.create.content.contraptions.processing.burner.LitBlazeBurnerBlock;
+import com.simibubi.create.content.kinetics.deployer.DeployerBlockEntity;
+import com.simibubi.create.content.kinetics.millstone.MillstoneBlockEntity;
+import com.simibubi.create.content.kinetics.mixer.MechanicalMixerBlockEntity;
+import com.simibubi.create.content.kinetics.press.MechanicalPressBlockEntity;
+import com.simibubi.create.content.kinetics.press.PressingBehaviour.Mode;
+import com.simibubi.create.content.processing.basin.BasinBlock;
+import com.simibubi.create.content.processing.basin.BasinBlockEntity;
+import com.simibubi.create.content.processing.burner.BlazeBurnerBlock;
+import com.simibubi.create.content.processing.burner.BlazeBurnerBlock.HeatLevel;
+import com.simibubi.create.content.processing.burner.LitBlazeBurnerBlock;
 import com.simibubi.create.foundation.ponder.ElementLink;
 import com.simibubi.create.foundation.ponder.PonderPalette;
 import com.simibubi.create.foundation.ponder.SceneBuilder;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/PulleyScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/PulleyScenes.java
similarity index 99%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/PulleyScenes.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/scenes/PulleyScenes.java
index e53ce1eb4..013fdede3 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/PulleyScenes.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/PulleyScenes.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.ponder.content;
+package com.simibubi.create.infrastructure.ponder.scenes;
 
 import com.simibubi.create.AllItems;
 import com.simibubi.create.foundation.ponder.ElementLink;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/RedstoneScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/RedstoneScenes.java
similarity index 96%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/RedstoneScenes.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/scenes/RedstoneScenes.java
index 92f479493..1d8b7bf70 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/RedstoneScenes.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/RedstoneScenes.java
@@ -1,20 +1,20 @@
-package com.simibubi.create.foundation.ponder.content;
+package com.simibubi.create.infrastructure.ponder.scenes;
 
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.components.structureMovement.chassis.StickerBlock;
-import com.simibubi.create.content.contraptions.components.structureMovement.chassis.StickerBlockEntity;
-import com.simibubi.create.content.curiosities.clipboard.ClipboardOverrides;
-import com.simibubi.create.content.curiosities.clipboard.ClipboardOverrides.ClipboardType;
-import com.simibubi.create.content.logistics.block.diodes.BrassDiodeBlock;
-import com.simibubi.create.content.logistics.block.diodes.PoweredLatchBlock;
-import com.simibubi.create.content.logistics.block.diodes.PulseExtenderBlockEntity;
-import com.simibubi.create.content.logistics.block.diodes.PulseRepeaterBlockEntity;
-import com.simibubi.create.content.logistics.block.diodes.ToggleLatchBlock;
-import com.simibubi.create.content.logistics.block.redstone.AnalogLeverBlockEntity;
-import com.simibubi.create.content.logistics.block.redstone.NixieTubeBlock;
-import com.simibubi.create.content.logistics.block.redstone.NixieTubeBlockEntity;
-import com.simibubi.create.content.logistics.block.redstone.RedstoneLinkBlock;
-import com.simibubi.create.content.logistics.block.redstone.RedstoneLinkBlockEntity;
+import com.simibubi.create.content.contraptions.chassis.StickerBlock;
+import com.simibubi.create.content.contraptions.chassis.StickerBlockEntity;
+import com.simibubi.create.content.equipment.clipboard.ClipboardOverrides;
+import com.simibubi.create.content.equipment.clipboard.ClipboardOverrides.ClipboardType;
+import com.simibubi.create.content.redstone.analogLever.AnalogLeverBlockEntity;
+import com.simibubi.create.content.redstone.diodes.BrassDiodeBlock;
+import com.simibubi.create.content.redstone.diodes.PoweredLatchBlock;
+import com.simibubi.create.content.redstone.diodes.PulseExtenderBlockEntity;
+import com.simibubi.create.content.redstone.diodes.PulseRepeaterBlockEntity;
+import com.simibubi.create.content.redstone.diodes.ToggleLatchBlock;
+import com.simibubi.create.content.redstone.link.RedstoneLinkBlock;
+import com.simibubi.create.content.redstone.link.RedstoneLinkBlockEntity;
+import com.simibubi.create.content.redstone.nixieTube.NixieTubeBlock;
+import com.simibubi.create.content.redstone.nixieTube.NixieTubeBlockEntity;
 import com.simibubi.create.foundation.ponder.ElementLink;
 import com.simibubi.create.foundation.ponder.PonderPalette;
 import com.simibubi.create.foundation.ponder.SceneBuilder;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/RedstoneScenes2.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/RedstoneScenes2.java
similarity index 96%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/RedstoneScenes2.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/scenes/RedstoneScenes2.java
index 821891120..aa7a9b36d 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/RedstoneScenes2.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/RedstoneScenes2.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.foundation.ponder.content;
+package com.simibubi.create.infrastructure.ponder.scenes;
 
-import com.simibubi.create.content.logistics.block.redstone.NixieTubeBlockEntity;
-import com.simibubi.create.content.logistics.block.redstone.RoseQuartzLampBlock;
+import com.simibubi.create.content.redstone.RoseQuartzLampBlock;
+import com.simibubi.create.content.redstone.nixieTube.NixieTubeBlockEntity;
 import com.simibubi.create.foundation.ponder.ElementLink;
 import com.simibubi.create.foundation.ponder.SceneBuilder;
 import com.simibubi.create.foundation.ponder.SceneBuildingUtil;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/RollerScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/RollerScenes.java
similarity index 98%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/RollerScenes.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/scenes/RollerScenes.java
index fa5596abe..600938c3a 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/RollerScenes.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/RollerScenes.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.foundation.ponder.content;
+package com.simibubi.create.infrastructure.ponder.scenes;
 
-import com.simibubi.create.content.contraptions.components.actors.RollerBlockEntity;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.station.StationBlock;
+import com.simibubi.create.content.contraptions.actors.roller.RollerBlockEntity;
+import com.simibubi.create.content.trains.station.StationBlock;
 import com.simibubi.create.foundation.gui.AllIcons;
 import com.simibubi.create.foundation.ponder.ElementLink;
 import com.simibubi.create.foundation.ponder.PonderPalette;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/SteamScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/SteamScenes.java
similarity index 97%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/SteamScenes.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/scenes/SteamScenes.java
index 78fc1d0f4..286d1840f 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/SteamScenes.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/SteamScenes.java
@@ -1,13 +1,13 @@
-package com.simibubi.create.foundation.ponder.content;
+package com.simibubi.create.infrastructure.ponder.scenes;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.contraptions.components.steam.whistle.WhistleBlock;
-import com.simibubi.create.content.contraptions.components.steam.whistle.WhistleExtenderBlock;
-import com.simibubi.create.content.contraptions.fluids.PumpBlock;
-import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock;
-import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock.HeatLevel;
-import com.simibubi.create.content.contraptions.relays.elementary.ShaftBlock;
+import com.simibubi.create.content.decoration.steamWhistle.WhistleBlock;
+import com.simibubi.create.content.decoration.steamWhistle.WhistleExtenderBlock;
+import com.simibubi.create.content.fluids.pump.PumpBlock;
+import com.simibubi.create.content.kinetics.simpleRelays.ShaftBlock;
+import com.simibubi.create.content.processing.burner.BlazeBurnerBlock;
+import com.simibubi.create.content.processing.burner.BlazeBurnerBlock.HeatLevel;
 import com.simibubi.create.foundation.ponder.ElementLink;
 import com.simibubi.create.foundation.ponder.PonderPalette;
 import com.simibubi.create.foundation.ponder.SceneBuilder;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/TemplateScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/TemplateScenes.java
similarity index 89%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/TemplateScenes.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/scenes/TemplateScenes.java
index 714a9b8e9..03a78c222 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/TemplateScenes.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/TemplateScenes.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.ponder.content;
+package com.simibubi.create.infrastructure.ponder.scenes;
 
 import com.simibubi.create.foundation.ponder.SceneBuilder;
 import com.simibubi.create.foundation.ponder.SceneBuildingUtil;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/TunnelScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/TunnelScenes.java
similarity index 98%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/TunnelScenes.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/scenes/TunnelScenes.java
index e25482929..a5832f4e0 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/TunnelScenes.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/TunnelScenes.java
@@ -1,13 +1,13 @@
-package com.simibubi.create.foundation.ponder.content;
+package com.simibubi.create.infrastructure.ponder.scenes;
 
 import java.util.Vector;
 
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.contraptions.relays.belt.BeltBlock;
-import com.simibubi.create.content.contraptions.relays.belt.BeltBlockEntity;
-import com.simibubi.create.content.logistics.block.belts.tunnel.BrassTunnelBlockEntity;
+import com.simibubi.create.content.kinetics.belt.BeltBlock;
+import com.simibubi.create.content.kinetics.belt.BeltBlockEntity;
+import com.simibubi.create.content.logistics.tunnel.BrassTunnelBlockEntity;
 import com.simibubi.create.foundation.blockEntity.behaviour.filtering.SidedFilteringBehaviour;
-import com.simibubi.create.foundation.blockEntity.behaviour.scrollvalue.ScrollOptionBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollOptionBehaviour;
 import com.simibubi.create.foundation.gui.AllIcons;
 import com.simibubi.create.foundation.ponder.ElementLink;
 import com.simibubi.create.foundation.ponder.PonderPalette;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/fluid/DrainScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/DrainScenes.java
similarity index 96%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/fluid/DrainScenes.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/DrainScenes.java
index 4375fd412..5a6c313ad 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/fluid/DrainScenes.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/DrainScenes.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.foundation.ponder.content.fluid;
+package com.simibubi.create.infrastructure.ponder.scenes.fluid;
 
-import com.simibubi.create.content.contraptions.fluids.actors.ItemDrainBlockEntity;
+import com.simibubi.create.content.fluids.drain.ItemDrainBlockEntity;
 import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour;
 import com.simibubi.create.foundation.ponder.ElementLink;
 import com.simibubi.create.foundation.ponder.SceneBuilder;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/fluid/FluidMovementActorScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/FluidMovementActorScenes.java
similarity index 96%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/fluid/FluidMovementActorScenes.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/FluidMovementActorScenes.java
index 4a5cd015f..e28e8bb99 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/fluid/FluidMovementActorScenes.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/FluidMovementActorScenes.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.foundation.ponder.content.fluid;
+package com.simibubi.create.infrastructure.ponder.scenes.fluid;
 
 import com.simibubi.create.AllFluids;
-import com.simibubi.create.content.contraptions.components.actors.PortableFluidInterfaceBlockEntity;
-import com.simibubi.create.content.contraptions.fluids.PumpBlock;
-import com.simibubi.create.content.contraptions.fluids.tank.FluidTankBlockEntity;
+import com.simibubi.create.content.contraptions.actors.psi.PortableFluidInterfaceBlockEntity;
+import com.simibubi.create.content.fluids.pump.PumpBlock;
+import com.simibubi.create.content.fluids.tank.FluidTankBlockEntity;
 import com.simibubi.create.foundation.fluid.FluidHelper;
 import com.simibubi.create.foundation.ponder.ElementLink;
 import com.simibubi.create.foundation.ponder.PonderPalette;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/fluid/FluidTankScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/FluidTankScenes.java
similarity index 96%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/fluid/FluidTankScenes.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/FluidTankScenes.java
index 5d437f8a0..ea36e91f0 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/fluid/FluidTankScenes.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/FluidTankScenes.java
@@ -1,15 +1,15 @@
-package com.simibubi.create.foundation.ponder.content.fluid;
+package com.simibubi.create.infrastructure.ponder.scenes.fluid;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllFluids;
-import com.simibubi.create.content.contraptions.fluids.FluidFX;
-import com.simibubi.create.content.contraptions.fluids.PumpBlock;
-import com.simibubi.create.content.contraptions.fluids.actors.SpoutBlockEntity;
-import com.simibubi.create.content.contraptions.fluids.tank.CreativeFluidTankBlockEntity;
-import com.simibubi.create.content.contraptions.fluids.tank.CreativeFluidTankBlockEntity.CreativeSmartFluidTank;
-import com.simibubi.create.content.contraptions.fluids.tank.FluidTankBlock;
-import com.simibubi.create.content.contraptions.fluids.tank.FluidTankBlockEntity;
-import com.simibubi.create.content.logistics.block.redstone.NixieTubeBlockEntity;
+import com.simibubi.create.content.fluids.FluidFX;
+import com.simibubi.create.content.fluids.pump.PumpBlock;
+import com.simibubi.create.content.fluids.spout.SpoutBlockEntity;
+import com.simibubi.create.content.fluids.tank.CreativeFluidTankBlockEntity;
+import com.simibubi.create.content.fluids.tank.CreativeFluidTankBlockEntity.CreativeSmartFluidTank;
+import com.simibubi.create.content.fluids.tank.FluidTankBlock;
+import com.simibubi.create.content.fluids.tank.FluidTankBlockEntity;
+import com.simibubi.create.content.redstone.nixieTube.NixieTubeBlockEntity;
 import com.simibubi.create.foundation.fluid.FluidHelper;
 import com.simibubi.create.foundation.gui.AllIcons;
 import com.simibubi.create.foundation.ponder.ElementLink;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/fluid/HosePulleyScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/HosePulleyScenes.java
similarity index 97%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/fluid/HosePulleyScenes.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/HosePulleyScenes.java
index fdd8b92a0..963395f7e 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/fluid/HosePulleyScenes.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/HosePulleyScenes.java
@@ -1,13 +1,13 @@
-package com.simibubi.create.foundation.ponder.content.fluid;
+package com.simibubi.create.infrastructure.ponder.scenes.fluid;
 
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
-import com.simibubi.create.content.contraptions.fluids.PumpBlock;
-import com.simibubi.create.content.contraptions.fluids.actors.HosePulleyBlockEntity;
-import com.simibubi.create.content.contraptions.fluids.actors.HosePulleyFluidHandler;
-import com.simibubi.create.content.contraptions.fluids.tank.FluidTankBlockEntity;
+import com.simibubi.create.content.fluids.hosePulley.HosePulleyBlockEntity;
+import com.simibubi.create.content.fluids.hosePulley.HosePulleyFluidHandler;
+import com.simibubi.create.content.fluids.pump.PumpBlock;
+import com.simibubi.create.content.fluids.tank.FluidTankBlockEntity;
 import com.simibubi.create.foundation.ponder.ElementLink;
 import com.simibubi.create.foundation.ponder.PonderPalette;
 import com.simibubi.create.foundation.ponder.SceneBuilder;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/fluid/PipeScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/PipeScenes.java
similarity index 96%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/fluid/PipeScenes.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/PipeScenes.java
index 8af8117b7..139150b32 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/fluid/PipeScenes.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/PipeScenes.java
@@ -1,17 +1,17 @@
-package com.simibubi.create.foundation.ponder.content.fluid;
+package com.simibubi.create.infrastructure.ponder.scenes.fluid;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllFluids;
-import com.simibubi.create.content.contraptions.fluids.PumpBlock;
-import com.simibubi.create.content.contraptions.fluids.actors.ItemDrainBlockEntity;
-import com.simibubi.create.content.contraptions.fluids.pipes.AxisPipeBlock;
-import com.simibubi.create.content.contraptions.fluids.pipes.FluidPipeBlock;
-import com.simibubi.create.content.contraptions.fluids.pipes.FluidValveBlock;
-import com.simibubi.create.content.contraptions.fluids.pipes.FluidValveBlockEntity;
-import com.simibubi.create.content.contraptions.fluids.pipes.GlassFluidPipeBlock;
-import com.simibubi.create.content.contraptions.fluids.pipes.SmartFluidPipeBlockEntity;
-import com.simibubi.create.content.contraptions.fluids.tank.FluidTankBlockEntity;
-import com.simibubi.create.content.contraptions.processing.BasinBlockEntity;
+import com.simibubi.create.content.fluids.drain.ItemDrainBlockEntity;
+import com.simibubi.create.content.fluids.pipes.AxisPipeBlock;
+import com.simibubi.create.content.fluids.pipes.FluidPipeBlock;
+import com.simibubi.create.content.fluids.pipes.GlassFluidPipeBlock;
+import com.simibubi.create.content.fluids.pipes.SmartFluidPipeBlockEntity;
+import com.simibubi.create.content.fluids.pipes.valve.FluidValveBlock;
+import com.simibubi.create.content.fluids.pipes.valve.FluidValveBlockEntity;
+import com.simibubi.create.content.fluids.pump.PumpBlock;
+import com.simibubi.create.content.fluids.tank.FluidTankBlockEntity;
+import com.simibubi.create.content.processing.basin.BasinBlockEntity;
 import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour;
 import com.simibubi.create.foundation.fluid.FluidHelper;
 import com.simibubi.create.foundation.ponder.ElementLink;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/fluid/PumpScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/PumpScenes.java
similarity index 96%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/fluid/PumpScenes.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/PumpScenes.java
index f45a966c2..66c0a36a6 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/fluid/PumpScenes.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/PumpScenes.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.foundation.ponder.content.fluid;
+package com.simibubi.create.infrastructure.ponder.scenes.fluid;
 
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.fluids.PumpBlock;
-import com.simibubi.create.content.contraptions.fluids.pipes.FluidPipeBlock;
-import com.simibubi.create.content.contraptions.fluids.pipes.GlassFluidPipeBlock;
-import com.simibubi.create.content.contraptions.fluids.tank.FluidTankBlockEntity;
-import com.simibubi.create.content.contraptions.relays.elementary.CogWheelBlock;
+import com.simibubi.create.content.fluids.pipes.FluidPipeBlock;
+import com.simibubi.create.content.fluids.pipes.GlassFluidPipeBlock;
+import com.simibubi.create.content.fluids.pump.PumpBlock;
+import com.simibubi.create.content.fluids.tank.FluidTankBlockEntity;
+import com.simibubi.create.content.kinetics.simpleRelays.CogWheelBlock;
 import com.simibubi.create.foundation.ponder.ElementLink;
 import com.simibubi.create.foundation.ponder.PonderPalette;
 import com.simibubi.create.foundation.ponder.SceneBuilder;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/fluid/SpoutScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/SpoutScenes.java
similarity index 96%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/fluid/SpoutScenes.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/SpoutScenes.java
index ab7c95f7a..1c07ce98a 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/fluid/SpoutScenes.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/SpoutScenes.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.foundation.ponder.content.fluid;
+package com.simibubi.create.infrastructure.ponder.scenes.fluid;
 
 import com.simibubi.create.AllFluids;
-import com.simibubi.create.content.contraptions.fluids.FluidFX;
-import com.simibubi.create.content.contraptions.fluids.PumpBlock;
-import com.simibubi.create.content.contraptions.fluids.actors.SpoutBlockEntity;
+import com.simibubi.create.content.fluids.FluidFX;
+import com.simibubi.create.content.fluids.pump.PumpBlock;
+import com.simibubi.create.content.fluids.spout.SpoutBlockEntity;
 import com.simibubi.create.foundation.fluid.FluidHelper;
 import com.simibubi.create.foundation.gui.AllIcons;
 import com.simibubi.create.foundation.ponder.ElementLink;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/trains/TrackObserverScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/trains/TrackObserverScenes.java
similarity index 97%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/trains/TrackObserverScenes.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/scenes/trains/TrackObserverScenes.java
index dafc3bd91..9d75efd85 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/trains/TrackObserverScenes.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/trains/TrackObserverScenes.java
@@ -1,7 +1,7 @@
-package com.simibubi.create.foundation.ponder.content.trains;
+package com.simibubi.create.infrastructure.ponder.scenes.trains;
 
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.observer.TrackObserverBlockEntity;
+import com.simibubi.create.content.trains.observer.TrackObserverBlockEntity;
 import com.simibubi.create.foundation.ponder.ElementLink;
 import com.simibubi.create.foundation.ponder.PonderPalette;
 import com.simibubi.create.foundation.ponder.SceneBuilder;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/trains/TrackScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/trains/TrackScenes.java
similarity index 99%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/trains/TrackScenes.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/scenes/trains/TrackScenes.java
index 4087a6a7e..bf230f2e1 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/trains/TrackScenes.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/trains/TrackScenes.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.foundation.ponder.content.trains;
+package com.simibubi.create.infrastructure.ponder.scenes.trains;
 
 import java.util.List;
 
 import com.simibubi.create.AllBlocks;
-import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock;
+import com.simibubi.create.content.processing.burner.BlazeBurnerBlock;
 import com.simibubi.create.foundation.ponder.ElementLink;
 import com.simibubi.create.foundation.ponder.PonderPalette;
 import com.simibubi.create.foundation.ponder.SceneBuilder;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/trains/TrainScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/trains/TrainScenes.java
similarity index 97%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/trains/TrainScenes.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/scenes/trains/TrainScenes.java
index fc7bd93b4..a05ec97ec 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/trains/TrainScenes.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/trains/TrainScenes.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.foundation.ponder.content.trains;
+package com.simibubi.create.infrastructure.ponder.scenes.trains;
 
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.station.StationBlock;
+import com.simibubi.create.content.processing.burner.BlazeBurnerBlock;
+import com.simibubi.create.content.trains.station.StationBlock;
 import com.simibubi.create.foundation.ponder.ElementLink;
 import com.simibubi.create.foundation.ponder.PonderPalette;
 import com.simibubi.create.foundation.ponder.SceneBuilder;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/trains/TrainSignalScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/trains/TrainSignalScenes.java
similarity index 98%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/trains/TrainSignalScenes.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/scenes/trains/TrainSignalScenes.java
index a72ce7be8..1372b14d4 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/trains/TrainSignalScenes.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/trains/TrainSignalScenes.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.foundation.ponder.content.trains;
+package com.simibubi.create.infrastructure.ponder.scenes.trains;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.SignalBlock;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.signal.SignalBlockEntity.SignalState;
+import com.simibubi.create.content.trains.signal.SignalBlock;
+import com.simibubi.create.content.trains.signal.SignalBlockEntity.SignalState;
 import com.simibubi.create.foundation.ponder.ElementLink;
 import com.simibubi.create.foundation.ponder.PonderPalette;
 import com.simibubi.create.foundation.ponder.SceneBuilder;
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/trains/TrainStationScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/trains/TrainStationScenes.java
similarity index 99%
rename from src/main/java/com/simibubi/create/foundation/ponder/content/trains/TrainStationScenes.java
rename to src/main/java/com/simibubi/create/infrastructure/ponder/scenes/trains/TrainStationScenes.java
index 3e9402552..0dc44d9ad 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/trains/TrainStationScenes.java
+++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/trains/TrainStationScenes.java
@@ -1,8 +1,8 @@
-package com.simibubi.create.foundation.ponder.content.trains;
+package com.simibubi.create.infrastructure.ponder.scenes.trains;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
-import com.simibubi.create.content.logistics.trains.management.edgePoint.station.StationBlock;
+import com.simibubi.create.content.trains.station.StationBlock;
 import com.simibubi.create.foundation.ponder.ElementLink;
 import com.simibubi.create.foundation.ponder.PonderPalette;
 import com.simibubi.create.foundation.ponder.SceneBuilder;
diff --git a/src/main/java/com/simibubi/create/foundation/worldgen/AllFeatures.java b/src/main/java/com/simibubi/create/infrastructure/worldgen/AllFeatures.java
similarity index 93%
rename from src/main/java/com/simibubi/create/foundation/worldgen/AllFeatures.java
rename to src/main/java/com/simibubi/create/infrastructure/worldgen/AllFeatures.java
index 5fa2a98c2..c417d50c0 100644
--- a/src/main/java/com/simibubi/create/foundation/worldgen/AllFeatures.java
+++ b/src/main/java/com/simibubi/create/infrastructure/worldgen/AllFeatures.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.worldgen;
+package com.simibubi.create.infrastructure.worldgen;
 
 import com.simibubi.create.Create;
 
diff --git a/src/main/java/com/simibubi/create/foundation/worldgen/AllLayerPatterns.java b/src/main/java/com/simibubi/create/infrastructure/worldgen/AllLayerPatterns.java
similarity index 96%
rename from src/main/java/com/simibubi/create/foundation/worldgen/AllLayerPatterns.java
rename to src/main/java/com/simibubi/create/infrastructure/worldgen/AllLayerPatterns.java
index 18fa3b0a5..15d75e0ef 100644
--- a/src/main/java/com/simibubi/create/foundation/worldgen/AllLayerPatterns.java
+++ b/src/main/java/com/simibubi/create/infrastructure/worldgen/AllLayerPatterns.java
@@ -1,6 +1,6 @@
-package com.simibubi.create.foundation.worldgen;
+package com.simibubi.create.infrastructure.worldgen;
 
-import com.simibubi.create.content.palettes.AllPaletteStoneTypes;
+import com.simibubi.create.content.decoration.palettes.AllPaletteStoneTypes;
 import com.tterrag.registrate.util.nullness.NonNullSupplier;
 
 import net.minecraft.world.level.block.Blocks;
diff --git a/src/main/java/com/simibubi/create/foundation/worldgen/AllOreFeatureConfigEntries.java b/src/main/java/com/simibubi/create/infrastructure/worldgen/AllOreFeatureConfigEntries.java
similarity index 97%
rename from src/main/java/com/simibubi/create/foundation/worldgen/AllOreFeatureConfigEntries.java
rename to src/main/java/com/simibubi/create/infrastructure/worldgen/AllOreFeatureConfigEntries.java
index ed7ddf983..9bd79f2af 100644
--- a/src/main/java/com/simibubi/create/foundation/worldgen/AllOreFeatureConfigEntries.java
+++ b/src/main/java/com/simibubi/create/infrastructure/worldgen/AllOreFeatureConfigEntries.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.worldgen;
+package com.simibubi.create.infrastructure.worldgen;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -7,7 +7,7 @@ import com.simibubi.create.AllBlocks;
 import com.simibubi.create.Create;
 import com.simibubi.create.foundation.data.DynamicDataProvider;
 import com.simibubi.create.foundation.utility.Couple;
-import com.simibubi.create.foundation.worldgen.OreFeatureConfigEntry.DatagenExtension;
+import com.simibubi.create.infrastructure.worldgen.OreFeatureConfigEntry.DatagenExtension;
 
 import net.minecraft.core.Registry;
 import net.minecraft.core.RegistryAccess;
diff --git a/src/main/java/com/simibubi/create/foundation/worldgen/AllPlacementModifiers.java b/src/main/java/com/simibubi/create/infrastructure/worldgen/AllPlacementModifiers.java
similarity index 93%
rename from src/main/java/com/simibubi/create/foundation/worldgen/AllPlacementModifiers.java
rename to src/main/java/com/simibubi/create/infrastructure/worldgen/AllPlacementModifiers.java
index fd8ce11bc..f30b6e037 100644
--- a/src/main/java/com/simibubi/create/foundation/worldgen/AllPlacementModifiers.java
+++ b/src/main/java/com/simibubi/create/infrastructure/worldgen/AllPlacementModifiers.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.worldgen;
+package com.simibubi.create.infrastructure.worldgen;
 
 import com.simibubi.create.Create;
 
diff --git a/src/main/java/com/simibubi/create/foundation/worldgen/BaseConfigDrivenOreFeature.java b/src/main/java/com/simibubi/create/infrastructure/worldgen/BaseConfigDrivenOreFeature.java
similarity index 95%
rename from src/main/java/com/simibubi/create/foundation/worldgen/BaseConfigDrivenOreFeature.java
rename to src/main/java/com/simibubi/create/infrastructure/worldgen/BaseConfigDrivenOreFeature.java
index a2299fb3e..f8e74c063 100644
--- a/src/main/java/com/simibubi/create/foundation/worldgen/BaseConfigDrivenOreFeature.java
+++ b/src/main/java/com/simibubi/create/infrastructure/worldgen/BaseConfigDrivenOreFeature.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.worldgen;
+package com.simibubi.create.infrastructure.worldgen;
 
 import java.util.function.Function;
 
diff --git a/src/main/java/com/simibubi/create/foundation/worldgen/BaseConfigDrivenOreFeatureConfiguration.java b/src/main/java/com/simibubi/create/infrastructure/worldgen/BaseConfigDrivenOreFeatureConfiguration.java
similarity index 92%
rename from src/main/java/com/simibubi/create/foundation/worldgen/BaseConfigDrivenOreFeatureConfiguration.java
rename to src/main/java/com/simibubi/create/infrastructure/worldgen/BaseConfigDrivenOreFeatureConfiguration.java
index 1c741236f..bc4292e68 100644
--- a/src/main/java/com/simibubi/create/foundation/worldgen/BaseConfigDrivenOreFeatureConfiguration.java
+++ b/src/main/java/com/simibubi/create/infrastructure/worldgen/BaseConfigDrivenOreFeatureConfiguration.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.worldgen;
+package com.simibubi.create.infrastructure.worldgen;
 
 import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
 
diff --git a/src/main/java/com/simibubi/create/foundation/worldgen/BuiltinRegistration.java b/src/main/java/com/simibubi/create/infrastructure/worldgen/BuiltinRegistration.java
similarity index 93%
rename from src/main/java/com/simibubi/create/foundation/worldgen/BuiltinRegistration.java
rename to src/main/java/com/simibubi/create/infrastructure/worldgen/BuiltinRegistration.java
index 29fc6d698..4c9a10fdf 100644
--- a/src/main/java/com/simibubi/create/foundation/worldgen/BuiltinRegistration.java
+++ b/src/main/java/com/simibubi/create/infrastructure/worldgen/BuiltinRegistration.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.foundation.worldgen;
+package com.simibubi.create.infrastructure.worldgen;
 
 import java.util.Map;
 
 import com.simibubi.create.Create;
-import com.simibubi.create.foundation.worldgen.OreFeatureConfigEntry.DatagenExtension;
+import com.simibubi.create.infrastructure.worldgen.OreFeatureConfigEntry.DatagenExtension;
 
 import net.minecraft.core.Registry;
 import net.minecraft.data.BuiltinRegistries;
diff --git a/src/main/java/com/simibubi/create/foundation/worldgen/ConfigDrivenLayeredOreFeatureConfiguration.java b/src/main/java/com/simibubi/create/infrastructure/worldgen/ConfigDrivenLayeredOreFeatureConfiguration.java
similarity index 95%
rename from src/main/java/com/simibubi/create/foundation/worldgen/ConfigDrivenLayeredOreFeatureConfiguration.java
rename to src/main/java/com/simibubi/create/infrastructure/worldgen/ConfigDrivenLayeredOreFeatureConfiguration.java
index 4066b20b3..452d3d783 100644
--- a/src/main/java/com/simibubi/create/foundation/worldgen/ConfigDrivenLayeredOreFeatureConfiguration.java
+++ b/src/main/java/com/simibubi/create/infrastructure/worldgen/ConfigDrivenLayeredOreFeatureConfiguration.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.worldgen;
+package com.simibubi.create.infrastructure.worldgen;
 
 import java.util.List;
 
diff --git a/src/main/java/com/simibubi/create/foundation/worldgen/ConfigDrivenOreFeatureConfiguration.java b/src/main/java/com/simibubi/create/infrastructure/worldgen/ConfigDrivenOreFeatureConfiguration.java
similarity index 95%
rename from src/main/java/com/simibubi/create/foundation/worldgen/ConfigDrivenOreFeatureConfiguration.java
rename to src/main/java/com/simibubi/create/infrastructure/worldgen/ConfigDrivenOreFeatureConfiguration.java
index d554cc139..3becda77c 100644
--- a/src/main/java/com/simibubi/create/foundation/worldgen/ConfigDrivenOreFeatureConfiguration.java
+++ b/src/main/java/com/simibubi/create/infrastructure/worldgen/ConfigDrivenOreFeatureConfiguration.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.worldgen;
+package com.simibubi.create.infrastructure.worldgen;
 
 import java.util.List;
 
diff --git a/src/main/java/com/simibubi/create/foundation/worldgen/ConfigDrivenPlacement.java b/src/main/java/com/simibubi/create/infrastructure/worldgen/ConfigDrivenPlacement.java
similarity index 94%
rename from src/main/java/com/simibubi/create/foundation/worldgen/ConfigDrivenPlacement.java
rename to src/main/java/com/simibubi/create/infrastructure/worldgen/ConfigDrivenPlacement.java
index cdff8a49e..c0bc19c6f 100644
--- a/src/main/java/com/simibubi/create/foundation/worldgen/ConfigDrivenPlacement.java
+++ b/src/main/java/com/simibubi/create/infrastructure/worldgen/ConfigDrivenPlacement.java
@@ -1,11 +1,11 @@
-package com.simibubi.create.foundation.worldgen;
+package com.simibubi.create.infrastructure.worldgen;
 
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
-import com.simibubi.create.foundation.config.AllConfigs;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.util.Mth;
diff --git a/src/main/java/com/simibubi/create/foundation/worldgen/LayerPattern.java b/src/main/java/com/simibubi/create/infrastructure/worldgen/LayerPattern.java
similarity index 98%
rename from src/main/java/com/simibubi/create/foundation/worldgen/LayerPattern.java
rename to src/main/java/com/simibubi/create/infrastructure/worldgen/LayerPattern.java
index a346ee5cd..0835cea27 100644
--- a/src/main/java/com/simibubi/create/foundation/worldgen/LayerPattern.java
+++ b/src/main/java/com/simibubi/create/infrastructure/worldgen/LayerPattern.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.worldgen;
+package com.simibubi.create.infrastructure.worldgen;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/simibubi/create/foundation/worldgen/LayeredOreFeature.java b/src/main/java/com/simibubi/create/infrastructure/worldgen/LayeredOreFeature.java
similarity index 97%
rename from src/main/java/com/simibubi/create/foundation/worldgen/LayeredOreFeature.java
rename to src/main/java/com/simibubi/create/infrastructure/worldgen/LayeredOreFeature.java
index 19e3f7545..fe0324bac 100644
--- a/src/main/java/com/simibubi/create/foundation/worldgen/LayeredOreFeature.java
+++ b/src/main/java/com/simibubi/create/infrastructure/worldgen/LayeredOreFeature.java
@@ -1,9 +1,9 @@
-package com.simibubi.create.foundation.worldgen;
+package com.simibubi.create.infrastructure.worldgen;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.simibubi.create.foundation.worldgen.LayerPattern.Layer;
+import com.simibubi.create.infrastructure.worldgen.LayerPattern.Layer;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.BlockPos.MutableBlockPos;
diff --git a/src/main/java/com/simibubi/create/foundation/worldgen/OreFeatureConfigEntry.java b/src/main/java/com/simibubi/create/infrastructure/worldgen/OreFeatureConfigEntry.java
similarity index 99%
rename from src/main/java/com/simibubi/create/foundation/worldgen/OreFeatureConfigEntry.java
rename to src/main/java/com/simibubi/create/infrastructure/worldgen/OreFeatureConfigEntry.java
index 882f7a8b7..1b1d32bc8 100644
--- a/src/main/java/com/simibubi/create/foundation/worldgen/OreFeatureConfigEntry.java
+++ b/src/main/java/com/simibubi/create/infrastructure/worldgen/OreFeatureConfigEntry.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.worldgen;
+package com.simibubi.create.infrastructure.worldgen;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/main/java/com/simibubi/create/foundation/worldgen/StandardOreFeature.java b/src/main/java/com/simibubi/create/infrastructure/worldgen/StandardOreFeature.java
similarity index 99%
rename from src/main/java/com/simibubi/create/foundation/worldgen/StandardOreFeature.java
rename to src/main/java/com/simibubi/create/infrastructure/worldgen/StandardOreFeature.java
index ea27c6b91..82e44aac4 100644
--- a/src/main/java/com/simibubi/create/foundation/worldgen/StandardOreFeature.java
+++ b/src/main/java/com/simibubi/create/infrastructure/worldgen/StandardOreFeature.java
@@ -1,4 +1,4 @@
-package com.simibubi.create.foundation.worldgen;
+package com.simibubi.create.infrastructure.worldgen;
 
 import java.util.BitSet;
 
diff --git a/src/main/resources/assets/create/lang/cs_cz.json b/src/main/resources/assets/create/lang/cs_cz.json
index e3011f5a1..066980a86 100644
--- a/src/main/resources/assets/create/lang/cs_cz.json
+++ b/src/main/resources/assets/create/lang/cs_cz.json
@@ -1064,7 +1064,7 @@
 	"create.schematic.mirror.leftRight": "Doleva-Doprava",
 	"create.schematic.tool.deploy": "Umístit",
 	"create.schematic.tool.move": "Posunout po osách XZ",
-	"create.schematic.tool.movey": "Posunout po ose Y",
+	"create.schematic.tool.move_y": "Posunout po ose Y",
 	"create.schematic.tool.rotate": "Otočit",
 	"create.schematic.tool.print": "Tisk",
 	"create.schematic.tool.flip": "Zrcadlit",
diff --git a/src/main/resources/assets/create/lang/da_dk.json b/src/main/resources/assets/create/lang/da_dk.json
index 2dec60f3f..6e29b339d 100644
--- a/src/main/resources/assets/create/lang/da_dk.json
+++ b/src/main/resources/assets/create/lang/da_dk.json
@@ -980,7 +980,7 @@
 	"create.schematic.mirror.frontBack": "For-bag",
 	"create.schematic.mirror.leftRight": "Venstre-højre",
 	"create.schematic.tool.move": "Flyt XZ",
-	"create.schematic.tool.movey": "Flyt Y",
+	"create.schematic.tool.move_y": "Flyt Y",
 	"create.schematic.tool.rotate": "Roter",
 	"create.schematic.tool.flip": "Spejlvend",
 	"create.schematic.tool.deploy.description.0": "Flytter strukturen til en placering.",
@@ -989,8 +989,8 @@
 	"create.schematic.tool.deploy.description.3": "[Ctrl]-rul for at ændre afstanden.",
 	"create.schematic.tool.move.description.0": "Flytter schematic'en vandret.",
 	"create.schematic.tool.move.description.1": "Kig på schematic'en og [CTRL]-rul for at flytte den.",
-	"create.schematic.tool.movey.description.0": "Flytter schematic'en lodret.",
-	"create.schematic.tool.movey.description.1": "[CTRL]-rul for at flytte den op/ned.",
+	"create.schematic.tool.move_y.description.0": "Flytter schematic'en lodret.",
+	"create.schematic.tool.move_y.description.1": "[CTRL]-rul for at flytte den op/ned.",
 	"create.schematic.tool.rotate.description.0": "Roterer schematic'en omkring dens midte.",
 	"create.schematic.tool.rotate.description.1": "[CTRL]-rul for at rotere 90°.",
 	"create.schematic.tool.print.description.0": "Placerer øjeblikkeligt strukturen i verdenen.",
diff --git a/src/main/resources/assets/create/lang/de_de.json b/src/main/resources/assets/create/lang/de_de.json
index 5b7116cea..8a90e38f5 100644
--- a/src/main/resources/assets/create/lang/de_de.json
+++ b/src/main/resources/assets/create/lang/de_de.json
@@ -1098,7 +1098,7 @@
 	"create.schematic.mirror.leftRight": "Links-Rechts",
 	"create.schematic.tool.deploy": "Positionieren",
 	"create.schematic.tool.move": "XZ Bewegen",
-	"create.schematic.tool.movey": "Y Bewegen",
+	"create.schematic.tool.move_y": "Y Bewegen",
 	"create.schematic.tool.rotate": "Rotieren",
 	"create.schematic.tool.print": "Drucken",
 	"create.schematic.tool.flip": "Umdrehen",
@@ -1108,8 +1108,8 @@
 	"create.schematic.tool.deploy.description.3": "[Strg]-Mausrad um die Entfernung zu ändern.",
 	"create.schematic.tool.move.description.0": "Bewegt das Schema horizontal",
 	"create.schematic.tool.move.description.1": "Zeig auf das Schema und benutze [Strg]-Mausrad.",
-	"create.schematic.tool.movey.description.0": "Bewegt das Schema vertikal",
-	"create.schematic.tool.movey.description.1": "[Strg]-Mausrad zum hoch- und runterbewegen",
+	"create.schematic.tool.move_y.description.0": "Bewegt das Schema vertikal",
+	"create.schematic.tool.move_y.description.1": "[Strg]-Mausrad zum hoch- und runterbewegen",
 	"create.schematic.tool.rotate.description.0": "Rotiert das Schema um seine Mitte.",
 	"create.schematic.tool.rotate.description.1": "[Strg]-Mausrad für eine Drehung um 90°",
 	"create.schematic.tool.print.description.0": "Platziert sofort die Struktur in der Welt",
diff --git a/src/main/resources/assets/create/lang/default/interface.json b/src/main/resources/assets/create/lang/default/interface.json
index db0568ce7..8379e8257 100644
--- a/src/main/resources/assets/create/lang/default/interface.json
+++ b/src/main/resources/assets/create/lang/default/interface.json
@@ -340,7 +340,7 @@
 
 	"create.schematic.tool.deploy": "Position",
 	"create.schematic.tool.move": "Move XZ",
-	"create.schematic.tool.movey": "Move Y",
+	"create.schematic.tool.move_y": "Move Y",
 	"create.schematic.tool.rotate": "Rotate",
 	"create.schematic.tool.print": "Print",
 	"create.schematic.tool.flip": "Mirror",
@@ -353,10 +353,10 @@
 	"create.schematic.tool.move.description.1": "Point at the Schematic and [CTRL]-Scroll to push it.",
 	"create.schematic.tool.move.description.2": "",
 	"create.schematic.tool.move.description.3": "",
-	"create.schematic.tool.movey.description.0": "Shifts the Schematic Vertically.",
-	"create.schematic.tool.movey.description.1": "[CTRL]-Scroll to move it up/down.",
-	"create.schematic.tool.movey.description.2": "",
-	"create.schematic.tool.movey.description.3": "",
+	"create.schematic.tool.move_y.description.0": "Shifts the Schematic Vertically.",
+	"create.schematic.tool.move_y.description.1": "[CTRL]-Scroll to move it up/down.",
+	"create.schematic.tool.move_y.description.2": "",
+	"create.schematic.tool.move_y.description.3": "",
 	"create.schematic.tool.rotate.description.0": "Rotates the Schematic around its center.",
 	"create.schematic.tool.rotate.description.1": "[CTRL]-Scroll to rotate by 90 Degrees.",
 	"create.schematic.tool.rotate.description.2": "",
diff --git a/src/main/resources/assets/create/lang/default/tooltips.json b/src/main/resources/assets/create/lang/default/tooltips.json
index fa5951e41..cb2a33020 100644
--- a/src/main/resources/assets/create/lang/default/tooltips.json
+++ b/src/main/resources/assets/create/lang/default/tooltips.json
@@ -200,12 +200,12 @@
 	"item.create.copper_diving_boots.tooltip": "COPPER DIVING BOOTS",
 	"item.create.copper_diving_boots.tooltip.summary": "A pair of _heavy_ _boots_, allowing for better traversal of the Ocean floor.",
 	"item.create.copper_diving_boots.tooltip.condition1": "When Worn",
-	"item.create.copper_diving_boots.tooltip.behaviour1": "Wielder _sinks_ _faster_ and _cannot_ _swim_. Grants the ability to _walk_ and _jump_ underwater. Wielder also is no longer affected by _Mechanical_ _Belts_.",
+	"item.create.copper_diving_boots.tooltip.behaviour1": "Wielder _descends_ more _quickly_ in liquids. Grants the ability to _walk_ and _jump_ underwater. Wielder also is no longer affected by _Mechanical_ _Belts_.",
 
 	"item.create.netherite_diving_boots.tooltip": "NETHERITE DIVING BOOTS",
 	"item.create.netherite_diving_boots.tooltip.summary": "A pair of _heavy_ _boots_, allowing for better traversal of the Ocean floor, including Oceans made of Lava.",
 	"item.create.netherite_diving_boots.tooltip.condition1": "When Worn",
-	"item.create.netherite_diving_boots.tooltip.behaviour1": "Wielder _sinks_ _faster_ and _cannot_ _swim_. Grants the ability to _walk_ and _jump_ underwater. Wielder also is no longer affected by _Mechanical_ _Belts_.",
+	"item.create.netherite_diving_boots.tooltip.behaviour1": "Wielder _descends_ more _quickly_ in liquids. Grants the ability to _walk_ and _jump_ underwater. Wielder also is no longer affected by _Mechanical_ _Belts_.",
 
 	"item.create.crafting_blueprint.tooltip": "CRAFTING BLUEPRINT",
 	"item.create.crafting_blueprint.tooltip.summary": "_Placed_ on a wall, it can be used to _specify_ _ingredient_ _arrangements_ for easier manual crafting. Each slot represents a Recipe.",
diff --git a/src/main/resources/assets/create/lang/es_cl.json b/src/main/resources/assets/create/lang/es_cl.json
index 2e4452c71..e59156f0b 100644
--- a/src/main/resources/assets/create/lang/es_cl.json
+++ b/src/main/resources/assets/create/lang/es_cl.json
@@ -603,7 +603,7 @@
 	"create.schematic.mirror.leftRight": "Izquierda-Derecha",
 	"create.schematic.tool.deploy": "Posición",
 	"create.schematic.tool.move": "Mover XZ",
-	"create.schematic.tool.movey": "Mover Y",
+	"create.schematic.tool.move_y": "Mover Y",
 	"create.schematic.tool.rotate": "Rotar",
 	"create.schematic.tool.print": "Imprimir",
 	"create.schematic.tool.flip": "Reflejar",
@@ -613,8 +613,8 @@
 	"create.schematic.tool.deploy.description.3": "[Ctrl]-Rueda para seleccionar distancia.",
 	"create.schematic.tool.move.description.0": "Desplaza el esquema horizontalmente.",
 	"create.schematic.tool.move.description.1": "Apunta al esquema y [CTRL]-Rueda para empujarlo.",
-	"create.schematic.tool.movey.description.0": "Desplaza el esquema verticalmente.",
-	"create.schematic.tool.movey.description.1": "[CTRL]-Rueda para moverlo arriba y abajo.",
+	"create.schematic.tool.move_y.description.0": "Desplaza el esquema verticalmente.",
+	"create.schematic.tool.move_y.description.1": "[CTRL]-Rueda para moverlo arriba y abajo.",
 	"create.schematic.tool.rotate.description.0": "Rota el esquema sobre su centro.",
 	"create.schematic.tool.rotate.description.1": "[CTRL]-Rueda para rotarlo en 90 Grados.",
 	"create.schematic.tool.print.description.0": "Instantáneamente construye la estructura en el mundo.",
diff --git a/src/main/resources/assets/create/lang/es_es.json b/src/main/resources/assets/create/lang/es_es.json
index da7d1432f..39b0d1bbb 100644
--- a/src/main/resources/assets/create/lang/es_es.json
+++ b/src/main/resources/assets/create/lang/es_es.json
@@ -1098,7 +1098,7 @@
 	"create.schematic.mirror.leftRight": "Izquierda-Derecha",
 	"create.schematic.tool.deploy": "Despliegue",
 	"create.schematic.tool.move": "Mover XZ",
-	"create.schematic.tool.movey": "Mover Y",
+	"create.schematic.tool.move_y": "Mover Y",
 	"create.schematic.tool.rotate": "Rotar",
 	"create.schematic.tool.print": "Imprimir",
 	"create.schematic.tool.flip": "Voltear",
@@ -1108,8 +1108,8 @@
 	"create.schematic.tool.deploy.description.3": "[Ctrl] + [RUEDA DEL RATÓN] para cambiar la distancia.",
 	"create.schematic.tool.move.description.0": "Desplaza el esquema horizontalmente.",
 	"create.schematic.tool.move.description.1": "Apunta al esquema y [Ctrl] + [RUEDA DEL RATÓN] para ponerlo.",
-	"create.schematic.tool.movey.description.0": "Desplaza el esquema verticalmente..",
-	"create.schematic.tool.movey.description.1": "[Ctrl] + [RUEDA DEL RATÓN] para moverlo hacia arriba/abajo.",
+	"create.schematic.tool.move_y.description.0": "Desplaza el esquema verticalmente..",
+	"create.schematic.tool.move_y.description.1": "[Ctrl] + [RUEDA DEL RATÓN] para moverlo hacia arriba/abajo.",
 	"create.schematic.tool.rotate.description.0": "Gira el esquema alrededor de su centro.",
 	"create.schematic.tool.rotate.description.1": "[Ctrl] + [RUEDA DEL RATÓN] para girar 90 grados.",
 	"create.schematic.tool.print.description.0": "Sitúa instantáneamente la estructura en el mundo.",
diff --git a/src/main/resources/assets/create/lang/es_mx.json b/src/main/resources/assets/create/lang/es_mx.json
index 95465288e..1e6661aee 100644
--- a/src/main/resources/assets/create/lang/es_mx.json
+++ b/src/main/resources/assets/create/lang/es_mx.json
@@ -1078,7 +1078,7 @@
 	"create.schematic.mirror.leftRight": "Izquierda-Derecha",
 	"create.schematic.tool.deploy": "Despliegue",
 	"create.schematic.tool.move": "Mover XZ",
-	"create.schematic.tool.movey": "Mover Y",
+	"create.schematic.tool.move_y": "Mover Y",
 	"create.schematic.tool.rotate": "Rotar",
 	"create.schematic.tool.print": "Imprimir",
 	"create.schematic.tool.flip": "Voltear",
@@ -1088,8 +1088,8 @@
 	"create.schematic.tool.deploy.description.3": "[Ctrl] + [RUEDA DEL RATÓN] para cambiar la distancia.",
 	"create.schematic.tool.move.description.0": "Desplaza el esquema horizontalmente.",
 	"create.schematic.tool.move.description.1": "Apunta al esquema y [Ctrl] + [RUEDA DEL RATÓN] para ponerlo.",
-	"create.schematic.tool.movey.description.0": "Desplaza el esquema verticalmente..",
-	"create.schematic.tool.movey.description.1": "[Ctrl] + [RUEDA DEL RATÓN] para moverlo hacia arriba/abajo.",
+	"create.schematic.tool.move_y.description.0": "Desplaza el esquema verticalmente..",
+	"create.schematic.tool.move_y.description.1": "[Ctrl] + [RUEDA DEL RATÓN] para moverlo hacia arriba/abajo.",
 	"create.schematic.tool.rotate.description.0": "Gira el esquema alrededor de su centro.",
 	"create.schematic.tool.rotate.description.1": "[Ctrl] + [RUEDA DEL RATÓN] para girar 90 grados.",
 	"create.schematic.tool.print.description.0": "Sitúa instantáneamente la estructura en el mundo.",
diff --git a/src/main/resources/assets/create/lang/fr_fr.json b/src/main/resources/assets/create/lang/fr_fr.json
index 353407be0..28c24127c 100644
--- a/src/main/resources/assets/create/lang/fr_fr.json
+++ b/src/main/resources/assets/create/lang/fr_fr.json
@@ -1098,7 +1098,7 @@
 	"create.schematic.mirror.leftRight": "Gauche-Droite",
 	"create.schematic.tool.deploy": "Déployer",
 	"create.schematic.tool.move": "Déplacer XZ",
-	"create.schematic.tool.movey": "Déplacer Y",
+	"create.schematic.tool.move_y": "Déplacer Y",
 	"create.schematic.tool.rotate": "Tourner",
 	"create.schematic.tool.print": "Imprimer",
 	"create.schematic.tool.flip": "Retourner",
@@ -1108,8 +1108,8 @@
 	"create.schematic.tool.deploy.description.3": "[Ctrl]-défiler pour changer la distance.",
 	"create.schematic.tool.move.description.0": "Décale le schéma horizontalement.",
 	"create.schematic.tool.move.description.1": "Pointez sur le schéma et [CTRL]-défiler pour le pousser.",
-	"create.schematic.tool.movey.description.0": "Décale le schéma verticalement.",
-	"create.schematic.tool.movey.description.1": "[CTRL]-défiler pour le déplacer vers le haut / bas.",
+	"create.schematic.tool.move_y.description.0": "Décale le schéma verticalement.",
+	"create.schematic.tool.move_y.description.1": "[CTRL]-défiler pour le déplacer vers le haut / bas.",
 	"create.schematic.tool.rotate.description.0": "Fait pivoter le schéma autour de son centre.",
 	"create.schematic.tool.rotate.description.1": "[CTRL]-défiler pour faire une rotation de 90 degrés.",
 	"create.schematic.tool.print.description.0": "Place instantanément la structure dans le monde.",
diff --git a/src/main/resources/assets/create/lang/hu_hu.json b/src/main/resources/assets/create/lang/hu_hu.json
index 78d643a30..feb6fddee 100644
--- a/src/main/resources/assets/create/lang/hu_hu.json
+++ b/src/main/resources/assets/create/lang/hu_hu.json
@@ -1098,7 +1098,7 @@
 	"create.schematic.mirror.leftRight": "Balról jobbra",
 	"create.schematic.tool.deploy": "Pozíció",
 	"create.schematic.tool.move": "XZ mozgatás",
-	"create.schematic.tool.movey": "Y mozgatás",
+	"create.schematic.tool.move_y": "Y mozgatás",
 	"create.schematic.tool.rotate": "Forgatás",
 	"create.schematic.tool.print": "Lehelyezés",
 	"create.schematic.tool.flip": "Tükrözés",
@@ -1108,8 +1108,8 @@
 	"create.schematic.tool.deploy.description.3": "[Ctrl]-görgetés a távolság választásához.",
 	"create.schematic.tool.move.description.0": "Vízszintesen eltolja a tervrazjot.",
 	"create.schematic.tool.move.description.1": "Mutass a tervrajzra és [CTRL]-görgess, hogy eltold.",
-	"create.schematic.tool.movey.description.0": "Függőlegesen eltolja a tervrajzot.",
-	"create.schematic.tool.movey.description.1": "[CTRL]-görgetéssel mozgathatod fel-le.",
+	"create.schematic.tool.move_y.description.0": "Függőlegesen eltolja a tervrajzot.",
+	"create.schematic.tool.move_y.description.1": "[CTRL]-görgetéssel mozgathatod fel-le.",
 	"create.schematic.tool.rotate.description.0": "A tervrajz középpontos forgatása.",
 	"create.schematic.tool.rotate.description.1": "[CTRL]-görgetés 90°-kal való elforgatáshoz.",
 	"create.schematic.tool.print.description.0": "Azonnal lehelyezi a szerkezetet a világban.",
diff --git a/src/main/resources/assets/create/lang/it_it.json b/src/main/resources/assets/create/lang/it_it.json
index 7009b1f62..07b078451 100644
--- a/src/main/resources/assets/create/lang/it_it.json
+++ b/src/main/resources/assets/create/lang/it_it.json
@@ -1098,7 +1098,7 @@
 	"create.schematic.mirror.leftRight": "Sinistra-destra",
 	"create.schematic.tool.deploy": "Posiziona",
 	"create.schematic.tool.move": "Muovi XZ",
-	"create.schematic.tool.movey": "Muovi Y",
+	"create.schematic.tool.move_y": "Muovi Y",
 	"create.schematic.tool.rotate": "Ruota",
 	"create.schematic.tool.print": "Installa",
 	"create.schematic.tool.flip": "Capovolgi",
@@ -1108,8 +1108,8 @@
 	"create.schematic.tool.deploy.description.3": "[Ctrl] e scorri per cambiare la distanza.",
 	"create.schematic.tool.move.description.0": "Sposta il progetto in orizzontale.",
 	"create.schematic.tool.move.description.1": "Indica il progetto e premi [Ctrl] mentre scorri per spingerlo.",
-	"create.schematic.tool.movey.description.0": "Sposta il progetto verticalmente.",
-	"create.schematic.tool.movey.description.1": "[Ctrl] e scorri per spostarlo su/giù.",
+	"create.schematic.tool.move_y.description.0": "Sposta il progetto verticalmente.",
+	"create.schematic.tool.move_y.description.1": "[Ctrl] e scorri per spostarlo su/giù.",
 	"create.schematic.tool.rotate.description.0": "Ruota il progetto attorno al suo centro.",
 	"create.schematic.tool.rotate.description.1": "[Ctrl] e scorri per ruotarlo di 90 gradi.",
 	"create.schematic.tool.print.description.0": "Posiziona istantaneamente la struttura nel mondo.",
diff --git a/src/main/resources/assets/create/lang/ja_jp.json b/src/main/resources/assets/create/lang/ja_jp.json
index ac87d6e7f..ec377f87b 100644
--- a/src/main/resources/assets/create/lang/ja_jp.json
+++ b/src/main/resources/assets/create/lang/ja_jp.json
@@ -1091,7 +1091,7 @@
 	"create.schematic.mirror.leftRight": "左-右",
 	"create.schematic.tool.deploy": "配置する",
 	"create.schematic.tool.move": "XZを移動",
-	"create.schematic.tool.movey": "Yを移動",
+	"create.schematic.tool.move_y": "Yを移動",
 	"create.schematic.tool.rotate": "回転",
 	"create.schematic.tool.print": "印刷",
 	"create.schematic.tool.flip": "裏返し",
@@ -1101,8 +1101,8 @@
 	"create.schematic.tool.deploy.description.3": "[Ctrl]-スクロールして距離を変更します",
 	"create.schematic.tool.move.description.0": "概略図を水平に動かします",
 	"create.schematic.tool.move.description.1": "概略図を向け、 [Ctrl]-スクロールして押し出します",
-	"create.schematic.tool.movey.description.0": "概略図を垂直に動かします",
-	"create.schematic.tool.movey.description.1": "[Ctrl]-スクロールして上下に移動します",
+	"create.schematic.tool.move_y.description.0": "概略図を垂直に動かします",
+	"create.schematic.tool.move_y.description.1": "[Ctrl]-スクロールして上下に移動します",
 	"create.schematic.tool.rotate.description.0": "概略図を中心に回転させます",
 	"create.schematic.tool.rotate.description.1": "[Ctrl]-スクロールして90度回転します",
 	"create.schematic.tool.print.description.0": "構造物を即座にワールドに配置します",
diff --git a/src/main/resources/assets/create/lang/ko_kr.json b/src/main/resources/assets/create/lang/ko_kr.json
index dabcedc1c..ca296d7a0 100644
--- a/src/main/resources/assets/create/lang/ko_kr.json
+++ b/src/main/resources/assets/create/lang/ko_kr.json
@@ -1098,7 +1098,7 @@
 	"create.schematic.mirror.leftRight": "좌-우",
 	"create.schematic.tool.deploy": "전개",
 	"create.schematic.tool.move": "X/Z좌표 이동",
-	"create.schematic.tool.movey": "Y좌표 이동",
+	"create.schematic.tool.move_y": "Y좌표 이동",
 	"create.schematic.tool.rotate": "회전",
 	"create.schematic.tool.print": "설치",
 	"create.schematic.tool.flip": "뒤집기",
@@ -1108,8 +1108,8 @@
 	"create.schematic.tool.deploy.description.3": "[Ctrl]을 누르고 스크롤하면 거리를 변경합니다.",
 	"create.schematic.tool.move.description.0": "설계도를 수평 이동합니다.",
 	"create.schematic.tool.move.description.1": "설계도를 바라보며 [CTRL]을 누르고 스크롤하면 설계도를 밀어냅니다.",
-	"create.schematic.tool.movey.description.0": "설계도를 수직 이동시킵니다.",
-	"create.schematic.tool.movey.description.1": "설계도를 보고 [CTRL]-스크롤로 밉니다.",
+	"create.schematic.tool.move_y.description.0": "설계도를 수직 이동시킵니다.",
+	"create.schematic.tool.move_y.description.1": "설계도를 보고 [CTRL]-스크롤로 밉니다.",
 	"create.schematic.tool.rotate.description.0": "설계도를 돌립니다.",
 	"create.schematic.tool.rotate.description.1": "[CTRL]-스크롤로 90도 돌립니다.",
 	"create.schematic.tool.print.description.0": "구조물을 즉시 설치합니다.",
diff --git a/src/main/resources/assets/create/lang/nl_nl.json b/src/main/resources/assets/create/lang/nl_nl.json
index e59237896..2b4f25778 100644
--- a/src/main/resources/assets/create/lang/nl_nl.json
+++ b/src/main/resources/assets/create/lang/nl_nl.json
@@ -798,7 +798,7 @@
 	"create.schematic.mirror.leftRight": "Links naar rechts",
 	"create.schematic.tool.deploy": "Inzetten",
 	"create.schematic.tool.move": "Verplaats XZ",
-	"create.schematic.tool.movey": "Verplaats Y",
+	"create.schematic.tool.move_y": "Verplaats Y",
 	"create.schematic.tool.rotate": "Draai",
 	"create.schematic.tool.flip": "Omdraaien",
 	"create.schematic.tool.deploy.description.0": "Verplaatst de structuur naar een locatie.",
@@ -807,8 +807,8 @@
 	"create.schematic.tool.deploy.description.3": "[Ctrl]-Scroll om de afstand te veranderen.",
 	"create.schematic.tool.move.description.0": "Verschuift de Bouwtekening Horizontaal",
 	"create.schematic.tool.move.description.1": "Wijs naar de Bouwtekening en [CTRL]-Scroll om hem te duwen.",
-	"create.schematic.tool.movey.description.0": "Verschuift de Bouwtekening Verticaal",
-	"create.schematic.tool.movey.description.1": "[CTRL]-Scroll om het omhoog/omlaag te bewegen",
+	"create.schematic.tool.move_y.description.0": "Verschuift de Bouwtekening Verticaal",
+	"create.schematic.tool.move_y.description.1": "[CTRL]-Scroll om het omhoog/omlaag te bewegen",
 	"create.schematic.tool.rotate.description.0": "Draait de Bouwtekening om zijn midden..",
 	"create.schematic.tool.rotate.description.1": "[CTRL]-Scroll om te draaien met 90 graden",
 	"create.schematic.tool.print.description.0": "Plaats onmiddelijk de structuur in de wereld.",
diff --git a/src/main/resources/assets/create/lang/no_no.json b/src/main/resources/assets/create/lang/no_no.json
index 808bbe8a6..c8f5e4bc9 100644
--- a/src/main/resources/assets/create/lang/no_no.json
+++ b/src/main/resources/assets/create/lang/no_no.json
@@ -1019,7 +1019,7 @@
 	"create.schematic.mirror.leftRight": "Høyre-venstre",
 	"create.schematic.tool.deploy": "Posisjon",
 	"create.schematic.tool.move": "Flytt lang Y- og Z-akse",
-	"create.schematic.tool.movey": "Flytt lang Y-akse",
+	"create.schematic.tool.move_y": "Flytt lang Y-akse",
 	"create.schematic.tool.rotate": "Roter",
 	"create.schematic.tool.print": "Skriv ut",
 	"create.schematic.tool.flip": "Speil",
@@ -1028,8 +1028,8 @@
 	"create.schematic.tool.deploy.description.2": "Hold [Ctrl] for å velge en fastsatt avstand.",
 	"create.schematic.tool.deploy.description.3": "[Ctrl]-rull for å endre avstanden.",
 	"create.schematic.tool.move.description.1": "Pek på byggeplanen og hold [CTRL]-rull for å flytte på den.",
-	"create.schematic.tool.movey.description.0": "Flytter byggeplanen vertikalt.",
-	"create.schematic.tool.movey.description.1": "[CTRL]-rull for å flytte oppover/nedover.",
+	"create.schematic.tool.move_y.description.0": "Flytter byggeplanen vertikalt.",
+	"create.schematic.tool.move_y.description.1": "[CTRL]-rull for å flytte oppover/nedover.",
 	"create.schematic.tool.rotate.description.0": "Roter byggeplanen rundt dens senter.",
 	"create.schematic.tool.rotate.description.1": "[CTRL]-rull for å roter 90° om gangen.",
 	"create.schematic.tool.print.description.0": "Plasserer umiddelbart strukturen i verdenen.",
diff --git a/src/main/resources/assets/create/lang/pl_pl.json b/src/main/resources/assets/create/lang/pl_pl.json
index 6166d4405..40dda0c26 100644
--- a/src/main/resources/assets/create/lang/pl_pl.json
+++ b/src/main/resources/assets/create/lang/pl_pl.json
@@ -1098,7 +1098,7 @@
 	"create.schematic.mirror.leftRight": "Prawo-lewo",
 	"create.schematic.tool.deploy": "Pozycja",
 	"create.schematic.tool.move": "Przesuń XZ",
-	"create.schematic.tool.movey": "Przesuń Y",
+	"create.schematic.tool.move_y": "Przesuń Y",
 	"create.schematic.tool.rotate": "Obróć",
 	"create.schematic.tool.print": "Drukuj",
 	"create.schematic.tool.flip": "Odbij",
@@ -1108,8 +1108,8 @@
 	"create.schematic.tool.deploy.description.3": "[Ctrl]+Przewijanie, aby zmienić dystans",
 	"create.schematic.tool.move.description.0": "Przesuwa schemat poziomo.",
 	"create.schematic.tool.move.description.1": "Wskaż na schemat i [Ctrl]+Przewijaj, aby popchnąć.",
-	"create.schematic.tool.movey.description.0": "Przesuwa schemat pionowo.",
-	"create.schematic.tool.movey.description.1": "[Ctrl]+Przewijanie, aby przesunąć w górę/dół.",
+	"create.schematic.tool.move_y.description.0": "Przesuwa schemat pionowo.",
+	"create.schematic.tool.move_y.description.1": "[Ctrl]+Przewijanie, aby przesunąć w górę/dół.",
 	"create.schematic.tool.rotate.description.0": "Obraca schemat wokół jego środka.",
 	"create.schematic.tool.rotate.description.1": "[Ctrl]+Przewijanie, aby obrócić o 90 stopni.",
 	"create.schematic.tool.print.description.0": "Natychmiastowo stawia strukturę w świecie.",
diff --git a/src/main/resources/assets/create/lang/pt_br.json b/src/main/resources/assets/create/lang/pt_br.json
index 592f1b186..f09073264 100644
--- a/src/main/resources/assets/create/lang/pt_br.json
+++ b/src/main/resources/assets/create/lang/pt_br.json
@@ -1098,7 +1098,7 @@
 	"create.schematic.mirror.leftRight": "Esquerda para Direita",
 	"create.schematic.tool.deploy": "Concluir",
 	"create.schematic.tool.move": "Mover XZ",
-	"create.schematic.tool.movey": "Mover Y",
+	"create.schematic.tool.move_y": "Mover Y",
 	"create.schematic.tool.rotate": "Rodar",
 	"create.schematic.tool.print": "Imprimir",
 	"create.schematic.tool.flip": "Virar",
@@ -1108,8 +1108,8 @@
 	"create.schematic.tool.deploy.description.3": "[Ctrl]-Rolar para mudar a distância.",
 	"create.schematic.tool.move.description.0": "Vira o Esquema Horizontalmente",
 	"create.schematic.tool.move.description.1": "Aponte ao Esquema e [CTRL]-Rolar para empurrar.",
-	"create.schematic.tool.movey.description.0": "Vira o Esquema Verticalmente",
-	"create.schematic.tool.movey.description.1": "[CTRL]-Rolar para mover para cima/baixo",
+	"create.schematic.tool.move_y.description.0": "Vira o Esquema Verticalmente",
+	"create.schematic.tool.move_y.description.1": "[CTRL]-Rolar para mover para cima/baixo",
 	"create.schematic.tool.rotate.description.0": "Roda o Esquema em torno do seu centro.",
 	"create.schematic.tool.rotate.description.1": "[CTRL]-Rolar para rolar 90 Graus",
 	"create.schematic.tool.print.description.0": "Colocá estrutura no mundo instantaneamente",
diff --git a/src/main/resources/assets/create/lang/pt_pt.json b/src/main/resources/assets/create/lang/pt_pt.json
index d5678c00e..524c76da3 100644
--- a/src/main/resources/assets/create/lang/pt_pt.json
+++ b/src/main/resources/assets/create/lang/pt_pt.json
@@ -421,7 +421,7 @@
 	"create.schematic.mirror.leftRight": "Esquerda para Direita",
 	"create.schematic.tool.deploy": "Concluir",
 	"create.schematic.tool.move": "Mover XZ",
-	"create.schematic.tool.movey": "Mover Y",
+	"create.schematic.tool.move_y": "Mover Y",
 	"create.schematic.tool.rotate": "Rodar",
 	"create.schematic.tool.print": "Imprimir",
 	"create.schematic.tool.flip": "Virar",
@@ -431,8 +431,8 @@
 	"create.schematic.tool.deploy.description.3": "[Ctrl]-Rolar para mudar a distância.",
 	"create.schematic.tool.move.description.0": "Vira o Esquema Horizontalmente",
 	"create.schematic.tool.move.description.1": "Aponte ao Esquema e [CTRL]-Rolar para empurrar.",
-	"create.schematic.tool.movey.description.0": "Vira o Esquema Verticalmente",
-	"create.schematic.tool.movey.description.1": "[CTRL]-Rolar para mover para cima/baixo",
+	"create.schematic.tool.move_y.description.0": "Vira o Esquema Verticalmente",
+	"create.schematic.tool.move_y.description.1": "[CTRL]-Rolar para mover para cima/baixo",
 	"create.schematic.tool.rotate.description.0": "Roda o Esquema em torno do seu centro.",
 	"create.schematic.tool.rotate.description.1": "[CTRL]-Rolar para rolar 90 Graus",
 	"create.schematic.tool.print.description.0": "Coloca estrutura no mundo instantaneamente",
diff --git a/src/main/resources/assets/create/lang/ro_ro.json b/src/main/resources/assets/create/lang/ro_ro.json
index 42b99aeec..c1d2bcbf8 100644
--- a/src/main/resources/assets/create/lang/ro_ro.json
+++ b/src/main/resources/assets/create/lang/ro_ro.json
@@ -1098,7 +1098,7 @@
 	"create.schematic.mirror.leftRight": "Stânga-Dreapta",
 	"create.schematic.tool.deploy": "Poziție",
 	"create.schematic.tool.move": "Mișcă XZ",
-	"create.schematic.tool.movey": "Mișcă Y",
+	"create.schematic.tool.move_y": "Mișcă Y",
 	"create.schematic.tool.rotate": "Rotește",
 	"create.schematic.tool.print": "Printează",
 	"create.schematic.tool.flip": "Oglindește",
@@ -1108,8 +1108,8 @@
 	"create.schematic.tool.deploy.description.3": "[Ctrl]-Scroll pentru a schimba distanța.",
 	"create.schematic.tool.move.description.0": "Deplasează Schema Orizontal.",
 	"create.schematic.tool.move.description.1": "Arată spre Schemă și apasă [CTRL]-Scroll ca să îl deplasezi.",
-	"create.schematic.tool.movey.description.0": "Deplasează Schema Vertical.",
-	"create.schematic.tool.movey.description.1": "[CTRL]-Scroll ca să îl miști sus/jos.",
+	"create.schematic.tool.move_y.description.0": "Deplasează Schema Vertical.",
+	"create.schematic.tool.move_y.description.1": "[CTRL]-Scroll ca să îl miști sus/jos.",
 	"create.schematic.tool.rotate.description.0": "Rotește Schema în jurul centrului sale.",
 	"create.schematic.tool.rotate.description.1": "[CTRL]-Scroll ca să rotești cu 90 de Grade.",
 	"create.schematic.tool.print.description.0": "Plasează structura instant în lume.",
diff --git a/src/main/resources/assets/create/lang/ru_ru.json b/src/main/resources/assets/create/lang/ru_ru.json
index 7ac02c955..334d49f57 100644
--- a/src/main/resources/assets/create/lang/ru_ru.json
+++ b/src/main/resources/assets/create/lang/ru_ru.json
@@ -1098,7 +1098,7 @@
 	"create.schematic.mirror.leftRight": "Влево-вправо",
 	"create.schematic.tool.deploy": "Разместить",
 	"create.schematic.tool.move": "Двигать по XZ",
-	"create.schematic.tool.movey": "Двигать по Y",
+	"create.schematic.tool.move_y": "Двигать по Y",
 	"create.schematic.tool.rotate": "Вращать",
 	"create.schematic.tool.print": "Создать",
 	"create.schematic.tool.flip": "Отразить",
@@ -1109,8 +1109,8 @@
 	"create.schematic.tool.move.description.0": "Сдвинуть схематику по горизонтали.",
 	"create.schematic.tool.move.description.1": "Наведите курсор на схему и [Ctrl] + Прокрутка,",
 	"create.schematic.tool.move.description.2": "для перемещения по горизонтали.",
-	"create.schematic.tool.movey.description.0": "Сдвинуть схематику по вертикали.",
-	"create.schematic.tool.movey.description.1": "Зажмите [Ctrl] + Прокрутка для перемещения вверх/вниз.",
+	"create.schematic.tool.move_y.description.0": "Сдвинуть схематику по вертикали.",
+	"create.schematic.tool.move_y.description.1": "Зажмите [Ctrl] + Прокрутка для перемещения вверх/вниз.",
 	"create.schematic.tool.rotate.description.0": "Вращать схематику вокруг её центра.",
 	"create.schematic.tool.rotate.description.1": "Зажмите [Ctrl] + Прокрутка для вращения на 90 градусов.",
 	"create.schematic.tool.print.description.0": "Мгновенно создать структуру в мире.",
diff --git a/src/main/resources/assets/create/lang/sv_se.json b/src/main/resources/assets/create/lang/sv_se.json
index 3ff9e5b13..d5f2748b3 100644
--- a/src/main/resources/assets/create/lang/sv_se.json
+++ b/src/main/resources/assets/create/lang/sv_se.json
@@ -1098,7 +1098,7 @@
 	"create.schematic.mirror.leftRight": "Vänster-höger",
 	"create.schematic.tool.deploy": "Position",
 	"create.schematic.tool.move": "Flytta XZ",
-	"create.schematic.tool.movey": "Flytta Y",
+	"create.schematic.tool.move_y": "Flytta Y",
 	"create.schematic.tool.rotate": "Rotera",
 	"create.schematic.tool.print": "Skriv ut",
 	"create.schematic.tool.flip": "Spegelvänd",
@@ -1108,8 +1108,8 @@
 	"create.schematic.tool.deploy.description.3": "Tryck [Ctrl] och skrolla för att ändra avståndet.",
 	"create.schematic.tool.move.description.0": "Vänder ritningen vågrätt.",
 	"create.schematic.tool.move.description.1": "Peka på ritningen och [CTRL]-skrolla för att flytta den.",
-	"create.schematic.tool.movey.description.0": "Vänder ritningen lodrätt.",
-	"create.schematic.tool.movey.description.1": "[CTRL]-skrolla för att flytta den upp/ned.",
+	"create.schematic.tool.move_y.description.0": "Vänder ritningen lodrätt.",
+	"create.schematic.tool.move_y.description.1": "[CTRL]-skrolla för att flytta den upp/ned.",
 	"create.schematic.tool.rotate.description.0": "Roterar ritningen runt dess axel.",
 	"create.schematic.tool.rotate.description.1": "Håll in [CTRL] och skrolla för att rotera med 90 grader.",
 	"create.schematic.tool.print.description.0": "Placerar omedelbart strukturen i världen.",
diff --git a/src/main/resources/assets/create/lang/tr_tr.json b/src/main/resources/assets/create/lang/tr_tr.json
index 3ac8c1758..5ddbe7b59 100644
--- a/src/main/resources/assets/create/lang/tr_tr.json
+++ b/src/main/resources/assets/create/lang/tr_tr.json
@@ -751,7 +751,7 @@
 	"create.schematic.mirror.leftRight": "Sol-Sağ",
 	"create.schematic.tool.deploy": "Pozisyon",
 	"create.schematic.tool.move": "XZ Hareket ettir",
-	"create.schematic.tool.movey": "Y Hareket ettir",
+	"create.schematic.tool.move_y": "Y Hareket ettir",
 	"create.schematic.tool.rotate": "Döndür",
 	"create.schematic.tool.print": "Yazdır",
 	"create.schematic.tool.flip": "Ayna",
diff --git a/src/main/resources/assets/create/lang/uk_ua.json b/src/main/resources/assets/create/lang/uk_ua.json
index 1320ec89e..db1f52edc 100644
--- a/src/main/resources/assets/create/lang/uk_ua.json
+++ b/src/main/resources/assets/create/lang/uk_ua.json
@@ -1098,7 +1098,7 @@
 	"create.schematic.mirror.leftRight": "Зліва-направо",
 	"create.schematic.tool.deploy": "Розташувати",
 	"create.schematic.tool.move": "Рухати по XZ",
-	"create.schematic.tool.movey": "Рухати по Y",
+	"create.schematic.tool.move_y": "Рухати по Y",
 	"create.schematic.tool.rotate": "Обертати",
 	"create.schematic.tool.print": "Надрукувати",
 	"create.schematic.tool.flip": "Віддзеркалити",
@@ -1109,9 +1109,9 @@
 	"create.schematic.tool.move.description.0": "Зміщує схематику по горизонталі.",
 	"create.schematic.tool.move.description.1": "Наведіть курсор на схематику, утримуйте [CTRL]",
 	"create.schematic.tool.move.description.2": "та прокручуйте, щоб змістити її.",
-	"create.schematic.tool.movey.description.0": "Зміщує схематику по вертикалі.",
-	"create.schematic.tool.movey.description.1": "Утримуйте [Ctrl] та прокручуйте,",
-	"create.schematic.tool.movey.description.2": "щоб переміщувати вгору/вниз.",
+	"create.schematic.tool.move_y.description.0": "Зміщує схематику по вертикалі.",
+	"create.schematic.tool.move_y.description.1": "Утримуйте [Ctrl] та прокручуйте,",
+	"create.schematic.tool.move_y.description.2": "щоб переміщувати вгору/вниз.",
 	"create.schematic.tool.rotate.description.0": "Обертає схематику навколо її центру.",
 	"create.schematic.tool.rotate.description.1": "Утримуйте [Ctrl] та прокручуйте,",
 	"create.schematic.tool.rotate.description.2": "щоб обертати на 90 градусів.",
diff --git a/src/main/resources/assets/create/lang/zh_cn.json b/src/main/resources/assets/create/lang/zh_cn.json
index e30cef7e8..e70796cfc 100644
--- a/src/main/resources/assets/create/lang/zh_cn.json
+++ b/src/main/resources/assets/create/lang/zh_cn.json
@@ -1098,7 +1098,7 @@
 	"create.schematic.mirror.leftRight": "左右",
 	"create.schematic.tool.deploy": "部署",
 	"create.schematic.tool.move": "移动 XZ",
-	"create.schematic.tool.movey": "移动 Y",
+	"create.schematic.tool.move_y": "移动 Y",
 	"create.schematic.tool.rotate": "旋转",
 	"create.schematic.tool.print": "打印",
 	"create.schematic.tool.flip": "翻转",
@@ -1108,8 +1108,8 @@
 	"create.schematic.tool.deploy.description.3": "按住 [Ctrl] 鼠标滚动更改距离",
 	"create.schematic.tool.move.description.0": "水平移动蓝图",
 	"create.schematic.tool.move.description.1": "选定蓝图，然后按住 [Ctrl] 鼠标滚动移动",
-	"create.schematic.tool.movey.description.0": "垂直移动蓝图",
-	"create.schematic.tool.movey.description.1": "按住 [Ctrl] 鼠标滚动上下移动",
+	"create.schematic.tool.move_y.description.0": "垂直移动蓝图",
+	"create.schematic.tool.move_y.description.1": "按住 [Ctrl] 鼠标滚动上下移动",
 	"create.schematic.tool.rotate.description.0": "围绕蓝图中心旋转蓝图",
 	"create.schematic.tool.rotate.description.1": "按住 [Ctrl] 鼠标滚动旋转90度",
 	"create.schematic.tool.print.description.0": "立即将结构放置在世界上",
diff --git a/src/main/resources/assets/create/lang/zh_tw.json b/src/main/resources/assets/create/lang/zh_tw.json
index 9a37b9e83..e838ee098 100644
--- a/src/main/resources/assets/create/lang/zh_tw.json
+++ b/src/main/resources/assets/create/lang/zh_tw.json
@@ -1098,7 +1098,7 @@
 	"create.schematic.mirror.leftRight": "左右",
 	"create.schematic.tool.deploy": "發佈",
 	"create.schematic.tool.move": "移動 XZ",
-	"create.schematic.tool.movey": "移動 Y",
+	"create.schematic.tool.move_y": "移動 Y",
 	"create.schematic.tool.rotate": "旋轉",
 	"create.schematic.tool.print": "列印",
 	"create.schematic.tool.flip": "翻轉",
@@ -1108,8 +1108,8 @@
 	"create.schematic.tool.deploy.description.3": "按住 Ctrl 滑鼠滾動更改距離",
 	"create.schematic.tool.move.description.0": "水平移動藍圖",
 	"create.schematic.tool.move.description.1": "選定藍圖，然後按住 Ctrl 滑鼠滾動",
-	"create.schematic.tool.movey.description.0": "垂直移動藍圖",
-	"create.schematic.tool.movey.description.1": "按住 Ctrl 滑鼠滾動上下移動",
+	"create.schematic.tool.move_y.description.0": "垂直移動藍圖",
+	"create.schematic.tool.move_y.description.1": "按住 Ctrl 滑鼠滾動上下移動",
 	"create.schematic.tool.rotate.description.0": "圍繞藍圖中心旋轉藍圖",
 	"create.schematic.tool.rotate.description.1": "按住 Ctrl 滑鼠滾動旋轉 90 度",
 	"create.schematic.tool.print.description.0": "立即將結構放置在世界上",
diff --git a/src/main/resources/assets/create/models/block/experience_block.json b/src/main/resources/assets/create/models/block/experience_block.json
new file mode 100644
index 000000000..c1b50ed74
--- /dev/null
+++ b/src/main/resources/assets/create/models/block/experience_block.json
@@ -0,0 +1,22 @@
+{
+	"parent": "block/block",
+    "ambientocclusion": false,
+    "textures": {
+        "all": "create:block/experience_block",
+        "particle": "create:block/experience_block"
+    },
+	"elements": [
+        {   "from": [ 0, 0, 0 ],
+            "to": [ 16, 16, 16 ],
+            "shade": false,
+            "faces": {
+                "down":  { "texture": "#all", "cullface": "down" },
+                "up":    { "texture": "#all", "cullface": "up" },
+                "north": { "texture": "#all", "cullface": "north" },
+                "south": { "texture": "#all", "cullface": "south" },
+                "west":  { "texture": "#all", "cullface": "west" },
+                "east":  { "texture": "#all", "cullface": "east" }
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/create/textures/block/experience_block.png b/src/main/resources/assets/create/textures/block/experience_block.png
new file mode 100644
index 000000000..bf01f6f37
Binary files /dev/null and b/src/main/resources/assets/create/textures/block/experience_block.png differ
diff --git a/src/main/resources/assets/create/textures/block/experience_block.png.mcmeta b/src/main/resources/assets/create/textures/block/experience_block.png.mcmeta
new file mode 100644
index 000000000..95a0543a7
--- /dev/null
+++ b/src/main/resources/assets/create/textures/block/experience_block.png.mcmeta
@@ -0,0 +1,6 @@
+{
+  "animation": {
+    "interpolate": false,
+    "frametime": 3
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/create/textures/item/crushed_brass.png b/src/main/resources/assets/create/textures/item/crushed_brass.png
deleted file mode 100644
index 1855d7afb..000000000
Binary files a/src/main/resources/assets/create/textures/item/crushed_brass.png and /dev/null differ
diff --git a/src/main/resources/assets/create/textures/item/crushed_aluminum_ore.png b/src/main/resources/assets/create/textures/item/crushed_raw_aluminum.png
similarity index 100%
rename from src/main/resources/assets/create/textures/item/crushed_aluminum_ore.png
rename to src/main/resources/assets/create/textures/item/crushed_raw_aluminum.png
diff --git a/src/main/resources/assets/create/textures/item/crushed_copper_ore.png b/src/main/resources/assets/create/textures/item/crushed_raw_copper.png
similarity index 100%
rename from src/main/resources/assets/create/textures/item/crushed_copper_ore.png
rename to src/main/resources/assets/create/textures/item/crushed_raw_copper.png
diff --git a/src/main/resources/assets/create/textures/item/crushed_gold_ore.png b/src/main/resources/assets/create/textures/item/crushed_raw_gold.png
similarity index 100%
rename from src/main/resources/assets/create/textures/item/crushed_gold_ore.png
rename to src/main/resources/assets/create/textures/item/crushed_raw_gold.png
diff --git a/src/main/resources/assets/create/textures/item/crushed_iron_ore.png b/src/main/resources/assets/create/textures/item/crushed_raw_iron.png
similarity index 100%
rename from src/main/resources/assets/create/textures/item/crushed_iron_ore.png
rename to src/main/resources/assets/create/textures/item/crushed_raw_iron.png
diff --git a/src/main/resources/assets/create/textures/item/crushed_lead_ore.png b/src/main/resources/assets/create/textures/item/crushed_raw_lead.png
similarity index 100%
rename from src/main/resources/assets/create/textures/item/crushed_lead_ore.png
rename to src/main/resources/assets/create/textures/item/crushed_raw_lead.png
diff --git a/src/main/resources/assets/create/textures/item/crushed_nickel_ore.png b/src/main/resources/assets/create/textures/item/crushed_raw_nickel.png
similarity index 100%
rename from src/main/resources/assets/create/textures/item/crushed_nickel_ore.png
rename to src/main/resources/assets/create/textures/item/crushed_raw_nickel.png
diff --git a/src/main/resources/assets/create/textures/item/crushed_osmium_ore.png b/src/main/resources/assets/create/textures/item/crushed_raw_osmium.png
similarity index 100%
rename from src/main/resources/assets/create/textures/item/crushed_osmium_ore.png
rename to src/main/resources/assets/create/textures/item/crushed_raw_osmium.png
diff --git a/src/main/resources/assets/create/textures/item/crushed_platinum_ore.png b/src/main/resources/assets/create/textures/item/crushed_raw_platinum.png
similarity index 100%
rename from src/main/resources/assets/create/textures/item/crushed_platinum_ore.png
rename to src/main/resources/assets/create/textures/item/crushed_raw_platinum.png
diff --git a/src/main/resources/assets/create/textures/item/crushed_quicksilver_ore.png b/src/main/resources/assets/create/textures/item/crushed_raw_quicksilver.png
similarity index 100%
rename from src/main/resources/assets/create/textures/item/crushed_quicksilver_ore.png
rename to src/main/resources/assets/create/textures/item/crushed_raw_quicksilver.png
diff --git a/src/main/resources/assets/create/textures/item/crushed_silver_ore.png b/src/main/resources/assets/create/textures/item/crushed_raw_silver.png
similarity index 100%
rename from src/main/resources/assets/create/textures/item/crushed_silver_ore.png
rename to src/main/resources/assets/create/textures/item/crushed_raw_silver.png
diff --git a/src/main/resources/assets/create/textures/item/crushed_tin_ore.png b/src/main/resources/assets/create/textures/item/crushed_raw_tin.png
similarity index 100%
rename from src/main/resources/assets/create/textures/item/crushed_tin_ore.png
rename to src/main/resources/assets/create/textures/item/crushed_raw_tin.png
diff --git a/src/main/resources/assets/create/textures/item/crushed_uranium_ore.png b/src/main/resources/assets/create/textures/item/crushed_raw_uranium.png
similarity index 100%
rename from src/main/resources/assets/create/textures/item/crushed_uranium_ore.png
rename to src/main/resources/assets/create/textures/item/crushed_raw_uranium.png
diff --git a/src/main/resources/assets/create/textures/item/crushed_zinc_ore.png b/src/main/resources/assets/create/textures/item/crushed_raw_zinc.png
similarity index 100%
rename from src/main/resources/assets/create/textures/item/crushed_zinc_ore.png
rename to src/main/resources/assets/create/textures/item/crushed_raw_zinc.png