diff --git a/api/src/main/java/com/viaversion/viaversion/api/Via.java b/api/src/main/java/com/viaversion/viaversion/api/Via.java
index cb473cacb..5fb598e21 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/Via.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/Via.java
@@ -23,7 +23,7 @@
 package com.viaversion.viaversion.api;
 
 import com.google.common.base.Preconditions;
-import com.viaversion.viaversion.ViaManager;
+import com.viaversion.viaversion.api.configuration.ViaVersionConfig;
 import com.viaversion.viaversion.api.platform.ViaPlatform;
 
 public final class Via {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/ViaAPI.java b/api/src/main/java/com/viaversion/viaversion/api/ViaAPI.java
index 34bdee481..7e0a281fb 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/ViaAPI.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/ViaAPI.java
@@ -22,15 +22,14 @@
  */
 package com.viaversion.viaversion.api;
 
+import com.viaversion.viaversion.api.protocol.connection.ViaConnectionManager;
 import io.netty.buffer.ByteBuf;
-import com.viaversion.viaversion.ViaManager;
 import com.viaversion.viaversion.api.boss.BossBar;
 import com.viaversion.viaversion.api.boss.BossColor;
 import com.viaversion.viaversion.api.boss.BossStyle;
-import com.viaversion.viaversion.api.platform.ViaConnectionManager;
 import com.viaversion.viaversion.api.platform.ViaPlatform;
 import com.viaversion.viaversion.api.protocol.ProtocolManager;
-import com.viaversion.viaversion.api.protocol.ServerProtocolVersion;
+import com.viaversion.viaversion.api.protocol.version.ServerProtocolVersion;
 
 import java.util.SortedSet;
 import java.util.UUID;
diff --git a/api/src/main/java/com/viaversion/viaversion/ViaManager.java b/api/src/main/java/com/viaversion/viaversion/api/ViaManager.java
similarity index 96%
rename from api/src/main/java/com/viaversion/viaversion/ViaManager.java
rename to api/src/main/java/com/viaversion/viaversion/api/ViaManager.java
index 49bd026ec..c71a8338c 100644
--- a/api/src/main/java/com/viaversion/viaversion/ViaManager.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/ViaManager.java
@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion;
+package com.viaversion.viaversion.api;
 
 import com.viaversion.viaversion.api.command.ViaVersionCommand;
-import com.viaversion.viaversion.api.platform.ViaConnectionManager;
 import com.viaversion.viaversion.api.platform.ViaInjector;
 import com.viaversion.viaversion.api.platform.ViaPlatform;
 import com.viaversion.viaversion.api.platform.ViaPlatformLoader;
 import com.viaversion.viaversion.api.platform.providers.ViaProviders;
 import com.viaversion.viaversion.api.protocol.ProtocolManager;
+import com.viaversion.viaversion.api.protocol.connection.ViaConnectionManager;
 
 import java.util.Set;
 
diff --git a/api/src/main/java/com/viaversion/viaversion/api/boss/BossBar.java b/api/src/main/java/com/viaversion/viaversion/api/boss/BossBar.java
index 7fba994d0..ffb70a4a7 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/boss/BossBar.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/boss/BossBar.java
@@ -23,7 +23,7 @@
 package com.viaversion.viaversion.api.boss;
 
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 
 import java.util.Set;
 import java.util.UUID;
diff --git a/api/src/main/java/com/viaversion/viaversion/api/ViaVersionConfig.java b/api/src/main/java/com/viaversion/viaversion/api/configuration/ViaVersionConfig.java
similarity index 99%
rename from api/src/main/java/com/viaversion/viaversion/api/ViaVersionConfig.java
rename to api/src/main/java/com/viaversion/viaversion/api/configuration/ViaVersionConfig.java
index 5cff97c70..6a7ad9582 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/ViaVersionConfig.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/configuration/ViaVersionConfig.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api;
+package com.viaversion.viaversion.api.configuration;
 
 import it.unimi.dsi.fastutil.ints.IntSet;
 
diff --git a/api/src/main/java/com/viaversion/viaversion/api/entities/Entity1_10Types.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/Entity1_10Types.java
similarity index 98%
rename from api/src/main/java/com/viaversion/viaversion/api/entities/Entity1_10Types.java
rename to api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/Entity1_10Types.java
index 3f96cf89c..3912ff9e2 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/entities/Entity1_10Types.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/Entity1_10Types.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.entities;
+package com.viaversion.viaversion.api.minecraft.entities;
 
 import com.viaversion.viaversion.api.Via;
 
@@ -47,7 +47,7 @@ public class Entity1_10Types {
         return type.get();
     }
 
-    public enum EntityType implements com.viaversion.viaversion.api.entities.EntityType {
+    public enum EntityType implements com.viaversion.viaversion.api.minecraft.entities.EntityType {
         ENTITY(-1),
         DROPPED_ITEM(1, ENTITY),
         EXPERIENCE_ORB(2, ENTITY),
@@ -172,7 +172,7 @@ public class Entity1_10Types {
         }
     }
 
-    public enum ObjectType implements com.viaversion.viaversion.api.entities.ObjectType {
+    public enum ObjectType implements com.viaversion.viaversion.api.minecraft.entities.ObjectType {
         BOAT(1, EntityType.BOAT),
         ITEM(2, EntityType.DROPPED_ITEM),
         AREA_EFFECT_CLOUD(3, EntityType.AREA_EFFECT_CLOUD),
diff --git a/api/src/main/java/com/viaversion/viaversion/api/entities/Entity1_11Types.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/Entity1_11Types.java
similarity index 98%
rename from api/src/main/java/com/viaversion/viaversion/api/entities/Entity1_11Types.java
rename to api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/Entity1_11Types.java
index ecadf7047..f6f23449b 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/entities/Entity1_11Types.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/Entity1_11Types.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.entities;
+package com.viaversion.viaversion.api.minecraft.entities;
 
 import com.viaversion.viaversion.api.Via;
 
@@ -47,7 +47,7 @@ public class Entity1_11Types {
         return type.get();
     }
 
-    public enum EntityType implements com.viaversion.viaversion.api.entities.EntityType {
+    public enum EntityType implements com.viaversion.viaversion.api.minecraft.entities.EntityType {
         ENTITY(-1),
         DROPPED_ITEM(1, ENTITY),
         EXPERIENCE_ORB(2, ENTITY),
@@ -200,7 +200,7 @@ public class Entity1_11Types {
         }
     }
 
-    public enum ObjectType implements com.viaversion.viaversion.api.entities.ObjectType {
+    public enum ObjectType implements com.viaversion.viaversion.api.minecraft.entities.ObjectType {
         BOAT(1, EntityType.BOAT),
         ITEM(2, EntityType.DROPPED_ITEM),
         AREA_EFFECT_CLOUD(3, EntityType.AREA_EFFECT_CLOUD),
diff --git a/api/src/main/java/com/viaversion/viaversion/api/entities/Entity1_12Types.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/Entity1_12Types.java
similarity index 98%
rename from api/src/main/java/com/viaversion/viaversion/api/entities/Entity1_12Types.java
rename to api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/Entity1_12Types.java
index 3b7d5121d..948eb1f0f 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/entities/Entity1_12Types.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/Entity1_12Types.java
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package com.viaversion.viaversion.api.entities;
+package com.viaversion.viaversion.api.minecraft.entities;
 
 import com.viaversion.viaversion.api.Via;
 
@@ -48,7 +48,7 @@ public class Entity1_12Types {
         return type.get();
     }
 
-    public enum EntityType implements com.viaversion.viaversion.api.entities.EntityType {
+    public enum EntityType implements com.viaversion.viaversion.api.minecraft.entities.EntityType {
         ENTITY(-1),
         DROPPED_ITEM(1, ENTITY),
         EXPERIENCE_ORB(2, ENTITY),
@@ -204,7 +204,7 @@ public class Entity1_12Types {
         }
     }
 
-    public enum ObjectType implements com.viaversion.viaversion.api.entities.ObjectType {
+    public enum ObjectType implements com.viaversion.viaversion.api.minecraft.entities.ObjectType {
         BOAT(1, EntityType.BOAT),
         ITEM(2, EntityType.DROPPED_ITEM),
         AREA_EFFECT_CLOUD(3, EntityType.AREA_EFFECT_CLOUD),
diff --git a/api/src/main/java/com/viaversion/viaversion/api/entities/Entity1_13Types.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/Entity1_13Types.java
similarity index 98%
rename from api/src/main/java/com/viaversion/viaversion/api/entities/Entity1_13Types.java
rename to api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/Entity1_13Types.java
index 4cb2cd299..3141ec2fd 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/entities/Entity1_13Types.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/Entity1_13Types.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.entities;
+package com.viaversion.viaversion.api.minecraft.entities;
 
 import com.viaversion.viaversion.api.Via;
 
@@ -46,7 +46,7 @@ public class Entity1_13Types {
         return type.get();
     }
 
-    public enum EntityType implements com.viaversion.viaversion.api.entities.EntityType {
+    public enum EntityType implements com.viaversion.viaversion.api.minecraft.entities.EntityType {
         // Auto generated
 
         ENTITY(-1), // abm
@@ -253,7 +253,7 @@ public class Entity1_13Types {
         }
     }
 
-    public enum ObjectType implements com.viaversion.viaversion.api.entities.ObjectType {
+    public enum ObjectType implements com.viaversion.viaversion.api.minecraft.entities.ObjectType {
         BOAT(1, EntityType.BOAT),
         ITEM(2, EntityType.ITEM),
         AREA_EFFECT_CLOUD(3, EntityType.AREA_EFFECT_CLOUD),
diff --git a/api/src/main/java/com/viaversion/viaversion/api/entities/Entity1_14Types.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/Entity1_14Types.java
similarity index 99%
rename from api/src/main/java/com/viaversion/viaversion/api/entities/Entity1_14Types.java
rename to api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/Entity1_14Types.java
index 9a637bbfb..0df78452f 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/entities/Entity1_14Types.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/Entity1_14Types.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.entities;
+package com.viaversion.viaversion.api.minecraft.entities;
 
 import com.viaversion.viaversion.util.EntityTypeUtil;
 
diff --git a/api/src/main/java/com/viaversion/viaversion/api/entities/Entity1_15Types.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/Entity1_15Types.java
similarity index 99%
rename from api/src/main/java/com/viaversion/viaversion/api/entities/Entity1_15Types.java
rename to api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/Entity1_15Types.java
index e92d2d278..46dc07dfc 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/entities/Entity1_15Types.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/Entity1_15Types.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.entities;
+package com.viaversion.viaversion.api.minecraft.entities;
 
 import com.viaversion.viaversion.util.EntityTypeUtil;
 
diff --git a/api/src/main/java/com/viaversion/viaversion/api/entities/Entity1_16Types.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/Entity1_16Types.java
similarity index 99%
rename from api/src/main/java/com/viaversion/viaversion/api/entities/Entity1_16Types.java
rename to api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/Entity1_16Types.java
index 8ca71898b..128b63ebe 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/entities/Entity1_16Types.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/Entity1_16Types.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.entities;
+package com.viaversion.viaversion.api.minecraft.entities;
 
 import com.viaversion.viaversion.util.EntityTypeUtil;
 
diff --git a/api/src/main/java/com/viaversion/viaversion/api/entities/Entity1_16_2Types.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/Entity1_16_2Types.java
similarity index 99%
rename from api/src/main/java/com/viaversion/viaversion/api/entities/Entity1_16_2Types.java
rename to api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/Entity1_16_2Types.java
index 7c7acd328..805c09bd8 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/entities/Entity1_16_2Types.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/Entity1_16_2Types.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.entities;
+package com.viaversion.viaversion.api.minecraft.entities;
 
 import com.viaversion.viaversion.util.EntityTypeUtil;
 
diff --git a/api/src/main/java/com/viaversion/viaversion/api/entities/Entity1_17Types.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/Entity1_17Types.java
similarity index 99%
rename from api/src/main/java/com/viaversion/viaversion/api/entities/Entity1_17Types.java
rename to api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/Entity1_17Types.java
index 6130d7c08..ef1873508 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/entities/Entity1_17Types.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/Entity1_17Types.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.entities;
+package com.viaversion.viaversion.api.minecraft.entities;
 
 import com.viaversion.viaversion.util.EntityTypeUtil;
 
diff --git a/api/src/main/java/com/viaversion/viaversion/api/entities/EntityType.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityType.java
similarity index 97%
rename from api/src/main/java/com/viaversion/viaversion/api/entities/EntityType.java
rename to api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityType.java
index eb8e572cf..710b5e07e 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/entities/EntityType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityType.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.entities;
+package com.viaversion.viaversion.api.minecraft.entities;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
 
diff --git a/api/src/main/java/com/viaversion/viaversion/api/entities/ObjectType.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/ObjectType.java
similarity index 95%
rename from api/src/main/java/com/viaversion/viaversion/api/entities/ObjectType.java
rename to api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/ObjectType.java
index 8101188c4..f80c8a65e 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/entities/ObjectType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/ObjectType.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.entities;
+package com.viaversion.viaversion.api.minecraft.entities;
 
 /**
  * Represents a legacy object entity type.
diff --git a/api/src/main/java/com/viaversion/viaversion/util/UnsupportedSoftware.java b/api/src/main/java/com/viaversion/viaversion/api/platform/UnsupportedSoftware.java
similarity index 97%
rename from api/src/main/java/com/viaversion/viaversion/util/UnsupportedSoftware.java
rename to api/src/main/java/com/viaversion/viaversion/api/platform/UnsupportedSoftware.java
index 2e2de8124..d7f6b6aec 100644
--- a/api/src/main/java/com/viaversion/viaversion/util/UnsupportedSoftware.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/platform/UnsupportedSoftware.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.util;
+package com.viaversion.viaversion.api.platform;
 
 public final class UnsupportedSoftware {
 
diff --git a/api/src/main/java/com/viaversion/viaversion/api/platform/ViaPlatform.java b/api/src/main/java/com/viaversion/viaversion/api/platform/ViaPlatform.java
index 0c015f53b..dabb349ee 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/platform/ViaPlatform.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/platform/ViaPlatform.java
@@ -23,14 +23,14 @@
 package com.viaversion.viaversion.api.platform;
 
 import com.google.gson.JsonObject;
-import com.viaversion.viaversion.ViaManager;
+import com.viaversion.viaversion.api.protocol.connection.ViaConnectionManager;
+import com.viaversion.viaversion.api.ViaManager;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.ViaAPI;
-import com.viaversion.viaversion.api.ViaVersionConfig;
+import com.viaversion.viaversion.api.configuration.ViaVersionConfig;
 import com.viaversion.viaversion.api.command.ViaCommandSender;
 import com.viaversion.viaversion.api.configuration.ConfigurationProvider;
-import com.viaversion.viaversion.api.data.UserConnection;
-import com.viaversion.viaversion.util.UnsupportedSoftware;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 
 import java.io.File;
 import java.util.Collection;
diff --git a/api/src/main/java/com/viaversion/viaversion/api/protocol/Protocol.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/Protocol.java
index 0434186de..a149b8645 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/protocol/Protocol.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/Protocol.java
@@ -23,17 +23,20 @@
 package com.viaversion.viaversion.api.protocol;
 
 import com.google.common.base.Preconditions;
+import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
+import com.viaversion.viaversion.api.protocol.packet.Direction;
+import com.viaversion.viaversion.api.protocol.packet.PacketType;
+import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType;
+import com.viaversion.viaversion.api.protocol.packet.State;
 import org.checkerframework.checker.nullness.qual.Nullable;
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.data.MappingData;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.platform.providers.ViaProviders;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
 import com.viaversion.viaversion.exception.CancelException;
 import com.viaversion.viaversion.exception.InformativeException;
-import com.viaversion.viaversion.packets.Direction;
-import com.viaversion.viaversion.packets.State;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -166,7 +169,7 @@ public abstract class Protocol<C1 extends ClientboundPacketType, C2 extends Clie
     /**
      * Loads the mappingdata.
      */
-    protected final void loadMappingData() {
+    public final void loadMappingData() {
         getMappingData().load();
         onMappingDataLoaded();
     }
@@ -186,7 +189,7 @@ public abstract class Protocol<C1 extends ClientboundPacketType, C2 extends Clie
      *
      * @param providers The current providers
      */
-    protected void register(ViaProviders providers) {
+    public void register(ViaProviders providers) {
     }
 
     /**
diff --git a/api/src/main/java/com/viaversion/viaversion/api/protocol/ProtocolManager.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/ProtocolManager.java
index 77afc5df7..2b50331a4 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/protocol/ProtocolManager.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/ProtocolManager.java
@@ -23,6 +23,8 @@
 package com.viaversion.viaversion.api.protocol;
 
 import com.google.common.collect.Range;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
+import com.viaversion.viaversion.api.protocol.version.ServerProtocolVersion;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 import java.util.List;
diff --git a/api/src/main/java/com/viaversion/viaversion/api/protocol/ProtocolPipeline.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/ProtocolPipeline.java
index 26b1f4d13..04db96b2f 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/protocol/ProtocolPipeline.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/ProtocolPipeline.java
@@ -23,13 +23,13 @@
 package com.viaversion.viaversion.api.protocol;
 
 import com.google.common.base.Preconditions;
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.ProtocolInfo;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.platform.ViaPlatform;
-import com.viaversion.viaversion.packets.Direction;
-import com.viaversion.viaversion.packets.State;
-import com.viaversion.viaversion.protocols.base.ProtocolInfo;
+import com.viaversion.viaversion.api.protocol.packet.Direction;
+import com.viaversion.viaversion.api.protocol.packet.State;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/api/src/main/java/com/viaversion/viaversion/api/protocol/SimpleProtocol.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/SimpleProtocol.java
index 4ef4bd541..e79f7e1ce 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/protocol/SimpleProtocol.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/SimpleProtocol.java
@@ -22,6 +22,9 @@
  */
 package com.viaversion.viaversion.api.protocol;
 
+import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
+import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType;
+
 /**
  * Dummy protocol class when there is no need of any of the
  * existing packet type enums or automated channel mappings.
diff --git a/api/src/main/java/com/viaversion/viaversion/protocols/base/ProtocolInfo.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/connection/ProtocolInfo.java
similarity index 94%
rename from api/src/main/java/com/viaversion/viaversion/protocols/base/ProtocolInfo.java
rename to api/src/main/java/com/viaversion/viaversion/api/protocol/connection/ProtocolInfo.java
index 961b22538..6dae01796 100644
--- a/api/src/main/java/com/viaversion/viaversion/protocols/base/ProtocolInfo.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/connection/ProtocolInfo.java
@@ -20,14 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.protocols.base;
+package com.viaversion.viaversion.api.protocol.connection;
 
-import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
-import com.viaversion.viaversion.api.data.StoredObject;
-import com.viaversion.viaversion.api.data.UserConnection;
 import com.viaversion.viaversion.api.protocol.ProtocolPipeline;
-import com.viaversion.viaversion.api.protocol.ProtocolVersion;
-import com.viaversion.viaversion.packets.State;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
+import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
+import com.viaversion.viaversion.api.protocol.packet.State;
 
 import java.util.UUID;
 
diff --git a/api/src/main/java/com/viaversion/viaversion/api/data/StoredObject.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/connection/StoredObject.java
similarity index 96%
rename from api/src/main/java/com/viaversion/viaversion/api/data/StoredObject.java
rename to api/src/main/java/com/viaversion/viaversion/api/protocol/connection/StoredObject.java
index 75d68d6d6..e343968c7 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/data/StoredObject.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/connection/StoredObject.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.data;
+package com.viaversion.viaversion.api.protocol.connection;
 
 public class StoredObject {
     private final UserConnection user;
diff --git a/api/src/main/java/com/viaversion/viaversion/api/data/UserConnection.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/connection/UserConnection.java
similarity index 98%
rename from api/src/main/java/com/viaversion/viaversion/api/data/UserConnection.java
rename to api/src/main/java/com/viaversion/viaversion/api/protocol/connection/UserConnection.java
index bcfdf69de..375bed877 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/data/UserConnection.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/connection/UserConnection.java
@@ -20,22 +20,22 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.data;
+package com.viaversion.viaversion.api.protocol.connection;
 
 import com.google.common.cache.CacheBuilder;
+import com.viaversion.viaversion.api.protocol.packet.PacketTracker;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelHandlerContext;
 import org.checkerframework.checker.nullness.qual.Nullable;
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.ViaVersionConfig;
+import com.viaversion.viaversion.api.configuration.ViaVersionConfig;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.exception.CancelException;
 import com.viaversion.viaversion.exception.InformativeException;
-import com.viaversion.viaversion.packets.Direction;
-import com.viaversion.viaversion.protocols.base.ProtocolInfo;
+import com.viaversion.viaversion.api.protocol.packet.Direction;
 import com.viaversion.viaversion.util.ChatColorUtil;
 import com.viaversion.viaversion.util.PipelineUtil;
 
diff --git a/api/src/main/java/com/viaversion/viaversion/api/platform/ViaConnectionManager.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/connection/ViaConnectionManager.java
similarity index 97%
rename from api/src/main/java/com/viaversion/viaversion/api/platform/ViaConnectionManager.java
rename to api/src/main/java/com/viaversion/viaversion/api/protocol/connection/ViaConnectionManager.java
index e73ac6ed9..052c8006b 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/platform/ViaConnectionManager.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/connection/ViaConnectionManager.java
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.platform;
+package com.viaversion.viaversion.api.protocol.connection;
 
+import com.viaversion.viaversion.api.Via;
 import io.netty.channel.ChannelFutureListener;
 import org.checkerframework.checker.nullness.qual.Nullable;
-import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 
 import java.util.Collections;
 import java.util.Map;
diff --git a/api/src/main/java/com/viaversion/viaversion/api/protocol/ClientboundPacketType.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/packet/ClientboundPacketType.java
similarity index 92%
rename from api/src/main/java/com/viaversion/viaversion/api/protocol/ClientboundPacketType.java
rename to api/src/main/java/com/viaversion/viaversion/api/protocol/packet/ClientboundPacketType.java
index b7807004c..d06fd4b07 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/protocol/ClientboundPacketType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/packet/ClientboundPacketType.java
@@ -20,7 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.protocol;
+package com.viaversion.viaversion.api.protocol.packet;
+
+import com.viaversion.viaversion.api.protocol.packet.PacketType;
 
 /**
  * Interface to be implemented by server outgoing packet type enums,
diff --git a/api/src/main/java/com/viaversion/viaversion/packets/Direction.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/packet/Direction.java
similarity index 96%
rename from api/src/main/java/com/viaversion/viaversion/packets/Direction.java
rename to api/src/main/java/com/viaversion/viaversion/api/protocol/packet/Direction.java
index ac3232040..0dd44cee0 100644
--- a/api/src/main/java/com/viaversion/viaversion/packets/Direction.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/packet/Direction.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.packets;
+package com.viaversion.viaversion.api.protocol.packet;
 
 public enum Direction {
 
diff --git a/api/src/main/java/com/viaversion/viaversion/api/data/PacketTracker.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/packet/PacketTracker.java
similarity index 96%
rename from api/src/main/java/com/viaversion/viaversion/api/data/PacketTracker.java
rename to api/src/main/java/com/viaversion/viaversion/api/protocol/packet/PacketTracker.java
index a0d24be59..d203e1243 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/data/PacketTracker.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/packet/PacketTracker.java
@@ -20,11 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.data;
+package com.viaversion.viaversion.api.protocol.packet;
 
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.ViaVersionConfig;
+import com.viaversion.viaversion.api.configuration.ViaVersionConfig;
 
 public class PacketTracker {
     private final UserConnection connection;
diff --git a/api/src/main/java/com/viaversion/viaversion/api/protocol/PacketType.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/packet/PacketType.java
similarity index 96%
rename from api/src/main/java/com/viaversion/viaversion/api/protocol/PacketType.java
rename to api/src/main/java/com/viaversion/viaversion/api/protocol/packet/PacketType.java
index f714d3c72..30df626fa 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/protocol/PacketType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/packet/PacketType.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.protocol;
+package com.viaversion.viaversion.api.protocol.packet;
 
 /**
  * Interface representing PLAY state packets, ordered by their packet id.
diff --git a/api/src/main/java/com/viaversion/viaversion/api/PacketWrapper.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/packet/PacketWrapper.java
similarity index 98%
rename from api/src/main/java/com/viaversion/viaversion/api/PacketWrapper.java
rename to api/src/main/java/com/viaversion/viaversion/api/protocol/packet/PacketWrapper.java
index e5b3563e2..8f3ce855e 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/PacketWrapper.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/packet/PacketWrapper.java
@@ -20,21 +20,20 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api;
+package com.viaversion.viaversion.api.protocol.packet;
 
 import com.google.common.base.Preconditions;
+import com.viaversion.viaversion.api.Via;
+import com.viaversion.viaversion.util.Pair;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelFuture;
-import com.viaversion.viaversion.api.data.UserConnection;
-import com.viaversion.viaversion.api.protocol.PacketType;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.remapper.ValueCreator;
+import com.viaversion.viaversion.api.protocol.remapper.ValueCreator;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.TypeConverter;
 import com.viaversion.viaversion.exception.CancelException;
 import com.viaversion.viaversion.exception.InformativeException;
-import com.viaversion.viaversion.packets.Direction;
-import com.viaversion.viaversion.packets.State;
 import com.viaversion.viaversion.util.PipelineUtil;
 
 import java.io.IOException;
diff --git a/api/src/main/java/com/viaversion/viaversion/api/protocol/ServerboundPacketType.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/packet/ServerboundPacketType.java
similarity index 92%
rename from api/src/main/java/com/viaversion/viaversion/api/protocol/ServerboundPacketType.java
rename to api/src/main/java/com/viaversion/viaversion/api/protocol/packet/ServerboundPacketType.java
index bf4e2308f..5b66dd2e7 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/protocol/ServerboundPacketType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/packet/ServerboundPacketType.java
@@ -20,7 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.protocol;
+package com.viaversion.viaversion.api.protocol.packet;
+
+import com.viaversion.viaversion.api.protocol.packet.PacketType;
 
 /**
  * Interface to be implemented by server incoming packet type enums,
diff --git a/api/src/main/java/com/viaversion/viaversion/packets/State.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/packet/State.java
similarity index 95%
rename from api/src/main/java/com/viaversion/viaversion/packets/State.java
rename to api/src/main/java/com/viaversion/viaversion/api/protocol/packet/State.java
index bf5264144..56ed23153 100644
--- a/api/src/main/java/com/viaversion/viaversion/packets/State.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/packet/State.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.packets;
+package com.viaversion.viaversion.api.protocol.packet;
 
 public enum State {
 
diff --git a/api/src/main/java/com/viaversion/viaversion/api/remapper/PacketHandler.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/remapper/PacketHandler.java
similarity index 93%
rename from api/src/main/java/com/viaversion/viaversion/api/remapper/PacketHandler.java
rename to api/src/main/java/com/viaversion/viaversion/api/protocol/remapper/PacketHandler.java
index a11f2edfd..147e38bbc 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/remapper/PacketHandler.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/remapper/PacketHandler.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.remapper;
+package com.viaversion.viaversion.api.protocol.remapper;
 
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.exception.InformativeException;
 
 @FunctionalInterface
diff --git a/api/src/main/java/com/viaversion/viaversion/api/remapper/PacketRemapper.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/remapper/PacketRemapper.java
similarity index 97%
rename from api/src/main/java/com/viaversion/viaversion/api/remapper/PacketRemapper.java
rename to api/src/main/java/com/viaversion/viaversion/api/protocol/remapper/PacketRemapper.java
index f42087ded..cc01bdadf 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/remapper/PacketRemapper.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/remapper/PacketRemapper.java
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.remapper;
+package com.viaversion.viaversion.api.protocol.remapper;
 
-import com.viaversion.viaversion.api.PacketWrapper;
-import com.viaversion.viaversion.api.Pair;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
+import com.viaversion.viaversion.util.Pair;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.exception.CancelException;
 import com.viaversion.viaversion.exception.InformativeException;
diff --git a/api/src/main/java/com/viaversion/viaversion/api/remapper/TypeRemapper.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/remapper/TypeRemapper.java
similarity index 93%
rename from api/src/main/java/com/viaversion/viaversion/api/remapper/TypeRemapper.java
rename to api/src/main/java/com/viaversion/viaversion/api/protocol/remapper/TypeRemapper.java
index 651de7270..0bf5d72d5 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/remapper/TypeRemapper.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/remapper/TypeRemapper.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.remapper;
+package com.viaversion.viaversion.api.protocol.remapper;
 
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.type.Type;
 
 public class TypeRemapper<T> implements ValueReader<T>, ValueWriter<T> {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/remapper/ValueCreator.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/remapper/ValueCreator.java
similarity index 93%
rename from api/src/main/java/com/viaversion/viaversion/api/remapper/ValueCreator.java
rename to api/src/main/java/com/viaversion/viaversion/api/protocol/remapper/ValueCreator.java
index 5801bf08b..da43c953a 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/remapper/ValueCreator.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/remapper/ValueCreator.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.remapper;
+package com.viaversion.viaversion.api.protocol.remapper;
 
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.exception.InformativeException;
 
 @FunctionalInterface
diff --git a/api/src/main/java/com/viaversion/viaversion/api/remapper/ValueReader.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/remapper/ValueReader.java
similarity index 92%
rename from api/src/main/java/com/viaversion/viaversion/api/remapper/ValueReader.java
rename to api/src/main/java/com/viaversion/viaversion/api/protocol/remapper/ValueReader.java
index a06141848..74dfc0395 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/remapper/ValueReader.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/remapper/ValueReader.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.remapper;
+package com.viaversion.viaversion.api.protocol.remapper;
 
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 
 @FunctionalInterface
 public interface ValueReader<T> {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/remapper/ValueTransformer.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/remapper/ValueTransformer.java
similarity index 95%
rename from api/src/main/java/com/viaversion/viaversion/api/remapper/ValueTransformer.java
rename to api/src/main/java/com/viaversion/viaversion/api/protocol/remapper/ValueTransformer.java
index aeb5b50bb..0bc9ab741 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/remapper/ValueTransformer.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/remapper/ValueTransformer.java
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.remapper;
+package com.viaversion.viaversion.api.protocol.remapper;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.exception.InformativeException;
 
diff --git a/api/src/main/java/com/viaversion/viaversion/api/remapper/ValueWriter.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/remapper/ValueWriter.java
similarity index 92%
rename from api/src/main/java/com/viaversion/viaversion/api/remapper/ValueWriter.java
rename to api/src/main/java/com/viaversion/viaversion/api/protocol/remapper/ValueWriter.java
index 6472295d3..17d9ddeae 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/remapper/ValueWriter.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/remapper/ValueWriter.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.remapper;
+package com.viaversion.viaversion.api.protocol.remapper;
 
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 
 @FunctionalInterface
 public interface ValueWriter<T> {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/protocol/ProtocolVersion.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java
similarity index 94%
rename from api/src/main/java/com/viaversion/viaversion/api/protocol/ProtocolVersion.java
rename to api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java
index b2fe8b66f..d2a3666ce 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/protocol/ProtocolVersion.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.protocol;
+package com.viaversion.viaversion.api.protocol.version;
 
 import com.google.common.base.Preconditions;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
@@ -35,8 +35,8 @@ import java.util.List;
 import java.util.Set;
 
 public class ProtocolVersion {
-    private static final Int2ObjectMap<ProtocolVersion> versions = new Int2ObjectOpenHashMap<>();
-    private static final List<ProtocolVersion> versionList = new ArrayList<>();
+    private static final Int2ObjectMap<ProtocolVersion> VERSIONS = new Int2ObjectOpenHashMap<>();
+    private static final List<ProtocolVersion> VERSION_LIST = new ArrayList<>();
 
     // Before the Netty rewrite
     public static final ProtocolVersion v1_4_6 = register(51, "1.4.6/7", new VersionRange("1.4", 6, 7));
@@ -102,10 +102,10 @@ public class ProtocolVersion {
      */
     public static ProtocolVersion register(int version, int snapshotVersion, String name, @Nullable VersionRange versionRange) {
         ProtocolVersion protocol = new ProtocolVersion(version, snapshotVersion, name, versionRange);
-        versionList.add(protocol);
-        versions.put(protocol.getVersion(), protocol);
+        VERSION_LIST.add(protocol);
+        VERSIONS.put(protocol.getVersion(), protocol);
         if (protocol.isSnapshot()) {
-            versions.put(protocol.getFullSnapshotVersion(), protocol);
+            VERSIONS.put(protocol.getFullSnapshotVersion(), protocol);
         }
         return protocol;
     }
@@ -117,7 +117,7 @@ public class ProtocolVersion {
      * @return true if this protocol version has been registered
      */
     public static boolean isRegistered(int id) {
-        return versions.containsKey(id);
+        return VERSIONS.containsKey(id);
     }
 
     /**
@@ -128,7 +128,7 @@ public class ProtocolVersion {
      * @return registered or unknown {@link ProtocolVersion}
      */
     public static @NonNull ProtocolVersion getProtocol(int id) {
-        ProtocolVersion protocolVersion = versions.get(id);
+        ProtocolVersion protocolVersion = VERSIONS.get(id);
         if (protocolVersion != null) {
             return protocolVersion;
         } else {
@@ -143,7 +143,7 @@ public class ProtocolVersion {
      * @return internal index of the stored protocol version
      */
     public static int getIndex(ProtocolVersion version) {
-        return versionList.indexOf(version);
+        return VERSION_LIST.indexOf(version);
     }
 
     /**
@@ -152,7 +152,7 @@ public class ProtocolVersion {
      * @return immutable list of registered protocol versions
      */
     public static List<ProtocolVersion> getProtocols() {
-        return Collections.unmodifiableList(new ArrayList<>(versions.values()));
+        return Collections.unmodifiableList(new ArrayList<>(VERSIONS.values()));
     }
 
     /**
@@ -164,7 +164,7 @@ public class ProtocolVersion {
      * @return registered protocol version if present, else null
      */
     public static @Nullable ProtocolVersion getClosest(String protocol) {
-        for (ProtocolVersion version : versions.values()) {
+        for (ProtocolVersion version : VERSIONS.values()) {
             String name = version.getName();
             if (name.equals(protocol)) {
                 return version;
@@ -326,15 +326,6 @@ public class ProtocolVersion {
         return snapshotVersion != -1;
     }
 
-    /**
-     * @return release version
-     * @deprecated ambiguous, see {@link #getOriginalVersion()}, {@link #getVersion()}, and {@link #getSnapshotVersion()}
-     */
-    @Deprecated
-    public int getId() {
-        return version;
-    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
diff --git a/api/src/main/java/com/viaversion/viaversion/api/protocol/ServerProtocolVersion.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ServerProtocolVersion.java
similarity index 55%
rename from api/src/main/java/com/viaversion/viaversion/api/protocol/ServerProtocolVersion.java
rename to api/src/main/java/com/viaversion/viaversion/api/protocol/version/ServerProtocolVersion.java
index 6e50392d6..467e78af8 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/protocol/ServerProtocolVersion.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ServerProtocolVersion.java
@@ -2,20 +2,25 @@
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
  * Copyright (C) 2016-2021 ViaVersion and contributors
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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 com.viaversion.viaversion.api.protocol;
+package com.viaversion.viaversion.api.protocol.version;
 
 import it.unimi.dsi.fastutil.ints.IntSortedSet;
 
diff --git a/api/src/main/java/com/viaversion/viaversion/protocols/base/VersionProvider.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/version/VersionProvider.java
similarity index 92%
rename from api/src/main/java/com/viaversion/viaversion/protocols/base/VersionProvider.java
rename to api/src/main/java/com/viaversion/viaversion/api/protocol/version/VersionProvider.java
index d8d35fcd2..be5406f65 100644
--- a/api/src/main/java/com/viaversion/viaversion/protocols/base/VersionProvider.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/version/VersionProvider.java
@@ -20,9 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.protocols.base;
+package com.viaversion.viaversion.api.protocol.version;
 
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.platform.providers.Provider;
 
 public interface VersionProvider extends Provider {
diff --git a/api/src/main/java/com/viaversion/viaversion/api/protocol/VersionRange.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/version/VersionRange.java
similarity index 97%
rename from api/src/main/java/com/viaversion/viaversion/api/protocol/VersionRange.java
rename to api/src/main/java/com/viaversion/viaversion/api/protocol/version/VersionRange.java
index 156d94d61..ea2c55fd6 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/protocol/VersionRange.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/version/VersionRange.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.protocol;
+package com.viaversion.viaversion.api.protocol.version;
 
 import com.google.common.base.Preconditions;
 
diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/Type.java b/api/src/main/java/com/viaversion/viaversion/api/type/Type.java
index bad73b93b..36eb231c9 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/Type.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/Type.java
@@ -205,11 +205,11 @@ public abstract class Type<T> implements ByteBufReader<T>, ByteBufWriter<T> {
     private final Class<? super T> outputClass;
     private final String typeName;
 
-    public Type(Class<? super T> outputClass) {
+    protected Type(Class<? super T> outputClass) {
         this(outputClass.getSimpleName(), outputClass);
     }
 
-    public Type(String typeName, Class<? super T> outputClass) {
+    protected Type(String typeName, Class<? super T> outputClass) {
         this.outputClass = outputClass;
         this.typeName = typeName;
     }
diff --git a/api/src/main/java/com/viaversion/viaversion/exception/CancelDecoderException.java b/api/src/main/java/com/viaversion/viaversion/exception/CancelDecoderException.java
index 999843779..7abbb28a3 100644
--- a/api/src/main/java/com/viaversion/viaversion/exception/CancelDecoderException.java
+++ b/api/src/main/java/com/viaversion/viaversion/exception/CancelDecoderException.java
@@ -22,6 +22,7 @@
  */
 package com.viaversion.viaversion.exception;
 
+import com.viaversion.viaversion.api.ViaManager;
 import io.netty.handler.codec.DecoderException;
 import com.viaversion.viaversion.api.Via;
 
@@ -54,7 +55,7 @@ public class CancelDecoderException extends DecoderException implements CancelCo
     }
 
     /**
-     * Returns a cached CancelDecoderException or a new instance when {@link com.viaversion.viaversion.ViaManager#isDebug()} is true.
+     * Returns a cached CancelDecoderException or a new instance when {@link ViaManager#isDebug()} is true.
      *
      * @param cause cause for being used when a new instance is creeated
      * @return a CancelDecoderException instance
diff --git a/api/src/main/java/com/viaversion/viaversion/exception/CancelEncoderException.java b/api/src/main/java/com/viaversion/viaversion/exception/CancelEncoderException.java
index db87095e4..9ce2cedb9 100644
--- a/api/src/main/java/com/viaversion/viaversion/exception/CancelEncoderException.java
+++ b/api/src/main/java/com/viaversion/viaversion/exception/CancelEncoderException.java
@@ -22,6 +22,7 @@
  */
 package com.viaversion.viaversion.exception;
 
+import com.viaversion.viaversion.api.ViaManager;
 import io.netty.handler.codec.EncoderException;
 import com.viaversion.viaversion.api.Via;
 
@@ -54,7 +55,7 @@ public class CancelEncoderException extends EncoderException implements CancelCo
     }
 
     /**
-     * Returns a cached CancelEncoderException or a new instance when {@link com.viaversion.viaversion.ViaManager#isDebug()} is true.
+     * Returns a cached CancelEncoderException or a new instance when {@link ViaManager#isDebug()} is true.
      *
      * @param cause cause for being used when a new instance is creeated
      * @return a CancelEncoderException instance
diff --git a/api/src/main/java/com/viaversion/viaversion/exception/CancelException.java b/api/src/main/java/com/viaversion/viaversion/exception/CancelException.java
index 0b1788248..6348e5120 100644
--- a/api/src/main/java/com/viaversion/viaversion/exception/CancelException.java
+++ b/api/src/main/java/com/viaversion/viaversion/exception/CancelException.java
@@ -22,6 +22,7 @@
  */
 package com.viaversion.viaversion.exception;
 
+import com.viaversion.viaversion.api.ViaManager;
 import io.netty.handler.codec.CodecException;
 import com.viaversion.viaversion.api.Via;
 
@@ -57,7 +58,7 @@ public class CancelException extends Exception {
     }
 
     /**
-     * Returns a cached CancelException or a new instance when {@link com.viaversion.viaversion.ViaManager#isDebug()} is true.
+     * Returns a cached CancelException or a new instance when {@link ViaManager#isDebug()} is true.
      *
      * @return a CancelException instance
      */
diff --git a/api/src/main/java/com/viaversion/viaversion/util/EntityTypeUtil.java b/api/src/main/java/com/viaversion/viaversion/util/EntityTypeUtil.java
index 1e18cf669..f47d056dd 100644
--- a/api/src/main/java/com/viaversion/viaversion/util/EntityTypeUtil.java
+++ b/api/src/main/java/com/viaversion/viaversion/util/EntityTypeUtil.java
@@ -23,7 +23,7 @@
 package com.viaversion.viaversion.util;
 
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.entities.EntityType;
+import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 
 import java.util.ArrayList;
 import java.util.Comparator;
diff --git a/api/src/main/java/com/viaversion/viaversion/api/Pair.java b/api/src/main/java/com/viaversion/viaversion/util/Pair.java
similarity index 98%
rename from api/src/main/java/com/viaversion/viaversion/api/Pair.java
rename to api/src/main/java/com/viaversion/viaversion/util/Pair.java
index d0d28a235..ad86de80a 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/Pair.java
+++ b/api/src/main/java/com/viaversion/viaversion/util/Pair.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api;
+package com.viaversion.viaversion.util;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
 
diff --git a/api/src/main/java/com/viaversion/viaversion/api/Triple.java b/api/src/main/java/com/viaversion/viaversion/util/Triple.java
similarity index 98%
rename from api/src/main/java/com/viaversion/viaversion/api/Triple.java
rename to api/src/main/java/com/viaversion/viaversion/util/Triple.java
index 29fed9366..eac115a21 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/Triple.java
+++ b/api/src/main/java/com/viaversion/viaversion/util/Triple.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api;
+package com.viaversion.viaversion.util;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
 
diff --git a/api/src/main/java/com/viaversion/viaversion/util/VersionInfo.java b/api/src/main/java/com/viaversion/viaversion/util/VersionInfo.java
index 3eae6af36..d65379066 100644
--- a/api/src/main/java/com/viaversion/viaversion/util/VersionInfo.java
+++ b/api/src/main/java/com/viaversion/viaversion/util/VersionInfo.java
@@ -24,7 +24,7 @@ package com.viaversion.viaversion.util;
 
 import com.viaversion.viaversion.api.platform.ViaPlatform;
 
-public class VersionInfo {
+public final class VersionInfo {
 
     /**
      * Plugin version.
diff --git a/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/ViaBukkitListener.java b/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/ViaBukkitListener.java
index 99084fcaa..c2c11b662 100644
--- a/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/ViaBukkitListener.java
+++ b/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/ViaBukkitListener.java
@@ -20,8 +20,8 @@ package com.viaversion.viaversion.bukkit.listeners;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;
 import org.bukkit.plugin.Plugin;
-import com.viaversion.viaversion.api.ViaListener;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.ViaListener;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.Protocol;
 
 public class ViaBukkitListener extends ViaListener implements Listener {
diff --git a/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_9to1_8/ArmorListener.java b/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_9to1_8/ArmorListener.java
index 124f6ce69..123c41316 100644
--- a/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_9to1_8/ArmorListener.java
+++ b/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_9to1_8/ArmorListener.java
@@ -32,7 +32,7 @@ import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.inventory.CraftingInventory;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.Plugin;
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.bukkit.listeners.ViaBukkitListener;
diff --git a/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_9to1_8/DeathListener.java b/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_9to1_8/DeathListener.java
index c55da2a09..a05de015d 100644
--- a/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_9to1_8/DeathListener.java
+++ b/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_9to1_8/DeathListener.java
@@ -23,9 +23,9 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.entity.PlayerDeathEvent;
 import org.bukkit.plugin.Plugin;
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.bukkit.listeners.ViaBukkitListener;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8;
diff --git a/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitBlockConnectionProvider.java b/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitBlockConnectionProvider.java
index f576ff1ba..c1ec8a5ad 100644
--- a/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitBlockConnectionProvider.java
+++ b/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitBlockConnectionProvider.java
@@ -22,8 +22,7 @@ import org.bukkit.Chunk;
 import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
-import com.viaversion.viaversion.api.data.UserConnection;
-import com.viaversion.viaversion.api.minecraft.Position;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections.providers.BlockConnectionProvider;
 
 import java.util.UUID;
diff --git a/bukkit/src/main/java/com/viaversion/viaversion/ViaVersionPlugin.java b/bukkit/src/main/java/com/viaversion/viaversion/ViaVersionPlugin.java
index e27c79259..903c966f9 100644
--- a/bukkit/src/main/java/com/viaversion/viaversion/ViaVersionPlugin.java
+++ b/bukkit/src/main/java/com/viaversion/viaversion/ViaVersionPlugin.java
@@ -42,7 +42,7 @@ import com.viaversion.viaversion.bukkit.platform.BukkitViaLoader;
 import com.viaversion.viaversion.bukkit.util.NMSUtil;
 import com.viaversion.viaversion.dump.PluginInfo;
 import com.viaversion.viaversion.util.GsonUtil;
-import com.viaversion.viaversion.util.UnsupportedSoftware;
+import com.viaversion.viaversion.api.platform.UnsupportedSoftware;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/classgenerator/BasicHandlerConstructor.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/classgenerator/BasicHandlerConstructor.java
index 30efd2a62..f3eab1d6c 100644
--- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/classgenerator/BasicHandlerConstructor.java
+++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/classgenerator/BasicHandlerConstructor.java
@@ -19,7 +19,7 @@ package com.viaversion.viaversion.bukkit.classgenerator;
 
 import io.netty.handler.codec.ByteToMessageDecoder;
 import io.netty.handler.codec.MessageToByteEncoder;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.bukkit.handlers.BukkitDecodeHandler;
 import com.viaversion.viaversion.bukkit.handlers.BukkitEncodeHandler;
 
diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/classgenerator/HandlerConstructor.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/classgenerator/HandlerConstructor.java
index bc0b1c08d..e4ac4cb36 100644
--- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/classgenerator/HandlerConstructor.java
+++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/classgenerator/HandlerConstructor.java
@@ -19,7 +19,7 @@ package com.viaversion.viaversion.bukkit.classgenerator;
 
 import io.netty.handler.codec.ByteToMessageDecoder;
 import io.netty.handler.codec.MessageToByteEncoder;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 
 public interface HandlerConstructor {
     public MessageToByteEncoder newEncodeHandler(UserConnection info, MessageToByteEncoder minecraftEncoder);
diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/handlers/BukkitChannelInitializer.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/handlers/BukkitChannelInitializer.java
index 4a4e63063..8d62db4df 100644
--- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/handlers/BukkitChannelInitializer.java
+++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/handlers/BukkitChannelInitializer.java
@@ -22,7 +22,7 @@ import io.netty.channel.ChannelInitializer;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.handler.codec.ByteToMessageDecoder;
 import io.netty.handler.codec.MessageToByteEncoder;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.ProtocolPipeline;
 import com.viaversion.viaversion.bukkit.classgenerator.ClassGenerator;
 import com.viaversion.viaversion.bukkit.classgenerator.HandlerConstructor;
diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/handlers/BukkitDecodeHandler.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/handlers/BukkitDecodeHandler.java
index afa468127..c6a5e0279 100644
--- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/handlers/BukkitDecodeHandler.java
+++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/handlers/BukkitDecodeHandler.java
@@ -21,12 +21,12 @@ import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.ByteToMessageDecoder;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.bukkit.util.NMSUtil;
 import com.viaversion.viaversion.exception.CancelCodecException;
 import com.viaversion.viaversion.exception.CancelDecoderException;
 import com.viaversion.viaversion.exception.InformativeException;
-import com.viaversion.viaversion.packets.State;
+import com.viaversion.viaversion.api.protocol.packet.State;
 import com.viaversion.viaversion.util.PipelineUtil;
 
 import java.lang.reflect.InvocationTargetException;
diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/handlers/BukkitEncodeHandler.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/handlers/BukkitEncodeHandler.java
index 05e8209a8..8fa09d633 100644
--- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/handlers/BukkitEncodeHandler.java
+++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/handlers/BukkitEncodeHandler.java
@@ -21,20 +21,20 @@ import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToByteEncoder;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.bukkit.util.NMSUtil;
 import com.viaversion.viaversion.exception.CancelCodecException;
 import com.viaversion.viaversion.exception.CancelEncoderException;
 import com.viaversion.viaversion.exception.InformativeException;
 import com.viaversion.viaversion.handlers.ChannelHandlerContextWrapper;
-import com.viaversion.viaversion.handlers.ViaHandler;
-import com.viaversion.viaversion.packets.State;
+import com.viaversion.viaversion.handlers.ViaCodecHandler;
+import com.viaversion.viaversion.api.protocol.packet.State;
 import com.viaversion.viaversion.util.PipelineUtil;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 
-public class BukkitEncodeHandler extends MessageToByteEncoder implements ViaHandler {
+public class BukkitEncodeHandler extends MessageToByteEncoder implements ViaCodecHandler {
     private static Field versionField;
 
     static {
diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/handlers/BukkitPacketHandler.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/handlers/BukkitPacketHandler.java
index 42a2c6fc8..635d93da8 100644
--- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/handlers/BukkitPacketHandler.java
+++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/handlers/BukkitPacketHandler.java
@@ -20,7 +20,7 @@ package com.viaversion.viaversion.bukkit.handlers;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToMessageEncoder;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 
 import java.util.List;
 
diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/multiversion/PlayerSneakListener.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/multiversion/PlayerSneakListener.java
index 82a23ed4f..d5509ede1 100644
--- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/multiversion/PlayerSneakListener.java
+++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/multiversion/PlayerSneakListener.java
@@ -25,10 +25,10 @@ import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.event.player.PlayerToggleSneakEvent;
 import com.viaversion.viaversion.ViaVersionPlugin;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.UserConnection;
-import com.viaversion.viaversion.api.protocol.ProtocolVersion;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.bukkit.listeners.ViaBukkitListener;
-import com.viaversion.viaversion.protocols.base.ProtocolInfo;
+import com.viaversion.viaversion.api.protocol.connection.ProtocolInfo;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_15to1_14_4/EntityToggleGlideListener.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_15to1_14_4/EntityToggleGlideListener.java
index 6675650e0..982919d0b 100644
--- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_15to1_14_4/EntityToggleGlideListener.java
+++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_15to1_14_4/EntityToggleGlideListener.java
@@ -23,7 +23,7 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.entity.EntityToggleGlideEvent;
 import org.bukkit.potion.PotionEffectType;
 import com.viaversion.viaversion.ViaVersionPlugin;
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
 import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_14;
 import com.viaversion.viaversion.api.type.Type;
diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaAPI.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaAPI.java
index e1fc0b69a..b7c0ebd7c 100644
--- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaAPI.java
+++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaAPI.java
@@ -22,11 +22,11 @@ import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import com.viaversion.viaversion.ViaVersionPlugin;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.ViaAPIBase;
+import com.viaversion.viaversion.ViaAPIBase;
 import com.viaversion.viaversion.api.boss.BossBar;
 import com.viaversion.viaversion.api.boss.BossColor;
 import com.viaversion.viaversion.api.boss.BossStyle;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.boss.ViaBossBar;
 import com.viaversion.viaversion.bukkit.util.ProtocolSupportUtil;
 
diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaConfig.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaConfig.java
index 19a519fc9..7b30dc9f3 100644
--- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaConfig.java
+++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaConfig.java
@@ -18,7 +18,7 @@
 package com.viaversion.viaversion.bukkit.platform;
 
 import org.bukkit.plugin.Plugin;
-import com.viaversion.viaversion.AbstractViaConfig;
+import com.viaversion.viaversion.configuration.AbstractViaConfig;
 import com.viaversion.viaversion.api.Via;
 
 import java.io.File;
diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaInjector.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaInjector.java
index 1cf0bf85b..b69043406 100644
--- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaInjector.java
+++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaInjector.java
@@ -25,7 +25,7 @@ import io.netty.channel.ChannelInitializer;
 import io.netty.channel.socket.SocketChannel;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.PluginDescriptionFile;
-import com.viaversion.viaversion.api.Pair;
+import com.viaversion.viaversion.util.Pair;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.platform.ViaInjector;
 import com.viaversion.viaversion.bukkit.handlers.BukkitChannelInitializer;
diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaLoader.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaLoader.java
index b027be033..4f2422cd6 100644
--- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaLoader.java
+++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaLoader.java
@@ -24,10 +24,10 @@ import org.bukkit.event.Listener;
 import org.bukkit.scheduler.BukkitTask;
 import com.viaversion.viaversion.ViaVersionPlugin;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.platform.ViaPlatformLoader;
-import com.viaversion.viaversion.api.protocol.ProtocolVersion;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.bukkit.classgenerator.ClassGenerator;
 import com.viaversion.viaversion.bukkit.listeners.UpdateListener;
 import com.viaversion.viaversion.bukkit.listeners.multiversion.PlayerSneakListener;
diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitInventoryQuickMoveProvider.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitInventoryQuickMoveProvider.java
index 3a1b2b7bd..0d8ad27ae 100644
--- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitInventoryQuickMoveProvider.java
+++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitInventoryQuickMoveProvider.java
@@ -23,11 +23,11 @@ import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryView;
 import org.bukkit.inventory.ItemStack;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.UserConnection;
-import com.viaversion.viaversion.api.protocol.ProtocolVersion;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.bukkit.tasks.protocol1_12to1_11_1.BukkitInventoryUpdateTask;
 import com.viaversion.viaversion.bukkit.util.NMSUtil;
-import com.viaversion.viaversion.protocols.base.ProtocolInfo;
+import com.viaversion.viaversion.api.protocol.connection.ProtocolInfo;
 import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.providers.InventoryQuickMoveProvider;
 import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.storage.ItemTransaction;
 import com.viaversion.viaversion.util.ReflectionUtil;
diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitViaMovementTransmitter.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitViaMovementTransmitter.java
index d8dad8a0d..5f3264650 100644
--- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitViaMovementTransmitter.java
+++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitViaMovementTransmitter.java
@@ -20,7 +20,7 @@ package com.viaversion.viaversion.bukkit.providers;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.bukkit.util.NMSUtil;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.MovementTransmitterProvider;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.MovementTracker;
diff --git a/bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeChannelInitializer.java b/bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeChannelInitializer.java
index 1caa811d6..bcebee858 100644
--- a/bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeChannelInitializer.java
+++ b/bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeChannelInitializer.java
@@ -19,7 +19,7 @@ package com.viaversion.viaversion.bungee.handlers;
 
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelInitializer;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.ProtocolPipeline;
 
 import java.lang.reflect.Method;
diff --git a/bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeDecodeHandler.java b/bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeDecodeHandler.java
index 3cfb07b94..ead6ec73f 100644
--- a/bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeDecodeHandler.java
+++ b/bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeDecodeHandler.java
@@ -21,7 +21,7 @@ import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToMessageDecoder;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.exception.CancelCodecException;
 import com.viaversion.viaversion.exception.CancelDecoderException;
 
diff --git a/bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeEncodeHandler.java b/bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeEncodeHandler.java
index e09f2a4fa..1602a113e 100644
--- a/bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeEncodeHandler.java
+++ b/bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeEncodeHandler.java
@@ -21,7 +21,7 @@ import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToMessageEncoder;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.bungee.util.BungeePipelineUtil;
 import com.viaversion.viaversion.exception.CancelCodecException;
 import com.viaversion.viaversion.exception.CancelEncoderException;
diff --git a/bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeServerHandler.java b/bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeServerHandler.java
index f1ab53bac..f2ca25ada 100644
--- a/bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeServerHandler.java
+++ b/bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeServerHandler.java
@@ -25,19 +25,19 @@ import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.api.score.Team;
 import net.md_5.bungee.event.EventHandler;
 import net.md_5.bungee.protocol.packet.PluginMessage;
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.data.ExternalJoinGameListener;
-import com.viaversion.viaversion.api.data.StoredObject;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.StoredObject;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.api.protocol.ProtocolPathEntry;
 import com.viaversion.viaversion.api.protocol.ProtocolPipeline;
-import com.viaversion.viaversion.api.protocol.ProtocolVersion;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.bungee.service.ProtocolDetectorService;
 import com.viaversion.viaversion.bungee.storage.BungeeStorage;
-import com.viaversion.viaversion.protocols.base.ProtocolInfo;
+import com.viaversion.viaversion.api.protocol.connection.ProtocolInfo;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.packets.InventoryPackets;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.EntityIdProvider;
diff --git a/bungee/src/main/java/com/viaversion/viaversion/bungee/listeners/ElytraPatch.java b/bungee/src/main/java/com/viaversion/viaversion/bungee/listeners/ElytraPatch.java
index f67d98149..cddcfe6e3 100644
--- a/bungee/src/main/java/com/viaversion/viaversion/bungee/listeners/ElytraPatch.java
+++ b/bungee/src/main/java/com/viaversion/viaversion/bungee/listeners/ElytraPatch.java
@@ -21,9 +21,9 @@ import net.md_5.bungee.api.event.ServerConnectedEvent;
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.event.EventHandler;
 import net.md_5.bungee.event.EventPriority;
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
 import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_9;
 import com.viaversion.viaversion.api.type.Type;
diff --git a/bungee/src/main/java/com/viaversion/viaversion/bungee/platform/BungeeViaAPI.java b/bungee/src/main/java/com/viaversion/viaversion/bungee/platform/BungeeViaAPI.java
index 7225173c7..7936e254a 100644
--- a/bungee/src/main/java/com/viaversion/viaversion/bungee/platform/BungeeViaAPI.java
+++ b/bungee/src/main/java/com/viaversion/viaversion/bungee/platform/BungeeViaAPI.java
@@ -20,7 +20,7 @@ package com.viaversion.viaversion.bungee.platform;
 import io.netty.buffer.ByteBuf;
 import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
-import com.viaversion.viaversion.api.ViaAPIBase;
+import com.viaversion.viaversion.ViaAPIBase;
 import com.viaversion.viaversion.api.boss.BossBar;
 import com.viaversion.viaversion.api.boss.BossColor;
 import com.viaversion.viaversion.api.boss.BossStyle;
diff --git a/bungee/src/main/java/com/viaversion/viaversion/bungee/platform/BungeeViaConfig.java b/bungee/src/main/java/com/viaversion/viaversion/bungee/platform/BungeeViaConfig.java
index 556ceeabc..63bdfe987 100644
--- a/bungee/src/main/java/com/viaversion/viaversion/bungee/platform/BungeeViaConfig.java
+++ b/bungee/src/main/java/com/viaversion/viaversion/bungee/platform/BungeeViaConfig.java
@@ -17,8 +17,8 @@
  */
 package com.viaversion.viaversion.bungee.platform;
 
-import com.viaversion.viaversion.AbstractViaConfig;
-import com.viaversion.viaversion.api.protocol.ProtocolVersion;
+import com.viaversion.viaversion.configuration.AbstractViaConfig;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.bungee.providers.BungeeVersionProvider;
 
 import java.io.File;
diff --git a/bungee/src/main/java/com/viaversion/viaversion/bungee/platform/BungeeViaLoader.java b/bungee/src/main/java/com/viaversion/viaversion/bungee/platform/BungeeViaLoader.java
index 0fe57d3f7..d3cab530c 100644
--- a/bungee/src/main/java/com/viaversion/viaversion/bungee/platform/BungeeViaLoader.java
+++ b/bungee/src/main/java/com/viaversion/viaversion/bungee/platform/BungeeViaLoader.java
@@ -23,7 +23,7 @@ import net.md_5.bungee.api.scheduler.ScheduledTask;
 import com.viaversion.viaversion.BungeePlugin;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.platform.ViaPlatformLoader;
-import com.viaversion.viaversion.api.protocol.ProtocolVersion;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.bungee.handlers.BungeeServerHandler;
 import com.viaversion.viaversion.bungee.listeners.ElytraPatch;
 import com.viaversion.viaversion.bungee.listeners.UpdateListener;
@@ -33,7 +33,7 @@ import com.viaversion.viaversion.bungee.providers.BungeeMainHandProvider;
 import com.viaversion.viaversion.bungee.providers.BungeeMovementTransmitter;
 import com.viaversion.viaversion.bungee.providers.BungeeVersionProvider;
 import com.viaversion.viaversion.bungee.service.ProtocolDetectorService;
-import com.viaversion.viaversion.protocols.base.VersionProvider;
+import com.viaversion.viaversion.api.protocol.version.VersionProvider;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.BossBarProvider;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.EntityIdProvider;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.MainHandProvider;
diff --git a/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeBossBarProvider.java b/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeBossBarProvider.java
index 4af5b78d3..762159499 100644
--- a/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeBossBarProvider.java
+++ b/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeBossBarProvider.java
@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.bungee.providers;
 
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.bungee.storage.BungeeStorage;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.BossBarProvider;
 
diff --git a/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeEntityIdProvider.java b/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeEntityIdProvider.java
index 70194e42a..350d157f7 100644
--- a/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeEntityIdProvider.java
+++ b/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeEntityIdProvider.java
@@ -18,7 +18,7 @@
 package com.viaversion.viaversion.bungee.providers;
 
 import net.md_5.bungee.api.connection.ProxiedPlayer;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.bungee.storage.BungeeStorage;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.EntityIdProvider;
 
diff --git a/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeMainHandProvider.java b/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeMainHandProvider.java
index bc851bc5d..1cb1190a2 100644
--- a/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeMainHandProvider.java
+++ b/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeMainHandProvider.java
@@ -19,8 +19,8 @@ package com.viaversion.viaversion.bungee.providers;
 
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
-import com.viaversion.viaversion.api.data.UserConnection;
-import com.viaversion.viaversion.protocols.base.ProtocolInfo;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.ProtocolInfo;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.MainHandProvider;
 
 import java.lang.reflect.InvocationTargetException;
diff --git a/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeMovementTransmitter.java b/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeMovementTransmitter.java
index 358860ff1..c7bae6395 100644
--- a/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeMovementTransmitter.java
+++ b/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeMovementTransmitter.java
@@ -17,10 +17,10 @@
  */
 package com.viaversion.viaversion.bungee.providers;
 
-import com.viaversion.viaversion.api.PacketWrapper;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.packets.State;
+import com.viaversion.viaversion.api.protocol.packet.State;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.MovementTransmitterProvider;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.MovementTracker;
diff --git a/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeVersionProvider.java b/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeVersionProvider.java
index 17d18f904..733baec9e 100644
--- a/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeVersionProvider.java
+++ b/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeVersionProvider.java
@@ -20,10 +20,10 @@ package com.viaversion.viaversion.bungee.providers;
 import com.google.common.collect.Lists;
 import net.md_5.bungee.api.ProxyServer;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.UserConnection;
-import com.viaversion.viaversion.api.protocol.ProtocolVersion;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.protocols.base.BaseVersionProvider;
-import com.viaversion.viaversion.protocols.base.ProtocolInfo;
+import com.viaversion.viaversion.api.protocol.connection.ProtocolInfo;
 import com.viaversion.viaversion.util.ReflectionUtil;
 
 import java.util.ArrayList;
diff --git a/bungee/src/main/java/com/viaversion/viaversion/bungee/storage/BungeeStorage.java b/bungee/src/main/java/com/viaversion/viaversion/bungee/storage/BungeeStorage.java
index 1f7bd3843..9af981616 100644
--- a/bungee/src/main/java/com/viaversion/viaversion/bungee/storage/BungeeStorage.java
+++ b/bungee/src/main/java/com/viaversion/viaversion/bungee/storage/BungeeStorage.java
@@ -18,8 +18,8 @@
 package com.viaversion.viaversion.bungee.storage;
 
 import net.md_5.bungee.api.connection.ProxiedPlayer;
-import com.viaversion.viaversion.api.data.StoredObject;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.StoredObject;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 
 import java.lang.reflect.Field;
 import java.util.Objects;
diff --git a/common/src/main/java/com/viaversion/viaversion/api/ViaAPIBase.java b/common/src/main/java/com/viaversion/viaversion/ViaAPIBase.java
similarity index 90%
rename from common/src/main/java/com/viaversion/viaversion/api/ViaAPIBase.java
rename to common/src/main/java/com/viaversion/viaversion/ViaAPIBase.java
index de989eb39..3c562faf6 100644
--- a/common/src/main/java/com/viaversion/viaversion/api/ViaAPIBase.java
+++ b/common/src/main/java/com/viaversion/viaversion/ViaAPIBase.java
@@ -15,11 +15,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.viaversion.api;
+package com.viaversion.viaversion;
 
+import com.viaversion.viaversion.api.Via;
+import com.viaversion.viaversion.api.ViaAPI;
 import io.netty.buffer.ByteBuf;
-import com.viaversion.viaversion.api.data.UserConnection;
-import com.viaversion.viaversion.api.protocol.ServerProtocolVersion;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.protocol.version.ServerProtocolVersion;
 
 import java.util.SortedSet;
 import java.util.TreeSet;
diff --git a/common/src/main/java/com/viaversion/viaversion/api/ViaListener.java b/common/src/main/java/com/viaversion/viaversion/ViaListener.java
similarity index 93%
rename from common/src/main/java/com/viaversion/viaversion/api/ViaListener.java
rename to common/src/main/java/com/viaversion/viaversion/ViaListener.java
index 6fc3d9fa7..7284a8abf 100644
--- a/common/src/main/java/com/viaversion/viaversion/api/ViaListener.java
+++ b/common/src/main/java/com/viaversion/viaversion/ViaListener.java
@@ -15,10 +15,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.viaversion.api;
+package com.viaversion.viaversion;
 
+import com.viaversion.viaversion.api.Via;
 import org.checkerframework.checker.nullness.qual.Nullable;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.Protocol;
 
 import java.util.UUID;
diff --git a/common/src/main/java/com/viaversion/viaversion/ViaManagerImpl.java b/common/src/main/java/com/viaversion/viaversion/ViaManagerImpl.java
index 4f6cb9d50..1adde9ee3 100644
--- a/common/src/main/java/com/viaversion/viaversion/ViaManagerImpl.java
+++ b/common/src/main/java/com/viaversion/viaversion/ViaManagerImpl.java
@@ -17,25 +17,26 @@
  */
 package com.viaversion.viaversion;
 
+import com.viaversion.viaversion.api.ViaManager;
 import it.unimi.dsi.fastutil.ints.IntSortedSet;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.platform.TaskId;
-import com.viaversion.viaversion.api.platform.ViaConnectionManager;
+import com.viaversion.viaversion.api.protocol.connection.ViaConnectionManager;
 import com.viaversion.viaversion.api.platform.ViaInjector;
 import com.viaversion.viaversion.api.platform.ViaPlatform;
 import com.viaversion.viaversion.api.platform.ViaPlatformLoader;
 import com.viaversion.viaversion.api.platform.providers.ViaProviders;
 import com.viaversion.viaversion.api.protocol.ProtocolManager;
-import com.viaversion.viaversion.api.protocol.ProtocolManagerImpl;
-import com.viaversion.viaversion.api.protocol.ProtocolVersion;
-import com.viaversion.viaversion.api.protocol.ServerProtocolVersion;
-import com.viaversion.viaversion.api.protocol.ServerProtocolVersionRange;
-import com.viaversion.viaversion.api.protocol.ServerProtocolVersionSingleton;
+import com.viaversion.viaversion.protocol.ProtocolManagerImpl;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
+import com.viaversion.viaversion.api.protocol.version.ServerProtocolVersion;
+import com.viaversion.viaversion.protocol.ServerProtocolVersionRange;
+import com.viaversion.viaversion.protocol.ServerProtocolVersionSingleton;
 import com.viaversion.viaversion.commands.ViaCommandHandler;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.TabCompleteThread;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.ViaIdleThread;
 import com.viaversion.viaversion.update.UpdateUtil;
-import com.viaversion.viaversion.util.UnsupportedSoftware;
+import com.viaversion.viaversion.api.platform.UnsupportedSoftware;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/common/src/main/java/com/viaversion/viaversion/boss/CommonBoss.java b/common/src/main/java/com/viaversion/viaversion/boss/CommonBoss.java
index e79ced0ed..6008ec17c 100644
--- a/common/src/main/java/com/viaversion/viaversion/boss/CommonBoss.java
+++ b/common/src/main/java/com/viaversion/viaversion/boss/CommonBoss.java
@@ -18,13 +18,13 @@
 package com.viaversion.viaversion.boss;
 
 import com.google.common.base.Preconditions;
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.boss.BossBar;
 import com.viaversion.viaversion.api.boss.BossColor;
 import com.viaversion.viaversion.api.boss.BossFlag;
 import com.viaversion.viaversion.api.boss.BossStyle;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8;
 
diff --git a/common/src/main/java/com/viaversion/viaversion/commands/defaultsubs/ListSubCmd.java b/common/src/main/java/com/viaversion/viaversion/commands/defaultsubs/ListSubCmd.java
index 54e961184..3ccac3ac0 100644
--- a/common/src/main/java/com/viaversion/viaversion/commands/defaultsubs/ListSubCmd.java
+++ b/common/src/main/java/com/viaversion/viaversion/commands/defaultsubs/ListSubCmd.java
@@ -20,7 +20,7 @@ package com.viaversion.viaversion.commands.defaultsubs;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.command.ViaCommandSender;
 import com.viaversion.viaversion.api.command.ViaSubCommand;
-import com.viaversion.viaversion.api.protocol.ProtocolVersion;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 
 import java.util.HashSet;
 import java.util.Map;
diff --git a/common/src/main/java/com/viaversion/viaversion/commands/defaultsubs/PPSSubCmd.java b/common/src/main/java/com/viaversion/viaversion/commands/defaultsubs/PPSSubCmd.java
index e6a570311..a12d1a98e 100644
--- a/common/src/main/java/com/viaversion/viaversion/commands/defaultsubs/PPSSubCmd.java
+++ b/common/src/main/java/com/viaversion/viaversion/commands/defaultsubs/PPSSubCmd.java
@@ -20,8 +20,8 @@ package com.viaversion.viaversion.commands.defaultsubs;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.command.ViaCommandSender;
 import com.viaversion.viaversion.api.command.ViaSubCommand;
-import com.viaversion.viaversion.api.data.UserConnection;
-import com.viaversion.viaversion.api.protocol.ProtocolVersion;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/common/src/main/java/com/viaversion/viaversion/AbstractViaConfig.java b/common/src/main/java/com/viaversion/viaversion/configuration/AbstractViaConfig.java
similarity index 99%
rename from common/src/main/java/com/viaversion/viaversion/AbstractViaConfig.java
rename to common/src/main/java/com/viaversion/viaversion/configuration/AbstractViaConfig.java
index d6329ec42..dfeb385f8 100644
--- a/common/src/main/java/com/viaversion/viaversion/AbstractViaConfig.java
+++ b/common/src/main/java/com/viaversion/viaversion/configuration/AbstractViaConfig.java
@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.viaversion;
+package com.viaversion.viaversion.configuration;
 
 import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
 import it.unimi.dsi.fastutil.ints.IntSet;
-import com.viaversion.viaversion.api.ViaVersionConfig;
+import com.viaversion.viaversion.api.configuration.ViaVersionConfig;
 import com.viaversion.viaversion.util.Config;
 
 import java.io.File;
diff --git a/common/src/main/java/com/viaversion/viaversion/api/storage/EntityTracker.java b/common/src/main/java/com/viaversion/viaversion/data/EntityTracker.java
similarity index 89%
rename from common/src/main/java/com/viaversion/viaversion/api/storage/EntityTracker.java
rename to common/src/main/java/com/viaversion/viaversion/data/EntityTracker.java
index daa4079d7..b693e7044 100644
--- a/common/src/main/java/com/viaversion/viaversion/api/storage/EntityTracker.java
+++ b/common/src/main/java/com/viaversion/viaversion/data/EntityTracker.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.viaversion.api.storage;
+package com.viaversion.viaversion.data;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
 import com.viaversion.viaversion.api.data.ExternalJoinGameListener;
-import com.viaversion.viaversion.api.data.StoredObject;
-import com.viaversion.viaversion.api.data.UserConnection;
-import com.viaversion.viaversion.api.entities.EntityType;
+import com.viaversion.viaversion.api.protocol.connection.StoredObject;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/common/src/main/java/com/viaversion/viaversion/handlers/ChannelHandlerContextWrapper.java b/common/src/main/java/com/viaversion/viaversion/handlers/ChannelHandlerContextWrapper.java
index d2857c89b..0dbc89186 100644
--- a/common/src/main/java/com/viaversion/viaversion/handlers/ChannelHandlerContextWrapper.java
+++ b/common/src/main/java/com/viaversion/viaversion/handlers/ChannelHandlerContextWrapper.java
@@ -34,9 +34,9 @@ import java.net.SocketAddress;
 
 public class ChannelHandlerContextWrapper implements ChannelHandlerContext {
     private final ChannelHandlerContext base;
-    private final ViaHandler handler;
+    private final ViaCodecHandler handler;
 
-    public ChannelHandlerContextWrapper(ChannelHandlerContext base, ViaHandler handler) {
+    public ChannelHandlerContextWrapper(ChannelHandlerContext base, ViaCodecHandler handler) {
         this.base = base;
         this.handler = handler;
     }
diff --git a/common/src/main/java/com/viaversion/viaversion/handlers/ViaHandler.java b/common/src/main/java/com/viaversion/viaversion/handlers/ViaCodecHandler.java
similarity index 96%
rename from common/src/main/java/com/viaversion/viaversion/handlers/ViaHandler.java
rename to common/src/main/java/com/viaversion/viaversion/handlers/ViaCodecHandler.java
index 43ff41a6f..3d2eaa734 100644
--- a/common/src/main/java/com/viaversion/viaversion/handlers/ViaHandler.java
+++ b/common/src/main/java/com/viaversion/viaversion/handlers/ViaCodecHandler.java
@@ -20,7 +20,7 @@ package com.viaversion.viaversion.handlers;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 
-public interface ViaHandler {
+public interface ViaCodecHandler {
 
     void transform(ByteBuf bytebuf) throws Exception;
 
diff --git a/common/src/main/java/com/viaversion/viaversion/api/protocol/ProtocolManagerImpl.java b/common/src/main/java/com/viaversion/viaversion/protocol/ProtocolManagerImpl.java
similarity index 97%
rename from common/src/main/java/com/viaversion/viaversion/api/protocol/ProtocolManagerImpl.java
rename to common/src/main/java/com/viaversion/viaversion/protocol/ProtocolManagerImpl.java
index b32ae0b5f..127a25b8a 100644
--- a/common/src/main/java/com/viaversion/viaversion/api/protocol/ProtocolManagerImpl.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocol/ProtocolManagerImpl.java
@@ -15,16 +15,22 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.viaversion.api.protocol;
+package com.viaversion.viaversion.protocol;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Range;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.protocol.ProtocolManager;
+import com.viaversion.viaversion.api.protocol.ProtocolPathEntry;
+import com.viaversion.viaversion.api.protocol.ProtocolPathKey;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
+import com.viaversion.viaversion.api.protocol.version.ServerProtocolVersion;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import org.checkerframework.checker.nullness.qual.Nullable;
-import com.viaversion.viaversion.api.Pair;
+import com.viaversion.viaversion.util.Pair;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.data.MappingDataLoader;
 import com.viaversion.viaversion.protocols.base.BaseProtocol;
diff --git a/common/src/main/java/com/viaversion/viaversion/api/protocol/ProtocolPathEntryImpl.java b/common/src/main/java/com/viaversion/viaversion/protocol/ProtocolPathEntryImpl.java
similarity index 91%
rename from common/src/main/java/com/viaversion/viaversion/api/protocol/ProtocolPathEntryImpl.java
rename to common/src/main/java/com/viaversion/viaversion/protocol/ProtocolPathEntryImpl.java
index 4dcc21882..3cac8ac06 100644
--- a/common/src/main/java/com/viaversion/viaversion/api/protocol/ProtocolPathEntryImpl.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocol/ProtocolPathEntryImpl.java
@@ -15,7 +15,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.viaversion.api.protocol;
+package com.viaversion.viaversion.protocol;
+
+import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.protocol.ProtocolPathEntry;
 
 public class ProtocolPathEntryImpl implements ProtocolPathEntry {
     private final int outputProtocolVersion;
diff --git a/common/src/main/java/com/viaversion/viaversion/api/protocol/ProtocolPathKeyImpl.java b/common/src/main/java/com/viaversion/viaversion/protocol/ProtocolPathKeyImpl.java
similarity index 94%
rename from common/src/main/java/com/viaversion/viaversion/api/protocol/ProtocolPathKeyImpl.java
rename to common/src/main/java/com/viaversion/viaversion/protocol/ProtocolPathKeyImpl.java
index eda571005..3c476dac8 100644
--- a/common/src/main/java/com/viaversion/viaversion/api/protocol/ProtocolPathKeyImpl.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocol/ProtocolPathKeyImpl.java
@@ -15,7 +15,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.viaversion.api.protocol;
+package com.viaversion.viaversion.protocol;
+
+import com.viaversion.viaversion.api.protocol.ProtocolPathKey;
 
 public class ProtocolPathKeyImpl implements ProtocolPathKey {
     private final int clientProtocolVersion;
diff --git a/common/src/main/java/com/viaversion/viaversion/api/protocol/ServerProtocolVersionRange.java b/common/src/main/java/com/viaversion/viaversion/protocol/ServerProtocolVersionRange.java
similarity index 93%
rename from common/src/main/java/com/viaversion/viaversion/api/protocol/ServerProtocolVersionRange.java
rename to common/src/main/java/com/viaversion/viaversion/protocol/ServerProtocolVersionRange.java
index d003b9516..dc9164f25 100644
--- a/common/src/main/java/com/viaversion/viaversion/api/protocol/ServerProtocolVersionRange.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocol/ServerProtocolVersionRange.java
@@ -15,8 +15,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.viaversion.api.protocol;
+package com.viaversion.viaversion.protocol;
 
+import com.viaversion.viaversion.api.protocol.version.ServerProtocolVersion;
 import it.unimi.dsi.fastutil.ints.IntSortedSet;
 
 public class ServerProtocolVersionRange implements ServerProtocolVersion {
diff --git a/common/src/main/java/com/viaversion/viaversion/api/protocol/ServerProtocolVersionSingleton.java b/common/src/main/java/com/viaversion/viaversion/protocol/ServerProtocolVersionSingleton.java
similarity index 92%
rename from common/src/main/java/com/viaversion/viaversion/api/protocol/ServerProtocolVersionSingleton.java
rename to common/src/main/java/com/viaversion/viaversion/protocol/ServerProtocolVersionSingleton.java
index 1bd1a653a..230c1df66 100644
--- a/common/src/main/java/com/viaversion/viaversion/api/protocol/ServerProtocolVersionSingleton.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocol/ServerProtocolVersionSingleton.java
@@ -15,8 +15,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.viaversion.api.protocol;
+package com.viaversion.viaversion.protocol;
 
+import com.viaversion.viaversion.api.protocol.version.ServerProtocolVersion;
 import it.unimi.dsi.fastutil.ints.IntSortedSet;
 import it.unimi.dsi.fastutil.ints.IntSortedSets;
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/base/BaseProtocol.java b/common/src/main/java/com/viaversion/viaversion/protocols/base/BaseProtocol.java
index a57ecb83e..23bfca30e 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/base/BaseProtocol.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/base/BaseProtocol.java
@@ -17,19 +17,21 @@
  */
 package com.viaversion.viaversion.protocols.base;
 
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.platform.providers.ViaProviders;
 import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.protocol.connection.ProtocolInfo;
 import com.viaversion.viaversion.api.protocol.ProtocolPathEntry;
 import com.viaversion.viaversion.api.protocol.ProtocolPipeline;
-import com.viaversion.viaversion.api.protocol.ProtocolVersion;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.api.protocol.SimpleProtocol;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.version.VersionProvider;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
 import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.packets.Direction;
-import com.viaversion.viaversion.packets.State;
+import com.viaversion.viaversion.api.protocol.packet.Direction;
+import com.viaversion.viaversion.api.protocol.packet.State;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -112,7 +114,7 @@ public class BaseProtocol extends SimpleProtocol {
     }
 
     @Override
-    protected void register(ViaProviders providers) {
+    public void register(ViaProviders providers) {
         providers.register(VersionProvider.class, new BaseVersionProvider());
     }
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/base/BaseProtocol1_16.java b/common/src/main/java/com/viaversion/viaversion/protocols/base/BaseProtocol1_16.java
index cc74e0d7e..f75af35c5 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/base/BaseProtocol1_16.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/base/BaseProtocol1_16.java
@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.base;
 
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.type.Type;
 
 import java.util.UUID;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/base/BaseProtocol1_7.java b/common/src/main/java/com/viaversion/viaversion/protocols/base/BaseProtocol1_7.java
index dd8151f8a..2a7dba4e1 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/base/BaseProtocol1_7.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/base/BaseProtocol1_7.java
@@ -21,18 +21,20 @@ import com.google.common.base.Joiner;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
+import com.viaversion.viaversion.api.protocol.connection.ProtocolInfo;
+import com.viaversion.viaversion.api.protocol.version.VersionProvider;
 import io.netty.channel.ChannelFuture;
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.protocol.ProtocolManagerImpl;
+import com.viaversion.viaversion.protocol.ProtocolManagerImpl;
 import com.viaversion.viaversion.api.protocol.ProtocolPathEntry;
-import com.viaversion.viaversion.api.protocol.ProtocolVersion;
-import com.viaversion.viaversion.api.protocol.ServerProtocolVersionSingleton;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
+import com.viaversion.viaversion.protocol.ServerProtocolVersionSingleton;
 import com.viaversion.viaversion.api.protocol.SimpleProtocol;
-import com.viaversion.viaversion.api.remapper.PacketHandler;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
 import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.packets.State;
+import com.viaversion.viaversion.api.protocol.packet.State;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8;
 import com.viaversion.viaversion.util.ChatColorUtil;
 import com.viaversion.viaversion.util.GsonUtil;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/base/BaseVersionProvider.java b/common/src/main/java/com/viaversion/viaversion/protocols/base/BaseVersionProvider.java
index d1b795ee4..a6e06977b 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/base/BaseVersionProvider.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/base/BaseVersionProvider.java
@@ -18,7 +18,8 @@
 package com.viaversion.viaversion.protocols.base;
 
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.protocol.version.VersionProvider;
 
 public class BaseVersionProvider implements VersionProvider {
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_10to1_9_3/Protocol1_10To1_9_3_4.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_10to1_9_3/Protocol1_10To1_9_3_4.java
index 5b244396b..370808dc7 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_10to1_9_3/Protocol1_10To1_9_3_4.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_10to1_9_3/Protocol1_10To1_9_3_4.java
@@ -17,16 +17,16 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_10to1_9_3;
 
-import com.viaversion.viaversion.api.PacketWrapper;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.remapper.PacketHandler;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
-import com.viaversion.viaversion.api.remapper.ValueTransformer;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.ValueTransformer;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.types.version.Types1_9;
-import com.viaversion.viaversion.packets.State;
+import com.viaversion.viaversion.api.protocol.packet.State;
 import com.viaversion.viaversion.protocols.protocol1_10to1_9_3.packets.InventoryPackets;
 import com.viaversion.viaversion.protocols.protocol1_10to1_9_3.storage.ResourcePackTracker;
 import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_10to1_9_3/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_10to1_9_3/packets/InventoryPackets.java
index 8691a65b5..e87d01f60 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_10to1_9_3/packets/InventoryPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_10to1_9_3/packets/InventoryPackets.java
@@ -18,7 +18,7 @@
 package com.viaversion.viaversion.protocols.protocol1_10to1_9_3.packets;
 
 import com.viaversion.viaversion.api.minecraft.item.Item;
-import com.viaversion.viaversion.api.rewriters.ItemRewriter;
+import com.viaversion.viaversion.rewriter.ItemRewriter;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_10to1_9_3.Protocol1_10To1_9_3_4;
 import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ServerboundPackets1_9_3;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_10to1_9_3/storage/ResourcePackTracker.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_10to1_9_3/storage/ResourcePackTracker.java
index 09a2b1a73..99f4799a8 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_10to1_9_3/storage/ResourcePackTracker.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_10to1_9_3/storage/ResourcePackTracker.java
@@ -17,8 +17,8 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_10to1_9_3.storage;
 
-import com.viaversion.viaversion.api.data.StoredObject;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.StoredObject;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 
 public class ResourcePackTracker extends StoredObject {
     private String lastHash = "";
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11_1to1_11/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11_1to1_11/packets/InventoryPackets.java
index 9352ec75f..32befba2e 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11_1to1_11/packets/InventoryPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11_1to1_11/packets/InventoryPackets.java
@@ -18,7 +18,7 @@
 package com.viaversion.viaversion.protocols.protocol1_11_1to1_11.packets;
 
 import com.viaversion.viaversion.api.minecraft.item.Item;
-import com.viaversion.viaversion.api.rewriters.ItemRewriter;
+import com.viaversion.viaversion.rewriter.ItemRewriter;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_11_1to1_11.Protocol1_11_1To1_11;
 import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ServerboundPackets1_9_3;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/Protocol1_11To1_10.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/Protocol1_11To1_10.java
index f20d48c2b..638cfa55f 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/Protocol1_11To1_10.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/Protocol1_11To1_10.java
@@ -19,19 +19,19 @@ package com.viaversion.viaversion.protocols.protocol1_11to1_10;
 
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.github.steveice10.opennbt.tag.builtin.StringTag;
-import com.viaversion.viaversion.api.PacketWrapper;
-import com.viaversion.viaversion.api.Pair;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
+import com.viaversion.viaversion.util.Pair;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.UserConnection;
-import com.viaversion.viaversion.api.entities.Entity1_11Types;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_11Types;
 import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.remapper.PacketHandler;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
-import com.viaversion.viaversion.api.remapper.ValueCreator;
-import com.viaversion.viaversion.api.remapper.ValueTransformer;
-import com.viaversion.viaversion.api.rewriters.MetadataRewriter;
-import com.viaversion.viaversion.api.rewriters.SoundRewriter;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.ValueCreator;
+import com.viaversion.viaversion.api.protocol.remapper.ValueTransformer;
+import com.viaversion.viaversion.rewriter.MetadataRewriter;
+import com.viaversion.viaversion.rewriter.SoundRewriter;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.types.version.Types1_9;
 import com.viaversion.viaversion.protocols.protocol1_11to1_10.data.PotionColorMapping;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/data/PotionColorMapping.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/data/PotionColorMapping.java
index 293bfd267..d42d9b7b6 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/data/PotionColorMapping.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/data/PotionColorMapping.java
@@ -19,7 +19,7 @@ package com.viaversion.viaversion.protocols.protocol1_11to1_10.data;
 
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import com.viaversion.viaversion.api.Pair;
+import com.viaversion.viaversion.util.Pair;
 
 public class PotionColorMapping {
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/metadata/MetadataRewriter1_11To1_10.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/metadata/MetadataRewriter1_11To1_10.java
index fd90eb1cc..d8383436f 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/metadata/MetadataRewriter1_11To1_10.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/metadata/MetadataRewriter1_11To1_10.java
@@ -17,15 +17,15 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_11to1_10.metadata;
 
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.UserConnection;
-import com.viaversion.viaversion.api.entities.Entity1_11Types;
-import com.viaversion.viaversion.api.entities.Entity1_11Types.EntityType;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_11Types;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_11Types.EntityType;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
 import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_9;
-import com.viaversion.viaversion.api.rewriters.MetadataRewriter;
+import com.viaversion.viaversion.rewriter.MetadataRewriter;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_11to1_10.EntityIdRewriter;
 import com.viaversion.viaversion.protocols.protocol1_11to1_10.Protocol1_11To1_10;
@@ -41,7 +41,7 @@ public class MetadataRewriter1_11To1_10 extends MetadataRewriter {
     }
 
     @Override
-    protected void handleMetadata(int entityId, com.viaversion.viaversion.api.entities.EntityType type, Metadata metadata, List<Metadata> metadatas, UserConnection connection) {
+    protected void handleMetadata(int entityId, com.viaversion.viaversion.api.minecraft.entities.EntityType type, Metadata metadata, List<Metadata> metadatas, UserConnection connection) {
         if (metadata.getValue() instanceof Item) {
             // Apply rewrite
             EntityIdRewriter.toClientItem((Item) metadata.getValue());
@@ -147,12 +147,12 @@ public class MetadataRewriter1_11To1_10 extends MetadataRewriter {
     }
 
     @Override
-    protected com.viaversion.viaversion.api.entities.EntityType getTypeFromId(int type) {
+    protected com.viaversion.viaversion.api.minecraft.entities.EntityType getTypeFromId(int type) {
         return Entity1_11Types.getTypeFromId(type, false);
     }
 
     @Override
-    protected com.viaversion.viaversion.api.entities.EntityType getObjectTypeFromId(int type) {
+    protected com.viaversion.viaversion.api.minecraft.entities.EntityType getObjectTypeFromId(int type) {
         return Entity1_11Types.getTypeFromId(type, true);
     }
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/packets/InventoryPackets.java
index a72274542..4fc0c75ae 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/packets/InventoryPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/packets/InventoryPackets.java
@@ -17,11 +17,11 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_11to1_10.packets;
 
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.minecraft.item.Item;
-import com.viaversion.viaversion.api.remapper.PacketHandler;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
-import com.viaversion.viaversion.api.rewriters.ItemRewriter;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+import com.viaversion.viaversion.rewriter.ItemRewriter;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_11to1_10.EntityIdRewriter;
 import com.viaversion.viaversion.protocols.protocol1_11to1_10.Protocol1_11To1_10;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/storage/EntityTracker1_11.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/storage/EntityTracker1_11.java
index c0f531a8d..38d6bcb30 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/storage/EntityTracker1_11.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/storage/EntityTracker1_11.java
@@ -18,9 +18,9 @@
 package com.viaversion.viaversion.protocols.protocol1_11to1_10.storage;
 
 import com.google.common.collect.Sets;
-import com.viaversion.viaversion.api.data.UserConnection;
-import com.viaversion.viaversion.api.entities.Entity1_11Types.EntityType;
-import com.viaversion.viaversion.api.storage.EntityTracker;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_11Types.EntityType;
+import com.viaversion.viaversion.data.EntityTracker;
 
 import java.util.Set;
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12_1to1_12/ClientboundPackets1_12_1.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12_1to1_12/ClientboundPackets1_12_1.java
index 3212af35f..728a4e18a 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12_1to1_12/ClientboundPackets1_12_1.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12_1to1_12/ClientboundPackets1_12_1.java
@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_12_1to1_12;
 
-import com.viaversion.viaversion.api.protocol.ClientboundPacketType;
+import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
 
 public enum ClientboundPackets1_12_1 implements ClientboundPacketType {
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12_1to1_12/ServerboundPackets1_12_1.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12_1to1_12/ServerboundPackets1_12_1.java
index 3557e1bde..020b11d46 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12_1to1_12/ServerboundPackets1_12_1.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12_1to1_12/ServerboundPackets1_12_1.java
@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_12_1to1_12;
 
-import com.viaversion.viaversion.api.protocol.ServerboundPacketType;
+import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType;
 
 public enum ServerboundPackets1_12_1 implements ServerboundPacketType {
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12_2to1_12_1/Protocol1_12_2To1_12_1.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12_2to1_12_1/Protocol1_12_2To1_12_1.java
index 331676985..bcb12bef9 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12_2to1_12_1/Protocol1_12_2To1_12_1.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12_2to1_12_1/Protocol1_12_2To1_12_1.java
@@ -18,7 +18,7 @@
 package com.viaversion.viaversion.protocols.protocol1_12_2to1_12_1;
 
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_12_1to1_12.ClientboundPackets1_12_1;
 import com.viaversion.viaversion.protocols.protocol1_12_1to1_12.ServerboundPackets1_12_1;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/ChatItemRewriter.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/ChatItemRewriter.java
index fd9d9e1f7..5c7e34cf1 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/ChatItemRewriter.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/ChatItemRewriter.java
@@ -21,7 +21,7 @@ import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 
 import java.util.regex.Pattern;
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/ClientboundPackets1_12.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/ClientboundPackets1_12.java
index 94c326a3f..1ac9a47c4 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/ClientboundPackets1_12.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/ClientboundPackets1_12.java
@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_12to1_11_1;
 
-import com.viaversion.viaversion.api.protocol.ClientboundPacketType;
+import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
 
 public enum ClientboundPackets1_12 implements ClientboundPacketType {
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/Protocol1_12To1_11_1.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/Protocol1_12To1_11_1.java
index f5361ab97..3b9103390 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/Protocol1_12To1_11_1.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/Protocol1_12To1_11_1.java
@@ -21,17 +21,17 @@ import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.github.steveice10.opennbt.tag.builtin.IntTag;
 import com.github.steveice10.opennbt.tag.builtin.StringTag;
 import com.google.gson.JsonElement;
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
 import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
 import com.viaversion.viaversion.api.platform.providers.ViaProviders;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.remapper.PacketHandler;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
-import com.viaversion.viaversion.api.rewriters.MetadataRewriter;
-import com.viaversion.viaversion.api.rewriters.SoundRewriter;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+import com.viaversion.viaversion.rewriter.MetadataRewriter;
+import com.viaversion.viaversion.rewriter.SoundRewriter;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.types.version.Types1_12;
 import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.metadata.MetadataRewriter1_12To1_11_1;
@@ -249,14 +249,15 @@ public class Protocol1_12To1_11_1 extends Protocol<ClientboundPackets1_9_3, Clie
     }
 
     @Override
-    protected void register(ViaProviders providers) {
+    public void register(ViaProviders providers) {
         providers.register(InventoryQuickMoveProvider.class, new InventoryQuickMoveProvider());
     }
 
     @Override
     public void init(UserConnection userConnection) {
         userConnection.put(new EntityTracker1_12(userConnection));
-        if (!userConnection.has(ClientWorld.class))
+        if (!userConnection.has(ClientWorld.class)) {
             userConnection.put(new ClientWorld(userConnection));
+        }
     }
 }
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/ServerboundPackets1_12.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/ServerboundPackets1_12.java
index 6c0bca6de..98276e504 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/ServerboundPackets1_12.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/ServerboundPackets1_12.java
@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_12to1_11_1;
 
-import com.viaversion.viaversion.api.protocol.ServerboundPacketType;
+import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType;
 
 public enum ServerboundPackets1_12 implements ServerboundPacketType {
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/TranslateRewriter.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/TranslateRewriter.java
index cc0e41e9c..d635eaf64 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/TranslateRewriter.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/TranslateRewriter.java
@@ -21,8 +21,8 @@ import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.UserConnection;
-import com.viaversion.viaversion.api.rewriters.ComponentRewriter;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.rewriter.ComponentRewriter;
 import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.data.AchievementTranslationMapping;
 
 public class TranslateRewriter {
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/metadata/MetadataRewriter1_12To1_11_1.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/metadata/MetadataRewriter1_12To1_11_1.java
index 87dafc172..273713d3b 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/metadata/MetadataRewriter1_12To1_11_1.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/metadata/MetadataRewriter1_12To1_11_1.java
@@ -17,12 +17,12 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_12to1_11_1.metadata;
 
-import com.viaversion.viaversion.api.data.UserConnection;
-import com.viaversion.viaversion.api.entities.Entity1_12Types;
-import com.viaversion.viaversion.api.entities.EntityType;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_12Types;
+import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
-import com.viaversion.viaversion.api.rewriters.MetadataRewriter;
+import com.viaversion.viaversion.rewriter.MetadataRewriter;
 import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.BedRewriter;
 import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.Protocol1_12To1_11_1;
 import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.storage.EntityTracker1_12;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/packets/InventoryPackets.java
index e45e3349b..37c505431 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/packets/InventoryPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/packets/InventoryPackets.java
@@ -17,12 +17,12 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_12to1_11_1.packets;
 
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.minecraft.item.Item;
-import com.viaversion.viaversion.api.remapper.PacketHandler;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
-import com.viaversion.viaversion.api.rewriters.ItemRewriter;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+import com.viaversion.viaversion.rewriter.ItemRewriter;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.BedRewriter;
 import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.Protocol1_12To1_11_1;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/providers/InventoryQuickMoveProvider.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/providers/InventoryQuickMoveProvider.java
index 60f19c0e2..edd30d1ac 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/providers/InventoryQuickMoveProvider.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/providers/InventoryQuickMoveProvider.java
@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_12to1_11_1.providers;
 
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.platform.providers.Provider;
 
 public class InventoryQuickMoveProvider implements Provider {
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/storage/EntityTracker1_12.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/storage/EntityTracker1_12.java
index b9c5bca83..99de47656 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/storage/EntityTracker1_12.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/storage/EntityTracker1_12.java
@@ -17,9 +17,9 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_12to1_11_1.storage;
 
-import com.viaversion.viaversion.api.data.UserConnection;
-import com.viaversion.viaversion.api.entities.Entity1_12Types.EntityType;
-import com.viaversion.viaversion.api.storage.EntityTracker;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_12Types.EntityType;
+import com.viaversion.viaversion.data.EntityTracker;
 
 public class EntityTracker1_12 extends EntityTracker {
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/Protocol1_13_1To1_13.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/Protocol1_13_1To1_13.java
index e904307ce..ffb81713c 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/Protocol1_13_1To1_13.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/Protocol1_13_1To1_13.java
@@ -17,17 +17,17 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13_1to1_13;
 
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.data.MappingData;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.remapper.PacketHandler;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
-import com.viaversion.viaversion.api.remapper.ValueTransformer;
-import com.viaversion.viaversion.api.rewriters.RegistryType;
-import com.viaversion.viaversion.api.rewriters.StatisticsRewriter;
-import com.viaversion.viaversion.api.rewriters.TagRewriter;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.ValueTransformer;
+import com.viaversion.viaversion.rewriter.RegistryType;
+import com.viaversion.viaversion.rewriter.StatisticsRewriter;
+import com.viaversion.viaversion.rewriter.TagRewriter;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_13_1to1_13.metadata.MetadataRewriter1_13_1To1_13;
 import com.viaversion.viaversion.protocols.protocol1_13_1to1_13.packets.EntityPackets;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/metadata/MetadataRewriter1_13_1To1_13.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/metadata/MetadataRewriter1_13_1To1_13.java
index 0466b49a2..779045cd0 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/metadata/MetadataRewriter1_13_1To1_13.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/metadata/MetadataRewriter1_13_1To1_13.java
@@ -17,13 +17,13 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13_1to1_13.metadata;
 
-import com.viaversion.viaversion.api.data.UserConnection;
-import com.viaversion.viaversion.api.entities.Entity1_13Types;
-import com.viaversion.viaversion.api.entities.EntityType;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_13Types;
+import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
 import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_13;
-import com.viaversion.viaversion.api.rewriters.MetadataRewriter;
+import com.viaversion.viaversion.rewriter.MetadataRewriter;
 import com.viaversion.viaversion.api.type.types.Particle;
 import com.viaversion.viaversion.protocols.protocol1_13_1to1_13.Protocol1_13_1To1_13;
 import com.viaversion.viaversion.protocols.protocol1_13_1to1_13.packets.InventoryPackets;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/packets/EntityPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/packets/EntityPackets.java
index dee44b578..3906a474c 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/packets/EntityPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/packets/EntityPackets.java
@@ -17,10 +17,10 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13_1to1_13.packets;
 
-import com.viaversion.viaversion.api.PacketWrapper;
-import com.viaversion.viaversion.api.entities.Entity1_13Types;
-import com.viaversion.viaversion.api.remapper.PacketHandler;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_13Types;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.types.version.Types1_13;
 import com.viaversion.viaversion.protocols.protocol1_13_1to1_13.Protocol1_13_1To1_13;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/packets/InventoryPackets.java
index 47fb70f21..792b18bcd 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/packets/InventoryPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/packets/InventoryPackets.java
@@ -17,12 +17,12 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13_1to1_13.packets;
 
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.minecraft.item.Item;
-import com.viaversion.viaversion.api.remapper.PacketHandler;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
-import com.viaversion.viaversion.api.rewriters.ItemRewriter;
-import com.viaversion.viaversion.api.rewriters.RecipeRewriter;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+import com.viaversion.viaversion.rewriter.ItemRewriter;
+import com.viaversion.viaversion.rewriter.RecipeRewriter;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_13_1to1_13.Protocol1_13_1To1_13;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/packets/WorldPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/packets/WorldPackets.java
index 4c798bf0e..a348fbb9f 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/packets/WorldPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/packets/WorldPackets.java
@@ -17,13 +17,13 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13_1to1_13.packets;
 
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
 import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.remapper.PacketHandler;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
-import com.viaversion.viaversion.api.rewriters.BlockRewriter;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.types.Chunk1_13Type;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/Protocol1_13_2To1_13_1.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/Protocol1_13_2To1_13_1.java
index c0d535984..2dc12fa2b 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/Protocol1_13_2To1_13_1.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/Protocol1_13_2To1_13_1.java
@@ -17,11 +17,11 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13_2to1_13_1;
 
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.remapper.PacketHandler;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_13_2to1_13_1.packets.EntityPackets;
 import com.viaversion.viaversion.protocols.protocol1_13_2to1_13_1.packets.InventoryPackets;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/packets/EntityPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/packets/EntityPackets.java
index b4607fd2b..eb4a07773 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/packets/EntityPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/packets/EntityPackets.java
@@ -20,8 +20,8 @@ package com.viaversion.viaversion.protocols.protocol1_13_2to1_13_1.packets;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
 import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_13_2;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.remapper.PacketHandler;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.types.version.Types1_13;
 import com.viaversion.viaversion.api.type.types.version.Types1_13_2;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/packets/InventoryPackets.java
index 3645a3e11..fba9638b3 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/packets/InventoryPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/packets/InventoryPackets.java
@@ -17,10 +17,10 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13_2to1_13_1.packets;
 
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.remapper.PacketHandler;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ServerboundPackets1_13;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/packets/WorldPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/packets/WorldPackets.java
index 07a9814f7..cdf223c01 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/packets/WorldPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/packets/WorldPackets.java
@@ -17,10 +17,10 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13_2to1_13_1.packets;
 
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.remapper.PacketHandler;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13;
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/ChatRewriter.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/ChatRewriter.java
index 2ffd85461..1dc579678 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/ChatRewriter.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/ChatRewriter.java
@@ -20,7 +20,7 @@ package com.viaversion.viaversion.protocols.protocol1_13to1_12_2;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.rewriters.ComponentRewriter;
+import com.viaversion.viaversion.rewriter.ComponentRewriter;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.ComponentRewriter1_13;
 import com.viaversion.viaversion.libs.kyori.adventure.text.Component;
 import com.viaversion.viaversion.libs.kyori.adventure.text.format.TextDecoration;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/ClientboundPackets1_13.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/ClientboundPackets1_13.java
index 28f667a22..32a608eb6 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/ClientboundPackets1_13.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/ClientboundPackets1_13.java
@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2;
 
-import com.viaversion.viaversion.api.protocol.ClientboundPacketType;
+import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
 
 public enum ClientboundPackets1_13 implements ClientboundPacketType {
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/Protocol1_13To1_12_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/Protocol1_13To1_12_2.java
index 5a8f8a0d7..c233eb2e5 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/Protocol1_13To1_12_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/Protocol1_13To1_12_2.java
@@ -21,22 +21,22 @@ import com.google.common.collect.Sets;
 import com.google.common.primitives.Ints;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.UserConnection;
-import com.viaversion.viaversion.api.entities.Entity1_13Types;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_13Types;
 import com.viaversion.viaversion.api.minecraft.Position;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.platform.providers.ViaProviders;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.remapper.PacketHandler;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
-import com.viaversion.viaversion.api.remapper.ValueCreator;
-import com.viaversion.viaversion.api.remapper.ValueTransformer;
-import com.viaversion.viaversion.api.rewriters.MetadataRewriter;
-import com.viaversion.viaversion.api.rewriters.SoundRewriter;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.ValueCreator;
+import com.viaversion.viaversion.api.protocol.remapper.ValueTransformer;
+import com.viaversion.viaversion.rewriter.MetadataRewriter;
+import com.viaversion.viaversion.rewriter.SoundRewriter;
 import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.packets.State;
+import com.viaversion.viaversion.api.protocol.packet.State;
 import com.viaversion.viaversion.protocols.protocol1_12_1to1_12.ClientboundPackets1_12_1;
 import com.viaversion.viaversion.protocols.protocol1_12_1to1_12.ServerboundPackets1_12_1;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections.ConnectionData;
@@ -1058,7 +1058,7 @@ public class Protocol1_13To1_12_2 extends Protocol<ClientboundPackets1_12_1, Cli
     }
 
     @Override
-    protected void register(ViaProviders providers) {
+    public void register(ViaProviders providers) {
         providers.register(BlockEntityProvider.class, new BlockEntityProvider());
         providers.register(PaintingProvider.class, new PaintingProvider());
     }
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/ServerboundPackets1_13.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/ServerboundPackets1_13.java
index 70c2ea5ef..e6f40be7c 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/ServerboundPackets1_13.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/ServerboundPackets1_13.java
@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2;
 
-import com.viaversion.viaversion.api.protocol.ServerboundPacketType;
+import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType;
 
 public enum ServerboundPackets1_13 implements ServerboundPacketType {
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/TabCompleteThread.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/TabCompleteThread.java
index 243791646..d2c487455 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/TabCompleteThread.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/TabCompleteThread.java
@@ -18,7 +18,7 @@
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2;
 
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.storage.TabCompleteTracker;
 
 public class TabCompleteThread implements Runnable {
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/AbstractFenceConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/AbstractFenceConnectionHandler.java
index 071f53b64..75f5edd13 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/AbstractFenceConnectionHandler.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/AbstractFenceConnectionHandler.java
@@ -17,10 +17,10 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections;
 
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockFace;
 import com.viaversion.viaversion.api.minecraft.Position;
-import com.viaversion.viaversion.api.protocol.ProtocolVersion;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/AbstractStempConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/AbstractStempConnectionHandler.java
index ddcc37f8d..67d332845 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/AbstractStempConnectionHandler.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/AbstractStempConnectionHandler.java
@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections;
 
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockFace;
 import com.viaversion.viaversion.api.minecraft.Position;
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ChestConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ChestConnectionHandler.java
index 9dbd6e73b..f7f0bb39f 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ChestConnectionHandler.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ChestConnectionHandler.java
@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections;
 
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockFace;
 import com.viaversion.viaversion.api.minecraft.Position;
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ChorusPlantConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ChorusPlantConnectionHandler.java
index 69007077a..554d1646e 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ChorusPlantConnectionHandler.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ChorusPlantConnectionHandler.java
@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections;
 
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockFace;
 import com.viaversion.viaversion.api.minecraft.Position;
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ConnectionData.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ConnectionData.java
index cfba149bb..2daf089dd 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ConnectionData.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ConnectionData.java
@@ -24,10 +24,10 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
 import it.unimi.dsi.fastutil.ints.IntSet;
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.data.MappingDataLoader;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockChangeRecord1_8;
 import com.viaversion.viaversion.api.minecraft.BlockFace;
 import com.viaversion.viaversion.api.minecraft.Position;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ConnectionHandler.java
index 9406b79c6..885ead0c9 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ConnectionHandler.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ConnectionHandler.java
@@ -18,7 +18,7 @@
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections;
 
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.Position;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections.providers.BlockConnectionProvider;
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/DoorConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/DoorConnectionHandler.java
index 40e1a9569..51d1e193b 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/DoorConnectionHandler.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/DoorConnectionHandler.java
@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections;
 
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockFace;
 import com.viaversion.viaversion.api.minecraft.Position;
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/FireConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/FireConnectionHandler.java
index 164adc7de..049795dd2 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/FireConnectionHandler.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/FireConnectionHandler.java
@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections;
 
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockFace;
 import com.viaversion.viaversion.api.minecraft.Position;
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/FlowerConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/FlowerConnectionHandler.java
index 9859c8536..b72fc6718 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/FlowerConnectionHandler.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/FlowerConnectionHandler.java
@@ -20,7 +20,7 @@ package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnection
 import it.unimi.dsi.fastutil.ints.Int2IntMap;
 import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockFace;
 import com.viaversion.viaversion.api.minecraft.Position;
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/GlassConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/GlassConnectionHandler.java
index 06ff11e7d..dafd4f595 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/GlassConnectionHandler.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/GlassConnectionHandler.java
@@ -17,9 +17,9 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections;
 
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.Position;
-import com.viaversion.viaversion.protocols.base.ProtocolInfo;
+import com.viaversion.viaversion.api.protocol.connection.ProtocolInfo;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/RedstoneConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/RedstoneConnectionHandler.java
index 6b26d4da2..73e513706 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/RedstoneConnectionHandler.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/RedstoneConnectionHandler.java
@@ -19,7 +19,7 @@ package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnection
 
 import it.unimi.dsi.fastutil.ints.Int2IntMap;
 import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockFace;
 import com.viaversion.viaversion.api.minecraft.Position;
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/SnowyGrassConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/SnowyGrassConnectionHandler.java
index 855b3a5a7..311ea657a 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/SnowyGrassConnectionHandler.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/SnowyGrassConnectionHandler.java
@@ -17,8 +17,8 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections;
 
-import com.viaversion.viaversion.api.Pair;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.util.Pair;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockFace;
 import com.viaversion.viaversion.api.minecraft.Position;
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/StairConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/StairConnectionHandler.java
index cf71fa15b..c53a2a05a 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/StairConnectionHandler.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/StairConnectionHandler.java
@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections;
 
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockFace;
 import com.viaversion.viaversion.api.minecraft.Position;
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/TripwireConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/TripwireConnectionHandler.java
index 5dc5356bc..59cb00789 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/TripwireConnectionHandler.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/TripwireConnectionHandler.java
@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections;
 
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockFace;
 import com.viaversion.viaversion.api.minecraft.Position;
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/VineConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/VineConnectionHandler.java
index e9cd149ab..18d12c859 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/VineConnectionHandler.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/VineConnectionHandler.java
@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections;
 
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockFace;
 import com.viaversion.viaversion.api.minecraft.Position;
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/WallConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/WallConnectionHandler.java
index 1c0840450..5b62fb566 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/WallConnectionHandler.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/WallConnectionHandler.java
@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections;
 
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockFace;
 import com.viaversion.viaversion.api.minecraft.Position;
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/providers/BlockConnectionProvider.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/providers/BlockConnectionProvider.java
index b2bdf3754..00f557539 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/providers/BlockConnectionProvider.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/providers/BlockConnectionProvider.java
@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections.providers;
 
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.platform.providers.Provider;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.Protocol1_13To1_12_2;
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/providers/PacketBlockConnectionProvider.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/providers/PacketBlockConnectionProvider.java
index 9e23c030e..aa4857d9e 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/providers/PacketBlockConnectionProvider.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/providers/PacketBlockConnectionProvider.java
@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections.providers;
 
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.storage.BlockConnectionStorage;
 
 public class PacketBlockConnectionProvider extends BlockConnectionProvider {
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/ComponentRewriter1_13.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/ComponentRewriter1_13.java
index 35427a60f..43df5b190 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/ComponentRewriter1_13.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/ComponentRewriter1_13.java
@@ -27,7 +27,7 @@ import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.minecraft.nbt.BinaryTagIO;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.rewriters.ComponentRewriter;
+import com.viaversion.viaversion.rewriter.ComponentRewriter;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.Protocol1_13To1_12_2;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.packets.InventoryPackets;
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/RecipeRewriter1_13_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/RecipeRewriter1_13_2.java
index 47cce69d1..e7f80cd01 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/RecipeRewriter1_13_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/RecipeRewriter1_13_2.java
@@ -17,11 +17,11 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data;
 
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.rewriters.ItemRewriter;
-import com.viaversion.viaversion.api.rewriters.RecipeRewriter;
+import com.viaversion.viaversion.rewriter.ItemRewriter;
+import com.viaversion.viaversion.rewriter.RecipeRewriter;
 import com.viaversion.viaversion.api.type.Type;
 
 /**
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/metadata/MetadataRewriter1_13To1_12_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/metadata/MetadataRewriter1_13To1_12_2.java
index a63848b51..438806636 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/metadata/MetadataRewriter1_13To1_12_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/metadata/MetadataRewriter1_13To1_12_2.java
@@ -17,13 +17,13 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.metadata;
 
-import com.viaversion.viaversion.api.data.UserConnection;
-import com.viaversion.viaversion.api.entities.Entity1_13Types;
-import com.viaversion.viaversion.api.entities.EntityType;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_13Types;
+import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
 import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_13;
-import com.viaversion.viaversion.api.rewriters.MetadataRewriter;
+import com.viaversion.viaversion.rewriter.MetadataRewriter;
 import com.viaversion.viaversion.api.type.types.Particle;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ChatRewriter;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.Protocol1_13To1_12_2;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/packets/EntityPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/packets/EntityPackets.java
index 8acffeaef..3bf8451c7 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/packets/EntityPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/packets/EntityPackets.java
@@ -17,10 +17,10 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.packets;
 
-import com.viaversion.viaversion.api.PacketWrapper;
-import com.viaversion.viaversion.api.entities.Entity1_13Types;
-import com.viaversion.viaversion.api.remapper.PacketHandler;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_13Types;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.types.version.Types1_12;
 import com.viaversion.viaversion.api.type.types.version.Types1_13;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/packets/InventoryPackets.java
index 8e0bb02b8..4e9f76a5b 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/packets/InventoryPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/packets/InventoryPackets.java
@@ -27,12 +27,12 @@ import com.github.steveice10.opennbt.tag.builtin.StringTag;
 import com.github.steveice10.opennbt.tag.builtin.Tag;
 import com.google.common.base.Joiner;
 import com.google.common.primitives.Ints;
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.minecraft.item.Item;
-import com.viaversion.viaversion.api.remapper.PacketHandler;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
-import com.viaversion.viaversion.api.rewriters.ItemRewriter;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+import com.viaversion.viaversion.rewriter.ItemRewriter;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_12_1to1_12.ClientboundPackets1_12_1;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ChatRewriter;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/packets/WorldPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/packets/WorldPackets.java
index 08b869b24..ea1bc78c4 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/packets/WorldPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/packets/WorldPackets.java
@@ -21,16 +21,16 @@ import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.github.steveice10.opennbt.tag.builtin.NumberTag;
 import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
 import it.unimi.dsi.fastutil.ints.IntSet;
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockChangeRecord;
 import com.viaversion.viaversion.api.minecraft.Position;
 import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
 import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.remapper.PacketHandler;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.types.Particle;
 import com.viaversion.viaversion.protocols.protocol1_12_1to1_12.ClientboundPackets1_12_1;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/BlockEntityProvider.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/BlockEntityProvider.java
index e82e50275..ccc073bfb 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/BlockEntityProvider.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/BlockEntityProvider.java
@@ -19,9 +19,9 @@ package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers;
 
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.github.steveice10.opennbt.tag.builtin.Tag;
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.Position;
 import com.viaversion.viaversion.api.platform.providers.Provider;
 import com.viaversion.viaversion.api.type.Type;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/BannerHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/BannerHandler.java
index 9f870a0cf..7032d5bde 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/BannerHandler.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/BannerHandler.java
@@ -24,7 +24,7 @@ import com.github.steveice10.opennbt.tag.builtin.NumberTag;
 import com.github.steveice10.opennbt.tag.builtin.StringTag;
 import com.github.steveice10.opennbt.tag.builtin.Tag;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.Position;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ChatRewriter;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.BlockEntityProvider;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/BedHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/BedHandler.java
index 4c4792730..d7863c038 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/BedHandler.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/BedHandler.java
@@ -21,7 +21,7 @@ import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.github.steveice10.opennbt.tag.builtin.NumberTag;
 import com.github.steveice10.opennbt.tag.builtin.Tag;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.Position;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.BlockEntityProvider;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.storage.BlockStorage;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/CommandBlockHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/CommandBlockHandler.java
index 02210e625..a72bd9c35 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/CommandBlockHandler.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/CommandBlockHandler.java
@@ -22,7 +22,7 @@ import com.github.steveice10.opennbt.tag.builtin.StringTag;
 import com.github.steveice10.opennbt.tag.builtin.Tag;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ChatRewriter;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.BlockEntityProvider;
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/FlowerPotHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/FlowerPotHandler.java
index 0bea476bb..365548638 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/FlowerPotHandler.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/FlowerPotHandler.java
@@ -18,8 +18,8 @@
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.blockentities;
 
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
-import com.viaversion.viaversion.api.Pair;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.util.Pair;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.BlockEntityProvider;
 
 import java.util.Map;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/SkullHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/SkullHandler.java
index b1b8d20de..47030dd3f 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/SkullHandler.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/SkullHandler.java
@@ -21,7 +21,7 @@ import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.github.steveice10.opennbt.tag.builtin.NumberTag;
 import com.github.steveice10.opennbt.tag.builtin.Tag;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.Position;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.BlockEntityProvider;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.storage.BlockStorage;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/SpawnerHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/SpawnerHandler.java
index 1e9f7e19a..4bcaeb976 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/SpawnerHandler.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/SpawnerHandler.java
@@ -19,7 +19,7 @@ package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.block
 
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.github.steveice10.opennbt.tag.builtin.StringTag;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.EntityNameRewriter;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.BlockEntityProvider;
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/BlockConnectionStorage.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/BlockConnectionStorage.java
index 6c57fcd48..dbfd9530c 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/BlockConnectionStorage.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/BlockConnectionStorage.java
@@ -17,10 +17,10 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.storage;
 
-import com.viaversion.viaversion.api.Pair;
+import com.viaversion.viaversion.util.Pair;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.StoredObject;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.StoredObject;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.Position;
 import com.viaversion.viaversion.api.minecraft.chunks.NibbleArray;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.Protocol1_13To1_12_2;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/BlockStorage.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/BlockStorage.java
index 74a79003e..48b4e7241 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/BlockStorage.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/BlockStorage.java
@@ -19,8 +19,8 @@ package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.storage;
 
 import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
 import it.unimi.dsi.fastutil.ints.IntSet;
-import com.viaversion.viaversion.api.data.StoredObject;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.StoredObject;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.Position;
 
 import java.util.Map;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/EntityTracker1_13.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/EntityTracker1_13.java
index 8815dc3a1..dd5f79bb6 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/EntityTracker1_13.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/EntityTracker1_13.java
@@ -17,9 +17,9 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.storage;
 
-import com.viaversion.viaversion.api.data.UserConnection;
-import com.viaversion.viaversion.api.entities.Entity1_13Types.EntityType;
-import com.viaversion.viaversion.api.storage.EntityTracker;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_13Types.EntityType;
+import com.viaversion.viaversion.data.EntityTracker;
 
 public class EntityTracker1_13 extends EntityTracker {
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/TabCompleteTracker.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/TabCompleteTracker.java
index e5200fe44..72a363a22 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/TabCompleteTracker.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/TabCompleteTracker.java
@@ -17,9 +17,9 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.storage;
 
-import com.viaversion.viaversion.api.PacketWrapper;
-import com.viaversion.viaversion.api.data.StoredObject;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.connection.StoredObject;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.Protocol1_13To1_12_2;
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_1to1_14/Protocol1_14_1To1_14.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_1to1_14/Protocol1_14_1To1_14.java
index df99f5742..60b4c5375 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_1to1_14/Protocol1_14_1To1_14.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_1to1_14/Protocol1_14_1To1_14.java
@@ -17,9 +17,9 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_14_1to1_14;
 
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.rewriters.MetadataRewriter;
+import com.viaversion.viaversion.rewriter.MetadataRewriter;
 import com.viaversion.viaversion.protocols.protocol1_14_1to1_14.metadata.MetadataRewriter1_14_1To1_14;
 import com.viaversion.viaversion.protocols.protocol1_14_1to1_14.packets.EntityPackets;
 import com.viaversion.viaversion.protocols.protocol1_14_1to1_14.storage.EntityTracker1_14_1;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_1to1_14/metadata/MetadataRewriter1_14_1To1_14.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_1to1_14/metadata/MetadataRewriter1_14_1To1_14.java
index add4e1c4b..b3664cbbb 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_1to1_14/metadata/MetadataRewriter1_14_1To1_14.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_1to1_14/metadata/MetadataRewriter1_14_1To1_14.java
@@ -17,11 +17,11 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_14_1to1_14.metadata;
 
-import com.viaversion.viaversion.api.data.UserConnection;
-import com.viaversion.viaversion.api.entities.Entity1_14Types;
-import com.viaversion.viaversion.api.entities.EntityType;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_14Types;
+import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
-import com.viaversion.viaversion.api.rewriters.MetadataRewriter;
+import com.viaversion.viaversion.rewriter.MetadataRewriter;
 import com.viaversion.viaversion.protocols.protocol1_14_1to1_14.Protocol1_14_1To1_14;
 import com.viaversion.viaversion.protocols.protocol1_14_1to1_14.storage.EntityTracker1_14_1;
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_1to1_14/packets/EntityPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_1to1_14/packets/EntityPackets.java
index aa822d2a1..5024215b2 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_1to1_14/packets/EntityPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_1to1_14/packets/EntityPackets.java
@@ -17,8 +17,8 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_14_1to1_14.packets;
 
-import com.viaversion.viaversion.api.entities.Entity1_14Types;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_14Types;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.types.version.Types1_14;
 import com.viaversion.viaversion.protocols.protocol1_14_1to1_14.Protocol1_14_1To1_14;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_1to1_14/storage/EntityTracker1_14_1.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_1to1_14/storage/EntityTracker1_14_1.java
index 3150ce300..eddd72f69 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_1to1_14/storage/EntityTracker1_14_1.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_1to1_14/storage/EntityTracker1_14_1.java
@@ -17,9 +17,9 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_14_1to1_14.storage;
 
-import com.viaversion.viaversion.api.data.UserConnection;
-import com.viaversion.viaversion.api.entities.Entity1_14Types;
-import com.viaversion.viaversion.api.storage.EntityTracker;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_14Types;
+import com.viaversion.viaversion.data.EntityTracker;
 
 public class EntityTracker1_14_1 extends EntityTracker {
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_3to1_14_2/Protocol1_14_3To1_14_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_3to1_14_2/Protocol1_14_3To1_14_2.java
index ec020fc8d..e5f44a71e 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_3to1_14_2/Protocol1_14_3To1_14_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_3to1_14_2/Protocol1_14_3To1_14_2.java
@@ -17,10 +17,10 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_14_3to1_14_2;
 
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.remapper.PacketHandler;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14;
 import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_4to1_14_3/Protocol1_14_4To1_14_3.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_4to1_14_3/Protocol1_14_4To1_14_3.java
index c84cdca77..c609b0dad 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_4to1_14_3/Protocol1_14_4To1_14_3.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_4to1_14_3/Protocol1_14_4To1_14_3.java
@@ -17,10 +17,10 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_14_4to1_14_3;
 
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.remapper.PacketHandler;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14;
 import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/ClientboundPackets1_14.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/ClientboundPackets1_14.java
index 8d3183bfc..8a448f5da 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/ClientboundPackets1_14.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/ClientboundPackets1_14.java
@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_14to1_13_2;
 
-import com.viaversion.viaversion.api.protocol.ClientboundPacketType;
+import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
 
 public enum ClientboundPackets1_14 implements ClientboundPacketType {
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/Protocol1_14To1_13_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/Protocol1_14To1_13_2.java
index 7cd25fca7..242713028 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/Protocol1_14To1_13_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/Protocol1_14To1_13_2.java
@@ -17,15 +17,15 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_14to1_13_2;
 
-import com.viaversion.viaversion.api.PacketWrapper;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.remapper.PacketHandler;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
-import com.viaversion.viaversion.api.rewriters.ComponentRewriter;
-import com.viaversion.viaversion.api.rewriters.MetadataRewriter;
-import com.viaversion.viaversion.api.rewriters.SoundRewriter;
-import com.viaversion.viaversion.api.rewriters.StatisticsRewriter;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+import com.viaversion.viaversion.rewriter.ComponentRewriter;
+import com.viaversion.viaversion.rewriter.MetadataRewriter;
+import com.viaversion.viaversion.rewriter.SoundRewriter;
+import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ServerboundPackets1_13;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/ServerboundPackets1_14.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/ServerboundPackets1_14.java
index 91cad5f64..507965f59 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/ServerboundPackets1_14.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/ServerboundPackets1_14.java
@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_14to1_13_2;
 
-import com.viaversion.viaversion.api.protocol.ServerboundPacketType;
+import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType;
 
 public enum ServerboundPackets1_14 implements ServerboundPacketType {
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/data/CommandRewriter1_14.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/data/CommandRewriter1_14.java
index 4df959b48..a5ae76794 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/data/CommandRewriter1_14.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/data/CommandRewriter1_14.java
@@ -19,7 +19,7 @@ package com.viaversion.viaversion.protocols.protocol1_14to1_13_2.data;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.rewriters.CommandRewriter;
+import com.viaversion.viaversion.rewriter.CommandRewriter;
 
 public class CommandRewriter1_14 extends CommandRewriter {
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/data/RecipeRewriter1_14.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/data/RecipeRewriter1_14.java
index b3cf8a9e1..518238863 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/data/RecipeRewriter1_14.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/data/RecipeRewriter1_14.java
@@ -17,10 +17,10 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_14to1_13_2.data;
 
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.rewriters.ItemRewriter;
+import com.viaversion.viaversion.rewriter.ItemRewriter;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.RecipeRewriter1_13_2;
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/metadata/MetadataRewriter1_14To1_13_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/metadata/MetadataRewriter1_14To1_13_2.java
index f5d862c3c..c4d98f02a 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/metadata/MetadataRewriter1_14To1_13_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/metadata/MetadataRewriter1_14To1_13_2.java
@@ -17,17 +17,17 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_14to1_13_2.metadata;
 
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.UserConnection;
-import com.viaversion.viaversion.api.entities.Entity1_13Types;
-import com.viaversion.viaversion.api.entities.Entity1_14Types;
-import com.viaversion.viaversion.api.entities.EntityType;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_13Types;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_14Types;
+import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 import com.viaversion.viaversion.api.minecraft.VillagerData;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
 import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_14;
-import com.viaversion.viaversion.api.rewriters.MetadataRewriter;
+import com.viaversion.viaversion.rewriter.MetadataRewriter;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.types.Particle;
 import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.Protocol1_14To1_13_2;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/EntityPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/EntityPackets.java
index 76c952c39..8f7b6197b 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/EntityPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/EntityPackets.java
@@ -17,15 +17,15 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_14to1_13_2.packets;
 
-import com.viaversion.viaversion.api.PacketWrapper;
-import com.viaversion.viaversion.api.entities.Entity1_13Types;
-import com.viaversion.viaversion.api.entities.Entity1_14Types;
-import com.viaversion.viaversion.api.entities.EntityType;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_13Types;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_14Types;
+import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 import com.viaversion.viaversion.api.minecraft.Position;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
 import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_14;
-import com.viaversion.viaversion.api.remapper.PacketHandler;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.types.version.Types1_13_2;
 import com.viaversion.viaversion.api.type.types.version.Types1_14;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/InventoryPackets.java
index c92713629..e629b1f09 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/InventoryPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/InventoryPackets.java
@@ -25,15 +25,15 @@ import com.github.steveice10.opennbt.tag.builtin.Tag;
 import com.google.common.collect.Sets;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.remapper.PacketHandler;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
-import com.viaversion.viaversion.api.rewriters.ComponentRewriter;
-import com.viaversion.viaversion.api.rewriters.ItemRewriter;
-import com.viaversion.viaversion.api.rewriters.RecipeRewriter;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+import com.viaversion.viaversion.rewriter.ComponentRewriter;
+import com.viaversion.viaversion.rewriter.ItemRewriter;
+import com.viaversion.viaversion.rewriter.RecipeRewriter;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ChatRewriter;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/PlayerPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/PlayerPackets.java
index c26e55fb5..a6f44d4e6 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/PlayerPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/PlayerPackets.java
@@ -20,13 +20,13 @@ package com.viaversion.viaversion.protocols.protocol1_14to1_13_2.packets;
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.github.steveice10.opennbt.tag.builtin.ListTag;
 import com.github.steveice10.opennbt.tag.builtin.Tag;
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.minecraft.Position;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.remapper.PacketHandler;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13;
 import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/WorldPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/WorldPackets.java
index d53714218..90f33b5ef 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/WorldPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/WorldPackets.java
@@ -19,17 +19,17 @@ package com.viaversion.viaversion.protocols.protocol1_14to1_13_2.packets;
 
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.github.steveice10.opennbt.tag.builtin.LongArrayTag;
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.entities.Entity1_14Types;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_14Types;
 import com.viaversion.viaversion.api.minecraft.BlockFace;
 import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
 import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
 import com.viaversion.viaversion.api.minecraft.chunks.NibbleArray;
-import com.viaversion.viaversion.api.remapper.PacketHandler;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
-import com.viaversion.viaversion.api.remapper.ValueCreator;
-import com.viaversion.viaversion.api.rewriters.BlockRewriter;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.ValueCreator;
+import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.types.Chunk1_13Type;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/storage/EntityTracker1_14.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/storage/EntityTracker1_14.java
index b4e8b6474..1ecf7d3f5 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/storage/EntityTracker1_14.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/storage/EntityTracker1_14.java
@@ -17,10 +17,10 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_14to1_13_2.storage;
 
-import com.viaversion.viaversion.api.PacketWrapper;
-import com.viaversion.viaversion.api.data.UserConnection;
-import com.viaversion.viaversion.api.entities.Entity1_14Types;
-import com.viaversion.viaversion.api.storage.EntityTracker;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_14Types;
+import com.viaversion.viaversion.data.EntityTracker;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.Protocol1_14To1_13_2;
 import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.packets.WorldPackets;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/ClientboundPackets1_15.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/ClientboundPackets1_15.java
index a3868879e..fd1c04c6a 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/ClientboundPackets1_15.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/ClientboundPackets1_15.java
@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_15to1_14_4;
 
-import com.viaversion.viaversion.api.protocol.ClientboundPacketType;
+import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
 
 public enum ClientboundPackets1_15 implements ClientboundPacketType {
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/Protocol1_15To1_14_4.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/Protocol1_15To1_14_4.java
index f03ac7475..fcb493f6f 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/Protocol1_15To1_14_4.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/Protocol1_15To1_14_4.java
@@ -17,14 +17,14 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_15to1_14_4;
 
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
-import com.viaversion.viaversion.api.rewriters.MetadataRewriter;
-import com.viaversion.viaversion.api.rewriters.RegistryType;
-import com.viaversion.viaversion.api.rewriters.SoundRewriter;
-import com.viaversion.viaversion.api.rewriters.StatisticsRewriter;
-import com.viaversion.viaversion.api.rewriters.TagRewriter;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+import com.viaversion.viaversion.rewriter.MetadataRewriter;
+import com.viaversion.viaversion.rewriter.RegistryType;
+import com.viaversion.viaversion.rewriter.SoundRewriter;
+import com.viaversion.viaversion.rewriter.StatisticsRewriter;
+import com.viaversion.viaversion.rewriter.TagRewriter;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14;
 import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/metadata/MetadataRewriter1_15To1_14_4.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/metadata/MetadataRewriter1_15To1_14_4.java
index ae350d7ba..575343a10 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/metadata/MetadataRewriter1_15To1_14_4.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/metadata/MetadataRewriter1_15To1_14_4.java
@@ -17,14 +17,14 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_15to1_14_4.metadata;
 
-import com.viaversion.viaversion.api.data.UserConnection;
-import com.viaversion.viaversion.api.entities.Entity1_15Types;
-import com.viaversion.viaversion.api.entities.EntityType;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_15Types;
+import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
 import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_13;
 import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_14;
-import com.viaversion.viaversion.api.rewriters.MetadataRewriter;
+import com.viaversion.viaversion.rewriter.MetadataRewriter;
 import com.viaversion.viaversion.api.type.types.Particle;
 import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.Protocol1_15To1_14_4;
 import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.packets.EntityPackets;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/packets/EntityPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/packets/EntityPackets.java
index 732eb0ca4..086cea5ff 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/packets/EntityPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/packets/EntityPackets.java
@@ -17,10 +17,10 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_15to1_14_4.packets;
 
-import com.viaversion.viaversion.api.PacketWrapper;
-import com.viaversion.viaversion.api.entities.Entity1_15Types;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_15Types;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.types.version.Types1_14;
 import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/packets/InventoryPackets.java
index 57dd61f6a..83ac3f304 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/packets/InventoryPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/packets/InventoryPackets.java
@@ -18,7 +18,7 @@
 package com.viaversion.viaversion.protocols.protocol1_15to1_14_4.packets;
 
 import com.viaversion.viaversion.api.minecraft.item.Item;
-import com.viaversion.viaversion.api.rewriters.ItemRewriter;
+import com.viaversion.viaversion.rewriter.ItemRewriter;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14;
 import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/packets/PlayerPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/packets/PlayerPackets.java
index 5cc3c9047..57bd03b7b 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/packets/PlayerPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/packets/PlayerPackets.java
@@ -18,9 +18,9 @@
 package com.viaversion.viaversion.protocols.protocol1_15to1_14_4.packets;
 
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.entities.Entity1_15Types;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_15Types;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14;
 import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.storage.EntityTracker1_15;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/packets/WorldPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/packets/WorldPackets.java
index b3787ce8f..08027ff35 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/packets/WorldPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/packets/WorldPackets.java
@@ -17,12 +17,12 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_15to1_14_4.packets;
 
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
 import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
-import com.viaversion.viaversion.api.remapper.PacketHandler;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
-import com.viaversion.viaversion.api.rewriters.BlockRewriter;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14;
 import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.types.Chunk1_14Type;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/storage/EntityTracker1_15.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/storage/EntityTracker1_15.java
index 1919feb29..51739d912 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/storage/EntityTracker1_15.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/storage/EntityTracker1_15.java
@@ -17,9 +17,9 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_15to1_14_4.storage;
 
-import com.viaversion.viaversion.api.data.UserConnection;
-import com.viaversion.viaversion.api.entities.Entity1_15Types;
-import com.viaversion.viaversion.api.storage.EntityTracker;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_15Types;
+import com.viaversion.viaversion.data.EntityTracker;
 
 public class EntityTracker1_15 extends EntityTracker {
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/ClientboundPackets1_16_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/ClientboundPackets1_16_2.java
index b5a0add33..1e6bb6830 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/ClientboundPackets1_16_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/ClientboundPackets1_16_2.java
@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1;
 
-import com.viaversion.viaversion.api.protocol.ClientboundPacketType;
+import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
 
 public enum ClientboundPackets1_16_2 implements ClientboundPacketType {
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/Protocol1_16_2To1_16_1.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/Protocol1_16_2To1_16_1.java
index b247db561..d8bd0e67c 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/Protocol1_16_2To1_16_1.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/Protocol1_16_2To1_16_1.java
@@ -17,14 +17,14 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1;
 
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
-import com.viaversion.viaversion.api.rewriters.MetadataRewriter;
-import com.viaversion.viaversion.api.rewriters.RegistryType;
-import com.viaversion.viaversion.api.rewriters.SoundRewriter;
-import com.viaversion.viaversion.api.rewriters.StatisticsRewriter;
-import com.viaversion.viaversion.api.rewriters.TagRewriter;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+import com.viaversion.viaversion.rewriter.MetadataRewriter;
+import com.viaversion.viaversion.rewriter.RegistryType;
+import com.viaversion.viaversion.rewriter.SoundRewriter;
+import com.viaversion.viaversion.rewriter.StatisticsRewriter;
+import com.viaversion.viaversion.rewriter.TagRewriter;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.data.MappingData;
 import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.metadata.MetadataRewriter1_16_2To1_16_1;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/ServerboundPackets1_16_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/ServerboundPackets1_16_2.java
index 621b9a713..6156b6128 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/ServerboundPackets1_16_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/ServerboundPackets1_16_2.java
@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1;
 
-import com.viaversion.viaversion.api.protocol.ServerboundPacketType;
+import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType;
 
 public enum ServerboundPackets1_16_2 implements ServerboundPacketType {
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/metadata/MetadataRewriter1_16_2To1_16_1.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/metadata/MetadataRewriter1_16_2To1_16_1.java
index 06096f4c6..2641f1bfd 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/metadata/MetadataRewriter1_16_2To1_16_1.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/metadata/MetadataRewriter1_16_2To1_16_1.java
@@ -17,14 +17,14 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.metadata;
 
-import com.viaversion.viaversion.api.data.UserConnection;
-import com.viaversion.viaversion.api.entities.Entity1_16Types;
-import com.viaversion.viaversion.api.entities.Entity1_16_2Types;
-import com.viaversion.viaversion.api.entities.EntityType;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_16Types;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_16_2Types;
+import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
 import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_14;
-import com.viaversion.viaversion.api.rewriters.MetadataRewriter;
+import com.viaversion.viaversion.rewriter.MetadataRewriter;
 import com.viaversion.viaversion.api.type.types.Particle;
 import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.Protocol1_16_2To1_16_1;
 import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.packets.InventoryPackets;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/packets/EntityPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/packets/EntityPackets.java
index b9e4ebecb..d08225430 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/packets/EntityPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/packets/EntityPackets.java
@@ -19,8 +19,8 @@ package com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.packets;
 
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.entities.Entity1_16_2Types;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_16_2Types;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.types.version.Types1_14;
 import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.Protocol1_16_2To1_16_1;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/packets/InventoryPackets.java
index 7690dec3c..21b189298 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/packets/InventoryPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/packets/InventoryPackets.java
@@ -18,8 +18,8 @@
 package com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.packets;
 
 import com.viaversion.viaversion.api.minecraft.item.Item;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
-import com.viaversion.viaversion.api.rewriters.ItemRewriter;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+import com.viaversion.viaversion.rewriter.ItemRewriter;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.Protocol1_16_2To1_16_1;
 import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.ServerboundPackets1_16_2;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/packets/WorldPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/packets/WorldPackets.java
index 63721d524..06f9aa74f 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/packets/WorldPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/packets/WorldPackets.java
@@ -17,14 +17,14 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.packets;
 
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.minecraft.BlockChangeRecord;
 import com.viaversion.viaversion.api.minecraft.BlockChangeRecord1_16_2;
 import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
 import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
-import com.viaversion.viaversion.api.rewriters.BlockRewriter;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.ClientboundPackets1_16_2;
 import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.Protocol1_16_2To1_16_1;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/storage/EntityTracker1_16_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/storage/EntityTracker1_16_2.java
index 977f8d6a1..f42f5ea88 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/storage/EntityTracker1_16_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/storage/EntityTracker1_16_2.java
@@ -17,9 +17,9 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.storage;
 
-import com.viaversion.viaversion.api.data.UserConnection;
-import com.viaversion.viaversion.api.entities.Entity1_16_2Types;
-import com.viaversion.viaversion.api.storage.EntityTracker;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_16_2Types;
+import com.viaversion.viaversion.data.EntityTracker;
 
 public class EntityTracker1_16_2 extends EntityTracker {
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_4to1_16_3/Protocol1_16_4To1_16_3.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_4to1_16_3/Protocol1_16_4To1_16_3.java
index 1734f6a64..e4d1d235b 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_4to1_16_3/Protocol1_16_4To1_16_3.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_4to1_16_3/Protocol1_16_4To1_16_3.java
@@ -18,7 +18,7 @@
 package com.viaversion.viaversion.protocols.protocol1_16_4to1_16_3;
 
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.ClientboundPackets1_16_2;
 import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.ServerboundPackets1_16_2;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/ClientboundPackets1_16.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/ClientboundPackets1_16.java
index a92ab164a..8e13bc539 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/ClientboundPackets1_16.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/ClientboundPackets1_16.java
@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_16to1_15_2;
 
-import com.viaversion.viaversion.api.protocol.ClientboundPacketType;
+import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
 
 public enum ClientboundPackets1_16 implements ClientboundPacketType {
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/Protocol1_16To1_15_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/Protocol1_16To1_15_2.java
index 327d6b2a5..a5d5c3cbb 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/Protocol1_16To1_15_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/Protocol1_16To1_15_2.java
@@ -22,17 +22,17 @@ import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
-import com.viaversion.viaversion.api.rewriters.ComponentRewriter;
-import com.viaversion.viaversion.api.rewriters.MetadataRewriter;
-import com.viaversion.viaversion.api.rewriters.RegistryType;
-import com.viaversion.viaversion.api.rewriters.SoundRewriter;
-import com.viaversion.viaversion.api.rewriters.StatisticsRewriter;
-import com.viaversion.viaversion.api.rewriters.TagRewriter;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+import com.viaversion.viaversion.rewriter.ComponentRewriter;
+import com.viaversion.viaversion.rewriter.MetadataRewriter;
+import com.viaversion.viaversion.rewriter.RegistryType;
+import com.viaversion.viaversion.rewriter.SoundRewriter;
+import com.viaversion.viaversion.rewriter.StatisticsRewriter;
+import com.viaversion.viaversion.rewriter.TagRewriter;
 import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.packets.State;
+import com.viaversion.viaversion.api.protocol.packet.State;
 import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14;
 import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.ClientboundPackets1_15;
 import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.data.MappingData;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/ServerboundPackets1_16.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/ServerboundPackets1_16.java
index 6c0780c2e..0a0bd71ef 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/ServerboundPackets1_16.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/ServerboundPackets1_16.java
@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_16to1_15_2;
 
-import com.viaversion.viaversion.api.protocol.ServerboundPacketType;
+import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType;
 
 public enum ServerboundPackets1_16 implements ServerboundPacketType {
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/data/RecipeRewriter1_16.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/data/RecipeRewriter1_16.java
index 8cd10719f..22e1dae6a 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/data/RecipeRewriter1_16.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/data/RecipeRewriter1_16.java
@@ -17,10 +17,10 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_16to1_15_2.data;
 
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.rewriters.ItemRewriter;
+import com.viaversion.viaversion.rewriter.ItemRewriter;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.data.RecipeRewriter1_14;
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/data/TranslationMappings.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/data/TranslationMappings.java
index 44b0f45dc..cac81aa39 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/data/TranslationMappings.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/data/TranslationMappings.java
@@ -21,7 +21,7 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.rewriters.ComponentRewriter;
+import com.viaversion.viaversion.rewriter.ComponentRewriter;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/metadata/MetadataRewriter1_16To1_15_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/metadata/MetadataRewriter1_16To1_15_2.java
index 8b48fc0d5..c47d53c99 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/metadata/MetadataRewriter1_16To1_15_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/metadata/MetadataRewriter1_16To1_15_2.java
@@ -17,14 +17,14 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_16to1_15_2.metadata;
 
-import com.viaversion.viaversion.api.data.UserConnection;
-import com.viaversion.viaversion.api.entities.Entity1_15Types;
-import com.viaversion.viaversion.api.entities.Entity1_16Types;
-import com.viaversion.viaversion.api.entities.EntityType;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_15Types;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_16Types;
+import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
 import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_14;
-import com.viaversion.viaversion.api.rewriters.MetadataRewriter;
+import com.viaversion.viaversion.rewriter.MetadataRewriter;
 import com.viaversion.viaversion.api.type.types.Particle;
 import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.Protocol1_16To1_15_2;
 import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.packets.InventoryPackets;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/packets/EntityPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/packets/EntityPackets.java
index 0e887770c..d43c099f2 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/packets/EntityPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/packets/EntityPackets.java
@@ -25,9 +25,9 @@ import com.github.steveice10.opennbt.tag.builtin.ListTag;
 import com.github.steveice10.opennbt.tag.builtin.LongTag;
 import com.github.steveice10.opennbt.tag.builtin.StringTag;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.entities.Entity1_16Types;
-import com.viaversion.viaversion.api.remapper.PacketHandler;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_16Types;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.types.version.Types1_14;
 import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.ClientboundPackets1_15;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/packets/InventoryPackets.java
index d426937f9..38bd0daac 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/packets/InventoryPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/packets/InventoryPackets.java
@@ -25,8 +25,8 @@ import com.github.steveice10.opennbt.tag.builtin.NumberTag;
 import com.github.steveice10.opennbt.tag.builtin.StringTag;
 import com.github.steveice10.opennbt.tag.builtin.Tag;
 import com.viaversion.viaversion.api.minecraft.item.Item;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
-import com.viaversion.viaversion.api.rewriters.ItemRewriter;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+import com.viaversion.viaversion.rewriter.ItemRewriter;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.types.UUIDIntArrayType;
 import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.data.RecipeRewriter1_14;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/packets/WorldPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/packets/WorldPackets.java
index b37024322..5fe1a7768 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/packets/WorldPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/packets/WorldPackets.java
@@ -25,8 +25,8 @@ import com.github.steveice10.opennbt.tag.builtin.Tag;
 import com.viaversion.viaversion.api.minecraft.Position;
 import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
 import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
-import com.viaversion.viaversion.api.rewriters.BlockRewriter;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.types.UUIDIntArrayType;
 import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.ClientboundPackets1_15;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/storage/EntityTracker1_16.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/storage/EntityTracker1_16.java
index 60876caf0..e99d5755a 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/storage/EntityTracker1_16.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/storage/EntityTracker1_16.java
@@ -17,9 +17,9 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_16to1_15_2.storage;
 
-import com.viaversion.viaversion.api.data.UserConnection;
-import com.viaversion.viaversion.api.entities.Entity1_16Types;
-import com.viaversion.viaversion.api.storage.EntityTracker;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_16Types;
+import com.viaversion.viaversion.data.EntityTracker;
 
 public class EntityTracker1_16 extends EntityTracker {
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/storage/InventoryTracker1_16.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/storage/InventoryTracker1_16.java
index 74e41d8f6..14d20e23a 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/storage/InventoryTracker1_16.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/storage/InventoryTracker1_16.java
@@ -17,8 +17,8 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_16to1_15_2.storage;
 
-import com.viaversion.viaversion.api.data.StoredObject;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.StoredObject;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 
 public class InventoryTracker1_16 extends StoredObject {
     private short inventory = -1;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/ClientboundPackets1_17.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/ClientboundPackets1_17.java
index e55f36c71..35fba40ca 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/ClientboundPackets1_17.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/ClientboundPackets1_17.java
@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_17to1_16_4;
 
-import com.viaversion.viaversion.api.protocol.ClientboundPacketType;
+import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
 
 public enum ClientboundPackets1_17 implements ClientboundPacketType {
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/Protocol1_17To1_16_4.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/Protocol1_17To1_16_4.java
index cb6d51910..a0ecba02c 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/Protocol1_17To1_16_4.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/Protocol1_17To1_16_4.java
@@ -19,15 +19,15 @@ package com.viaversion.viaversion.protocols.protocol1_17to1_16_4;
 
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.data.MappingData;
-import com.viaversion.viaversion.api.data.UserConnection;
-import com.viaversion.viaversion.api.protocol.ClientboundPacketType;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
-import com.viaversion.viaversion.api.rewriters.MetadataRewriter;
-import com.viaversion.viaversion.api.rewriters.RegistryType;
-import com.viaversion.viaversion.api.rewriters.SoundRewriter;
-import com.viaversion.viaversion.api.rewriters.StatisticsRewriter;
-import com.viaversion.viaversion.api.rewriters.TagRewriter;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+import com.viaversion.viaversion.rewriter.MetadataRewriter;
+import com.viaversion.viaversion.rewriter.RegistryType;
+import com.viaversion.viaversion.rewriter.SoundRewriter;
+import com.viaversion.viaversion.rewriter.StatisticsRewriter;
+import com.viaversion.viaversion.rewriter.TagRewriter;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.ClientboundPackets1_16_2;
 import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.ServerboundPackets1_16_2;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/ServerboundPackets1_17.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/ServerboundPackets1_17.java
index 72f6058e4..9f1749132 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/ServerboundPackets1_17.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/ServerboundPackets1_17.java
@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_17to1_16_4;
 
-import com.viaversion.viaversion.api.protocol.ServerboundPacketType;
+import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType;
 
 public enum ServerboundPackets1_17 implements ServerboundPacketType {
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/metadata/MetadataRewriter1_17To1_16_4.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/metadata/MetadataRewriter1_17To1_16_4.java
index 81fac1e10..01e2a81aa 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/metadata/MetadataRewriter1_17To1_16_4.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/metadata/MetadataRewriter1_17To1_16_4.java
@@ -17,14 +17,14 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_17to1_16_4.metadata;
 
-import com.viaversion.viaversion.api.data.UserConnection;
-import com.viaversion.viaversion.api.entities.Entity1_16_2Types;
-import com.viaversion.viaversion.api.entities.Entity1_17Types;
-import com.viaversion.viaversion.api.entities.EntityType;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_16_2Types;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_17Types;
+import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
 import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_17;
-import com.viaversion.viaversion.api.rewriters.MetadataRewriter;
+import com.viaversion.viaversion.rewriter.MetadataRewriter;
 import com.viaversion.viaversion.api.type.types.Particle;
 import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.Protocol1_17To1_16_4;
 import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.packets.InventoryPackets;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/packets/EntityPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/packets/EntityPackets.java
index 35ad85e6b..797027026 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/packets/EntityPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/packets/EntityPackets.java
@@ -17,9 +17,9 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_17to1_16_4.packets;
 
-import com.viaversion.viaversion.api.entities.Entity1_17Types;
-import com.viaversion.viaversion.api.protocol.ClientboundPacketType;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_17Types;
+import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.types.version.Types1_14;
 import com.viaversion.viaversion.api.type.types.version.Types1_17;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/packets/InventoryPackets.java
index f1d9d65b3..afe67abf6 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/packets/InventoryPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/packets/InventoryPackets.java
@@ -17,10 +17,10 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_17to1_16_4.packets;
 
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.minecraft.item.Item;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
-import com.viaversion.viaversion.api.rewriters.ItemRewriter;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+import com.viaversion.viaversion.rewriter.ItemRewriter;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.ClientboundPackets1_16_2;
 import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.ServerboundPackets1_16_2;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/packets/WorldPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/packets/WorldPackets.java
index 28ce2be84..355fb8837 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/packets/WorldPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/packets/WorldPackets.java
@@ -21,15 +21,15 @@ import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.github.steveice10.opennbt.tag.builtin.IntTag;
 import com.github.steveice10.opennbt.tag.builtin.ListTag;
 import com.github.steveice10.opennbt.tag.builtin.Tag;
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.UserConnection;
-import com.viaversion.viaversion.api.entities.Entity1_17Types;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_17Types;
 import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
 import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
-import com.viaversion.viaversion.api.protocol.ClientboundPacketType;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
-import com.viaversion.viaversion.api.rewriters.BlockRewriter;
+import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.ClientboundPackets1_16_2;
 import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.types.Chunk1_16_2Type;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/storage/BiomeStorage.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/storage/BiomeStorage.java
index 9d21043a8..01b5ec320 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/storage/BiomeStorage.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/storage/BiomeStorage.java
@@ -18,8 +18,8 @@
 package com.viaversion.viaversion.protocols.protocol1_17to1_16_4.storage;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
-import com.viaversion.viaversion.api.data.StoredObject;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.StoredObject;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/storage/EntityTracker1_17.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/storage/EntityTracker1_17.java
index 2b0453d0f..44d282a4a 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/storage/EntityTracker1_17.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/storage/EntityTracker1_17.java
@@ -17,9 +17,9 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_17to1_16_4.storage;
 
-import com.viaversion.viaversion.api.data.UserConnection;
-import com.viaversion.viaversion.api.entities.Entity1_17Types;
-import com.viaversion.viaversion.api.storage.EntityTracker;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_17Types;
+import com.viaversion.viaversion.data.EntityTracker;
 
 public class EntityTracker1_17 extends EntityTracker {
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_8/ClientboundPackets1_8.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_8/ClientboundPackets1_8.java
index 3509f32e5..91b04d05d 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_8/ClientboundPackets1_8.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_8/ClientboundPackets1_8.java
@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_8;
 
-import com.viaversion.viaversion.api.protocol.ClientboundPacketType;
+import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
 
 public enum ClientboundPackets1_8 implements ClientboundPacketType {
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_8/ServerboundPackets1_8.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_8/ServerboundPackets1_8.java
index 4a4a176c8..2fb664961 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_8/ServerboundPackets1_8.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_8/ServerboundPackets1_8.java
@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_8;
 
-import com.viaversion.viaversion.api.protocol.ServerboundPacketType;
+import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType;
 
 public enum ServerboundPackets1_8 implements ServerboundPacketType {
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_1_2to1_9_3_4/Protocol1_9_1_2To1_9_3_4.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_1_2to1_9_3_4/Protocol1_9_1_2To1_9_3_4.java
index 7d998546f..255c08a5f 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_1_2to1_9_3_4/Protocol1_9_1_2To1_9_3_4.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_1_2to1_9_3_4/Protocol1_9_1_2To1_9_3_4.java
@@ -18,13 +18,13 @@
 package com.viaversion.viaversion.protocols.protocol1_9_1_2to1_9_3_4;
 
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
-import com.viaversion.viaversion.api.PacketWrapper;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.Position;
 import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.remapper.PacketHandler;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_9_1_2to1_9_3_4.chunks.BlockEntity;
 import com.viaversion.viaversion.protocols.protocol1_9_1_2to1_9_3_4.types.Chunk1_9_3_4Type;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_1_2to1_9_3_4/chunks/BlockEntity.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_1_2to1_9_3_4/chunks/BlockEntity.java
index 7c30f3145..f9510c693 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_1_2to1_9_3_4/chunks/BlockEntity.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_1_2to1_9_3_4/chunks/BlockEntity.java
@@ -19,9 +19,9 @@ package com.viaversion.viaversion.protocols.protocol1_9_1_2to1_9_3_4.chunks;
 
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.github.steveice10.opennbt.tag.builtin.NumberTag;
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.Position;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_9_1_2to1_9_3_4.Protocol1_9_1_2To1_9_3_4;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_1to1_9/Protocol1_9_1To1_9.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_1to1_9/Protocol1_9_1To1_9.java
index 15156a2c3..f8c517f44 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_1to1_9/Protocol1_9_1To1_9.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_1to1_9/Protocol1_9_1To1_9.java
@@ -17,10 +17,10 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_9_1to1_9;
 
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.remapper.PacketHandler;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.ClientboundPackets1_9;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.ServerboundPackets1_9;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_3to1_9_1_2/ClientboundPackets1_9_3.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_3to1_9_1_2/ClientboundPackets1_9_3.java
index 0e1b33466..416960568 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_3to1_9_1_2/ClientboundPackets1_9_3.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_3to1_9_1_2/ClientboundPackets1_9_3.java
@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2;
 
-import com.viaversion.viaversion.api.protocol.ClientboundPacketType;
+import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
 
 public enum ClientboundPackets1_9_3 implements ClientboundPacketType {
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_3to1_9_1_2/Protocol1_9_3To1_9_1_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_3to1_9_1_2/Protocol1_9_3To1_9_1_2.java
index 928fb44c8..958345108 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_3to1_9_1_2/Protocol1_9_3To1_9_1_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_3to1_9_1_2/Protocol1_9_3To1_9_1_2.java
@@ -21,15 +21,15 @@ import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.github.steveice10.opennbt.tag.builtin.IntTag;
 import com.github.steveice10.opennbt.tag.builtin.StringTag;
 import com.google.gson.JsonElement;
-import com.viaversion.viaversion.api.PacketWrapper;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.Position;
 import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
 import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.remapper.PacketHandler;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
-import com.viaversion.viaversion.api.remapper.ValueTransformer;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.ValueTransformer;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.chunks.FakeTileEntity;
 import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_3to1_9_1_2/ServerboundPackets1_9_3.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_3to1_9_1_2/ServerboundPackets1_9_3.java
index 30d62824b..d9e667076 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_3to1_9_1_2/ServerboundPackets1_9_3.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_3to1_9_1_2/ServerboundPackets1_9_3.java
@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2;
 
-import com.viaversion.viaversion.api.protocol.ServerboundPacketType;
+import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType;
 
 public enum ServerboundPackets1_9_3 implements ServerboundPacketType {
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_3to1_9_1_2/storage/ClientWorld.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_3to1_9_1_2/storage/ClientWorld.java
index 73f563e33..31c309344 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_3to1_9_1_2/storage/ClientWorld.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_3to1_9_1_2/storage/ClientWorld.java
@@ -17,8 +17,8 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage;
 
-import com.viaversion.viaversion.api.data.StoredObject;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.StoredObject;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.Environment;
 
 /**
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/ClientboundPackets1_9.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/ClientboundPackets1_9.java
index 6d385fd71..f381146d9 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/ClientboundPackets1_9.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/ClientboundPackets1_9.java
@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_9to1_8;
 
-import com.viaversion.viaversion.api.protocol.ClientboundPacketType;
+import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
 
 public enum ClientboundPackets1_9 implements ClientboundPacketType {
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/PlayerMovementMapper.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/PlayerMovementMapper.java
index ca1a28992..83e5ced9a 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/PlayerMovementMapper.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/PlayerMovementMapper.java
@@ -17,8 +17,8 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_9to1_8;
 
-import com.viaversion.viaversion.api.PacketWrapper;
-import com.viaversion.viaversion.api.remapper.PacketHandler;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.MovementTracker;
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/Protocol1_9To1_8.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/Protocol1_9To1_8.java
index 86516221f..9a49e187a 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/Protocol1_9To1_8.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/Protocol1_9To1_8.java
@@ -19,17 +19,17 @@ package com.viaversion.viaversion.protocols.protocol1_9to1_8;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.platform.providers.ViaProviders;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
-import com.viaversion.viaversion.api.remapper.ValueTransformer;
-import com.viaversion.viaversion.api.rewriters.MetadataRewriter;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.ValueTransformer;
+import com.viaversion.viaversion.rewriter.MetadataRewriter;
 import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.packets.State;
+import com.viaversion.viaversion.api.protocol.packet.State;
 import com.viaversion.viaversion.protocols.protocol1_8.ClientboundPackets1_8;
 import com.viaversion.viaversion.protocols.protocol1_8.ServerboundPackets1_8;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.metadata.MetadataRewriter1_9To1_8;
@@ -137,7 +137,7 @@ public class Protocol1_9To1_8 extends Protocol<ClientboundPackets1_8, Clientboun
     }
 
     @Override
-    protected void register(ViaProviders providers) {
+    public void register(ViaProviders providers) {
         providers.register(HandItemProvider.class, new HandItemProvider());
         providers.register(BulkChunkTranslatorProvider.class, new BulkChunkTranslatorProvider());
         providers.register(CommandBlockProvider.class, new CommandBlockProvider());
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/ServerboundPackets1_9.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/ServerboundPackets1_9.java
index e6db4cb37..44b1f119d 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/ServerboundPackets1_9.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/ServerboundPackets1_9.java
@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_9to1_8;
 
-import com.viaversion.viaversion.api.protocol.ServerboundPacketType;
+import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType;
 
 public enum ServerboundPackets1_9 implements ServerboundPacketType {
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/ViaIdleThread.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/ViaIdleThread.java
index 77d2e39dc..6750abc9c 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/ViaIdleThread.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/ViaIdleThread.java
@@ -18,8 +18,8 @@
 package com.viaversion.viaversion.protocols.protocol1_9to1_8;
 
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.UserConnection;
-import com.viaversion.viaversion.protocols.base.ProtocolInfo;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.ProtocolInfo;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.MovementTransmitterProvider;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.MovementTracker;
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/chat/ChatRewriter.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/chat/ChatRewriter.java
index adcf5054b..7aa6f3e1e 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/chat/ChatRewriter.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/chat/ChatRewriter.java
@@ -19,7 +19,7 @@ package com.viaversion.viaversion.protocols.protocol1_9to1_8.chat;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.EntityTracker1_9;
 
 public class ChatRewriter {
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/metadata/MetaIndex.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/metadata/MetaIndex.java
index ab30bbd8b..2026c8237 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/metadata/MetaIndex.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/metadata/MetaIndex.java
@@ -17,16 +17,16 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_9to1_8.metadata;
 
-import com.viaversion.viaversion.api.Pair;
-import com.viaversion.viaversion.api.entities.Entity1_10Types;
-import com.viaversion.viaversion.api.entities.EntityType;
+import com.viaversion.viaversion.util.Pair;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_10Types;
+import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_8;
 import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_9;
 
 import java.util.HashMap;
 import java.util.Optional;
 
-import static com.viaversion.viaversion.api.entities.Entity1_10Types.EntityType.*;
+import static com.viaversion.viaversion.api.minecraft.entities.Entity1_10Types.EntityType.*;
 
 public enum MetaIndex {
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/metadata/MetadataRewriter1_9To1_8.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/metadata/MetadataRewriter1_9To1_8.java
index 9ee0f8330..06f03b2bb 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/metadata/MetadataRewriter1_9To1_8.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/metadata/MetadataRewriter1_9To1_8.java
@@ -17,9 +17,9 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_9to1_8.metadata;
 
-import com.viaversion.viaversion.api.data.UserConnection;
-import com.viaversion.viaversion.api.entities.Entity1_10Types;
-import com.viaversion.viaversion.api.entities.EntityType;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_10Types;
+import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 import com.viaversion.viaversion.api.minecraft.EulerAngle;
 import com.viaversion.viaversion.api.minecraft.Vector;
 import com.viaversion.viaversion.api.minecraft.item.Item;
@@ -27,7 +27,7 @@ import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
 import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_8;
 import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_9;
-import com.viaversion.viaversion.api.rewriters.MetadataRewriter;
+import com.viaversion.viaversion.rewriter.MetadataRewriter;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.ItemRewriter;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.EntityTracker1_9;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/EntityPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/EntityPackets.java
index d2a5e231b..a3038bf58 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/EntityPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/EntityPackets.java
@@ -18,15 +18,15 @@
 package com.viaversion.viaversion.protocols.protocol1_9to1_8.packets;
 
 import com.google.common.collect.ImmutableList;
-import com.viaversion.viaversion.api.PacketWrapper;
-import com.viaversion.viaversion.api.Pair;
-import com.viaversion.viaversion.api.Triple;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
+import com.viaversion.viaversion.util.Pair;
+import com.viaversion.viaversion.util.Triple;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
-import com.viaversion.viaversion.api.remapper.PacketHandler;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
-import com.viaversion.viaversion.api.remapper.ValueTransformer;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.ValueTransformer;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.types.version.Types1_8;
 import com.viaversion.viaversion.api.type.types.version.Types1_9;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/InventoryPackets.java
index 63a9134bf..4e892673a 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/InventoryPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/InventoryPackets.java
@@ -17,13 +17,13 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_9to1_8.packets;
 
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.remapper.PacketHandler;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
-import com.viaversion.viaversion.api.remapper.ValueCreator;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.ValueCreator;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_8.ClientboundPackets1_8;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.ItemRewriter;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/PlayerPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/PlayerPackets.java
index 8292b9bab..b1b2e5651 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/PlayerPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/PlayerPackets.java
@@ -18,13 +18,13 @@
 package com.viaversion.viaversion.protocols.protocol1_9to1_8.packets;
 
 import com.google.gson.JsonObject;
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.entities.Entity1_10Types;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_10Types;
 import com.viaversion.viaversion.api.minecraft.item.Item;
-import com.viaversion.viaversion.api.remapper.PacketHandler;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
-import com.viaversion.viaversion.api.remapper.ValueCreator;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.ValueCreator;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_8.ClientboundPackets1_8;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.ItemRewriter;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/SpawnPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/SpawnPackets.java
index 96bd04953..878b14579 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/SpawnPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/SpawnPackets.java
@@ -17,16 +17,16 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_9to1_8.packets;
 
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.entities.Entity1_10Types;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_10Types;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
 import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_9;
-import com.viaversion.viaversion.api.remapper.PacketHandler;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
-import com.viaversion.viaversion.api.remapper.ValueCreator;
-import com.viaversion.viaversion.api.remapper.ValueTransformer;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.ValueCreator;
+import com.viaversion.viaversion.api.protocol.remapper.ValueTransformer;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.types.version.Types1_8;
 import com.viaversion.viaversion.api.type.types.version.Types1_9;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/WorldPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/WorldPackets.java
index 876a1bbf7..401ddd17f 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/WorldPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/WorldPackets.java
@@ -20,15 +20,15 @@ package com.viaversion.viaversion.protocols.protocol1_9to1_8.packets;
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.github.steveice10.opennbt.tag.builtin.StringTag;
 import io.netty.buffer.ByteBuf;
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.minecraft.Position;
 import com.viaversion.viaversion.api.minecraft.chunks.Chunk1_8;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.remapper.PacketHandler;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
-import com.viaversion.viaversion.api.remapper.ValueCreator;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.ValueCreator;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_8.ClientboundPackets1_8;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.ItemRewriter;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/BossBarProvider.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/BossBarProvider.java
index 0532d4c57..1031c0a5e 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/BossBarProvider.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/BossBarProvider.java
@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_9to1_8.providers;
 
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.platform.providers.Provider;
 
 import java.util.UUID;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/BulkChunkTranslatorProvider.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/BulkChunkTranslatorProvider.java
index cf724dd11..7b4f3f87f 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/BulkChunkTranslatorProvider.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/BulkChunkTranslatorProvider.java
@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_9to1_8.providers;
 
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.platform.providers.Provider;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.types.CustomByteType;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/CommandBlockProvider.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/CommandBlockProvider.java
index 7adad7014..95616f554 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/CommandBlockProvider.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/CommandBlockProvider.java
@@ -18,8 +18,8 @@
 package com.viaversion.viaversion.protocols.protocol1_9to1_8.providers;
 
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
-import com.viaversion.viaversion.api.PacketWrapper;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.Position;
 import com.viaversion.viaversion.api.platform.providers.Provider;
 import com.viaversion.viaversion.api.type.Type;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/EntityIdProvider.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/EntityIdProvider.java
index ca1349576..8a3fc1e1a 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/EntityIdProvider.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/EntityIdProvider.java
@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_9to1_8.providers;
 
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.platform.providers.Provider;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.EntityTracker1_9;
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/HandItemProvider.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/HandItemProvider.java
index 7866e72c3..3c996f92e 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/HandItemProvider.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/HandItemProvider.java
@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_9to1_8.providers;
 
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.platform.providers.Provider;
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/MainHandProvider.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/MainHandProvider.java
index f7128cbd5..b718b95ea 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/MainHandProvider.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/MainHandProvider.java
@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_9to1_8.providers;
 
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.platform.providers.Provider;
 
 public class MainHandProvider implements Provider {
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/MovementTransmitterProvider.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/MovementTransmitterProvider.java
index 108dcbf94..f8c83f4fc 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/MovementTransmitterProvider.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/MovementTransmitterProvider.java
@@ -18,7 +18,7 @@
 package com.viaversion.viaversion.protocols.protocol1_9to1_8.providers;
 
 import io.netty.channel.ChannelHandlerContext;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.platform.providers.Provider;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.MovementTracker;
 import com.viaversion.viaversion.util.PipelineUtil;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/ClientChunks.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/ClientChunks.java
index b8c9b20b4..a4d2f1b25 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/ClientChunks.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/ClientChunks.java
@@ -19,8 +19,8 @@ package com.viaversion.viaversion.protocols.protocol1_9to1_8.storage;
 
 import com.google.common.collect.Sets;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.StoredObject;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.StoredObject;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.BulkChunkTranslatorProvider;
 
 import java.util.List;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/CommandBlockStorage.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/CommandBlockStorage.java
index 5eadc27a9..b1355aee9 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/CommandBlockStorage.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/CommandBlockStorage.java
@@ -19,9 +19,9 @@ package com.viaversion.viaversion.protocols.protocol1_9to1_8.storage;
 
 import com.github.steveice10.opennbt.tag.builtin.ByteTag;
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
-import com.viaversion.viaversion.api.Pair;
-import com.viaversion.viaversion.api.data.StoredObject;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.util.Pair;
+import com.viaversion.viaversion.api.protocol.connection.StoredObject;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.Position;
 
 import java.util.Map;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/EntityTracker1_9.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/EntityTracker1_9.java
index 79d99bcd3..322b05231 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/EntityTracker1_9.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/EntityTracker1_9.java
@@ -19,18 +19,18 @@ package com.viaversion.viaversion.protocols.protocol1_9to1_8.storage;
 
 import com.google.common.cache.CacheBuilder;
 import com.google.common.collect.Sets;
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.boss.BossBar;
 import com.viaversion.viaversion.api.boss.BossColor;
 import com.viaversion.viaversion.api.boss.BossStyle;
-import com.viaversion.viaversion.api.data.UserConnection;
-import com.viaversion.viaversion.api.entities.Entity1_10Types.EntityType;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_10Types.EntityType;
 import com.viaversion.viaversion.api.minecraft.Position;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
 import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_9;
-import com.viaversion.viaversion.api.storage.EntityTracker;
+import com.viaversion.viaversion.data.EntityTracker;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.types.version.Types1_9;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8;
@@ -159,7 +159,7 @@ public class EntityTracker1_9 extends EntityTracker {
     }
 
     public void handleMetadata(int entityId, List<Metadata> metadataList) {
-        com.viaversion.viaversion.api.entities.EntityType type = getEntity(entityId);
+        com.viaversion.viaversion.api.minecraft.entities.EntityType type = getEntity(entityId);
         if (type == null) {
             return;
         }
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/InventoryTracker.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/InventoryTracker.java
index bda86ac23..ac41b54cc 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/InventoryTracker.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/InventoryTracker.java
@@ -17,8 +17,8 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_9to1_8.storage;
 
-import com.viaversion.viaversion.api.data.StoredObject;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.StoredObject;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/MovementTracker.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/MovementTracker.java
index 7b3b4b107..6b86bed23 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/MovementTracker.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/MovementTracker.java
@@ -17,8 +17,8 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_9to1_8.storage;
 
-import com.viaversion.viaversion.api.data.StoredObject;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.StoredObject;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 
 public class MovementTracker extends StoredObject {
     private static final long IDLE_PACKET_DELAY = 50L; // Update every 50ms (20tps)
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_9_1/Protocol1_9To1_9_1.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_9_1/Protocol1_9To1_9_1.java
index 875bf92be..588bb0b72 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_9_1/Protocol1_9To1_9_1.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_9_1/Protocol1_9To1_9_1.java
@@ -17,10 +17,10 @@
  */
 package com.viaversion.viaversion.protocols.protocol1_9to1_9_1;
 
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.remapper.PacketHandler;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.ClientboundPackets1_9;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.ServerboundPackets1_9;
diff --git a/common/src/main/java/com/viaversion/viaversion/api/rewriters/BlockRewriter.java b/common/src/main/java/com/viaversion/viaversion/rewriter/BlockRewriter.java
similarity index 96%
rename from common/src/main/java/com/viaversion/viaversion/api/rewriters/BlockRewriter.java
rename to common/src/main/java/com/viaversion/viaversion/rewriter/BlockRewriter.java
index c679f4acf..82b6ad04b 100644
--- a/common/src/main/java/com/viaversion/viaversion/api/rewriters/BlockRewriter.java
+++ b/common/src/main/java/com/viaversion/viaversion/rewriter/BlockRewriter.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.viaversion.api.rewriters;
+package com.viaversion.viaversion.rewriter;
 
 import com.viaversion.viaversion.api.minecraft.BlockChangeRecord;
 import com.viaversion.viaversion.api.minecraft.Position;
-import com.viaversion.viaversion.api.protocol.ClientboundPacketType;
+import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
 import com.viaversion.viaversion.api.type.Type;
 
 // If any of these methods become outdated, just create a new rewriter overriding the methods
diff --git a/common/src/main/java/com/viaversion/viaversion/api/rewriters/CommandRewriter.java b/common/src/main/java/com/viaversion/viaversion/rewriter/CommandRewriter.java
similarity index 95%
rename from common/src/main/java/com/viaversion/viaversion/api/rewriters/CommandRewriter.java
rename to common/src/main/java/com/viaversion/viaversion/rewriter/CommandRewriter.java
index 437430178..b18bd06a3 100644
--- a/common/src/main/java/com/viaversion/viaversion/api/rewriters/CommandRewriter.java
+++ b/common/src/main/java/com/viaversion/viaversion/rewriter/CommandRewriter.java
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.viaversion.api.rewriters;
+package com.viaversion.viaversion.rewriter;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
-import com.viaversion.viaversion.api.PacketWrapper;
-import com.viaversion.viaversion.api.protocol.ClientboundPacketType;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
 import com.viaversion.viaversion.api.type.Type;
 
 import java.util.HashMap;
diff --git a/common/src/main/java/com/viaversion/viaversion/api/rewriters/ComponentRewriter.java b/common/src/main/java/com/viaversion/viaversion/rewriter/ComponentRewriter.java
similarity index 96%
rename from common/src/main/java/com/viaversion/viaversion/api/rewriters/ComponentRewriter.java
rename to common/src/main/java/com/viaversion/viaversion/rewriter/ComponentRewriter.java
index 12a4e9eee..4b06cc9a6 100644
--- a/common/src/main/java/com/viaversion/viaversion/api/rewriters/ComponentRewriter.java
+++ b/common/src/main/java/com/viaversion/viaversion/rewriter/ComponentRewriter.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.viaversion.api.rewriters;
+package com.viaversion.viaversion.rewriter;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -23,11 +23,10 @@ import com.google.gson.JsonParser;
 import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonSyntaxException;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.protocol.ClientboundPacketType;
+import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
 import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.util.GsonUtil;
 
 /**
  * Handles json chat components, containing methods to override certain parts of the handling.
diff --git a/common/src/main/java/com/viaversion/viaversion/api/rewriters/IdRewriteFunction.java b/common/src/main/java/com/viaversion/viaversion/rewriter/IdRewriteFunction.java
similarity index 94%
rename from common/src/main/java/com/viaversion/viaversion/api/rewriters/IdRewriteFunction.java
rename to common/src/main/java/com/viaversion/viaversion/rewriter/IdRewriteFunction.java
index 810b89b48..152d288b8 100644
--- a/common/src/main/java/com/viaversion/viaversion/api/rewriters/IdRewriteFunction.java
+++ b/common/src/main/java/com/viaversion/viaversion/rewriter/IdRewriteFunction.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.viaversion.api.rewriters;
+package com.viaversion.viaversion.rewriter;
 
 @FunctionalInterface
 public interface IdRewriteFunction {
diff --git a/common/src/main/java/com/viaversion/viaversion/api/rewriters/ItemRewriter.java b/common/src/main/java/com/viaversion/viaversion/rewriter/ItemRewriter.java
similarity index 97%
rename from common/src/main/java/com/viaversion/viaversion/api/rewriters/ItemRewriter.java
rename to common/src/main/java/com/viaversion/viaversion/rewriter/ItemRewriter.java
index fd9144b6e..7323dcc6e 100644
--- a/common/src/main/java/com/viaversion/viaversion/api/rewriters/ItemRewriter.java
+++ b/common/src/main/java/com/viaversion/viaversion/rewriter/ItemRewriter.java
@@ -15,15 +15,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.viaversion.api.rewriters;
+package com.viaversion.viaversion.rewriter;
 
 import com.viaversion.viaversion.api.data.ParticleMappings;
 import com.viaversion.viaversion.api.minecraft.item.Item;
-import com.viaversion.viaversion.api.protocol.ClientboundPacketType;
+import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.protocol.ServerboundPacketType;
-import com.viaversion.viaversion.api.remapper.PacketHandler;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
 import com.viaversion.viaversion.api.type.Type;
 
 // If any of these methods become outdated, just create a new rewriter overriding the methods
diff --git a/common/src/main/java/com/viaversion/viaversion/api/rewriters/MetadataRewriter.java b/common/src/main/java/com/viaversion/viaversion/rewriter/MetadataRewriter.java
similarity index 96%
rename from common/src/main/java/com/viaversion/viaversion/api/rewriters/MetadataRewriter.java
rename to common/src/main/java/com/viaversion/viaversion/rewriter/MetadataRewriter.java
index e0bb93f15..0428b47ab 100644
--- a/common/src/main/java/com/viaversion/viaversion/api/rewriters/MetadataRewriter.java
+++ b/common/src/main/java/com/viaversion/viaversion/rewriter/MetadataRewriter.java
@@ -15,21 +15,21 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.viaversion.api.rewriters;
+package com.viaversion.viaversion.rewriter;
 
+import com.viaversion.viaversion.data.EntityTracker;
 import it.unimi.dsi.fastutil.ints.Int2IntMap;
 import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.data.ParticleMappings;
-import com.viaversion.viaversion.api.data.UserConnection;
-import com.viaversion.viaversion.api.entities.EntityType;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
-import com.viaversion.viaversion.api.protocol.ClientboundPacketType;
+import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.remapper.PacketHandler;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
-import com.viaversion.viaversion.api.storage.EntityTracker;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.types.Particle;
 
diff --git a/common/src/main/java/com/viaversion/viaversion/api/rewriters/RecipeRewriter.java b/common/src/main/java/com/viaversion/viaversion/rewriter/RecipeRewriter.java
similarity index 90%
rename from common/src/main/java/com/viaversion/viaversion/api/rewriters/RecipeRewriter.java
rename to common/src/main/java/com/viaversion/viaversion/rewriter/RecipeRewriter.java
index 77a9a9e06..8cf9ce688 100644
--- a/common/src/main/java/com/viaversion/viaversion/api/rewriters/RecipeRewriter.java
+++ b/common/src/main/java/com/viaversion/viaversion/rewriter/RecipeRewriter.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.viaversion.api.rewriters;
+package com.viaversion.viaversion.rewriter;
 
-import com.viaversion.viaversion.api.PacketWrapper;
-import com.viaversion.viaversion.api.protocol.ClientboundPacketType;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
 import com.viaversion.viaversion.api.type.Type;
 
 import java.util.HashMap;
diff --git a/common/src/main/java/com/viaversion/viaversion/api/rewriters/RegistryType.java b/common/src/main/java/com/viaversion/viaversion/rewriter/RegistryType.java
similarity index 97%
rename from common/src/main/java/com/viaversion/viaversion/api/rewriters/RegistryType.java
rename to common/src/main/java/com/viaversion/viaversion/rewriter/RegistryType.java
index e2aab7826..8a30d39bc 100644
--- a/common/src/main/java/com/viaversion/viaversion/api/rewriters/RegistryType.java
+++ b/common/src/main/java/com/viaversion/viaversion/rewriter/RegistryType.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.viaversion.api.rewriters;
+package com.viaversion.viaversion.rewriter;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
 
diff --git a/common/src/main/java/com/viaversion/viaversion/api/rewriters/SoundRewriter.java b/common/src/main/java/com/viaversion/viaversion/rewriter/SoundRewriter.java
similarity index 88%
rename from common/src/main/java/com/viaversion/viaversion/api/rewriters/SoundRewriter.java
rename to common/src/main/java/com/viaversion/viaversion/rewriter/SoundRewriter.java
index 77a2fc7d3..b53f77aa5 100644
--- a/common/src/main/java/com/viaversion/viaversion/api/rewriters/SoundRewriter.java
+++ b/common/src/main/java/com/viaversion/viaversion/rewriter/SoundRewriter.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.viaversion.api.rewriters;
+package com.viaversion.viaversion.rewriter;
 
-import com.viaversion.viaversion.api.protocol.ClientboundPacketType;
+import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.remapper.PacketHandler;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
 import com.viaversion.viaversion.api.type.Type;
 
 public class SoundRewriter {
diff --git a/common/src/main/java/com/viaversion/viaversion/api/rewriters/StatisticsRewriter.java b/common/src/main/java/com/viaversion/viaversion/rewriter/StatisticsRewriter.java
similarity index 95%
rename from common/src/main/java/com/viaversion/viaversion/api/rewriters/StatisticsRewriter.java
rename to common/src/main/java/com/viaversion/viaversion/rewriter/StatisticsRewriter.java
index 3000e5c98..4e481177d 100644
--- a/common/src/main/java/com/viaversion/viaversion/api/rewriters/StatisticsRewriter.java
+++ b/common/src/main/java/com/viaversion/viaversion/rewriter/StatisticsRewriter.java
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.viaversion.api.rewriters;
+package com.viaversion.viaversion.rewriter;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
-import com.viaversion.viaversion.api.protocol.ClientboundPacketType;
+import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
 import com.viaversion.viaversion.api.type.Type;
 
 public class StatisticsRewriter {
diff --git a/common/src/main/java/com/viaversion/viaversion/api/rewriters/TagRewriter.java b/common/src/main/java/com/viaversion/viaversion/rewriter/TagRewriter.java
similarity index 95%
rename from common/src/main/java/com/viaversion/viaversion/api/rewriters/TagRewriter.java
rename to common/src/main/java/com/viaversion/viaversion/rewriter/TagRewriter.java
index 700a1597d..01370173c 100644
--- a/common/src/main/java/com/viaversion/viaversion/api/rewriters/TagRewriter.java
+++ b/common/src/main/java/com/viaversion/viaversion/rewriter/TagRewriter.java
@@ -15,17 +15,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.viaversion.api.rewriters;
+package com.viaversion.viaversion.rewriter;
 
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 import it.unimi.dsi.fastutil.ints.IntList;
 import org.checkerframework.checker.nullness.qual.Nullable;
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.data.MappingData;
-import com.viaversion.viaversion.api.protocol.ClientboundPacketType;
+import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.api.remapper.PacketHandler;
-import com.viaversion.viaversion.api.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
+import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
 import com.viaversion.viaversion.api.type.Type;
 
 import java.util.ArrayList;
diff --git a/common/src/test/java/us/myles/ViaVersion/common/entities/EntityTypesTest.java b/common/src/test/java/us/myles/ViaVersion/common/entities/EntityTypesTest.java
index ee251f8e4..3119920e6 100644
--- a/common/src/test/java/us/myles/ViaVersion/common/entities/EntityTypesTest.java
+++ b/common/src/test/java/us/myles/ViaVersion/common/entities/EntityTypesTest.java
@@ -19,12 +19,12 @@ package com.viaversion.viaversion.common.entities;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import com.viaversion.viaversion.api.entities.Entity1_14Types;
-import com.viaversion.viaversion.api.entities.Entity1_15Types;
-import com.viaversion.viaversion.api.entities.Entity1_16Types;
-import com.viaversion.viaversion.api.entities.Entity1_16_2Types;
-import com.viaversion.viaversion.api.entities.Entity1_17Types;
-import com.viaversion.viaversion.api.entities.EntityType;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_14Types;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_15Types;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_16Types;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_16_2Types;
+import com.viaversion.viaversion.api.minecraft.entities.Entity1_17Types;
+import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 
 import java.util.function.Function;
 
diff --git a/common/src/test/java/us/myles/ViaVersion/common/protocol/ProtocolVersionTest.java b/common/src/test/java/us/myles/ViaVersion/common/protocol/ProtocolVersionTest.java
index c6ed00a4a..9b77eddba 100644
--- a/common/src/test/java/us/myles/ViaVersion/common/protocol/ProtocolVersionTest.java
+++ b/common/src/test/java/us/myles/ViaVersion/common/protocol/ProtocolVersionTest.java
@@ -19,7 +19,7 @@ package com.viaversion.viaversion.common.protocol;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import com.viaversion.viaversion.api.protocol.ProtocolVersion;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 
 public class ProtocolVersionTest {
 
diff --git a/sponge-legacy/src/main/java/com/viaversion/viaversion/sponge/listeners/protocol1_9to1_8/sponge4/Sponge4ArmorListener.java b/sponge-legacy/src/main/java/com/viaversion/viaversion/sponge/listeners/protocol1_9to1_8/sponge4/Sponge4ArmorListener.java
index 001493ed3..abf312989 100644
--- a/sponge-legacy/src/main/java/com/viaversion/viaversion/sponge/listeners/protocol1_9to1_8/sponge4/Sponge4ArmorListener.java
+++ b/sponge-legacy/src/main/java/com/viaversion/viaversion/sponge/listeners/protocol1_9to1_8/sponge4/Sponge4ArmorListener.java
@@ -28,9 +28,9 @@ import org.spongepowered.api.event.item.inventory.ClickInventoryEvent;
 import org.spongepowered.api.event.network.ClientConnectionEvent;
 import org.spongepowered.api.item.inventory.ItemStack;
 import org.spongepowered.api.item.inventory.transaction.SlotTransaction;
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.ViaListener;
+import com.viaversion.viaversion.ViaListener;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.ArmorType;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8;
diff --git a/sponge/src/main/java/com/viaversion/viaversion/sponge/handlers/SpongeChannelInitializer.java b/sponge/src/main/java/com/viaversion/viaversion/sponge/handlers/SpongeChannelInitializer.java
index d6e733176..42a44ce8d 100644
--- a/sponge/src/main/java/com/viaversion/viaversion/sponge/handlers/SpongeChannelInitializer.java
+++ b/sponge/src/main/java/com/viaversion/viaversion/sponge/handlers/SpongeChannelInitializer.java
@@ -23,7 +23,7 @@ import io.netty.channel.socket.SocketChannel;
 import io.netty.handler.codec.ByteToMessageDecoder;
 import io.netty.handler.codec.MessageToByteEncoder;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.ProtocolPipeline;
 
 import java.lang.reflect.Method;
diff --git a/sponge/src/main/java/com/viaversion/viaversion/sponge/handlers/SpongeDecodeHandler.java b/sponge/src/main/java/com/viaversion/viaversion/sponge/handlers/SpongeDecodeHandler.java
index ca168867d..16882cd3f 100644
--- a/sponge/src/main/java/com/viaversion/viaversion/sponge/handlers/SpongeDecodeHandler.java
+++ b/sponge/src/main/java/com/viaversion/viaversion/sponge/handlers/SpongeDecodeHandler.java
@@ -20,7 +20,7 @@ package com.viaversion.viaversion.sponge.handlers;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.ByteToMessageDecoder;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.exception.CancelDecoderException;
 import com.viaversion.viaversion.exception.CancelCodecException;
 import com.viaversion.viaversion.util.PipelineUtil;
diff --git a/sponge/src/main/java/com/viaversion/viaversion/sponge/handlers/SpongeEncodeHandler.java b/sponge/src/main/java/com/viaversion/viaversion/sponge/handlers/SpongeEncodeHandler.java
index 0e7d42822..99e447d3d 100644
--- a/sponge/src/main/java/com/viaversion/viaversion/sponge/handlers/SpongeEncodeHandler.java
+++ b/sponge/src/main/java/com/viaversion/viaversion/sponge/handlers/SpongeEncodeHandler.java
@@ -20,16 +20,16 @@ package com.viaversion.viaversion.sponge.handlers;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToByteEncoder;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.exception.CancelEncoderException;
 import com.viaversion.viaversion.exception.CancelCodecException;
 import com.viaversion.viaversion.handlers.ChannelHandlerContextWrapper;
-import com.viaversion.viaversion.handlers.ViaHandler;
+import com.viaversion.viaversion.handlers.ViaCodecHandler;
 import com.viaversion.viaversion.util.PipelineUtil;
 
 import java.lang.reflect.InvocationTargetException;
 
-public class SpongeEncodeHandler extends MessageToByteEncoder<Object> implements ViaHandler {
+public class SpongeEncodeHandler extends MessageToByteEncoder<Object> implements ViaCodecHandler {
     private final UserConnection info;
     private final MessageToByteEncoder<?> minecraftEncoder;
 
diff --git a/sponge/src/main/java/com/viaversion/viaversion/sponge/handlers/SpongePacketHandler.java b/sponge/src/main/java/com/viaversion/viaversion/sponge/handlers/SpongePacketHandler.java
index 4f0ca56c0..a93b4e02c 100644
--- a/sponge/src/main/java/com/viaversion/viaversion/sponge/handlers/SpongePacketHandler.java
+++ b/sponge/src/main/java/com/viaversion/viaversion/sponge/handlers/SpongePacketHandler.java
@@ -20,7 +20,7 @@ package com.viaversion.viaversion.sponge.handlers;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToMessageEncoder;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 
 import java.util.List;
 
diff --git a/sponge/src/main/java/com/viaversion/viaversion/sponge/listeners/ViaSpongeListener.java b/sponge/src/main/java/com/viaversion/viaversion/sponge/listeners/ViaSpongeListener.java
index 76e21714c..263cb7803 100644
--- a/sponge/src/main/java/com/viaversion/viaversion/sponge/listeners/ViaSpongeListener.java
+++ b/sponge/src/main/java/com/viaversion/viaversion/sponge/listeners/ViaSpongeListener.java
@@ -21,7 +21,7 @@ import org.spongepowered.api.Sponge;
 import org.spongepowered.api.entity.living.player.Player;
 import com.viaversion.viaversion.SpongePlugin;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.ViaListener;
+import com.viaversion.viaversion.ViaListener;
 import com.viaversion.viaversion.api.protocol.Protocol;
 
 import java.lang.reflect.Field;
diff --git a/sponge/src/main/java/com/viaversion/viaversion/sponge/listeners/protocol1_9to1_8/DeathListener.java b/sponge/src/main/java/com/viaversion/viaversion/sponge/listeners/protocol1_9to1_8/DeathListener.java
index db495af9d..8fa1e9d14 100644
--- a/sponge/src/main/java/com/viaversion/viaversion/sponge/listeners/protocol1_9to1_8/DeathListener.java
+++ b/sponge/src/main/java/com/viaversion/viaversion/sponge/listeners/protocol1_9to1_8/DeathListener.java
@@ -23,7 +23,7 @@ import org.spongepowered.api.event.Order;
 import org.spongepowered.api.event.entity.DestructEntityEvent;
 import org.spongepowered.api.world.World;
 import com.viaversion.viaversion.SpongePlugin;
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8;
diff --git a/sponge/src/main/java/com/viaversion/viaversion/sponge/listeners/protocol1_9to1_8/sponge5/Sponge5ArmorListener.java b/sponge/src/main/java/com/viaversion/viaversion/sponge/listeners/protocol1_9to1_8/sponge5/Sponge5ArmorListener.java
index 1fab136d8..68713e382 100644
--- a/sponge/src/main/java/com/viaversion/viaversion/sponge/listeners/protocol1_9to1_8/sponge5/Sponge5ArmorListener.java
+++ b/sponge/src/main/java/com/viaversion/viaversion/sponge/listeners/protocol1_9to1_8/sponge5/Sponge5ArmorListener.java
@@ -29,7 +29,7 @@ import org.spongepowered.api.event.network.ClientConnectionEvent;
 import org.spongepowered.api.item.inventory.ItemStack;
 import org.spongepowered.api.item.inventory.transaction.SlotTransaction;
 import com.viaversion.viaversion.SpongePlugin;
-import com.viaversion.viaversion.api.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.ArmorType;
diff --git a/sponge/src/main/java/com/viaversion/viaversion/sponge/platform/SpongeViaAPI.java b/sponge/src/main/java/com/viaversion/viaversion/sponge/platform/SpongeViaAPI.java
index b756e9d32..9d7f5c00e 100644
--- a/sponge/src/main/java/com/viaversion/viaversion/sponge/platform/SpongeViaAPI.java
+++ b/sponge/src/main/java/com/viaversion/viaversion/sponge/platform/SpongeViaAPI.java
@@ -19,7 +19,7 @@ package com.viaversion.viaversion.sponge.platform;
 
 import io.netty.buffer.ByteBuf;
 import org.spongepowered.api.entity.living.player.Player;
-import com.viaversion.viaversion.api.ViaAPIBase;
+import com.viaversion.viaversion.ViaAPIBase;
 import com.viaversion.viaversion.api.boss.BossBar;
 import com.viaversion.viaversion.api.boss.BossColor;
 import com.viaversion.viaversion.api.boss.BossStyle;
diff --git a/sponge/src/main/java/com/viaversion/viaversion/sponge/platform/SpongeViaConfig.java b/sponge/src/main/java/com/viaversion/viaversion/sponge/platform/SpongeViaConfig.java
index 6b92c296d..f99a5167c 100644
--- a/sponge/src/main/java/com/viaversion/viaversion/sponge/platform/SpongeViaConfig.java
+++ b/sponge/src/main/java/com/viaversion/viaversion/sponge/platform/SpongeViaConfig.java
@@ -19,7 +19,7 @@ package com.viaversion.viaversion.sponge.platform;
 
 import org.spongepowered.api.asset.Asset;
 import org.spongepowered.api.plugin.PluginContainer;
-import com.viaversion.viaversion.AbstractViaConfig;
+import com.viaversion.viaversion.configuration.AbstractViaConfig;
 
 import java.io.File;
 import java.net.URL;
diff --git a/sponge/src/main/java/com/viaversion/viaversion/sponge/platform/SpongeViaInjector.java b/sponge/src/main/java/com/viaversion/viaversion/sponge/platform/SpongeViaInjector.java
index 13320e9a8..e8fef869a 100644
--- a/sponge/src/main/java/com/viaversion/viaversion/sponge/platform/SpongeViaInjector.java
+++ b/sponge/src/main/java/com/viaversion/viaversion/sponge/platform/SpongeViaInjector.java
@@ -25,7 +25,7 @@ import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelInitializer;
 import org.spongepowered.api.MinecraftVersion;
 import org.spongepowered.api.Sponge;
-import com.viaversion.viaversion.api.Pair;
+import com.viaversion.viaversion.util.Pair;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.platform.ViaInjector;
 import com.viaversion.viaversion.sponge.handlers.SpongeChannelInitializer;
diff --git a/sponge/src/main/java/com/viaversion/viaversion/sponge/platform/SpongeViaLoader.java b/sponge/src/main/java/com/viaversion/viaversion/sponge/platform/SpongeViaLoader.java
index e2b2dad74..dc461fba5 100644
--- a/sponge/src/main/java/com/viaversion/viaversion/sponge/platform/SpongeViaLoader.java
+++ b/sponge/src/main/java/com/viaversion/viaversion/sponge/platform/SpongeViaLoader.java
@@ -20,11 +20,11 @@ package com.viaversion.viaversion.sponge.platform;
 import org.spongepowered.api.Sponge;
 import com.viaversion.viaversion.SpongePlugin;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.platform.TaskId;
 import com.viaversion.viaversion.api.platform.ViaPlatformLoader;
-import com.viaversion.viaversion.api.protocol.ProtocolVersion;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.BulkChunkTranslatorProvider;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.HandItemProvider;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.MovementTransmitterProvider;
diff --git a/velocity/src/main/java/com/viaversion/viaversion/velocity/handlers/VelocityChannelInitializer.java b/velocity/src/main/java/com/viaversion/viaversion/velocity/handlers/VelocityChannelInitializer.java
index 7680b8e43..09e3f9656 100644
--- a/velocity/src/main/java/com/viaversion/viaversion/velocity/handlers/VelocityChannelInitializer.java
+++ b/velocity/src/main/java/com/viaversion/viaversion/velocity/handlers/VelocityChannelInitializer.java
@@ -19,7 +19,7 @@ package com.viaversion.viaversion.velocity.handlers;
 
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelInitializer;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.ProtocolPipeline;
 
 import java.lang.reflect.Method;
diff --git a/velocity/src/main/java/com/viaversion/viaversion/velocity/handlers/VelocityDecodeHandler.java b/velocity/src/main/java/com/viaversion/viaversion/velocity/handlers/VelocityDecodeHandler.java
index bd5d84403..a1cfed598 100644
--- a/velocity/src/main/java/com/viaversion/viaversion/velocity/handlers/VelocityDecodeHandler.java
+++ b/velocity/src/main/java/com/viaversion/viaversion/velocity/handlers/VelocityDecodeHandler.java
@@ -22,7 +22,7 @@ import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToByteEncoder;
 import io.netty.handler.codec.MessageToMessageDecoder;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.exception.CancelCodecException;
 import com.viaversion.viaversion.exception.CancelDecoderException;
 import com.viaversion.viaversion.util.PipelineUtil;
diff --git a/velocity/src/main/java/com/viaversion/viaversion/velocity/handlers/VelocityEncodeHandler.java b/velocity/src/main/java/com/viaversion/viaversion/velocity/handlers/VelocityEncodeHandler.java
index e5b8b8a22..62f76ed9c 100644
--- a/velocity/src/main/java/com/viaversion/viaversion/velocity/handlers/VelocityEncodeHandler.java
+++ b/velocity/src/main/java/com/viaversion/viaversion/velocity/handlers/VelocityEncodeHandler.java
@@ -23,7 +23,7 @@ import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToByteEncoder;
 import io.netty.handler.codec.MessageToMessageDecoder;
 import io.netty.handler.codec.MessageToMessageEncoder;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.exception.CancelEncoderException;
 import com.viaversion.viaversion.exception.CancelCodecException;
 import com.viaversion.viaversion.util.PipelineUtil;
diff --git a/velocity/src/main/java/com/viaversion/viaversion/velocity/platform/VelocityViaAPI.java b/velocity/src/main/java/com/viaversion/viaversion/velocity/platform/VelocityViaAPI.java
index 055c57fed..2d1c2c707 100644
--- a/velocity/src/main/java/com/viaversion/viaversion/velocity/platform/VelocityViaAPI.java
+++ b/velocity/src/main/java/com/viaversion/viaversion/velocity/platform/VelocityViaAPI.java
@@ -19,7 +19,7 @@ package com.viaversion.viaversion.velocity.platform;
 
 import com.velocitypowered.api.proxy.Player;
 import io.netty.buffer.ByteBuf;
-import com.viaversion.viaversion.api.ViaAPIBase;
+import com.viaversion.viaversion.ViaAPIBase;
 import com.viaversion.viaversion.api.boss.BossBar;
 import com.viaversion.viaversion.api.boss.BossColor;
 import com.viaversion.viaversion.api.boss.BossStyle;
diff --git a/velocity/src/main/java/com/viaversion/viaversion/velocity/platform/VelocityViaConfig.java b/velocity/src/main/java/com/viaversion/viaversion/velocity/platform/VelocityViaConfig.java
index 6f5577c9c..966d5213a 100644
--- a/velocity/src/main/java/com/viaversion/viaversion/velocity/platform/VelocityViaConfig.java
+++ b/velocity/src/main/java/com/viaversion/viaversion/velocity/platform/VelocityViaConfig.java
@@ -17,8 +17,8 @@
  */
 package com.viaversion.viaversion.velocity.platform;
 
-import com.viaversion.viaversion.AbstractViaConfig;
-import com.viaversion.viaversion.api.protocol.ProtocolVersion;
+import com.viaversion.viaversion.configuration.AbstractViaConfig;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 
 import java.io.File;
 import java.net.URL;
diff --git a/velocity/src/main/java/com/viaversion/viaversion/velocity/platform/VelocityViaInjector.java b/velocity/src/main/java/com/viaversion/viaversion/velocity/platform/VelocityViaInjector.java
index 3f141aec5..801b61437 100644
--- a/velocity/src/main/java/com/viaversion/viaversion/velocity/platform/VelocityViaInjector.java
+++ b/velocity/src/main/java/com/viaversion/viaversion/velocity/platform/VelocityViaInjector.java
@@ -24,7 +24,7 @@ import it.unimi.dsi.fastutil.ints.IntSortedSet;
 import com.viaversion.viaversion.VelocityPlugin;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.platform.ViaInjector;
-import com.viaversion.viaversion.api.protocol.ProtocolVersion;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.util.ReflectionUtil;
 import com.viaversion.viaversion.velocity.handlers.VelocityChannelInitializer;
 
diff --git a/velocity/src/main/java/com/viaversion/viaversion/velocity/platform/VelocityViaLoader.java b/velocity/src/main/java/com/viaversion/viaversion/velocity/platform/VelocityViaLoader.java
index 8d7e6521d..92e9f4ba0 100644
--- a/velocity/src/main/java/com/viaversion/viaversion/velocity/platform/VelocityViaLoader.java
+++ b/velocity/src/main/java/com/viaversion/viaversion/velocity/platform/VelocityViaLoader.java
@@ -21,8 +21,8 @@ import com.velocitypowered.api.plugin.PluginContainer;
 import com.viaversion.viaversion.VelocityPlugin;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.platform.ViaPlatformLoader;
-import com.viaversion.viaversion.api.protocol.ProtocolVersion;
-import com.viaversion.viaversion.protocols.base.VersionProvider;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
+import com.viaversion.viaversion.api.protocol.version.VersionProvider;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.BossBarProvider;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.MovementTransmitterProvider;
 import com.viaversion.viaversion.velocity.listeners.UpdateListener;
diff --git a/velocity/src/main/java/com/viaversion/viaversion/velocity/providers/VelocityBossBarProvider.java b/velocity/src/main/java/com/viaversion/viaversion/velocity/providers/VelocityBossBarProvider.java
index 59c21287f..e97d7b959 100644
--- a/velocity/src/main/java/com/viaversion/viaversion/velocity/providers/VelocityBossBarProvider.java
+++ b/velocity/src/main/java/com/viaversion/viaversion/velocity/providers/VelocityBossBarProvider.java
@@ -17,7 +17,7 @@
  */
 package com.viaversion.viaversion.velocity.providers;
 
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.BossBarProvider;
 import com.viaversion.viaversion.velocity.storage.VelocityStorage;
 
diff --git a/velocity/src/main/java/com/viaversion/viaversion/velocity/providers/VelocityMovementTransmitter.java b/velocity/src/main/java/com/viaversion/viaversion/velocity/providers/VelocityMovementTransmitter.java
index d4ae457ca..05da2793c 100644
--- a/velocity/src/main/java/com/viaversion/viaversion/velocity/providers/VelocityMovementTransmitter.java
+++ b/velocity/src/main/java/com/viaversion/viaversion/velocity/providers/VelocityMovementTransmitter.java
@@ -17,10 +17,10 @@
  */
 package com.viaversion.viaversion.velocity.providers;
 
-import com.viaversion.viaversion.api.PacketWrapper;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.packets.State;
+import com.viaversion.viaversion.api.protocol.packet.State;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.MovementTransmitterProvider;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.MovementTracker;
diff --git a/velocity/src/main/java/com/viaversion/viaversion/velocity/providers/VelocityVersionProvider.java b/velocity/src/main/java/com/viaversion/viaversion/velocity/providers/VelocityVersionProvider.java
index d0ed39939..bd230ba84 100644
--- a/velocity/src/main/java/com/viaversion/viaversion/velocity/providers/VelocityVersionProvider.java
+++ b/velocity/src/main/java/com/viaversion/viaversion/velocity/providers/VelocityVersionProvider.java
@@ -21,8 +21,8 @@ import com.velocitypowered.api.proxy.ServerConnection;
 import io.netty.channel.ChannelHandler;
 import com.viaversion.viaversion.VelocityPlugin;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.UserConnection;
-import com.viaversion.viaversion.api.protocol.ProtocolVersion;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.protocols.base.BaseVersionProvider;
 import com.viaversion.viaversion.velocity.platform.VelocityViaInjector;
 import com.viaversion.viaversion.velocity.service.ProtocolDetectorService;
diff --git a/velocity/src/main/java/com/viaversion/viaversion/velocity/service/ProtocolDetectorService.java b/velocity/src/main/java/com/viaversion/viaversion/velocity/service/ProtocolDetectorService.java
index f3c1a8b7f..213b2a06b 100644
--- a/velocity/src/main/java/com/viaversion/viaversion/velocity/service/ProtocolDetectorService.java
+++ b/velocity/src/main/java/com/viaversion/viaversion/velocity/service/ProtocolDetectorService.java
@@ -20,7 +20,7 @@ package com.viaversion.viaversion.velocity.service;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
 import com.viaversion.viaversion.VelocityPlugin;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.protocol.ProtocolVersion;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.velocity.platform.VelocityViaConfig;
 
 import java.util.HashMap;
diff --git a/velocity/src/main/java/com/viaversion/viaversion/velocity/storage/VelocityStorage.java b/velocity/src/main/java/com/viaversion/viaversion/velocity/storage/VelocityStorage.java
index f128bf3e0..dad6d458e 100644
--- a/velocity/src/main/java/com/viaversion/viaversion/velocity/storage/VelocityStorage.java
+++ b/velocity/src/main/java/com/viaversion/viaversion/velocity/storage/VelocityStorage.java
@@ -18,8 +18,8 @@
 package com.viaversion.viaversion.velocity.storage;
 
 import com.velocitypowered.api.proxy.Player;
-import com.viaversion.viaversion.api.data.StoredObject;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.StoredObject;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.util.ReflectionUtil;
 
 import java.lang.reflect.InvocationTargetException;