diff --git a/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java b/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java
index 22a309d02..4baabd0fc 100644
--- a/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java
+++ b/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java
@@ -14,7 +14,6 @@ import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
 import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent;
 import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent;
 import net.minecraftforge.fmlserverevents.FMLServerStartedEvent;
-import net.minecraftforge.fmlserverevents.FMLServerStartingEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -22,6 +21,8 @@ import ru.dbotthepony.mc.otm.capability.AndroidCapability;
 import ru.dbotthepony.mc.otm.capability.AndroidCapabilityPlayer;
 import ru.dbotthepony.mc.otm.capability.MatteryCapability;
 import ru.dbotthepony.mc.otm.client.AndroidGui;
+import ru.dbotthepony.mc.otm.matter.MatterGrid;
+import ru.dbotthepony.mc.otm.matter.MatterRegistry;
 import ru.dbotthepony.mc.otm.network.MatteryNetworking;
 
 import java.util.stream.Collectors;
diff --git a/src/main/java/ru/dbotthepony/mc/otm/block/BlockMatterCable.java b/src/main/java/ru/dbotthepony/mc/otm/block/BlockMatterCable.java
index 75a96de80..af3577291 100644
--- a/src/main/java/ru/dbotthepony/mc/otm/block/BlockMatterCable.java
+++ b/src/main/java/ru/dbotthepony/mc/otm/block/BlockMatterCable.java
@@ -18,7 +18,7 @@ import net.minecraft.world.phys.shapes.BooleanOp;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
-import ru.dbotthepony.mc.otm.IMatterGridCell;
+import ru.dbotthepony.mc.otm.matter.IMatterGridCell;
 import ru.dbotthepony.mc.otm.block.entity.BlockEntityMatterCable;
 
 import javax.annotation.Nullable;
diff --git a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityBatteryBank.java b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityBatteryBank.java
index 4f2a2d88e..e2f4ac024 100644
--- a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityBatteryBank.java
+++ b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityBatteryBank.java
@@ -18,7 +18,6 @@ import net.minecraftforge.energy.CapabilityEnergy;
 import net.minecraftforge.energy.IEnergyStorage;
 import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
-import ru.dbotthepony.mc.otm.MatterRegistry;
 import ru.dbotthepony.mc.otm.Registry;
 import ru.dbotthepony.mc.otm.block.BlockMatteryRotatable;
 import ru.dbotthepony.mc.otm.capability.IMatteryEnergyStorage;
diff --git a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterCable.java b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterCable.java
index 0f21b59a5..3ed820367 100644
--- a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterCable.java
+++ b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterCable.java
@@ -6,8 +6,8 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
-import ru.dbotthepony.mc.otm.IMatterGridCell;
-import ru.dbotthepony.mc.otm.MatterGrid;
+import ru.dbotthepony.mc.otm.matter.IMatterGridCell;
+import ru.dbotthepony.mc.otm.matter.MatterGrid;
 import ru.dbotthepony.mc.otm.Registry;
 import ru.dbotthepony.mc.otm.block.BlockMatterCable;
 import ru.dbotthepony.mc.otm.capability.IMatterHandler;
diff --git a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterCapacitorBank.java b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterCapacitorBank.java
index 17a2f71a3..3e3dad18f 100644
--- a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterCapacitorBank.java
+++ b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterCapacitorBank.java
@@ -13,8 +13,8 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.util.LazyOptional;
-import ru.dbotthepony.mc.otm.IMatterGridCell;
-import ru.dbotthepony.mc.otm.MatterGrid;
+import ru.dbotthepony.mc.otm.matter.IMatterGridCell;
+import ru.dbotthepony.mc.otm.matter.MatterGrid;
 import ru.dbotthepony.mc.otm.Registry;
 import ru.dbotthepony.mc.otm.capability.IMatterHandler;
 import ru.dbotthepony.mc.otm.capability.IPatternStorage;
