diff --git a/src/main/java/buttondevteam/bucket/core/PlayerListener.java b/src/main/java/buttondevteam/bucket/PlayerListener.java
similarity index 100%
rename from src/main/java/buttondevteam/bucket/core/PlayerListener.java
rename to src/main/java/buttondevteam/bucket/PlayerListener.java
diff --git a/src/main/java/buttondevteam/bucket/core/TBMCCoreAPI.java b/src/main/java/buttondevteam/bucket/TBMCCoreAPI.java
similarity index 100%
rename from src/main/java/buttondevteam/bucket/core/TBMCCoreAPI.java
rename to src/main/java/buttondevteam/bucket/TBMCCoreAPI.java
diff --git a/src/main/java/buttondevteam/bucket/core/TBMCPlayer.java b/src/main/java/buttondevteam/bucket/TBMCPlayer.java
similarity index 100%
rename from src/main/java/buttondevteam/bucket/core/TBMCPlayer.java
rename to src/main/java/buttondevteam/bucket/TBMCPlayer.java
diff --git a/src/main/java/buttondevteam/bucket/core/TBMCPlayerAddEvent.java b/src/main/java/buttondevteam/bucket/TBMCPlayerAddEvent.java
similarity index 100%
rename from src/main/java/buttondevteam/bucket/core/TBMCPlayerAddEvent.java
rename to src/main/java/buttondevteam/bucket/TBMCPlayerAddEvent.java
diff --git a/src/main/java/buttondevteam/bucket/core/TBMCPlayerJoinEvent.java b/src/main/java/buttondevteam/bucket/TBMCPlayerJoinEvent.java
similarity index 100%
rename from src/main/java/buttondevteam/bucket/core/TBMCPlayerJoinEvent.java
rename to src/main/java/buttondevteam/bucket/TBMCPlayerJoinEvent.java
diff --git a/src/main/java/buttondevteam/bucket/core/TBMCPlayerLoadEvent.java b/src/main/java/buttondevteam/bucket/TBMCPlayerLoadEvent.java
similarity index 100%
rename from src/main/java/buttondevteam/bucket/core/TBMCPlayerLoadEvent.java
rename to src/main/java/buttondevteam/bucket/TBMCPlayerLoadEvent.java
diff --git a/src/main/java/buttondevteam/bucket/core/TBMCPlayerQuitEvent.java b/src/main/java/buttondevteam/bucket/TBMCPlayerQuitEvent.java
similarity index 100%
rename from src/main/java/buttondevteam/bucket/core/TBMCPlayerQuitEvent.java
rename to src/main/java/buttondevteam/bucket/TBMCPlayerQuitEvent.java
diff --git a/src/main/java/buttondevteam/bucket/core/TBMCPlayerSaveEvent.java b/src/main/java/buttondevteam/bucket/TBMCPlayerSaveEvent.java
similarity index 100%
rename from src/main/java/buttondevteam/bucket/core/TBMCPlayerSaveEvent.java
rename to src/main/java/buttondevteam/bucket/TBMCPlayerSaveEvent.java
diff --git a/src/main/java/buttondevteam/bucket/core/CoreSubPlugin.java b/src/main/java/buttondevteam/bucket/core/CoreSubPlugin.java
deleted file mode 100644
index 19fc006..0000000
--- a/src/main/java/buttondevteam/bucket/core/CoreSubPlugin.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package buttondevteam.bucket.core;
-
-import java.util.logging.Level;
-
-import org.bukkit.Bukkit;
-import org.bukkit.plugin.Plugin;
-
-public class CoreSubPlugin {
-	public Plugin plugin;
-
-	public CoreSubPlugin(Plugin plugin) {
-		this.plugin = plugin;
-	}
-
-	public void register() {
-		Bukkit.getPluginManager().registerEvents(new PlayerListener(), plugin);
-		plugin.getLogger().log(Level.INFO, "Core subplugin registered!");
-	}
-}