Move some packages and classes around

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 {

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;

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;
 

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;

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;
 

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),

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),

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),

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),

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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.

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 {
 

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.api.protocol.connection.UserConnection;
-import com.viaversion.viaversion.util.UnsupportedSoftware;
 
 import java.io.File;
 import java.util.Collection;

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) {
     }
 
     /**

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;

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.api.protocol.packet.Direction;
-import com.viaversion.viaversion.packets.State;
+import com.viaversion.viaversion.api.protocol.packet.State;
-import com.viaversion.viaversion.protocols.base.ProtocolInfo;
 
 import java.util.ArrayList;
 import java.util.List;

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.

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.api.protocol.version.ProtocolVersion;
-import com.viaversion.viaversion.packets.State;
+import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
+import com.viaversion.viaversion.api.protocol.packet.State;
 
 import java.util.UUID;
 

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;

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.api.protocol.packet.Direction;
-import com.viaversion.viaversion.protocols.base.ProtocolInfo;
 import com.viaversion.viaversion.util.ChatColorUtil;
 import com.viaversion.viaversion.util.PipelineUtil;
 

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.protocol.connection.UserConnection;
-import com.viaversion.viaversion.api.data.UserConnection;
 
 import java.util.Collections;
 import java.util.Map;

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,

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 {
 

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;

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.

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.connection.UserConnection;
-import com.viaversion.viaversion.api.protocol.PacketType;
 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;

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,

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 {
 

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

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.protocol.packet.PacketWrapper;
-import com.viaversion.viaversion.api.Pair;
+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;

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> {

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

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> {

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;
 

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> {

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 Int2ObjectMap<ProtocolVersion> VERSIONS = new Int2ObjectOpenHashMap<>();
-    private static final List<ProtocolVersion> versionList = new ArrayList<>();
+    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);
+        VERSION_LIST.add(protocol);
-        versions.put(protocol.getVersion(), 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;

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
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
- * it under the terms of the GNU General Public License as published by
+ * of this software and associated documentation files (the "Software"), to deal
- * the Free Software Foundation, either version 3 of the License, or
+ * in the Software without restriction, including without limitation the rights
- * (at your option) any later version.
+ * 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,
+ * The above copyright notice and this permission notice shall be included in all
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * copies or substantial portions of the Software.
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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;
 

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 {

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;
 

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;
     }

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

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

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
      */

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;

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;
 

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;
 

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.

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.ViaListener;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.Protocol;
 
 public class ViaBukkitListener extends ViaListener implements Listener {

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;

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;

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.protocol.connection.UserConnection;
-import com.viaversion.viaversion.api.minecraft.Position;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections.providers.BlockConnectionProvider;
 
 import java.util.UUID;

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;

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;
 

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);

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;

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;

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.handlers.ViaCodecHandler;
-import com.viaversion.viaversion.packets.State;
+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 {

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;
 

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.connection.UserConnection;
-import com.viaversion.viaversion.api.protocol.ProtocolVersion;
+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;

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;

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;
 

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;

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;

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;

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.connection.UserConnection;
-import com.viaversion.viaversion.api.protocol.ProtocolVersion;
+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;

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;

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;

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;
 

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;

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.protocol.connection.StoredObject;
-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.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;

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;

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;

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.configuration.AbstractViaConfig;
-import com.viaversion.viaversion.api.protocol.ProtocolVersion;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.bungee.providers.BungeeVersionProvider;
 
 import java.io.File;

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;

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;
 

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;
 

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.api.protocol.connection.UserConnection;
-import com.viaversion.viaversion.protocols.base.ProtocolInfo;
+import com.viaversion.viaversion.api.protocol.connection.ProtocolInfo;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.MainHandProvider;
 
 import java.lang.reflect.InvocationTargetException;

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.protocol.packet.PacketWrapper;
-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.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;

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.connection.UserConnection;
-import com.viaversion.viaversion.api.protocol.ProtocolVersion;
+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;

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.protocol.connection.StoredObject;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
 
 import java.lang.reflect.Field;
 import java.util.Objects;

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.connection.UserConnection;
-import com.viaversion.viaversion.api.protocol.ServerProtocolVersion;
+import com.viaversion.viaversion.api.protocol.version.ServerProtocolVersion;
 
 import java.util.SortedSet;
 import java.util.TreeSet;

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;

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.protocol.ProtocolManagerImpl;
-import com.viaversion.viaversion.api.protocol.ProtocolVersion;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import com.viaversion.viaversion.api.protocol.ServerProtocolVersion;
+import com.viaversion.viaversion.api.protocol.version.ServerProtocolVersion;
-import com.viaversion.viaversion.api.protocol.ServerProtocolVersionRange;
+import com.viaversion.viaversion.protocol.ServerProtocolVersionRange;
-import com.viaversion.viaversion.api.protocol.ServerProtocolVersionSingleton;
+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;

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;
 

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;

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.connection.UserConnection;
-import com.viaversion.viaversion.api.protocol.ProtocolVersion;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 
 import java.util.HashMap;
 import java.util.HashSet;

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;

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.protocol.connection.StoredObject;
-import com.viaversion.viaversion.api.data.UserConnection;
+import com.viaversion.viaversion.api.protocol.connection.UserConnection;
-import com.viaversion.viaversion.api.entities.EntityType;
+import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

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;
     }

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;
 

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;

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;

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;

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 {

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;