diff --git a/src/main/java/buttondevteam/lib/ChromaGamerBase.java b/src/main/java/buttondevteam/lib/player/ChromaGamerBase.java
similarity index 100%
rename from src/main/java/buttondevteam/lib/ChromaGamerBase.java
rename to src/main/java/buttondevteam/lib/player/ChromaGamerBase.java
diff --git a/src/main/java/buttondevteam/lib/TBMCPlayer.java b/src/main/java/buttondevteam/lib/player/TBMCPlayer.java
similarity index 100%
rename from src/main/java/buttondevteam/lib/TBMCPlayer.java
rename to src/main/java/buttondevteam/lib/player/TBMCPlayer.java
diff --git a/src/main/java/buttondevteam/lib/TBMCPlayerAddEvent.java b/src/main/java/buttondevteam/lib/player/TBMCPlayerAddEvent.java
similarity index 100%
rename from src/main/java/buttondevteam/lib/TBMCPlayerAddEvent.java
rename to src/main/java/buttondevteam/lib/player/TBMCPlayerAddEvent.java
diff --git a/src/main/java/buttondevteam/lib/TBMCPlayerBase.java b/src/main/java/buttondevteam/lib/player/TBMCPlayerBase.java
similarity index 100%
rename from src/main/java/buttondevteam/lib/TBMCPlayerBase.java
rename to src/main/java/buttondevteam/lib/player/TBMCPlayerBase.java
diff --git a/src/main/java/buttondevteam/lib/TBMCPlayerGetInfoEvent.java b/src/main/java/buttondevteam/lib/player/TBMCPlayerGetInfoEvent.java
similarity index 100%
rename from src/main/java/buttondevteam/lib/TBMCPlayerGetInfoEvent.java
rename to src/main/java/buttondevteam/lib/player/TBMCPlayerGetInfoEvent.java
diff --git a/src/main/java/buttondevteam/lib/TBMCPlayerJoinEvent.java b/src/main/java/buttondevteam/lib/player/TBMCPlayerJoinEvent.java
similarity index 100%
rename from src/main/java/buttondevteam/lib/TBMCPlayerJoinEvent.java
rename to src/main/java/buttondevteam/lib/player/TBMCPlayerJoinEvent.java
diff --git a/src/main/java/buttondevteam/lib/TBMCPlayerLoadEvent.java b/src/main/java/buttondevteam/lib/player/TBMCPlayerLoadEvent.java
similarity index 100%
rename from src/main/java/buttondevteam/lib/TBMCPlayerLoadEvent.java
rename to src/main/java/buttondevteam/lib/player/TBMCPlayerLoadEvent.java
diff --git a/src/main/java/buttondevteam/lib/TBMCPlayerQuitEvent.java b/src/main/java/buttondevteam/lib/player/TBMCPlayerQuitEvent.java
similarity index 100%
rename from src/main/java/buttondevteam/lib/TBMCPlayerQuitEvent.java
rename to src/main/java/buttondevteam/lib/player/TBMCPlayerQuitEvent.java
diff --git a/src/main/java/buttondevteam/lib/TBMCPlayerSaveEvent.java b/src/main/java/buttondevteam/lib/player/TBMCPlayerSaveEvent.java
similarity index 100%
rename from src/main/java/buttondevteam/lib/TBMCPlayerSaveEvent.java
rename to src/main/java/buttondevteam/lib/player/TBMCPlayerSaveEvent.java
diff --git a/src/main/java/buttondevteam/lib/TBMCYEEHAWEvent.java b/src/main/java/buttondevteam/lib/player/TBMCYEEHAWEvent.java
similarity index 100%
rename from src/main/java/buttondevteam/lib/TBMCYEEHAWEvent.java
rename to src/main/java/buttondevteam/lib/player/TBMCYEEHAWEvent.java
diff --git a/src/main/java/buttondevteam/lib/DebugPotato.java b/src/main/java/buttondevteam/lib/potato/DebugPotato.java
similarity index 100%
rename from src/main/java/buttondevteam/lib/DebugPotato.java
rename to src/main/java/buttondevteam/lib/potato/DebugPotato.java
diff --git a/src/main/java/buttondevteam/lib/Gary.java b/src/main/java/buttondevteam/lib/potato/Gary.java
similarity index 100%
rename from src/main/java/buttondevteam/lib/Gary.java
rename to src/main/java/buttondevteam/lib/potato/Gary.java