diff --git a/src/main/java/appeng/block/AEBaseBlock.java b/core/src/main/java/appeng/block/AEBaseBlock.java
similarity index 100%
rename from src/main/java/appeng/block/AEBaseBlock.java
rename to core/src/main/java/appeng/block/AEBaseBlock.java
diff --git a/src/main/java/appeng/block/AEBaseBlockItem.java b/core/src/main/java/appeng/block/AEBaseBlockItem.java
similarity index 100%
rename from src/main/java/appeng/block/AEBaseBlockItem.java
rename to core/src/main/java/appeng/block/AEBaseBlockItem.java
diff --git a/src/main/java/appeng/block/AEBaseBlockItemChargeable.java b/core/src/main/java/appeng/block/AEBaseBlockItemChargeable.java
similarity index 100%
rename from src/main/java/appeng/block/AEBaseBlockItemChargeable.java
rename to core/src/main/java/appeng/block/AEBaseBlockItemChargeable.java
diff --git a/src/main/java/appeng/block/AEBaseTileBlock.java b/core/src/main/java/appeng/block/AEBaseTileBlock.java
similarity index 100%
rename from src/main/java/appeng/block/AEBaseTileBlock.java
rename to core/src/main/java/appeng/block/AEBaseTileBlock.java
diff --git a/src/main/java/appeng/items/AEBaseItem.java b/core/src/main/java/appeng/items/AEBaseItem.java
similarity index 100%
rename from src/main/java/appeng/items/AEBaseItem.java
rename to core/src/main/java/appeng/items/AEBaseItem.java
diff --git a/src/main/java/appeng/tile/AEBaseBlockEntity.java b/core/src/main/java/appeng/tile/AEBaseBlockEntity.java
similarity index 100%
rename from src/main/java/appeng/tile/AEBaseBlockEntity.java
rename to core/src/main/java/appeng/tile/AEBaseBlockEntity.java
diff --git a/src/main/java/appeng/tile/AEBaseInvBlockEntity.java b/core/src/main/java/appeng/tile/AEBaseInvBlockEntity.java
similarity index 100%
rename from src/main/java/appeng/tile/AEBaseInvBlockEntity.java
rename to core/src/main/java/appeng/tile/AEBaseInvBlockEntity.java