diff --git a/src/main/java/li/cil/oc2/OpenComputers.java b/src/main/java/li/cil/oc2/OpenComputers.java
index af3beea9..a5175e40 100644
--- a/src/main/java/li/cil/oc2/OpenComputers.java
+++ b/src/main/java/li/cil/oc2/OpenComputers.java
@@ -5,13 +5,13 @@ import li.cil.oc2.api.API;
 import li.cil.oc2.client.ClientSetup;
 import li.cil.oc2.common.CommonSetup;
 import li.cil.oc2.common.block.Blocks;
-import li.cil.oc2.common.block.entity.TileEntities;
 import li.cil.oc2.common.bus.device.DeviceTypes;
 import li.cil.oc2.common.bus.device.data.BaseBlockDevices;
 import li.cil.oc2.common.bus.device.data.Firmwares;
 import li.cil.oc2.common.bus.device.provider.Providers;
 import li.cil.oc2.common.container.Containers;
 import li.cil.oc2.common.item.Items;
+import li.cil.oc2.common.tileentity.TileEntities;
 import li.cil.sedna.devicetree.DeviceTreeRegistry;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
diff --git a/src/main/java/li/cil/oc2/client/ClientSetup.java b/src/main/java/li/cil/oc2/client/ClientSetup.java
index 4d05654e..683d5ec8 100644
--- a/src/main/java/li/cil/oc2/client/ClientSetup.java
+++ b/src/main/java/li/cil/oc2/client/ClientSetup.java
@@ -2,8 +2,8 @@ package li.cil.oc2.client;
 
 import li.cil.oc2.client.gui.ComputerContainerScreen;
 import li.cil.oc2.client.renderer.tileentity.ComputerTileEntityRenderer;
-import li.cil.oc2.common.block.entity.TileEntities;
 import li.cil.oc2.common.container.Containers;
+import li.cil.oc2.common.tileentity.TileEntities;
 import net.minecraft.client.gui.ScreenManager;
 import net.minecraftforge.fml.client.registry.ClientRegistry;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
diff --git a/src/main/java/li/cil/oc2/client/gui/TerminalScreen.java b/src/main/java/li/cil/oc2/client/gui/TerminalScreen.java
index d1acd5de..9f9ebfd7 100644
--- a/src/main/java/li/cil/oc2/client/gui/TerminalScreen.java
+++ b/src/main/java/li/cil/oc2/client/gui/TerminalScreen.java
@@ -7,10 +7,10 @@ import li.cil.oc2.api.API;
 import li.cil.oc2.client.gui.terminal.TerminalInput;
 import li.cil.oc2.client.gui.widget.Sprite;
 import li.cil.oc2.client.gui.widget.ToggleImageButton;
-import li.cil.oc2.common.block.entity.ComputerTileEntity;
 import li.cil.oc2.common.network.Network;
 import li.cil.oc2.common.network.message.ComputerPowerMessage;
 import li.cil.oc2.common.network.message.TerminalBlockInputMessage;
+import li.cil.oc2.common.tileentity.ComputerTileEntity;
 import li.cil.oc2.common.vm.Terminal;
 import net.minecraft.client.entity.player.ClientPlayerEntity;
 import net.minecraft.client.gui.screen.Screen;
diff --git a/src/main/java/li/cil/oc2/client/renderer/tileentity/ComputerTileEntityRenderer.java b/src/main/java/li/cil/oc2/client/renderer/tileentity/ComputerTileEntityRenderer.java
index d8cf6b14..83ff385e 100644
--- a/src/main/java/li/cil/oc2/client/renderer/tileentity/ComputerTileEntityRenderer.java
+++ b/src/main/java/li/cil/oc2/client/renderer/tileentity/ComputerTileEntityRenderer.java
@@ -6,7 +6,7 @@ import com.mojang.blaze3d.vertex.IVertexBuilder;
 import li.cil.oc2.api.API;
 import li.cil.oc2.client.renderer.OpenComputersRenderType;
 import li.cil.oc2.common.block.ComputerBlock;
