diff --git a/src/main/scala/resonantinduction/atomic/AtomicContent.scala b/src/main/scala/resonantinduction/atomic/AtomicContent.scala
index 015954874..fe0cb8087 100644
--- a/src/main/scala/resonantinduction/atomic/AtomicContent.scala
+++ b/src/main/scala/resonantinduction/atomic/AtomicContent.scala
@@ -25,12 +25,12 @@ import resonant.api.IElectromagnet
 import resonant.api.event.PlasmaEvent
 import resonant.api.recipe.QuantumAssemblerRecipes
 import resonant.content.loader.{ContentHolder, ExplicitContentName}
-import resonant.engine.content.debug.TileCreativeBuilder
 import resonant.engine.grid.thermal.EventThermal
 import resonant.lib.network.discriminator.PacketAnnotationManager
 import resonant.lib.ore.OreGenerator
 import resonant.lib.recipe.UniversalRecipe
 import resonant.lib.render.RenderUtility
+import resonant.lib.schematic.SchematicRegistry
 import resonantinduction.atomic.blocks._
 import resonantinduction.atomic.items._
 import resonantinduction.atomic.machine.TileFunnel
@@ -142,10 +142,10 @@ object AtomicContent extends ContentHolder
         itemBucketToxic = manager.newItem("bucketToxicWaste", new ItemBucket(AtomicContent.blockPlasma)).setCreativeTab(ResonantTab.tab).setContainerItem(Items.bucket).setTextureName(Reference.prefix + "bucketToxicWaste")
 
         //Schematics
-        TileCreativeBuilder.register(new SchematicAccelerator)
-        TileCreativeBuilder.register(new SchematicBreedingReactor)
-        TileCreativeBuilder.register(new SchematicFissionReactor)
-        TileCreativeBuilder.register(new SchematicFusionReactor)
+        SchematicRegistry.register("resonantInduction.atomic.accelerator", new SchematicAccelerator)
+        SchematicRegistry.register("resonantInduction.atomic.breedingReactor",new SchematicBreedingReactor)
+        SchematicRegistry.register("resonantInduction.atomic.fissionReactor",new SchematicFissionReactor)
+        SchematicRegistry.register("resonantInduction.atomic.fusionReactor",new SchematicFusionReactor)
 
         //Fluid Containers
         AtomicContent.FLUID_PLASMA.setBlock(AtomicContent.blockPlasma)
diff --git a/src/main/scala/resonantinduction/mechanical/MechanicalContent.scala b/src/main/scala/resonantinduction/mechanical/MechanicalContent.scala
index 451a83dc8..7c9c47f35 100644
--- a/src/main/scala/resonantinduction/mechanical/MechanicalContent.scala
+++ b/src/main/scala/resonantinduction/mechanical/MechanicalContent.scala
@@ -4,10 +4,9 @@ import net.minecraft.block.Block
 import net.minecraft.init.{Blocks, Items}
 import net.minecraft.item.{Item, ItemStack}
 import resonant.content.loader.ContentHolder
-import resonant.engine.content.debug.TileCreativeBuilder
 import resonant.lib.network.discriminator.PacketAnnotationManager
 import resonant.lib.recipe.UniversalRecipe
-import resonant.lib.schematic.SchematicPlate
+import resonant.lib.schematic.{SchematicPlate, SchematicRegistry}
 import resonantinduction.core.interfaces.IMechanicalNode
 import resonantinduction.core.{Reference, ResonantPartFactory, ResonantTab}
 import resonantinduction.mechanical.fluid.pipe.{ItemPipe, PartPipe, PipeMaterials}
@@ -68,9 +67,9 @@ object MechanicalContent extends ContentHolder
         blockTileBreaker = manager.newBlock(classOf[TileBreaker])
         blockTilePlacer = manager.newBlock(classOf[TilePlacer])
 
-        TileCreativeBuilder.register(new SchematicPlate("schematic.waterTurbine.name", MechanicalContent.blockWaterTurbine))
-        TileCreativeBuilder.register(new SchematicPlate("schematic.windTurbine.name", MechanicalContent.blockWindTurbine))
-        TileCreativeBuilder.register(new SchematicPlate("schematic.electricTurbine.name", MechanicalContent.blockElectricTurbine))
+        SchematicRegistry.register("resonantinduction.mechanical.waterTurbine",new SchematicPlate("schematic.waterTurbine.name", MechanicalContent.blockWaterTurbine))
+        SchematicRegistry.register("resonantinduction.mechanical.windTurbine",new SchematicPlate("schematic.windTurbine.name", MechanicalContent.blockWindTurbine))
+        SchematicRegistry.register("resonantinduction.mechanical.electricalTurbine",new SchematicPlate("schematic.electricTurbine.name", MechanicalContent.blockElectricTurbine))
 
         NodeRegistry.register(classOf[IMechanicalNode], classOf[MechanicalNode])