diff --git a/src/main/java/com/grubnest/game/core/PluginMessage.java b/src/main/java/com/grubnest/game/core/PluginMessage.java
index 157b392..e1f76fa 100644
--- a/src/main/java/com/grubnest/game/core/PluginMessage.java
+++ b/src/main/java/com/grubnest/game/core/PluginMessage.java
@@ -3,6 +3,7 @@
 import com.google.common.io.ByteArrayDataInput;
 import com.google.common.io.ByteArrayDataOutput;
 import com.google.common.io.ByteStreams;
+import com.grubnest.game.core.paper.GrubnestCorePlugin;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.messaging.PluginMessageListener;
diff --git a/src/main/java/com/grubnest/game/core/databasehandler/MySQL.java b/src/main/java/com/grubnest/game/core/databasehandler/MySQL.java
index 908186b..068df00 100644
--- a/src/main/java/com/grubnest/game/core/databasehandler/MySQL.java
+++ b/src/main/java/com/grubnest/game/core/databasehandler/MySQL.java
@@ -1,10 +1,7 @@
 package com.grubnest.game.core.databasehandler;
 
-import com.grubnest.game.core.velocity.VelocityPlugin;
 import com.velocitypowered.api.proxy.Player;
-import org.bukkit.Bukkit;
 
-import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
@@ -24,8 +21,6 @@ public MySQL(MySQLData data) {
         super(data);
     }
 
-    //You make method to fetch / add data in this class
-
     /**
      * Close pool on plugin Disable
      */
diff --git a/src/main/java/com/grubnest/game/core/GrubnestCorePlugin.java b/src/main/java/com/grubnest/game/core/paper/GrubnestCorePlugin.java
similarity index 93%
rename from src/main/java/com/grubnest/game/core/GrubnestCorePlugin.java
rename to src/main/java/com/grubnest/game/core/paper/GrubnestCorePlugin.java
index f6773fb..de7eaa8 100644
--- a/src/main/java/com/grubnest/game/core/GrubnestCorePlugin.java
+++ b/src/main/java/com/grubnest/game/core/paper/GrubnestCorePlugin.java
@@ -1,14 +1,11 @@
-package com.grubnest.game.core;
+package com.grubnest.game.core.paper;
 
+import com.grubnest.game.core.PluginMessage;
 import com.grubnest.game.core.databasehandler.MySQL;
 import com.grubnest.game.core.databasehandler.MySQLData;
 import com.grubnest.game.core.databasehandler.utils.Disabler;
 import org.bukkit.ChatColor;
 import org.bukkit.plugin.java.JavaPlugin;
-import org.yaml.snakeyaml.Yaml;
-
-import java.io.InputStream;
-import java.util.Map;
 
 public class GrubnestCorePlugin extends JavaPlugin {
 
diff --git a/src/main/java/com/grubnest/game/core/velocity/entities/VPlayer.java b/src/main/java/com/grubnest/game/core/velocity/entities/VPlayer.java
index 51a15a1..0371918 100644
--- a/src/main/java/com/grubnest/game/core/velocity/entities/VPlayer.java
+++ b/src/main/java/com/grubnest/game/core/velocity/entities/VPlayer.java
@@ -23,6 +23,9 @@ public VPlayer(Player player) {
         this.player = player;
     }
 
+    /**
+     * Updates the cached username of this player in the database
+     */
     public void updateUsername() {
         VelocityPlugin.getInstance().getMySQL().updatePlayerUsername(this.player);
     }
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 9ed2e37..ac3f33d 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: GrubnestCore
-main: com.grubnest.game.core.GrubnestCorePlugin
+main: com.grubnest.game.core.paper.GrubnestCorePlugin
 version: 1.0
 authors:
   - Theeef