-import li.cil.oc2.common.block.entity.ComputerTileEntity;
+import li.cil.oc2.common.tileentity.ComputerTileEntity;
 import li.cil.oc2.common.vm.Terminal;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.renderer.IRenderTypeBuffer;
diff --git a/src/main/java/li/cil/oc2/common/block/BusCableBlock.java b/src/main/java/li/cil/oc2/common/block/BusCableBlock.java
index bfbc87c0..f58985e8 100644
--- a/src/main/java/li/cil/oc2/common/block/BusCableBlock.java
+++ b/src/main/java/li/cil/oc2/common/block/BusCableBlock.java
@@ -1,11 +1,11 @@
 package li.cil.oc2.common.block;
 
 import com.google.common.collect.Maps;
-import li.cil.oc2.common.block.entity.BusCableTileEntity;
-import li.cil.oc2.common.block.entity.TileEntities;
 import li.cil.oc2.common.capabilities.Capabilities;
 import li.cil.oc2.common.integration.Wrenches;
 import li.cil.oc2.common.item.Items;
+import li.cil.oc2.common.tileentity.BusCableTileEntity;
+import li.cil.oc2.common.tileentity.TileEntities;
 import li.cil.oc2.common.util.ItemStackUtils;
 import li.cil.oc2.common.util.WorldUtils;
 import net.minecraft.block.Block;
diff --git a/src/main/java/li/cil/oc2/common/block/ComputerBlock.java b/src/main/java/li/cil/oc2/common/block/ComputerBlock.java
index 357de840..dd6811ea 100644
--- a/src/main/java/li/cil/oc2/common/block/ComputerBlock.java
+++ b/src/main/java/li/cil/oc2/common/block/ComputerBlock.java
@@ -2,11 +2,11 @@ package li.cil.oc2.common.block;
 
 import li.cil.oc2.api.bus.device.capabilities.RedstoneEmitter;
 import li.cil.oc2.client.gui.TerminalScreen;
-import li.cil.oc2.common.block.entity.ComputerTileEntity;
-import li.cil.oc2.common.block.entity.TileEntities;
 import li.cil.oc2.common.capabilities.Capabilities;
 import li.cil.oc2.common.container.ComputerContainer;
 import li.cil.oc2.common.integration.Wrenches;
+import li.cil.oc2.common.tileentity.ComputerTileEntity;
+import li.cil.oc2.common.tileentity.TileEntities;
 import li.cil.oc2.common.util.TooltipUtils;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
diff --git a/src/main/java/li/cil/oc2/common/block/RedstoneInterfaceBlock.java b/src/main/java/li/cil/oc2/common/block/RedstoneInterfaceBlock.java
index e52b0e64..d025ffb4 100644
--- a/src/main/java/li/cil/oc2/common/block/RedstoneInterfaceBlock.java
+++ b/src/main/java/li/cil/oc2/common/block/RedstoneInterfaceBlock.java
@@ -1,7 +1,7 @@
 package li.cil.oc2.common.block;
 
-import li.cil.oc2.common.block.entity.RedstoneInterfaceTileEntity;
-import li.cil.oc2.common.block.entity.TileEntities;
+import li.cil.oc2.common.tileentity.RedstoneInterfaceTileEntity;
+import li.cil.oc2.common.tileentity.TileEntities;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.HorizontalBlock;
diff --git a/src/main/java/li/cil/oc2/common/container/ComputerContainer.java b/src/main/java/li/cil/oc2/common/container/ComputerContainer.java
index 71e5bc1b..e5b10e1b 100644
--- a/src/main/java/li/cil/oc2/common/container/ComputerContainer.java
+++ b/src/main/java/li/cil/oc2/common/container/ComputerContainer.java
@@ -2,7 +2,7 @@ package li.cil.oc2.common.container;
 
 import li.cil.oc2.api.bus.device.DeviceTypes;
 import li.cil.oc2.common.block.Blocks;
