diff --git a/Jenkinsfile b/Jenkinsfile
index 3c63f1a31..b36da780e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,7 +1,7 @@
 pipeline {
   agent {
     docker {
-      image 'gradle:jdk8-slim'
+      image 'openjdk:8-jdk-slim'
       args '-v gradle-cache:/home/gradle/.gradle:rw'
     }
 
@@ -10,7 +10,7 @@ pipeline {
     stage('Build') {
       steps {
         sh './gradlew shadowJar'
-        archiveArtifacts 'build/libs/*.jar'
+        archiveArtifacts 'proxy/build/libs/*-all.jar'
       }
     }
     stage('Test') {
diff --git a/api/build.gradle b/api/build.gradle
new file mode 100644
index 000000000..0252e96c4
--- /dev/null
+++ b/api/build.gradle
@@ -0,0 +1,29 @@
+plugins {
+    id 'java'
+    id 'com.github.johnrengelman.shadow' version '2.0.4'
+}
+
+dependencies {
+    compile 'com.google.code.gson:gson:2.8.5'
+    compile 'com.google.guava:guava:25.1-jre'
+    compile 'net.kyori:text:1.12-1.6.0-SNAPSHOT'
+    compile 'com.moandjiezana.toml:toml4j:0.7.2'
+    testCompile "org.junit.jupiter:junit-jupiter-api:${junitVersion}"
+    testCompile "org.junit.jupiter:junit-jupiter-engine:${junitVersion}"
+}
+
+task javadocJar(type: Jar) {
+    classifier 'javadoc'
+    from javadoc
+}
+
+task sourcesJar(type: Jar) {
+    classifier 'sources'
+    from sourceSets.main.allSource
+}
+
+artifacts {
+    archives javadocJar
+    archives shadowJar
+    archives sourcesJar
+}
\ No newline at end of file
diff --git a/api/src/main/java/com/velocitypowered/api/package-info.java b/api/src/main/java/com/velocitypowered/api/package-info.java
new file mode 100644
index 000000000..6d8698019
--- /dev/null
+++ b/api/src/main/java/com/velocitypowered/api/package-info.java
@@ -0,0 +1,5 @@
+package com.velocitypowered.api;
+
+/**
+ * Welcome to the Velocity API documentation.
+ */
\ No newline at end of file
diff --git a/src/main/java/com/velocitypowered/proxy/data/ServerInfo.java b/api/src/main/java/com/velocitypowered/api/servers/ServerInfo.java
similarity index 77%
rename from src/main/java/com/velocitypowered/proxy/data/ServerInfo.java
rename to api/src/main/java/com/velocitypowered/api/servers/ServerInfo.java
index 833e404c0..2bb8000bc 100644
--- a/src/main/java/com/velocitypowered/proxy/data/ServerInfo.java
+++ b/api/src/main/java/com/velocitypowered/api/servers/ServerInfo.java
@@ -1,14 +1,22 @@
-package com.velocitypowered.proxy.data;
+package com.velocitypowered.api.servers;
 
 import com.google.common.base.Preconditions;
 
 import java.net.InetSocketAddress;
 import java.util.Objects;
 
+/**
+ * ServerInfo represents a server that a player can connect to. This object is immutable and safe for concurrent access.
+ */
 public final class ServerInfo {
     private final String name;
     private final InetSocketAddress address;
 
+    /**
+     * Creates a new ServerInfo object.
+     * @param name the name for the server
+     * @param address the address of the server to connect to
+     */
     public ServerInfo(String name, InetSocketAddress address) {
         this.name = Preconditions.checkNotNull(name, "name");
         this.address = Preconditions.checkNotNull(address, "address");
diff --git a/src/main/java/com/velocitypowered/proxy/util/LegacyChatColorUtils.java b/api/src/main/java/com/velocitypowered/api/util/LegacyChatColorUtils.java
similarity index 87%
rename from src/main/java/com/velocitypowered/proxy/util/LegacyChatColorUtils.java
rename to api/src/main/java/com/velocitypowered/api/util/LegacyChatColorUtils.java
index 8488002ea..9116a8158 100644
--- a/src/main/java/com/velocitypowered/proxy/util/LegacyChatColorUtils.java
+++ b/api/src/main/java/com/velocitypowered/api/util/LegacyChatColorUtils.java
@@ -1,12 +1,12 @@
-package com.velocitypowered.proxy.util;
+package com.velocitypowered.api.util;
 
 import com.google.common.base.Preconditions;
 
 import java.util.regex.Pattern;
 
 /**
- * Utilities for handling legacy Minecraft color codes. Generally, you should prefer JSON-based components, but for
- * convenience Velocity provides these utilities.
+ * LegacyChatColorUtils contains utilities for handling legacy Minecraft color codes. Generally, you should prefer
+ * JSON-based components, but for convenience Velocity provides a limited set of tools to handle Minecraft color codes.
  */
 public enum LegacyChatColorUtils {
     ;
diff --git a/src/test/java/com/velocitypowered/proxy/util/LegacyChatColorUtilsTest.java b/api/src/test/java/com/velocitypowered/api/util/LegacyChatColorUtilsTest.java
similarity index 95%
rename from src/test/java/com/velocitypowered/proxy/util/LegacyChatColorUtilsTest.java
rename to api/src/test/java/com/velocitypowered/api/util/LegacyChatColorUtilsTest.java
index 04841bf78..b98b7027b 100644
--- a/src/test/java/com/velocitypowered/proxy/util/LegacyChatColorUtilsTest.java
+++ b/api/src/test/java/com/velocitypowered/api/util/LegacyChatColorUtilsTest.java
@@ -1,5 +1,6 @@
-package com.velocitypowered.proxy.util;
+package com.velocitypowered.api.util;
 
+import com.velocitypowered.api.util.LegacyChatColorUtils;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
diff --git a/build.gradle b/build.gradle
index ffab65172..b87c0c007 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,78 +1,32 @@
 plugins {
     id 'java'
-    id 'com.github.johnrengelman.shadow' version '2.0.4'
 }
 
-group 'com.velocitypowered'
-version '1.0-SNAPSHOT'
+allprojects {
+    group 'com.velocitypowered'
+    version '1.0-SNAPSHOT'
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+    sourceCompatibility = 1.8
+    targetCompatibility = 1.8
 
-ext {
-    // dependency versions
-    junitVersion = '5.3.0-M1'
-    log4jVersion = '2.11.0'
-    nettyVersion = '4.1.28.Final'
-}
-
-repositories {
-    mavenLocal()
-    mavenCentral()
-    maven {
-        url 'https://oss.sonatype.org/content/groups/public/'
+    ext {
+        // dependency versions
+        junitVersion = '5.3.0-M1'
+        log4jVersion = '2.11.0'
+        nettyVersion = '4.1.28.Final'
     }
-}
 
-dependencies {
-    compile 'com.google.code.gson:gson:2.8.5'
-    compile 'com.google.guava:guava:25.1-jre'
-    compile "io.netty:netty-codec:${nettyVersion}"
-    compile "io.netty:netty-codec-http:${nettyVersion}"
-    compile "io.netty:netty-handler:${nettyVersion}"
-    compile "io.netty:netty-transport-native-epoll:${nettyVersion}"
-    compile "io.netty:netty-transport-native-epoll:${nettyVersion}:linux-x86_64"
-    compile 'net.kyori:text:1.12-1.6.0-SNAPSHOT'
-    compile "org.apache.logging.log4j:log4j-api:${log4jVersion}"
-    compile "org.apache.logging.log4j:log4j-core:${log4jVersion}"
-    compile 'com.moandjiezana.toml:toml4j:0.7.2'
-    testCompile "org.junit.jupiter:junit-jupiter-api:${junitVersion}"
-    testCompile "org.junit.jupiter:junit-jupiter-engine:${junitVersion}"
-}
-
-compileJava {
-    options.compilerArgs += ['-proc:none']
-}
-
-compileTestJava {
-    options.compilerArgs += ['-proc:none']
-}
-
-jar {
-    manifest {
-        attributes 'Main-Class': 'com.velocitypowered.proxy.Velocity'
-        attributes 'Implementation-Version': project.version
+    repositories {
+        mavenLocal()
+        mavenCentral()
+        maven {
+            url 'https://oss.sonatype.org/content/groups/public/'
+        }
     }
-}
 
-test {
-    reports {
-        junitXml.enabled = true
+    test {
+        reports {
+            junitXml.enabled = true
+        }
     }
-}
-
-task javadocJar(type: Jar) {
-    classifier 'javadoc'
-    from javadoc
-}
-
-task sourcesJar(type: Jar) {
-    classifier 'sources'
-    from sourceSets.main.allSource
-}
-
-artifacts {
-    archives javadocJar
-    archives shadowJar
-    archives sourcesJar
-}
+}
\ No newline at end of file
diff --git a/proxy/build.gradle b/proxy/build.gradle
new file mode 100644
index 000000000..39d44b65c
--- /dev/null
+++ b/proxy/build.gradle
@@ -0,0 +1,36 @@
+plugins {
+    id 'java'
+    id 'com.github.johnrengelman.shadow' version '2.0.4'
+}
+
+compileJava {
+    options.compilerArgs += ['-proc:none']
+}
+
+compileTestJava {
+    options.compilerArgs += ['-proc:none']
+}
+
+jar {
+    manifest {
+        attributes 'Main-Class': 'com.velocitypowered.proxy.Velocity'
+        attributes 'Implementation-Version': project.version
+    }
+}
+
+dependencies {
+    compile project(':velocity-api')
+    compile "io.netty:netty-codec:${nettyVersion}"
+    compile "io.netty:netty-codec-http:${nettyVersion}"
+    compile "io.netty:netty-handler:${nettyVersion}"
+    compile "io.netty:netty-transport-native-epoll:${nettyVersion}"
+    compile "io.netty:netty-transport-native-epoll:${nettyVersion}:linux-x86_64"
+    compile "org.apache.logging.log4j:log4j-api:${log4jVersion}"
+    compile "org.apache.logging.log4j:log4j-core:${log4jVersion}"
+    testCompile "org.junit.jupiter:junit-jupiter-api:${junitVersion}"
+    testCompile "org.junit.jupiter:junit-jupiter-engine:${junitVersion}"
+}
+
+artifacts {
+    archives shadowJar
+}
\ No newline at end of file
diff --git a/src/main/java/com/velocitypowered/network/ConnectionManager.java b/proxy/src/main/java/com.velocitypowered/network/ConnectionManager.java
similarity index 100%
rename from src/main/java/com/velocitypowered/network/ConnectionManager.java
rename to proxy/src/main/java/com.velocitypowered/network/ConnectionManager.java
diff --git a/src/main/java/com/velocitypowered/network/Connections.java b/proxy/src/main/java/com.velocitypowered/network/Connections.java
similarity index 100%
rename from src/main/java/com/velocitypowered/network/Connections.java
rename to proxy/src/main/java/com.velocitypowered/network/Connections.java
diff --git a/src/main/java/com/velocitypowered/proxy/Velocity.java b/proxy/src/main/java/com.velocitypowered/proxy/Velocity.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/Velocity.java
rename to proxy/src/main/java/com.velocitypowered/proxy/Velocity.java
diff --git a/src/main/java/com/velocitypowered/proxy/VelocityServer.java b/proxy/src/main/java/com.velocitypowered/proxy/VelocityServer.java
similarity index 97%
rename from src/main/java/com/velocitypowered/proxy/VelocityServer.java
rename to proxy/src/main/java/com.velocitypowered/proxy/VelocityServer.java
index 079f685d5..ea79f7742 100644
--- a/src/main/java/com/velocitypowered/proxy/VelocityServer.java
+++ b/proxy/src/main/java/com.velocitypowered/proxy/VelocityServer.java
@@ -5,7 +5,7 @@ import com.google.gson.GsonBuilder;
 import com.velocitypowered.network.ConnectionManager;
 import com.velocitypowered.proxy.config.VelocityConfiguration;
 import com.velocitypowered.proxy.connection.http.NettyHttpClient;
-import com.velocitypowered.proxy.data.ServerInfo;
+import com.velocitypowered.api.servers.ServerInfo;
 import com.velocitypowered.proxy.util.AddressUtil;
 import com.velocitypowered.proxy.util.EncryptionUtils;
 import com.velocitypowered.proxy.util.ServerMap;
@@ -21,7 +21,6 @@ import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.security.KeyPair;
-import java.util.HashMap;
 import java.util.Map;
 
 public class VelocityServer {
diff --git a/src/main/java/com/velocitypowered/proxy/config/IPForwardingMode.java b/proxy/src/main/java/com.velocitypowered/proxy/config/IPForwardingMode.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/config/IPForwardingMode.java
rename to proxy/src/main/java/com.velocitypowered/proxy/config/IPForwardingMode.java
diff --git a/src/main/java/com/velocitypowered/proxy/config/VelocityConfiguration.java b/proxy/src/main/java/com.velocitypowered/proxy/config/VelocityConfiguration.java
similarity index 99%
rename from src/main/java/com/velocitypowered/proxy/config/VelocityConfiguration.java
rename to proxy/src/main/java/com.velocitypowered/proxy/config/VelocityConfiguration.java
index cd1839d4e..04c9f3657 100644
--- a/src/main/java/com/velocitypowered/proxy/config/VelocityConfiguration.java
+++ b/proxy/src/main/java/com.velocitypowered/proxy/config/VelocityConfiguration.java
@@ -3,7 +3,7 @@ package com.velocitypowered.proxy.config;
 import com.google.common.collect.ImmutableMap;
 import com.moandjiezana.toml.Toml;
 import com.velocitypowered.proxy.util.AddressUtil;
-import com.velocitypowered.proxy.util.LegacyChatColorUtils;
+import com.velocitypowered.api.util.LegacyChatColorUtils;
 import net.kyori.text.Component;
 import net.kyori.text.serializer.ComponentSerializers;
 import org.apache.logging.log4j.LogManager;
diff --git a/src/main/java/com/velocitypowered/proxy/connection/MinecraftConnection.java b/proxy/src/main/java/com.velocitypowered/proxy/connection/MinecraftConnection.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/connection/MinecraftConnection.java
rename to proxy/src/main/java/com.velocitypowered/proxy/connection/MinecraftConnection.java
diff --git a/src/main/java/com/velocitypowered/proxy/connection/MinecraftConnectionAssociation.java b/proxy/src/main/java/com.velocitypowered/proxy/connection/MinecraftConnectionAssociation.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/connection/MinecraftConnectionAssociation.java
rename to proxy/src/main/java/com.velocitypowered/proxy/connection/MinecraftConnectionAssociation.java
diff --git a/src/main/java/com/velocitypowered/proxy/connection/MinecraftSessionHandler.java b/proxy/src/main/java/com.velocitypowered/proxy/connection/MinecraftSessionHandler.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/connection/MinecraftSessionHandler.java
rename to proxy/src/main/java/com.velocitypowered/proxy/connection/MinecraftSessionHandler.java
diff --git a/src/main/java/com/velocitypowered/proxy/connection/VelocityConstants.java b/proxy/src/main/java/com.velocitypowered/proxy/connection/VelocityConstants.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/connection/VelocityConstants.java
rename to proxy/src/main/java/com.velocitypowered/proxy/connection/VelocityConstants.java
diff --git a/src/main/java/com/velocitypowered/proxy/connection/backend/BackendPlaySessionHandler.java b/proxy/src/main/java/com.velocitypowered/proxy/connection/backend/BackendPlaySessionHandler.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/connection/backend/BackendPlaySessionHandler.java
rename to proxy/src/main/java/com.velocitypowered/proxy/connection/backend/BackendPlaySessionHandler.java
diff --git a/src/main/java/com/velocitypowered/proxy/connection/backend/LoginSessionHandler.java b/proxy/src/main/java/com.velocitypowered/proxy/connection/backend/LoginSessionHandler.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/connection/backend/LoginSessionHandler.java
rename to proxy/src/main/java/com.velocitypowered/proxy/connection/backend/LoginSessionHandler.java
diff --git a/src/main/java/com/velocitypowered/proxy/connection/backend/ServerConnection.java b/proxy/src/main/java/com.velocitypowered/proxy/connection/backend/ServerConnection.java
similarity index 99%
rename from src/main/java/com/velocitypowered/proxy/connection/backend/ServerConnection.java
rename to proxy/src/main/java/com.velocitypowered/proxy/connection/backend/ServerConnection.java
index de7b11dd0..829325d01 100644
--- a/src/main/java/com/velocitypowered/proxy/connection/backend/ServerConnection.java
+++ b/proxy/src/main/java/com.velocitypowered/proxy/connection/backend/ServerConnection.java
@@ -11,7 +11,7 @@ import com.velocitypowered.proxy.protocol.packets.Handshake;
 import com.velocitypowered.proxy.protocol.packets.ServerLogin;
 import com.velocitypowered.proxy.connection.MinecraftConnection;
 import com.velocitypowered.proxy.protocol.StateRegistry;
-import com.velocitypowered.proxy.data.ServerInfo;
+import com.velocitypowered.api.servers.ServerInfo;
 import com.velocitypowered.proxy.VelocityServer;
 import com.velocitypowered.proxy.connection.client.ConnectedPlayer;
 import io.netty.channel.*;
diff --git a/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java b/proxy/src/main/java/com.velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java
similarity index 99%
rename from src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java
rename to proxy/src/main/java/com.velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java
index 147a8c522..93c251192 100644
--- a/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java
+++ b/proxy/src/main/java/com.velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java
@@ -2,7 +2,7 @@ package com.velocitypowered.proxy.connection.client;
 
 import com.velocitypowered.proxy.VelocityServer;
 import com.velocitypowered.proxy.connection.backend.ServerConnection;
-import com.velocitypowered.proxy.data.ServerInfo;
+import com.velocitypowered.api.servers.ServerInfo;
 import com.velocitypowered.proxy.data.scoreboard.Objective;
 import com.velocitypowered.proxy.data.scoreboard.Score;
 import com.velocitypowered.proxy.data.scoreboard.Scoreboard;
diff --git a/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java b/proxy/src/main/java/com.velocitypowered/proxy/connection/client/ConnectedPlayer.java
similarity index 98%
rename from src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java
rename to proxy/src/main/java/com.velocitypowered/proxy/connection/client/ConnectedPlayer.java
index b96560510..61e138c72 100644
--- a/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java
+++ b/proxy/src/main/java/com.velocitypowered/proxy/connection/client/ConnectedPlayer.java
@@ -9,7 +9,7 @@ import com.velocitypowered.proxy.connection.MinecraftConnection;
 import com.velocitypowered.proxy.connection.backend.ServerConnection;
 import com.velocitypowered.proxy.protocol.packets.ClientSettings;
 import com.velocitypowered.proxy.util.ThrowableUtils;
-import com.velocitypowered.proxy.data.ServerInfo;
+import com.velocitypowered.api.servers.ServerInfo;
 import com.velocitypowered.proxy.protocol.packets.Disconnect;
 import net.kyori.text.Component;
 import net.kyori.text.TextComponent;
@@ -21,7 +21,6 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 import java.net.InetSocketAddress;
-import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
diff --git a/src/main/java/com/velocitypowered/proxy/connection/client/HandshakeSessionHandler.java b/proxy/src/main/java/com.velocitypowered/proxy/connection/client/HandshakeSessionHandler.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/connection/client/HandshakeSessionHandler.java
rename to proxy/src/main/java/com.velocitypowered/proxy/connection/client/HandshakeSessionHandler.java
diff --git a/src/main/java/com/velocitypowered/proxy/connection/client/InitialConnectSessionHandler.java b/proxy/src/main/java/com.velocitypowered/proxy/connection/client/InitialConnectSessionHandler.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/connection/client/InitialConnectSessionHandler.java
rename to proxy/src/main/java/com.velocitypowered/proxy/connection/client/InitialConnectSessionHandler.java
diff --git a/src/main/java/com/velocitypowered/proxy/connection/client/LoginSessionHandler.java b/proxy/src/main/java/com.velocitypowered/proxy/connection/client/LoginSessionHandler.java
similarity index 97%
rename from src/main/java/com/velocitypowered/proxy/connection/client/LoginSessionHandler.java
rename to proxy/src/main/java/com.velocitypowered/proxy/connection/client/LoginSessionHandler.java
index 7c7fc9eec..1640e1d69 100644
--- a/src/main/java/com/velocitypowered/proxy/connection/client/LoginSessionHandler.java
+++ b/proxy/src/main/java/com.velocitypowered/proxy/connection/client/LoginSessionHandler.java
@@ -10,10 +10,8 @@ import com.velocitypowered.proxy.protocol.packets.*;
 import com.velocitypowered.proxy.connection.MinecraftConnection;
 import com.velocitypowered.proxy.connection.MinecraftSessionHandler;
 import com.velocitypowered.proxy.VelocityServer;
-import com.velocitypowered.proxy.connection.backend.ServerConnection;
-import com.velocitypowered.proxy.data.ServerInfo;
+import com.velocitypowered.api.servers.ServerInfo;
 import com.velocitypowered.proxy.util.EncryptionUtils;
-import com.velocitypowered.proxy.util.UuidUtils;
 import io.netty.buffer.Unpooled;
 import net.kyori.text.TextComponent;
 import net.kyori.text.format.TextColor;
diff --git a/src/main/java/com/velocitypowered/proxy/connection/client/StatusSessionHandler.java b/proxy/src/main/java/com.velocitypowered/proxy/connection/client/StatusSessionHandler.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/connection/client/StatusSessionHandler.java
rename to proxy/src/main/java/com.velocitypowered/proxy/connection/client/StatusSessionHandler.java
diff --git a/src/main/java/com/velocitypowered/proxy/connection/http/NettyHttpClient.java b/proxy/src/main/java/com.velocitypowered/proxy/connection/http/NettyHttpClient.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/connection/http/NettyHttpClient.java
rename to proxy/src/main/java/com.velocitypowered/proxy/connection/http/NettyHttpClient.java
diff --git a/src/main/java/com/velocitypowered/proxy/connection/http/SimpleHttpResponseCollector.java b/proxy/src/main/java/com.velocitypowered/proxy/connection/http/SimpleHttpResponseCollector.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/connection/http/SimpleHttpResponseCollector.java
rename to proxy/src/main/java/com.velocitypowered/proxy/connection/http/SimpleHttpResponseCollector.java
diff --git a/src/main/java/com/velocitypowered/proxy/data/GameProfile.java b/proxy/src/main/java/com.velocitypowered/proxy/data/GameProfile.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/data/GameProfile.java
rename to proxy/src/main/java/com.velocitypowered/proxy/data/GameProfile.java
diff --git a/src/main/java/com/velocitypowered/proxy/data/ServerPing.java b/proxy/src/main/java/com.velocitypowered/proxy/data/ServerPing.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/data/ServerPing.java
rename to proxy/src/main/java/com.velocitypowered/proxy/data/ServerPing.java
diff --git a/src/main/java/com/velocitypowered/proxy/data/scoreboard/Objective.java b/proxy/src/main/java/com.velocitypowered/proxy/data/scoreboard/Objective.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/data/scoreboard/Objective.java
rename to proxy/src/main/java/com.velocitypowered/proxy/data/scoreboard/Objective.java
diff --git a/src/main/java/com/velocitypowered/proxy/data/scoreboard/ObjectiveMode.java b/proxy/src/main/java/com.velocitypowered/proxy/data/scoreboard/ObjectiveMode.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/data/scoreboard/ObjectiveMode.java
rename to proxy/src/main/java/com.velocitypowered/proxy/data/scoreboard/ObjectiveMode.java
diff --git a/src/main/java/com/velocitypowered/proxy/data/scoreboard/Score.java b/proxy/src/main/java/com.velocitypowered/proxy/data/scoreboard/Score.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/data/scoreboard/Score.java
rename to proxy/src/main/java/com.velocitypowered/proxy/data/scoreboard/Score.java
diff --git a/src/main/java/com/velocitypowered/proxy/data/scoreboard/Scoreboard.java b/proxy/src/main/java/com.velocitypowered/proxy/data/scoreboard/Scoreboard.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/data/scoreboard/Scoreboard.java
rename to proxy/src/main/java/com.velocitypowered/proxy/data/scoreboard/Scoreboard.java
diff --git a/src/main/java/com/velocitypowered/proxy/data/scoreboard/Team.java b/proxy/src/main/java/com.velocitypowered/proxy/data/scoreboard/Team.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/data/scoreboard/Team.java
rename to proxy/src/main/java/com.velocitypowered/proxy/data/scoreboard/Team.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/MinecraftPacket.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/MinecraftPacket.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/MinecraftPacket.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/MinecraftPacket.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/PacketWrapper.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/PacketWrapper.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/PacketWrapper.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/PacketWrapper.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/ProtocolConstants.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/ProtocolConstants.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/ProtocolConstants.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/ProtocolConstants.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/ProtocolUtils.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/ProtocolUtils.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/ProtocolUtils.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/ProtocolUtils.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/StateRegistry.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/StateRegistry.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/StateRegistry.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/StateRegistry.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/compression/JavaVelocityCompressor.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/compression/JavaVelocityCompressor.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/compression/JavaVelocityCompressor.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/compression/JavaVelocityCompressor.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/compression/VelocityCompressor.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/compression/VelocityCompressor.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/compression/VelocityCompressor.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/compression/VelocityCompressor.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/encryption/JavaVelocityCipher.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/encryption/JavaVelocityCipher.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/encryption/JavaVelocityCipher.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/encryption/JavaVelocityCipher.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/encryption/VelocityCipher.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/encryption/VelocityCipher.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/encryption/VelocityCipher.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/encryption/VelocityCipher.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/netty/LegacyPingDecoder.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/netty/LegacyPingDecoder.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/netty/LegacyPingDecoder.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/netty/LegacyPingDecoder.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/netty/LegacyPingEncoder.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/netty/LegacyPingEncoder.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/netty/LegacyPingEncoder.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/netty/LegacyPingEncoder.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftCipherDecoder.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/netty/MinecraftCipherDecoder.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftCipherDecoder.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/netty/MinecraftCipherDecoder.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftCipherEncoder.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/netty/MinecraftCipherEncoder.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftCipherEncoder.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/netty/MinecraftCipherEncoder.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftCompressDecoder.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/netty/MinecraftCompressDecoder.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftCompressDecoder.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/netty/MinecraftCompressDecoder.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftCompressEncoder.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/netty/MinecraftCompressEncoder.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftCompressEncoder.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/netty/MinecraftCompressEncoder.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftDecoder.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/netty/MinecraftDecoder.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftDecoder.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/netty/MinecraftDecoder.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftEncoder.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/netty/MinecraftEncoder.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftEncoder.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/netty/MinecraftEncoder.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftVarintFrameDecoder.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/netty/MinecraftVarintFrameDecoder.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftVarintFrameDecoder.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/netty/MinecraftVarintFrameDecoder.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftVarintLengthEncoder.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/netty/MinecraftVarintLengthEncoder.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftVarintLengthEncoder.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/netty/MinecraftVarintLengthEncoder.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/packets/BossBar.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/BossBar.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/packets/BossBar.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/BossBar.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/packets/Chat.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/Chat.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/packets/Chat.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/Chat.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/packets/ClientSettings.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/ClientSettings.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/packets/ClientSettings.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/ClientSettings.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/packets/Disconnect.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/Disconnect.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/packets/Disconnect.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/Disconnect.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/packets/EncryptionRequest.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/EncryptionRequest.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/packets/EncryptionRequest.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/EncryptionRequest.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/packets/EncryptionResponse.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/EncryptionResponse.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/packets/EncryptionResponse.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/EncryptionResponse.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/packets/Handshake.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/Handshake.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/packets/Handshake.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/Handshake.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/packets/JoinGame.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/JoinGame.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/packets/JoinGame.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/JoinGame.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/packets/KeepAlive.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/KeepAlive.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/packets/KeepAlive.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/KeepAlive.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/packets/LegacyPing.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/LegacyPing.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/packets/LegacyPing.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/LegacyPing.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/packets/LegacyPingResponse.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/LegacyPingResponse.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/packets/LegacyPingResponse.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/LegacyPingResponse.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/packets/LoginPluginMessage.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/LoginPluginMessage.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/packets/LoginPluginMessage.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/LoginPluginMessage.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/packets/LoginPluginResponse.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/LoginPluginResponse.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/packets/LoginPluginResponse.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/LoginPluginResponse.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/packets/PluginMessage.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/PluginMessage.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/packets/PluginMessage.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/PluginMessage.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/packets/Respawn.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/Respawn.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/packets/Respawn.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/Respawn.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/packets/ScoreboardDisplay.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/ScoreboardDisplay.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/packets/ScoreboardDisplay.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/ScoreboardDisplay.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/packets/ScoreboardObjective.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/ScoreboardObjective.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/packets/ScoreboardObjective.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/ScoreboardObjective.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/packets/ScoreboardSetScore.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/ScoreboardSetScore.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/packets/ScoreboardSetScore.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/ScoreboardSetScore.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/packets/ScoreboardTeam.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/ScoreboardTeam.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/packets/ScoreboardTeam.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/ScoreboardTeam.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/packets/ServerLogin.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/ServerLogin.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/packets/ServerLogin.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/ServerLogin.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/packets/ServerLoginSuccess.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/ServerLoginSuccess.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/packets/ServerLoginSuccess.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/ServerLoginSuccess.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/packets/SetCompression.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/SetCompression.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/packets/SetCompression.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/SetCompression.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/packets/StatusPing.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/StatusPing.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/packets/StatusPing.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/StatusPing.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/packets/StatusRequest.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/StatusRequest.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/packets/StatusRequest.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/StatusRequest.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/packets/StatusResponse.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/StatusResponse.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/packets/StatusResponse.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/packets/StatusResponse.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/remap/EntityIdRemapper.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/remap/EntityIdRemapper.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/remap/EntityIdRemapper.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/remap/EntityIdRemapper.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/remap/Minecraft18EntityIdRemapper.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/remap/Minecraft18EntityIdRemapper.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/remap/Minecraft18EntityIdRemapper.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/remap/Minecraft18EntityIdRemapper.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/remap/NoopEntityIdRemapper.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/remap/NoopEntityIdRemapper.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/remap/NoopEntityIdRemapper.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/remap/NoopEntityIdRemapper.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/util/PluginMessageUtil.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/util/PluginMessageUtil.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/util/PluginMessageUtil.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/util/PluginMessageUtil.java
diff --git a/src/main/java/com/velocitypowered/proxy/protocol/util/ScoreboardProtocolUtil.java b/proxy/src/main/java/com.velocitypowered/proxy/protocol/util/ScoreboardProtocolUtil.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/protocol/util/ScoreboardProtocolUtil.java
rename to proxy/src/main/java/com.velocitypowered/proxy/protocol/util/ScoreboardProtocolUtil.java
diff --git a/src/main/java/com/velocitypowered/proxy/util/AddressUtil.java b/proxy/src/main/java/com.velocitypowered/proxy/util/AddressUtil.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/util/AddressUtil.java
rename to proxy/src/main/java/com.velocitypowered/proxy/util/AddressUtil.java
diff --git a/src/main/java/com/velocitypowered/proxy/util/Disposable.java b/proxy/src/main/java/com.velocitypowered/proxy/util/Disposable.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/util/Disposable.java
rename to proxy/src/main/java/com.velocitypowered/proxy/util/Disposable.java
diff --git a/src/main/java/com/velocitypowered/proxy/util/EncryptionUtils.java b/proxy/src/main/java/com.velocitypowered/proxy/util/EncryptionUtils.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/util/EncryptionUtils.java
rename to proxy/src/main/java/com.velocitypowered/proxy/util/EncryptionUtils.java
diff --git a/src/main/java/com/velocitypowered/proxy/util/ServerMap.java b/proxy/src/main/java/com.velocitypowered/proxy/util/ServerMap.java
similarity index 93%
rename from src/main/java/com/velocitypowered/proxy/util/ServerMap.java
rename to proxy/src/main/java/com.velocitypowered/proxy/util/ServerMap.java
index bea4b4b21..d78b5f305 100644
--- a/src/main/java/com/velocitypowered/proxy/util/ServerMap.java
+++ b/proxy/src/main/java/com.velocitypowered/proxy/util/ServerMap.java
@@ -2,7 +2,7 @@ package com.velocitypowered.proxy.util;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
-import com.velocitypowered.proxy.data.ServerInfo;
+import com.velocitypowered.api.servers.ServerInfo;
 
 import java.util.Collection;
 import java.util.HashMap;
diff --git a/src/main/java/com/velocitypowered/proxy/util/ThrowableUtils.java b/proxy/src/main/java/com.velocitypowered/proxy/util/ThrowableUtils.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/util/ThrowableUtils.java
rename to proxy/src/main/java/com.velocitypowered/proxy/util/ThrowableUtils.java
diff --git a/src/main/java/com/velocitypowered/proxy/util/UuidUtils.java b/proxy/src/main/java/com.velocitypowered/proxy/util/UuidUtils.java
similarity index 100%
rename from src/main/java/com/velocitypowered/proxy/util/UuidUtils.java
rename to proxy/src/main/java/com.velocitypowered/proxy/util/UuidUtils.java
diff --git a/src/main/resources/log4j2.xml b/proxy/src/main/resources/log4j2.xml
similarity index 100%
rename from src/main/resources/log4j2.xml
rename to proxy/src/main/resources/log4j2.xml
diff --git a/src/test/java/com/velocitypowered/proxy/protocol/PacketRegistryTest.java b/proxy/src/test/java/com/velocitypowered/proxy/protocol/PacketRegistryTest.java
similarity index 100%
rename from src/test/java/com/velocitypowered/proxy/protocol/PacketRegistryTest.java
rename to proxy/src/test/java/com/velocitypowered/proxy/protocol/PacketRegistryTest.java
diff --git a/src/test/java/com/velocitypowered/proxy/util/EncryptionUtilsTest.java b/proxy/src/test/java/com/velocitypowered/proxy/util/EncryptionUtilsTest.java
similarity index 100%
rename from src/test/java/com/velocitypowered/proxy/util/EncryptionUtilsTest.java
rename to proxy/src/test/java/com/velocitypowered/proxy/util/EncryptionUtilsTest.java
diff --git a/src/test/java/com/velocitypowered/proxy/util/UuidUtilsTest.java b/proxy/src/test/java/com/velocitypowered/proxy/util/UuidUtilsTest.java
similarity index 100%
rename from src/test/java/com/velocitypowered/proxy/util/UuidUtilsTest.java
rename to proxy/src/test/java/com/velocitypowered/proxy/util/UuidUtilsTest.java
diff --git a/settings.gradle b/settings.gradle
index b3d35706e..f89347eec 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,6 @@
 rootProject.name = 'velocity'
+include 'api'
+include 'proxy'
+findProject(':api')?.name = 'velocity-api'
+findProject(':proxy')?.name = 'velocity-proxy'
+
diff --git a/src/main/resources/velocity.toml b/src/main/resources/velocity.toml
deleted file mode 100644
index 648f9e4a4..000000000
--- a/src/main/resources/velocity.toml
+++ /dev/null
@@ -1,33 +0,0 @@
-# What port should the proxy be bound to? By default, we'll bind to all addresses on port 25577.
-bind = "0.0.0.0:25577"
-
-# What should be the MOTD? Legacy color codes and JSON are accepted.
-motd = "&3A Velocity Server"
-
-# What should we display for the maximum number of players? (Velocity does not support a cap
-# on the number of players online.)
-show-max-players = 500
-
-# Should we authenticate players with Mojang? By default, this is on.
-online-mode = true
-
-# Should we forward IP addresses and other data to backend servers?
-# Available options:
-# - "none":   No forwarding will be done. All players will appear to be connecting from the proxy
-#             and will have offline-mode UUIDs.
-# - "legacy": Forward player IPs and UUIDs in BungeeCord-compatible fashion. Use this if you run
-#             servers using Minecraft 1.12 or lower.
-# - "modern": Forward player IPs and UUIDs as part of the login process using Velocity's native
-#             forwarding. Only applicable for Minecraft 1.13 or higher.
-ip-forwarding = "modern"
-
-[servers]
-# Configure your servers here.
-lobby = "127.0.0.1:30066"
-factions = "127.0.0.1:30067"
-minigames = "127.0.0.1:30068"
-
-# In what order we should try servers when a player logs in or is kicked from a server.
-try = [
-  "lobby"
-]
\ No newline at end of file