diff --git a/src/main/java/com/teammoeg/steampowered/ItemRegistry.java b/src/main/java/com/teammoeg/steampowered/ItemRegistry.java
index 1c7ecee..cc9bc27 100644
--- a/src/main/java/com/teammoeg/steampowered/ItemRegistry.java
+++ b/src/main/java/com/teammoeg/steampowered/ItemRegistry.java
@@ -1,5 +1,6 @@
 package com.teammoeg.steampowered;
 
+import com.teammoeg.steampowered.item.GasContainerItem;
 import net.minecraft.fluid.Fluids;
 import net.minecraft.item.Item;
 import net.minecraftforge.fml.RegistryObject;
diff --git a/src/main/java/com/teammoeg/steampowered/SteamPowered.java b/src/main/java/com/teammoeg/steampowered/SteamPowered.java
index ae43cda..723c4f7 100644
--- a/src/main/java/com/teammoeg/steampowered/SteamPowered.java
+++ b/src/main/java/com/teammoeg/steampowered/SteamPowered.java
@@ -1,20 +1,16 @@
 package com.teammoeg.steampowered;
 
-import com.simibubi.create.CreateClient;
 import com.simibubi.create.foundation.data.CreateRegistrate;
 import com.simibubi.create.repack.registrate.util.NonNullLazyValue;
 import com.teammoeg.steampowered.client.SteamPoweredClient;
-import com.teammoeg.steampowered.create.SPBlocks;
-import com.teammoeg.steampowered.create.SPTiles;
+import com.teammoeg.steampowered.registrate.SPBlocks;
+import com.teammoeg.steampowered.registrate.SPTiles;
 import com.teammoeg.steampowered.network.PacketHandler;
-import net.minecraft.block.Block;
 import net.minecraft.item.ItemGroup;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.RegistryEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
diff --git a/src/main/java/com/teammoeg/steampowered/create/MetalCogwheelBlock.java b/src/main/java/com/teammoeg/steampowered/block/MetalCogwheelBlock.java
similarity index 89%
rename from src/main/java/com/teammoeg/steampowered/create/MetalCogwheelBlock.java
rename to src/main/java/com/teammoeg/steampowered/block/MetalCogwheelBlock.java
index 46a210b..34185e2 100644
--- a/src/main/java/com/teammoeg/steampowered/create/MetalCogwheelBlock.java
+++ b/src/main/java/com/teammoeg/steampowered/block/MetalCogwheelBlock.java
@@ -1,6 +1,7 @@
-package com.teammoeg.steampowered.create;
+package com.teammoeg.steampowered.block;
 
 import com.simibubi.create.content.contraptions.relays.elementary.CogWheelBlock;
+import com.teammoeg.steampowered.registrate.SPTiles;
 import net.minecraft.block.BlockState;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.IBlockReader;
diff --git a/src/main/java/com/teammoeg/steampowered/create/SteamEngineBlock.java b/src/main/java/com/teammoeg/steampowered/block/SteamEngineBlock.java
similarity index 97%
rename from src/main/java/com/teammoeg/steampowered/create/SteamEngineBlock.java
rename to src/main/java/com/teammoeg/steampowered/block/SteamEngineBlock.java
index bb1791a..40e7743 100644
--- a/src/main/java/com/teammoeg/steampowered/create/SteamEngineBlock.java
+++ b/src/main/java/com/teammoeg/steampowered/block/SteamEngineBlock.java
@@ -1,4 +1,4 @@
-package com.teammoeg.steampowered.create;
+package com.teammoeg.steampowered.block;
 
 import com.jozufozu.flywheel.core.PartialModel;
 import com.simibubi.create.AllBlockPartials;
@@ -6,6 +6,7 @@ import com.simibubi.create.AllShapes;
 import com.simibubi.create.content.contraptions.components.flywheel.engine.EngineBlock;
 import com.simibubi.create.content.contraptions.components.flywheel.engine.FurnaceEngineTileEntity;
 import com.simibubi.create.foundation.block.ITE;
+import com.teammoeg.steampowered.registrate.SPTiles;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.item.BlockItemUseContext;
diff --git a/src/main/java/com/teammoeg/steampowered/client/SteamPoweredClient.java b/src/main/java/com/teammoeg/steampowered/client/SteamPoweredClient.java
index aab918d..27791b0 100644
--- a/src/main/java/com/teammoeg/steampowered/client/SteamPoweredClient.java
+++ b/src/main/java/com/teammoeg/steampowered/client/SteamPoweredClient.java
@@ -1,6 +1,6 @@
 package com.teammoeg.steampowered.client;
 
-import com.teammoeg.steampowered.create.SPPonderIndex;
+import com.teammoeg.steampowered.registrate.SPPonderIndex;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 
diff --git a/src/main/java/com/teammoeg/steampowered/GasContainerItem.java b/src/main/java/com/teammoeg/steampowered/item/GasContainerItem.java
similarity index 97%
rename from src/main/java/com/teammoeg/steampowered/GasContainerItem.java
rename to src/main/java/com/teammoeg/steampowered/item/GasContainerItem.java
index 61aeaa3..a55f5b9 100644
--- a/src/main/java/com/teammoeg/steampowered/GasContainerItem.java
+++ b/src/main/java/com/teammoeg/steampowered/item/GasContainerItem.java
@@ -1,5 +1,7 @@
-package com.teammoeg.steampowered;
+package com.teammoeg.steampowered.item;
 
