diff --git a/core/src/main/java/nl/matsv/viabackwards/api/v2/MetaHandler.java b/core/src/main/java/nl/matsv/viabackwards/api/entities/meta/MetaHandler.java
similarity index 96%
rename from core/src/main/java/nl/matsv/viabackwards/api/v2/MetaHandler.java
rename to core/src/main/java/nl/matsv/viabackwards/api/entities/meta/MetaHandler.java
index 039a6af7..184c9b79 100644
--- a/core/src/main/java/nl/matsv/viabackwards/api/v2/MetaHandler.java
+++ b/core/src/main/java/nl/matsv/viabackwards/api/entities/meta/MetaHandler.java
@@ -8,7 +8,7 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package nl.matsv.viabackwards.api.v2;
+package nl.matsv.viabackwards.api.entities.meta;
 
 import nl.matsv.viabackwards.api.exceptions.RemovedValueException;
 import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
diff --git a/core/src/main/java/nl/matsv/viabackwards/api/v2/MetaHandlerEvent.java b/core/src/main/java/nl/matsv/viabackwards/api/entities/meta/MetaHandlerEvent.java
similarity index 90%
rename from core/src/main/java/nl/matsv/viabackwards/api/v2/MetaHandlerEvent.java
rename to core/src/main/java/nl/matsv/viabackwards/api/entities/meta/MetaHandlerEvent.java
index 836f3a3c..44ed4be5 100644
--- a/core/src/main/java/nl/matsv/viabackwards/api/v2/MetaHandlerEvent.java
+++ b/core/src/main/java/nl/matsv/viabackwards/api/entities/meta/MetaHandlerEvent.java
@@ -8,11 +8,12 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package nl.matsv.viabackwards.api.v2;
+package nl.matsv.viabackwards.api.entities.meta;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import nl.matsv.viabackwards.api.entities.AbstractEntityType;
+import nl.matsv.viabackwards.api.entities.storage.MetaStorage;
+import nl.matsv.viabackwards.api.entities.types.AbstractEntityType;
 import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
 
 import java.util.Optional;
diff --git a/core/src/main/java/nl/matsv/viabackwards/api/v2/MetaHandlerSettings.java b/core/src/main/java/nl/matsv/viabackwards/api/entities/meta/MetaHandlerSettings.java
similarity index 96%
rename from core/src/main/java/nl/matsv/viabackwards/api/v2/MetaHandlerSettings.java
rename to core/src/main/java/nl/matsv/viabackwards/api/entities/meta/MetaHandlerSettings.java
index 3b6fdc18..7adb53c7 100644
--- a/core/src/main/java/nl/matsv/viabackwards/api/v2/MetaHandlerSettings.java
+++ b/core/src/main/java/nl/matsv/viabackwards/api/entities/meta/MetaHandlerSettings.java
@@ -8,11 +8,11 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package nl.matsv.viabackwards.api.v2;
+package nl.matsv.viabackwards.api.entities.meta;
 
 import lombok.Getter;
 import lombok.ToString;
-import nl.matsv.viabackwards.api.entities.AbstractEntityType;
+import nl.matsv.viabackwards.api.entities.types.AbstractEntityType;
 import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
 
 import java.util.List;
diff --git a/core/src/main/java/nl/matsv/viabackwards/api/storage/EntityData.java b/core/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityData.java
similarity index 94%
rename from core/src/main/java/nl/matsv/viabackwards/api/storage/EntityData.java
rename to core/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityData.java
index dafefc19..b553c6b0 100644
--- a/core/src/main/java/nl/matsv/viabackwards/api/storage/EntityData.java
+++ b/core/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityData.java
@@ -8,12 +8,11 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package nl.matsv.viabackwards.api.storage;
+package nl.matsv.viabackwards.api.entities.storage;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
-import nl.matsv.viabackwards.api.v2.MetaStorage;
 
 @RequiredArgsConstructor
 @Getter
diff --git a/core/src/main/java/nl/matsv/viabackwards/api/storage/EntityTracker.java b/core/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityTracker.java
similarity index 95%
rename from core/src/main/java/nl/matsv/viabackwards/api/storage/EntityTracker.java
rename to core/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityTracker.java
index 87135856..a16eeac6 100644
--- a/core/src/main/java/nl/matsv/viabackwards/api/storage/EntityTracker.java
+++ b/core/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityTracker.java
@@ -8,10 +8,10 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package nl.matsv.viabackwards.api.storage;
+package nl.matsv.viabackwards.api.entities.storage;
 
 import nl.matsv.viabackwards.api.BackwardsProtocol;