-import li.cil.oc2.common.block.entity.ComputerTileEntity;
+import li.cil.oc2.common.tileentity.ComputerTileEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.network.PacketBuffer;
diff --git a/src/main/java/li/cil/oc2/common/network/message/AbstractTerminalBlockMessage.java b/src/main/java/li/cil/oc2/common/network/message/AbstractTerminalBlockMessage.java
index 5f7cd72d..16738ef3 100644
--- a/src/main/java/li/cil/oc2/common/network/message/AbstractTerminalBlockMessage.java
+++ b/src/main/java/li/cil/oc2/common/network/message/AbstractTerminalBlockMessage.java
@@ -1,6 +1,6 @@
 package li.cil.oc2.common.network.message;
 
-import li.cil.oc2.common.block.entity.ComputerTileEntity;
+import li.cil.oc2.common.tileentity.ComputerTileEntity;
 import net.minecraft.network.PacketBuffer;
 import net.minecraft.util.math.BlockPos;
 
diff --git a/src/main/java/li/cil/oc2/common/network/message/ComputerBootErrorMessage.java b/src/main/java/li/cil/oc2/common/network/message/ComputerBootErrorMessage.java
index 82169c37..b7e74d40 100644
--- a/src/main/java/li/cil/oc2/common/network/message/ComputerBootErrorMessage.java
+++ b/src/main/java/li/cil/oc2/common/network/message/ComputerBootErrorMessage.java
@@ -1,7 +1,7 @@
 package li.cil.oc2.common.network.message;
 
-import li.cil.oc2.common.block.entity.ComputerTileEntity;
 import li.cil.oc2.common.network.MessageUtils;
+import li.cil.oc2.common.tileentity.ComputerTileEntity;
 import net.minecraft.network.PacketBuffer;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.text.ITextComponent;
diff --git a/src/main/java/li/cil/oc2/common/network/message/ComputerBusStateMessage.java b/src/main/java/li/cil/oc2/common/network/message/ComputerBusStateMessage.java
index 3a0abfda..e9bc0a77 100644
--- a/src/main/java/li/cil/oc2/common/network/message/ComputerBusStateMessage.java
+++ b/src/main/java/li/cil/oc2/common/network/message/ComputerBusStateMessage.java
@@ -1,8 +1,8 @@
 package li.cil.oc2.common.network.message;
 
-import li.cil.oc2.common.block.entity.ComputerTileEntity;
 import li.cil.oc2.common.bus.AbstractDeviceBusController;
 import li.cil.oc2.common.network.MessageUtils;
+import li.cil.oc2.common.tileentity.ComputerTileEntity;
 import net.minecraft.network.PacketBuffer;
 import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fml.network.NetworkEvent;
diff --git a/src/main/java/li/cil/oc2/common/network/message/ComputerPowerMessage.java b/src/main/java/li/cil/oc2/common/network/message/ComputerPowerMessage.java
index 7ad816f8..5f7f7c07 100644
--- a/src/main/java/li/cil/oc2/common/network/message/ComputerPowerMessage.java
+++ b/src/main/java/li/cil/oc2/common/network/message/ComputerPowerMessage.java
@@ -1,7 +1,7 @@
 package li.cil.oc2.common.network.message;
 
-import li.cil.oc2.common.block.entity.ComputerTileEntity;
 import li.cil.oc2.common.network.MessageUtils;
+import li.cil.oc2.common.tileentity.ComputerTileEntity;
 import net.minecraft.entity.player.ServerPlayerEntity;
 import net.minecraft.network.PacketBuffer;
 import net.minecraft.util.math.BlockPos;
