diff --git a/src/dark/core/DarkMain.java b/src/dark/core/DarkMain.java
index c94d847f1..fc895d740 100644
--- a/src/dark/core/DarkMain.java
+++ b/src/dark/core/DarkMain.java
@@ -29,9 +29,7 @@ import dark.common.debug.BlockDebug;
 import dark.common.debug.BlockDebug.debugBlocks;
 import dark.common.transmit.BlockWire;
 import dark.common.transmit.TileEntityWire;
-import dark.core.blocks.BlockMulti;
 import dark.core.blocks.BlockOre;
-import dark.core.blocks.TileEntityMulti;
 import dark.core.helpers.FluidRestrictionHandler;
 import dark.core.helpers.SaveManager;
 import dark.core.items.EnumMeterials;
@@ -43,7 +41,9 @@ import dark.core.items.ItemParts;
 import dark.core.items.ItemParts.Parts;
 import dark.core.items.ItemTools;
 import dark.core.items.ItemWrench;
+import dark.prefab.BlockMulti;
 import dark.prefab.ModPrefab;
+import dark.prefab.TileEntityMulti;
 
 /** @author HangCow, DarkGuardsman */
 @Mod(modid = DarkMain.MOD_ID, name = DarkMain.MOD_NAME, version = DarkMain.VERSION, dependencies = "after:BuildCraft|Energy", useMetadata = true)
diff --git a/src/dark/core/math/LinearAlg.java b/src/dark/core/helpers/LinearAlg.java
similarity index 97%
rename from src/dark/core/math/LinearAlg.java
rename to src/dark/core/helpers/LinearAlg.java
index daca6beda..dc61445dd 100644
--- a/src/dark/core/math/LinearAlg.java
+++ b/src/dark/core/helpers/LinearAlg.java
@@ -1,4 +1,4 @@
-package dark.core.math;
+package dark.core.helpers;
 
 import universalelectricity.core.vector.Vector3;
 
diff --git a/src/dark/core/math/MathHelper.java b/src/dark/core/helpers/MathHelper.java
similarity index 98%
rename from src/dark/core/math/MathHelper.java
rename to src/dark/core/helpers/MathHelper.java
index b0f5ed81d..e943cd52c 100644
--- a/src/dark/core/math/MathHelper.java
+++ b/src/dark/core/helpers/MathHelper.java
@@ -1,4 +1,4 @@
-package dark.core.math;
+package dark.core.helpers;
 
 import java.util.Random;
 
diff --git a/src/dark/core/math/Matrix4.java b/src/dark/core/helpers/Matrix4.java
similarity index 88%
rename from src/dark/core/math/Matrix4.java
rename to src/dark/core/helpers/Matrix4.java
index e3ce5ad58..8024810b7 100644
--- a/src/dark/core/math/Matrix4.java
+++ b/src/dark/core/helpers/Matrix4.java
@@ -1,4 +1,4 @@
-package dark.core.math;
+package dark.core.helpers;
 
 public class Matrix4
 {
diff --git a/src/dark/core/math/Quaternion.java b/src/dark/core/helpers/Quaternion.java
similarity index 99%
rename from src/dark/core/math/Quaternion.java
rename to src/dark/core/helpers/Quaternion.java
index 0d2607008..60e8f9f45 100644
--- a/src/dark/core/math/Quaternion.java
+++ b/src/dark/core/helpers/Quaternion.java
@@ -1,4 +1,4 @@
-package dark.core.math;
+package dark.core.helpers;
 
 import universalelectricity.core.vector.Vector3;
 
diff --git a/src/dark/core/blocks/BlockMulti.java b/src/dark/prefab/BlockMulti.java
similarity index 99%
rename from src/dark/core/blocks/BlockMulti.java
rename to src/dark/prefab/BlockMulti.java
index be8ee8484..8bf3e57db 100644
--- a/src/dark/core/blocks/BlockMulti.java
+++ b/src/dark/prefab/BlockMulti.java
@@ -1,4 +1,4 @@
-package dark.core.blocks;
+package dark.prefab;
 
 import java.util.Random;
 
diff --git a/src/dark/core/blocks/IMultiBlock.java b/src/dark/prefab/IMultiBlock.java
similarity index 96%
rename from src/dark/core/blocks/IMultiBlock.java
rename to src/dark/prefab/IMultiBlock.java
index d75b4d84d..fdeba6018 100644
--- a/src/dark/core/blocks/IMultiBlock.java
+++ b/src/dark/prefab/IMultiBlock.java
@@ -1,4 +1,4 @@
-package dark.core.blocks;
+package dark.prefab;
 
 import net.minecraft.tileentity.TileEntity;
 import universalelectricity.core.vector.Vector3;
diff --git a/src/dark/core/blocks/TileEntityMulti.java b/src/dark/prefab/TileEntityMulti.java
similarity index 99%
rename from src/dark/core/blocks/TileEntityMulti.java
rename to src/dark/prefab/TileEntityMulti.java
index 676964b7f..4c49173d0 100644
--- a/src/dark/core/blocks/TileEntityMulti.java
+++ b/src/dark/prefab/TileEntityMulti.java
@@ -1,4 +1,4 @@
-package dark.core.blocks;
+package dark.prefab;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;