-import nl.matsv.viabackwards.api.entities.AbstractEntityType;
+import nl.matsv.viabackwards.api.entities.types.AbstractEntityType;
 import us.myles.ViaVersion.api.data.StoredObject;
 import us.myles.ViaVersion.api.data.UserConnection;
 
diff --git a/core/src/main/java/nl/matsv/viabackwards/api/v2/MetaStorage.java b/core/src/main/java/nl/matsv/viabackwards/api/entities/storage/MetaStorage.java
similarity index 97%
rename from core/src/main/java/nl/matsv/viabackwards/api/v2/MetaStorage.java
rename to core/src/main/java/nl/matsv/viabackwards/api/entities/storage/MetaStorage.java
index 4f9028c1..7695873b 100644
--- a/core/src/main/java/nl/matsv/viabackwards/api/v2/MetaStorage.java
+++ b/core/src/main/java/nl/matsv/viabackwards/api/entities/storage/MetaStorage.java
@@ -8,7 +8,7 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package nl.matsv.viabackwards.api.v2;
+package nl.matsv.viabackwards.api.entities.storage;
 
 import lombok.*;
 import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
diff --git a/core/src/main/java/nl/matsv/viabackwards/api/entities/AbstractEntityType.java b/core/src/main/java/nl/matsv/viabackwards/api/entities/types/AbstractEntityType.java
similarity index 96%
rename from core/src/main/java/nl/matsv/viabackwards/api/entities/AbstractEntityType.java
rename to core/src/main/java/nl/matsv/viabackwards/api/entities/types/AbstractEntityType.java
index ada0f314..d523a80b 100644
--- a/core/src/main/java/nl/matsv/viabackwards/api/entities/AbstractEntityType.java
+++ b/core/src/main/java/nl/matsv/viabackwards/api/entities/types/AbstractEntityType.java
@@ -8,7 +8,7 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package nl.matsv.viabackwards.api.entities;
+package nl.matsv.viabackwards.api.entities.types;
 
 import java.util.List;
 
