diff --git a/build.gradle b/build.gradle
index 33bf72c..82c161b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -116,7 +116,7 @@ minecraft {
             property 'forge.logging.console.level', 'debug'
 
             // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
-            args '--mod', 'examplemod', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
+            args '--mod', 'masterfulmachinery', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
 
             mods {
                 examplemod {
@@ -127,9 +127,6 @@ minecraft {
     }
 }
 
-// Include resources generated by data generators.
-sourceSets.main.resources { srcDir 'src/generated/resources' }
-
 shadowJar {
     configurations = [project.configurations.shade]
 }
@@ -190,7 +187,8 @@ dependencies {
     runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}")
     implementation fg.deobf('me.desht.pneumaticcraft:pneumaticcraft-repressurized:1.16.5-2.12.2-186')
 
-    implementation fg.deobf("curse.maven:create-328085:3278516")
+    implementation fg.deobf("curse.maven:create-328085:3384222")
+    implementation fg.deobf("curse.maven:flywheel-486392:3384004")
 
     implementation fg.deobf("curse.maven:astral-sorcery-241721:3156477")
     implementation fg.deobf("curse.maven:observerlib-316833:3162044")
diff --git a/demo_config/masterful_machinery/controllers/basic.json b/demo_config/masterful_machinery/controllers/basic.json
deleted file mode 100644
index 6615d16..0000000
--- a/demo_config/masterful_machinery/controllers/basic.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "controllerId": "basic",
-  "name": "Basic",
-
-  "ports": [
-    {
-      "type": "masterfulmachinery:items",
-      "name": "Basic Item",
-      "id": "basic",
-      "data": {
-        "rows": 3,
-        "columns": 3
-      }
-    },
-    {
-      "type": "masterfulmachinery:energy",
-      "name": "Basic Item",
-      "id": "chungus",
-      "data": {
-        "capacity": 1000000000
-      }
-    },
-    {
-      "type": "masterfulmachinery:fluids",
-      "name": "Small Item",
-      "id": "small",
-      "data": {
-        "capacity": 10000
-      }
-    },
-    {
-      "type": "masterfulmachinery:mekanism_gas",
-      "name": "Gassy",
-      "id": "gassy",
-      "data": {
-        "capacity": 100000
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/src/main/java/com/ticticboooom/mods/mm/MM.java b/src/main/java/com/ticticboooom/mods/mm/MM.java
index a3dc23d..b96afce 100644
--- a/src/main/java/com/ticticboooom/mods/mm/MM.java
+++ b/src/main/java/com/ticticboooom/mods/mm/MM.java
@@ -14,10 +14,10 @@ import com.ticticboooom.mods.mm.client.ter.StructureGenTileEntityRenderer;
 import com.ticticboooom.mods.mm.datagen.MMPackFinder;
 import com.ticticboooom.mods.mm.datagen.DataGeneratorFactory;
 import com.ticticboooom.mods.mm.datagen.PackType;
-import com.ticticboooom.mods.mm.datagen.gen.MMBlockStateProvider;
-import com.ticticboooom.mods.mm.datagen.gen.MMItemModelProvider;
-import com.ticticboooom.mods.mm.datagen.gen.MMLangProvider;
-import com.ticticboooom.mods.mm.datagen.gen.MMLootTableProvider;
+import com.ticticboooom.mods.mm.datagen.gen.runtime.MMBlockStateProvider;
+import com.ticticboooom.mods.mm.datagen.gen.runtime.MMItemModelProvider;
+import com.ticticboooom.mods.mm.datagen.gen.runtime.MMLangProvider;
+import com.ticticboooom.mods.mm.datagen.gen.runtime.MMLootTableProvider;
 import com.ticticboooom.mods.mm.network.PacketHandler;
 import com.ticticboooom.mods.mm.registration.MMLoader;
 import com.ticticboooom.mods.mm.registration.MMPorts;
@@ -71,8 +71,13 @@ public class MM {
         MMSetup.CONTAINER_REG.register(bus);
         RecipeTypes.RECIPE_SERIALIZERS.register(bus);
         bus.addListener(this::clientEvents);
+        try {
+
         if (FMLEnvironment.dist == Dist.CLIENT) {
             Minecraft.getInstance().getResourcePackList().addPackFinder(new MMPackFinder(PackType.RESOURCE));
+        }
+        } catch(Exception ignored){
+
         }
         MinecraftForge.EVENT_BUS.addListener(this::onServerStart);
     }
diff --git a/src/main/java/com/ticticboooom/mods/mm/client/jei/category/MachineStructureRecipeCategory.java b/src/main/java/com/ticticboooom/mods/mm/client/jei/category/MachineStructureRecipeCategory.java
index 7bdb876..6c8b630 100644
--- a/src/main/java/com/ticticboooom/mods/mm/client/jei/category/MachineStructureRecipeCategory.java
+++ b/src/main/java/com/ticticboooom/mods/mm/client/jei/category/MachineStructureRecipeCategory.java
@@ -194,7 +194,7 @@ public class MachineStructureRecipeCategory implements IRecipeCategory<MachineSt
                 if (tag != null){
                     Integer index = tagIndexes.get(i);
 
-                    Block block = tag.getAllElements().get(index);
+                    Block block = tag.getAllElements().get((int) Math.floor(index / 30.0));
                     tagIndexCounter.put(i, tagIndexCounter.get(i) + 1);
                     if (tagIndexCounter.get(i) > 30){
                         tagIndexCounter.put(i, 0);
@@ -203,6 +203,7 @@ public class MachineStructureRecipeCategory implements IRecipeCategory<MachineSt
                     if (index >= tag.getAllElements().size()) {
                         index = 0;
                     }
+
                     tagIndexes.put(i, index);
                     if (block != null) {
                         BlockState defaultState = block.getDefaultState();
diff --git a/src/main/java/com/ticticboooom/mods/mm/datagen/gen/BaseLootTableProvider.java b/src/main/java/com/ticticboooom/mods/mm/datagen/gen/runtime/BaseLootTableProvider.java
similarity index 99%
rename from src/main/java/com/ticticboooom/mods/mm/datagen/gen/BaseLootTableProvider.java
rename to src/main/java/com/ticticboooom/mods/mm/datagen/gen/runtime/BaseLootTableProvider.java
index 7bb2029..ac2cf92 100644
--- a/src/main/java/com/ticticboooom/mods/mm/datagen/gen/BaseLootTableProvider.java
+++ b/src/main/java/com/ticticboooom/mods/mm/datagen/gen/runtime/BaseLootTableProvider.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package com.ticticboooom.mods.mm.datagen.gen;
+package com.ticticboooom.mods.mm.datagen.gen.runtime;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
diff --git a/src/main/java/com/ticticboooom/mods/mm/datagen/gen/MMBlockStateProvider.java b/src/main/java/com/ticticboooom/mods/mm/datagen/gen/runtime/MMBlockStateProvider.java
similarity index 99%
rename from src/main/java/com/ticticboooom/mods/mm/datagen/gen/MMBlockStateProvider.java
rename to src/main/java/com/ticticboooom/mods/mm/datagen/gen/runtime/MMBlockStateProvider.java
index 925a892..8f51671 100644
--- a/src/main/java/com/ticticboooom/mods/mm/datagen/gen/MMBlockStateProvider.java
+++ b/src/main/java/com/ticticboooom/mods/mm/datagen/gen/runtime/MMBlockStateProvider.java
@@ -1,4 +1,4 @@
-package com.ticticboooom.mods.mm.datagen.gen;
+package com.ticticboooom.mods.mm.datagen.gen.runtime;
 
 import com.ticticboooom.mods.mm.MM;
 import com.ticticboooom.mods.mm.block.ControllerBlock;
diff --git a/src/main/java/com/ticticboooom/mods/mm/datagen/gen/MMItemModelProvider.java b/src/main/java/com/ticticboooom/mods/mm/datagen/gen/runtime/MMItemModelProvider.java
similarity index 97%
rename from src/main/java/com/ticticboooom/mods/mm/datagen/gen/MMItemModelProvider.java
rename to src/main/java/com/ticticboooom/mods/mm/datagen/gen/runtime/MMItemModelProvider.java
index 76b0048..c176b82 100644
--- a/src/main/java/com/ticticboooom/mods/mm/datagen/gen/MMItemModelProvider.java
+++ b/src/main/java/com/ticticboooom/mods/mm/datagen/gen/runtime/MMItemModelProvider.java
@@ -1,4 +1,4 @@
-package com.ticticboooom.mods.mm.datagen.gen;
+package com.ticticboooom.mods.mm.datagen.gen.runtime;
 
 import com.ticticboooom.mods.mm.MM;
 import com.ticticboooom.mods.mm.block.ControllerBlock;
diff --git a/src/main/java/com/ticticboooom/mods/mm/datagen/gen/MMLangProvider.java b/src/main/java/com/ticticboooom/mods/mm/datagen/gen/runtime/MMLangProvider.java
similarity index 97%
rename from src/main/java/com/ticticboooom/mods/mm/datagen/gen/MMLangProvider.java
rename to src/main/java/com/ticticboooom/mods/mm/datagen/gen/runtime/MMLangProvider.java
index 131d80a..ec37b31 100644
--- a/src/main/java/com/ticticboooom/mods/mm/datagen/gen/MMLangProvider.java
+++ b/src/main/java/com/ticticboooom/mods/mm/datagen/gen/runtime/MMLangProvider.java
@@ -1,4 +1,4 @@
-package com.ticticboooom.mods.mm.datagen.gen;
+package com.ticticboooom.mods.mm.datagen.gen.runtime;
 
 import com.ticticboooom.mods.mm.MM;
 import com.ticticboooom.mods.mm.block.ControllerBlock;
diff --git a/src/main/java/com/ticticboooom/mods/mm/datagen/gen/MMLootTableProvider.java b/src/main/java/com/ticticboooom/mods/mm/datagen/gen/runtime/MMLootTableProvider.java
similarity index 96%
rename from src/main/java/com/ticticboooom/mods/mm/datagen/gen/MMLootTableProvider.java
rename to src/main/java/com/ticticboooom/mods/mm/datagen/gen/runtime/MMLootTableProvider.java
index 7107bcd..70d3490 100644
--- a/src/main/java/com/ticticboooom/mods/mm/datagen/gen/MMLootTableProvider.java
+++ b/src/main/java/com/ticticboooom/mods/mm/datagen/gen/runtime/MMLootTableProvider.java
@@ -1,4 +1,4 @@
-package com.ticticboooom.mods.mm.datagen.gen;
+package com.ticticboooom.mods.mm.datagen.gen.runtime;
 
 import com.ticticboooom.mods.mm.block.ControllerBlock;
 import com.ticticboooom.mods.mm.block.MachinePortBlock;
diff --git a/src/main/java/com/ticticboooom/mods/mm/helper/StructureHelper.java b/src/main/java/com/ticticboooom/mods/mm/helper/StructureHelper.java
index aad8707..69fb9f5 100644
--- a/src/main/java/com/ticticboooom/mods/mm/helper/StructureHelper.java
+++ b/src/main/java/com/ticticboooom/mods/mm/helper/StructureHelper.java
@@ -59,7 +59,7 @@ public class StructureHelper {
         Map<Character, ResourceLocation> legend = new HashMap<>();
         Map<ResourceLocation, Character> legendLookup = new HashMap<>();
 
-        char index = 33;
+        char index = 41;
 
         for (int yi = minPos.getY(); yi <= maxPos.getY(); yi++) {
             ArrayList<String> strings = new ArrayList<>();
diff --git a/version.properties b/version.properties
index 37fddc7..c702b37 100644
--- a/version.properties
+++ b/version.properties
@@ -1,2 +1,2 @@
-#Sun Jul 04 20:32:09 BST 2021
-VERSION_CODE=476
+#Tue Jul 13 03:35:05 BST 2021
+VERSION_CODE=553