+import com.teammoeg.steampowered.FluidRegistry;
+import com.teammoeg.steampowered.ItemRegistry;
 import net.minecraft.advancements.CriteriaTriggers;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.FlowingFluidBlock;
diff --git a/src/main/java/com/teammoeg/steampowered/network/TileSyncPacket.java b/src/main/java/com/teammoeg/steampowered/network/TileSyncPacket.java
index 93e45f2..1f3d9e1 100644
--- a/src/main/java/com/teammoeg/steampowered/network/TileSyncPacket.java
+++ b/src/main/java/com/teammoeg/steampowered/network/TileSyncPacket.java
@@ -1,8 +1,7 @@
 package com.teammoeg.steampowered.network;
 
-import blusunrize.immersiveengineering.ImmersiveEngineering;
 import com.teammoeg.steampowered.client.ClientUtils;
-import com.teammoeg.steampowered.create.SteamEngineTileEntity;
+import com.teammoeg.steampowered.tileentity.SteamEngineTileEntity;
 import net.minecraft.entity.player.ServerPlayerEntity;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.network.PacketBuffer;
diff --git a/src/main/java/com/teammoeg/steampowered/create/ponder/SPScenes.java b/src/main/java/com/teammoeg/steampowered/ponder/SPScenes.java
similarity index 95%
rename from src/main/java/com/teammoeg/steampowered/create/ponder/SPScenes.java
rename to src/main/java/com/teammoeg/steampowered/ponder/SPScenes.java
index 5a362a5..9147cc0 100644
--- a/src/main/java/com/teammoeg/steampowered/create/ponder/SPScenes.java
+++ b/src/main/java/com/teammoeg/steampowered/ponder/SPScenes.java
@@ -1,4 +1,4 @@
-package com.teammoeg.steampowered.create.ponder;
+package com.teammoeg.steampowered.ponder;
 
 import com.simibubi.create.foundation.ponder.ElementLink;
 import com.simibubi.create.foundation.ponder.SceneBuilder;
@@ -6,10 +6,9 @@ import com.simibubi.create.foundation.ponder.SceneBuildingUtil;
 import com.simibubi.create.foundation.ponder.Selection;
 import com.simibubi.create.foundation.ponder.content.PonderPalette;
 import com.simibubi.create.foundation.ponder.elements.WorldSectionElement;
-import com.teammoeg.steampowered.create.SPBlocks;
-import com.teammoeg.steampowered.create.SteamEngineBlock;
+import com.teammoeg.steampowered.registrate.SPBlocks;
+import com.teammoeg.steampowered.block.SteamEngineBlock;
 import net.minecraft.block.BlockState;
-import net.minecraft.block.Blocks;
 import net.minecraft.block.FurnaceBlock;
 import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
diff --git a/src/main/java/com/teammoeg/steampowered/create/SPBlocks.java b/src/main/java/com/teammoeg/steampowered/registrate/SPBlocks.java
similarity index 96%
rename from src/main/java/com/teammoeg/steampowered/create/SPBlocks.java
rename to src/main/java/com/teammoeg/steampowered/registrate/SPBlocks.java
index 91d0580..30f144e 100644
--- a/src/main/java/com/teammoeg/steampowered/create/SPBlocks.java
+++ b/src/main/java/com/teammoeg/steampowered/registrate/SPBlocks.java
@@ -1,4 +1,4 @@
-package com.teammoeg.steampowered.create;
+package com.teammoeg.steampowered.registrate;
 
 import com.simibubi.create.Create;
 import com.simibubi.create.content.AllSections;
@@ -10,6 +10,8 @@ import com.simibubi.create.foundation.data.CreateRegistrate;
 import com.simibubi.create.foundation.data.SharedProperties;
 import com.simibubi.create.repack.registrate.util.entry.BlockEntry;
 import com.teammoeg.steampowered.SteamPowered;
+import com.teammoeg.steampowered.block.MetalCogwheelBlock;
+import com.teammoeg.steampowered.block.SteamEngineBlock;
 import net.minecraft.block.SoundType;
 
 import static com.simibubi.create.foundation.data.ModelGen.customItemModel;
diff --git a/src/main/java/com/teammoeg/steampowered/create/SPPonderIndex.java b/src/main/java/com/teammoeg/steampowered/registrate/SPPonderIndex.java
similarity index 93%
rename from src/main/java/com/teammoeg/steampowered/create/SPPonderIndex.java
rename to src/main/java/com/teammoeg/steampowered/registrate/SPPonderIndex.java
index 73f480a..db0a886 100644
--- a/src/main/java/com/teammoeg/steampowered/create/SPPonderIndex.java
+++ b/src/main/java/com/teammoeg/steampowered/registrate/SPPonderIndex.java
@@ -1,11 +1,11 @@
-package com.teammoeg.steampowered.create;
+package com.teammoeg.steampowered.registrate;
 
 import com.simibubi.create.Create;
 import com.simibubi.create.foundation.ponder.PonderRegistrationHelper;
 import com.simibubi.create.foundation.ponder.content.KineticsScenes;
 import com.simibubi.create.foundation.ponder.content.PonderTag;
 import com.teammoeg.steampowered.SteamPowered;