diff --git a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterDecomposer.java b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterDecomposer.java
index 7707a07b4..a941a6b1a 100644
--- a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterDecomposer.java
+++ b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterDecomposer.java
@@ -19,6 +19,9 @@ import net.minecraftforge.items.IItemHandler;
 import ru.dbotthepony.mc.otm.*;
 import ru.dbotthepony.mc.otm.capability.*;
 import ru.dbotthepony.mc.otm.container.MatteryContainer;
+import ru.dbotthepony.mc.otm.matter.IMatterGridCell;
+import ru.dbotthepony.mc.otm.matter.MatterGrid;
+import ru.dbotthepony.mc.otm.matter.MatterRegistry;
 import ru.dbotthepony.mc.otm.menu.MatterDecomposerMenu;
 
 import javax.annotation.Nonnull;
diff --git a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterScanner.java b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterScanner.java
index 21f43438c..d6278d6ce 100644
--- a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterScanner.java
+++ b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterScanner.java
@@ -4,23 +4,20 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TextComponent;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.util.LazyOptional;
 import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
-import ru.dbotthepony.mc.otm.IMatterGridCell;
-import ru.dbotthepony.mc.otm.MatterGrid;
-import ru.dbotthepony.mc.otm.MatterRegistry;
+import ru.dbotthepony.mc.otm.matter.IMatterGridCell;
+import ru.dbotthepony.mc.otm.matter.MatterGrid;
+import ru.dbotthepony.mc.otm.matter.MatterRegistry;
 import ru.dbotthepony.mc.otm.Registry;
 import ru.dbotthepony.mc.otm.capability.IMatterHandler;
 import ru.dbotthepony.mc.otm.capability.IPatternStorage;
diff --git a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityPatternStorage.java b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityPatternStorage.java
index 7df60758d..15f24879e 100644
--- a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityPatternStorage.java
+++ b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityPatternStorage.java
@@ -9,15 +9,13 @@ import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.AbstractContainerMenu;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.util.LazyOptional;
 import net.minecraftforge.items.CapabilityItemHandler;
-import net.minecraftforge.items.IItemHandler;
-import ru.dbotthepony.mc.otm.IMatterGridCell;
-import ru.dbotthepony.mc.otm.MatterGrid;
+import ru.dbotthepony.mc.otm.matter.IMatterGridCell;
+import ru.dbotthepony.mc.otm.matter.MatterGrid;
 import ru.dbotthepony.mc.otm.Registry;
 import ru.dbotthepony.mc.otm.capability.IMatterHandler;
 import ru.dbotthepony.mc.otm.capability.IPatternStorage;
diff --git a/src/main/java/ru/dbotthepony/mc/otm/capability/MatterHandlerCapability.java b/src/main/java/ru/dbotthepony/mc/otm/capability/MatterHandlerCapability.java
index ca5cc0f7a..1218c5346 100644
--- a/src/main/java/ru/dbotthepony/mc/otm/capability/MatterHandlerCapability.java
+++ b/src/main/java/ru/dbotthepony/mc/otm/capability/MatterHandlerCapability.java
@@ -2,7 +2,7 @@ package ru.dbotthepony.mc.otm.capability;
 
 import net.minecraft.nbt.CompoundTag;
 import net.minecraftforge.common.util.INBTSerializable;