diff --git a/core/src/main/java/nl/matsv/viabackwards/api/entities/AbstractObjectType.java b/core/src/main/java/nl/matsv/viabackwards/api/entities/types/AbstractObjectType.java
similarity index 96%
rename from core/src/main/java/nl/matsv/viabackwards/api/entities/AbstractObjectType.java
rename to core/src/main/java/nl/matsv/viabackwards/api/entities/types/AbstractObjectType.java
index 4f3866d6..287fbd3d 100644
--- a/core/src/main/java/nl/matsv/viabackwards/api/entities/AbstractObjectType.java
+++ b/core/src/main/java/nl/matsv/viabackwards/api/entities/types/AbstractObjectType.java
@@ -8,7 +8,7 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package nl.matsv.viabackwards.api.entities;
+package nl.matsv.viabackwards.api.entities.types;
 
 public interface AbstractObjectType {
     /**
diff --git a/core/src/main/java/nl/matsv/viabackwards/api/entities/EntityType1_10.java b/core/src/main/java/nl/matsv/viabackwards/api/entities/types/EntityType1_10.java
similarity index 99%
rename from core/src/main/java/nl/matsv/viabackwards/api/entities/EntityType1_10.java
rename to core/src/main/java/nl/matsv/viabackwards/api/entities/types/EntityType1_10.java
index 987c47b3..555d4ff9 100644
--- a/core/src/main/java/nl/matsv/viabackwards/api/entities/EntityType1_10.java
+++ b/core/src/main/java/nl/matsv/viabackwards/api/entities/types/EntityType1_10.java
@@ -8,7 +8,7 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package nl.matsv.viabackwards.api.entities;
+package nl.matsv.viabackwards.api.entities.types;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/core/src/main/java/nl/matsv/viabackwards/api/entities/EntityType1_11.java b/core/src/main/java/nl/matsv/viabackwards/api/entities/types/EntityType1_11.java
similarity index 99%
rename from core/src/main/java/nl/matsv/viabackwards/api/entities/EntityType1_11.java
rename to core/src/main/java/nl/matsv/viabackwards/api/entities/types/EntityType1_11.java
index 273f13cd..e393f732 100644
--- a/core/src/main/java/nl/matsv/viabackwards/api/entities/EntityType1_11.java
+++ b/core/src/main/java/nl/matsv/viabackwards/api/entities/types/EntityType1_11.java
@@ -8,7 +8,7 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package nl.matsv.viabackwards.api.entities;
+package nl.matsv.viabackwards.api.entities.types;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/core/src/main/java/nl/matsv/viabackwards/api/rewriters/EntityRewriter.java b/core/src/main/java/nl/matsv/viabackwards/api/rewriters/EntityRewriter.java
index 1acb1060..2ba4e571 100644
--- a/core/src/main/java/nl/matsv/viabackwards/api/rewriters/EntityRewriter.java
+++ b/core/src/main/java/nl/matsv/viabackwards/api/rewriters/EntityRewriter.java
@@ -13,14 +13,14 @@ package nl.matsv.viabackwards.api.rewriters;
 import lombok.RequiredArgsConstructor;
 import nl.matsv.viabackwards.ViaBackwards;
 import nl.matsv.viabackwards.api.BackwardsProtocol;
-import nl.matsv.viabackwards.api.entities.AbstractEntityType;
-import nl.matsv.viabackwards.api.entities.AbstractObjectType;
+import nl.matsv.viabackwards.api.entities.meta.MetaHandlerEvent;
+import nl.matsv.viabackwards.api.entities.meta.MetaHandlerSettings;
+import nl.matsv.viabackwards.api.entities.storage.EntityData;
+import nl.matsv.viabackwards.api.entities.storage.EntityTracker;
+import nl.matsv.viabackwards.api.entities.storage.MetaStorage;
+import nl.matsv.viabackwards.api.entities.types.AbstractEntityType;
+import nl.matsv.viabackwards.api.entities.types.AbstractObjectType;
 import nl.matsv.viabackwards.api.exceptions.RemovedValueException;
-import nl.matsv.viabackwards.api.storage.EntityData;
-import nl.matsv.viabackwards.api.storage.EntityTracker;
-import nl.matsv.viabackwards.api.v2.MetaHandlerEvent;
-import nl.matsv.viabackwards.api.v2.MetaHandlerSettings;
-import nl.matsv.viabackwards.api.v2.MetaStorage;
 import us.myles.ViaVersion.api.Via;
 import us.myles.ViaVersion.api.data.UserConnection;
 import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/Protocol1_10To1_11.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/Protocol1_10To1_11.java
index 706dda31..ca0ce077 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/Protocol1_10To1_11.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/Protocol1_10To1_11.java
@@ -12,7 +12,7 @@ package nl.matsv.viabackwards.protocol.protocol1_10to1_11;
 
 import lombok.Getter;
 import nl.matsv.viabackwards.api.BackwardsProtocol;
-import nl.matsv.viabackwards.api.storage.EntityTracker;
+import nl.matsv.viabackwards.api.entities.storage.EntityTracker;
 import nl.matsv.viabackwards.protocol.protocol1_10to1_11.packets.BlockItemPackets;
 import nl.matsv.viabackwards.protocol.protocol1_10to1_11.packets.EntityPackets;
 import nl.matsv.viabackwards.protocol.protocol1_10to1_11.packets.PlayerPackets;
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/EntityPackets.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/EntityPackets.java
index d1c9ab11..d4b1c6bc 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/EntityPackets.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/EntityPackets.java
@@ -11,11 +11,11 @@
 package nl.matsv.viabackwards.protocol.protocol1_10to1_11.packets;
 
 import nl.matsv.viabackwards.ViaBackwards;
-import nl.matsv.viabackwards.api.entities.AbstractEntityType;
+import nl.matsv.viabackwards.api.entities.storage.EntityData;
+import nl.matsv.viabackwards.api.entities.storage.MetaStorage;
+import nl.matsv.viabackwards.api.entities.types.AbstractEntityType;
 import nl.matsv.viabackwards.api.exceptions.RemovedValueException;
 import nl.matsv.viabackwards.api.rewriters.EntityRewriter;
-import nl.matsv.viabackwards.api.storage.EntityData;
-import nl.matsv.viabackwards.api.v2.MetaStorage;
 import nl.matsv.viabackwards.protocol.protocol1_10to1_11.Protocol1_10To1_11;
 import us.myles.ViaVersion.api.PacketWrapper;
 import us.myles.ViaVersion.api.Via;
@@ -30,7 +30,7 @@ import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
 
 import java.util.Optional;
 
-import static nl.matsv.viabackwards.api.entities.EntityType1_11.*;
+import static nl.matsv.viabackwards.api.entities.types.EntityType1_11.*;
 
 
 public class EntityPackets extends EntityRewriter<Protocol1_10To1_11> {
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/Protocol1_11To1_11_1.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/Protocol1_11To1_11_1.java
index f2f87d92..548af28d 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/Protocol1_11To1_11_1.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/Protocol1_11To1_11_1.java
@@ -11,7 +11,7 @@
 package nl.matsv.viabackwards.protocol.protocol1_11to1_11_1;
 
 import nl.matsv.viabackwards.api.BackwardsProtocol;
-import nl.matsv.viabackwards.api.storage.EntityTracker;
+import nl.matsv.viabackwards.api.entities.storage.EntityTracker;
 import nl.matsv.viabackwards.protocol.protocol1_11to1_11_1.packets.EntityPackets;
 import nl.matsv.viabackwards.protocol.protocol1_11to1_11_1.packets.ItemPackets;
 import us.myles.ViaVersion.api.data.UserConnection;
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/packets/EntityPackets.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/packets/EntityPackets.java
index e38b0ae1..d7deab38 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/packets/EntityPackets.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/packets/EntityPackets.java
@@ -11,11 +11,11 @@
 package nl.matsv.viabackwards.protocol.protocol1_11to1_11_1.packets;
 
 import nl.matsv.viabackwards.ViaBackwards;
-import nl.matsv.viabackwards.api.entities.AbstractEntityType;
+import nl.matsv.viabackwards.api.entities.storage.EntityData;
+import nl.matsv.viabackwards.api.entities.storage.MetaStorage;
+import nl.matsv.viabackwards.api.entities.types.AbstractEntityType;
 import nl.matsv.viabackwards.api.exceptions.RemovedValueException;
 import nl.matsv.viabackwards.api.rewriters.EntityRewriter;
-import nl.matsv.viabackwards.api.storage.EntityData;
-import nl.matsv.viabackwards.api.v2.MetaStorage;
 import nl.matsv.viabackwards.protocol.protocol1_11to1_11_1.Protocol1_11To1_11_1;
 import us.myles.ViaVersion.api.PacketWrapper;
 import us.myles.ViaVersion.api.Via;
@@ -28,7 +28,7 @@ import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
 
 import java.util.Optional;
 
-import static nl.matsv.viabackwards.api.entities.EntityType1_11.*;
+import static nl.matsv.viabackwards.api.entities.types.EntityType1_11.*;
 
 public class EntityPackets extends EntityRewriter<Protocol1_11To1_11_1> {
 
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/Protocol1_9_4To1_10.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/Protocol1_9_4To1_10.java
index 6b8d535b..ed2f8fb8 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/Protocol1_9_4To1_10.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/Protocol1_9_4To1_10.java
@@ -12,7 +12,7 @@ package nl.matsv.viabackwards.protocol.protocol1_9_4to1_10;
 
 import lombok.Getter;
 import nl.matsv.viabackwards.api.BackwardsProtocol;
-import nl.matsv.viabackwards.api.storage.EntityTracker;
+import nl.matsv.viabackwards.api.entities.storage.EntityTracker;
 import nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.packets.BlockItemPackets;
 import nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.packets.ChangedPackets;
 import nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.packets.EntityPackets;
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/EntityPackets.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/EntityPackets.java
index 2900878f..ac6a5539 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/EntityPackets.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/EntityPackets.java
@@ -11,13 +11,13 @@
 package nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.packets;
 
 import nl.matsv.viabackwards.ViaBackwards;
-import nl.matsv.viabackwards.api.entities.AbstractEntityType;
-import nl.matsv.viabackwards.api.entities.EntityType1_10;
-import nl.matsv.viabackwards.api.entities.EntityType1_11;
+import nl.matsv.viabackwards.api.entities.storage.EntityData;
+import nl.matsv.viabackwards.api.entities.storage.MetaStorage;
+import nl.matsv.viabackwards.api.entities.types.AbstractEntityType;
+import nl.matsv.viabackwards.api.entities.types.EntityType1_10;
+import nl.matsv.viabackwards.api.entities.types.EntityType1_11;
 import nl.matsv.viabackwards.api.exceptions.RemovedValueException;
 import nl.matsv.viabackwards.api.rewriters.EntityRewriter;
-import nl.matsv.viabackwards.api.storage.EntityData;
-import nl.matsv.viabackwards.api.v2.MetaStorage;
 import nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.Protocol1_9_4To1_10;
 import us.myles.ViaVersion.api.PacketWrapper;
 import us.myles.ViaVersion.api.Via;
@@ -32,8 +32,8 @@ import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
 
 import java.util.Optional;
 
-import static nl.matsv.viabackwards.api.entities.EntityType1_10.EntityType;
-import static nl.matsv.viabackwards.api.entities.EntityType1_11.getTypeFromId;
+import static nl.matsv.viabackwards.api.entities.types.EntityType1_10.EntityType;
+import static nl.matsv.viabackwards.api.entities.types.EntityType1_11.getTypeFromId;
 
 public class EntityPackets extends EntityRewriter<Protocol1_9_4To1_10> {