-import com.teammoeg.steampowered.create.ponder.SPScenes;
+import com.teammoeg.steampowered.ponder.SPScenes;
 import net.minecraft.util.ResourceLocation;
 
 public class SPPonderIndex {
diff --git a/src/main/java/com/teammoeg/steampowered/create/SPShapes.java b/src/main/java/com/teammoeg/steampowered/registrate/SPShapes.java
similarity index 98%
rename from src/main/java/com/teammoeg/steampowered/create/SPShapes.java
rename to src/main/java/com/teammoeg/steampowered/registrate/SPShapes.java
index 7bba30d..94db38d 100644
--- a/src/main/java/com/teammoeg/steampowered/create/SPShapes.java
+++ b/src/main/java/com/teammoeg/steampowered/registrate/SPShapes.java
@@ -1,4 +1,4 @@
-package com.teammoeg.steampowered.create;
+package com.teammoeg.steampowered.registrate;
 
 import static net.minecraft.util.Direction.UP;
 import java.util.function.BiFunction;
diff --git a/src/main/java/com/teammoeg/steampowered/create/SPTiles.java b/src/main/java/com/teammoeg/steampowered/registrate/SPTiles.java
similarity index 87%
rename from src/main/java/com/teammoeg/steampowered/create/SPTiles.java
rename to src/main/java/com/teammoeg/steampowered/registrate/SPTiles.java
index d4bb8b2..b8d7983 100644
--- a/src/main/java/com/teammoeg/steampowered/create/SPTiles.java
+++ b/src/main/java/com/teammoeg/steampowered/registrate/SPTiles.java
@@ -1,10 +1,12 @@
-package com.teammoeg.steampowered.create;
+package com.teammoeg.steampowered.registrate;
 
 import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer;
 import com.simibubi.create.content.contraptions.base.SingleRotatingInstance;
 import com.simibubi.create.foundation.data.CreateRegistrate;
 import com.simibubi.create.repack.registrate.util.entry.TileEntityEntry;
 import com.teammoeg.steampowered.SteamPowered;
+import com.teammoeg.steampowered.tileentity.MetalCogwheelTileEntity;
+import com.teammoeg.steampowered.tileentity.SteamEngineTileEntity;
 
 public class SPTiles {
     private static final CreateRegistrate REGISTRATE = SteamPowered.registrate.get()
diff --git a/src/main/java/com/teammoeg/steampowered/create/MetalCogwheelTileEntity.java b/src/main/java/com/teammoeg/steampowered/tileentity/MetalCogwheelTileEntity.java
similarity index 87%
rename from src/main/java/com/teammoeg/steampowered/create/MetalCogwheelTileEntity.java
rename to src/main/java/com/teammoeg/steampowered/tileentity/MetalCogwheelTileEntity.java
index cd6da40..854e2b4 100644
--- a/src/main/java/com/teammoeg/steampowered/create/MetalCogwheelTileEntity.java
+++ b/src/main/java/com/teammoeg/steampowered/tileentity/MetalCogwheelTileEntity.java
@@ -1,4 +1,4 @@
-package com.teammoeg.steampowered.create;
+package com.teammoeg.steampowered.tileentity;
 
 import com.simibubi.create.content.contraptions.relays.elementary.SimpleKineticTileEntity;
 import net.minecraft.tileentity.TileEntityType;
diff --git a/src/main/java/com/teammoeg/steampowered/create/SteamEngineTileEntity.java b/src/main/java/com/teammoeg/steampowered/tileentity/SteamEngineTileEntity.java
similarity index 97%
rename from src/main/java/com/teammoeg/steampowered/create/SteamEngineTileEntity.java
rename to src/main/java/com/teammoeg/steampowered/tileentity/SteamEngineTileEntity.java
index 9a44ced..1ae90d7 100644
--- a/src/main/java/com/teammoeg/steampowered/create/SteamEngineTileEntity.java
+++ b/src/main/java/com/teammoeg/steampowered/tileentity/SteamEngineTileEntity.java
@@ -1,8 +1,9 @@
-package com.teammoeg.steampowered.create;
+package com.teammoeg.steampowered.tileentity;
 
 import com.simibubi.create.content.contraptions.components.flywheel.engine.EngineTileEntity;
 import com.simibubi.create.content.contraptions.goggles.IHaveGoggleInformation;
 import com.teammoeg.steampowered.FluidRegistry;
+import com.teammoeg.steampowered.block.SteamEngineBlock;
 import com.teammoeg.steampowered.network.PacketHandler;
 import com.teammoeg.steampowered.network.TileSyncPacket;
 import net.minecraft.block.BlockState;