diff --git a/src/main/java/li/cil/oc2/common/network/message/ComputerRunStateMessage.java b/src/main/java/li/cil/oc2/common/network/message/ComputerRunStateMessage.java
index d456e49f..722c5405 100644
--- a/src/main/java/li/cil/oc2/common/network/message/ComputerRunStateMessage.java
+++ b/src/main/java/li/cil/oc2/common/network/message/ComputerRunStateMessage.java
@@ -1,7 +1,7 @@
 package li.cil.oc2.common.network.message;
 
-import li.cil.oc2.common.block.entity.ComputerTileEntity;
 import li.cil.oc2.common.network.MessageUtils;
+import li.cil.oc2.common.tileentity.ComputerTileEntity;
 import net.minecraft.network.PacketBuffer;
 import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fml.network.NetworkEvent;
diff --git a/src/main/java/li/cil/oc2/common/network/message/TerminalBlockInputMessage.java b/src/main/java/li/cil/oc2/common/network/message/TerminalBlockInputMessage.java
index 7ffa8948..280f32eb 100644
--- a/src/main/java/li/cil/oc2/common/network/message/TerminalBlockInputMessage.java
+++ b/src/main/java/li/cil/oc2/common/network/message/TerminalBlockInputMessage.java
@@ -1,7 +1,7 @@
 package li.cil.oc2.common.network.message;
 
-import li.cil.oc2.common.block.entity.ComputerTileEntity;
 import li.cil.oc2.common.network.MessageUtils;
+import li.cil.oc2.common.tileentity.ComputerTileEntity;
 import net.minecraft.network.PacketBuffer;
 import net.minecraftforge.fml.network.NetworkEvent;
 
diff --git a/src/main/java/li/cil/oc2/common/network/message/TerminalBlockOutputMessage.java b/src/main/java/li/cil/oc2/common/network/message/TerminalBlockOutputMessage.java
index 73477cdd..71e1db26 100644
--- a/src/main/java/li/cil/oc2/common/network/message/TerminalBlockOutputMessage.java
+++ b/src/main/java/li/cil/oc2/common/network/message/TerminalBlockOutputMessage.java
@@ -1,7 +1,7 @@
 package li.cil.oc2.common.network.message;
 
-import li.cil.oc2.common.block.entity.ComputerTileEntity;
 import li.cil.oc2.common.network.MessageUtils;
+import li.cil.oc2.common.tileentity.ComputerTileEntity;
 import net.minecraft.network.PacketBuffer;
 import net.minecraftforge.fml.network.NetworkEvent;
 
diff --git a/src/main/java/li/cil/oc2/common/block/entity/AbstractTileEntity.java b/src/main/java/li/cil/oc2/common/tileentity/AbstractTileEntity.java
similarity index 99%
rename from src/main/java/li/cil/oc2/common/block/entity/AbstractTileEntity.java
rename to src/main/java/li/cil/oc2/common/tileentity/AbstractTileEntity.java
index 991e72c6..5ba0f209 100644
--- a/src/main/java/li/cil/oc2/common/block/entity/AbstractTileEntity.java
+++ b/src/main/java/li/cil/oc2/common/tileentity/AbstractTileEntity.java
@@ -1,4 +1,4 @@
-package li.cil.oc2.common.block.entity;
+package li.cil.oc2.common.tileentity;
 
 import li.cil.oc2.common.util.ServerScheduler;
 import net.minecraft.tileentity.TileEntity;
diff --git a/src/main/java/li/cil/oc2/common/block/entity/BusCableTileEntity.java b/src/main/java/li/cil/oc2/common/tileentity/BusCableTileEntity.java
similarity index 98%
rename from src/main/java/li/cil/oc2/common/block/entity/BusCableTileEntity.java
rename to src/main/java/li/cil/oc2/common/tileentity/BusCableTileEntity.java
index f0d46912..ad2d57c1 100644
--- a/src/main/java/li/cil/oc2/common/block/entity/BusCableTileEntity.java
+++ b/src/main/java/li/cil/oc2/common/tileentity/BusCableTileEntity.java
@@ -1,4 +1,4 @@
-package li.cil.oc2.common.block.entity;
+package li.cil.oc2.common.tileentity;
 
 import li.cil.oc2.common.block.BusCableBlock;
 import li.cil.oc2.common.bus.TileEntityDeviceBusElement;