-import ru.dbotthepony.mc.otm.MatterRegistry;
+import ru.dbotthepony.mc.otm.matter.MatterRegistry;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/src/main/java/ru/dbotthepony/mc/otm/IMatterGridCell.java b/src/main/java/ru/dbotthepony/mc/otm/matter/IMatterGridCell.java
similarity index 98%
rename from src/main/java/ru/dbotthepony/mc/otm/IMatterGridCell.java
rename to src/main/java/ru/dbotthepony/mc/otm/matter/IMatterGridCell.java
index 598dde18e..0233de361 100644
--- a/src/main/java/ru/dbotthepony/mc/otm/IMatterGridCell.java
+++ b/src/main/java/ru/dbotthepony/mc/otm/matter/IMatterGridCell.java
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm;
+package ru.dbotthepony.mc.otm.matter;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/ru/dbotthepony/mc/otm/MatterGrid.java b/src/main/java/ru/dbotthepony/mc/otm/matter/MatterGrid.java
similarity index 99%
rename from src/main/java/ru/dbotthepony/mc/otm/MatterGrid.java
rename to src/main/java/ru/dbotthepony/mc/otm/matter/MatterGrid.java
index 97043dfc4..74ba6feab 100644
--- a/src/main/java/ru/dbotthepony/mc/otm/MatterGrid.java
+++ b/src/main/java/ru/dbotthepony/mc/otm/matter/MatterGrid.java
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm;
+package ru.dbotthepony.mc.otm.matter;
 
 import com.google.common.collect.ImmutableList;
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/ru/dbotthepony/mc/otm/MatterRegistry.java b/src/main/java/ru/dbotthepony/mc/otm/matter/MatterRegistry.java
similarity index 99%
rename from src/main/java/ru/dbotthepony/mc/otm/MatterRegistry.java
rename to src/main/java/ru/dbotthepony/mc/otm/matter/MatterRegistry.java
index d80966baa..7d66f911e 100644
--- a/src/main/java/ru/dbotthepony/mc/otm/MatterRegistry.java
+++ b/src/main/java/ru/dbotthepony/mc/otm/matter/MatterRegistry.java
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm;
+package ru.dbotthepony.mc.otm.matter;
 
 import com.mojang.blaze3d.platform.InputConstants;
 import net.minecraft.ChatFormatting;
@@ -12,6 +12,7 @@ import net.minecraft.world.item.crafting.RecipeType;
 import net.minecraftforge.event.entity.player.ItemTooltipEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fmlserverevents.FMLServerStartedEvent;
+import ru.dbotthepony.mc.otm.OverdriveThatMatters;
 import ru.dbotthepony.mc.otm.capability.MatteryCapability;
 import ru.dbotthepony.mc.otm.menu.FormattingHelper;
 
diff --git a/src/main/java/ru/dbotthepony/mc/otm/menu/MatterDecomposerMenu.java b/src/main/java/ru/dbotthepony/mc/otm/menu/MatterDecomposerMenu.java
index 1567b6379..3f5c93572 100644
--- a/src/main/java/ru/dbotthepony/mc/otm/menu/MatterDecomposerMenu.java
+++ b/src/main/java/ru/dbotthepony/mc/otm/menu/MatterDecomposerMenu.java
@@ -4,7 +4,7 @@ import net.minecraft.world.Container;
 import net.minecraft.world.SimpleContainer;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.item.ItemStack;
-import ru.dbotthepony.mc.otm.MatterRegistry;
+import ru.dbotthepony.mc.otm.matter.MatterRegistry;
 import ru.dbotthepony.mc.otm.Registry;
 import ru.dbotthepony.mc.otm.block.entity.BlockEntityMatterDecomposer;
 import ru.dbotthepony.mc.otm.capability.MatteryCapability;
diff --git a/src/main/java/ru/dbotthepony/mc/otm/menu/MatterScannerMenu.java b/src/main/java/ru/dbotthepony/mc/otm/menu/MatterScannerMenu.java
index 1033aea84..b756d1e64 100644
--- a/src/main/java/ru/dbotthepony/mc/otm/menu/MatterScannerMenu.java
+++ b/src/main/java/ru/dbotthepony/mc/otm/menu/MatterScannerMenu.java
@@ -4,7 +4,7 @@ import net.minecraft.world.Container;
 import net.minecraft.world.SimpleContainer;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.item.ItemStack;
-import ru.dbotthepony.mc.otm.MatterRegistry;
+import ru.dbotthepony.mc.otm.matter.MatterRegistry;
 import ru.dbotthepony.mc.otm.Registry;
 import ru.dbotthepony.mc.otm.block.entity.BlockEntityMatterScanner;
 import ru.dbotthepony.mc.otm.menu.slot.SlotAutoRenderable;