diff --git a/src/main/java/li/cil/oc2/common/block/entity/ComputerTileEntity.java b/src/main/java/li/cil/oc2/common/tileentity/ComputerTileEntity.java
similarity index 99%
rename from src/main/java/li/cil/oc2/common/block/entity/ComputerTileEntity.java
rename to src/main/java/li/cil/oc2/common/tileentity/ComputerTileEntity.java
index 97a70284..3bc81799 100644
--- a/src/main/java/li/cil/oc2/common/block/entity/ComputerTileEntity.java
+++ b/src/main/java/li/cil/oc2/common/tileentity/ComputerTileEntity.java
@@ -1,4 +1,4 @@
-package li.cil.oc2.common.block.entity;
+package li.cil.oc2.common.tileentity;
 
 import it.unimi.dsi.fastutil.bytes.ByteArrayFIFOQueue;
 import li.cil.ceres.api.Serialized;
diff --git a/src/main/java/li/cil/oc2/common/block/entity/RedstoneInterfaceTileEntity.java b/src/main/java/li/cil/oc2/common/tileentity/RedstoneInterfaceTileEntity.java
similarity index 99%
rename from src/main/java/li/cil/oc2/common/block/entity/RedstoneInterfaceTileEntity.java
rename to src/main/java/li/cil/oc2/common/tileentity/RedstoneInterfaceTileEntity.java
index cf9abed4..34d4c033 100644
--- a/src/main/java/li/cil/oc2/common/block/entity/RedstoneInterfaceTileEntity.java
+++ b/src/main/java/li/cil/oc2/common/tileentity/RedstoneInterfaceTileEntity.java
@@ -1,4 +1,4 @@
-package li.cil.oc2.common.block.entity;
+package li.cil.oc2.common.tileentity;
 
 import li.cil.oc2.api.bus.device.object.Callback;
 import li.cil.oc2.api.bus.device.object.DocumentedDevice;
diff --git a/src/main/java/li/cil/oc2/common/block/entity/TileEntities.java b/src/main/java/li/cil/oc2/common/tileentity/TileEntities.java
similarity index 98%
rename from src/main/java/li/cil/oc2/common/block/entity/TileEntities.java
rename to src/main/java/li/cil/oc2/common/tileentity/TileEntities.java
index 83d5c72a..1f56d9cb 100644
--- a/src/main/java/li/cil/oc2/common/block/entity/TileEntities.java
+++ b/src/main/java/li/cil/oc2/common/tileentity/TileEntities.java
@@ -1,4 +1,4 @@
-package li.cil.oc2.common.block.entity;
+package li.cil.oc2.common.tileentity;
 
 import li.cil.oc2.Constants;
 import li.cil.oc2.api.API;
diff --git a/src/main/java/li/cil/oc2/common/block/entity/package-info.java b/src/main/java/li/cil/oc2/common/tileentity/package-info.java
similarity index 80%
rename from src/main/java/li/cil/oc2/common/block/entity/package-info.java
rename to src/main/java/li/cil/oc2/common/tileentity/package-info.java
index 8c89ea50..e3df2356 100644
--- a/src/main/java/li/cil/oc2/common/block/entity/package-info.java
+++ b/src/main/java/li/cil/oc2/common/tileentity/package-info.java
@@ -1,6 +1,6 @@
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
-package li.cil.oc2.common.block.entity;
+package li.cil.oc2.common.tileentity;
 
 import mcp.MethodsReturnNonnullByDefault;