diff --git a/src/net/mc_pandacraft/java/plugin/pandacraftutils/PandacraftUtils.java b/src/net/mc_pandacraft/java/plugin/pandacraftutils/PandacraftUtils.java
index 8d12bef..d135192 100644
--- a/src/net/mc_pandacraft/java/plugin/pandacraftutils/PandacraftUtils.java
+++ b/src/net/mc_pandacraft/java/plugin/pandacraftutils/PandacraftUtils.java
@@ -1,24 +1,24 @@
 package net.mc_pandacraft.java.plugin.pandacraftutils;
 
-import net.mc_pandacraft.java.plugin.pandacraftutils.commands.CommandsManager;
-import net.mc_pandacraft.java.plugin.pandacraftutils.modules.AfkManager;
+import net.mc_pandacraft.java.plugin.pandacraftutils.commands.PandacraftUtilsCommandsManager;
 import net.mc_pandacraft.java.plugin.pandacraftutils.modules.AutoMessagesManager;
 import net.mc_pandacraft.java.plugin.pandacraftutils.modules.CalculatorManager;
-import net.mc_pandacraft.java.plugin.pandacraftutils.modules.ChatAnalysisManager;
 import net.mc_pandacraft.java.plugin.pandacraftutils.modules.CommandAliasManager;
-import net.mc_pandacraft.java.plugin.pandacraftutils.modules.HeartThrowManager;
 import net.mc_pandacraft.java.plugin.pandacraftutils.modules.LoginLogoutMessageManager;
 import net.mc_pandacraft.java.plugin.pandacraftutils.modules.PacketOutServerInfoListener;
 import net.mc_pandacraft.java.plugin.pandacraftutils.modules.SpawnTimeManager;
-import net.mc_pandacraft.java.plugin.pandacraftutils.modules.StaffQueueManager;
-import net.mc_pandacraft.java.plugin.pandacraftutils.modules.SurvivalCuboManager;
 import net.mc_pandacraft.java.plugin.pandacraftutils.modules.TPSAnalysisManager;
 import net.mc_pandacraft.java.plugin.pandacraftutils.modules.WESelectionDisplayManager;
-import net.mc_pandacraft.java.plugin.pandacraftutils.modules.WorldBorderManager;
-import net.mc_pandacraft.java.plugin.pandacraftutils.modules.cheat_protect.CreativCheatManager;
-import net.mc_pandacraft.java.plugin.pandacraftutils.modules.cheat_protect.EntitySpamManager;
-import net.mc_pandacraft.java.plugin.pandacraftutils.modules.cheat_protect.NoPvpProtectManager;
-import net.mc_pandacraft.java.plugin.pandacraftutils.modules.cheat_protect.TamedEntityProtectManager;
+import net.mc_pandacraft.java.plugin.pandacraftutils.modules.fun.HeartThrowManager;
+import net.mc_pandacraft.java.plugin.pandacraftutils.modules.player_control.AfkManager;
+import net.mc_pandacraft.java.plugin.pandacraftutils.modules.player_control.ChatAnalysisManager;
+import net.mc_pandacraft.java.plugin.pandacraftutils.modules.protection.CreativCheatManager;
+import net.mc_pandacraft.java.plugin.pandacraftutils.modules.protection.EntitySpamManager;
+import net.mc_pandacraft.java.plugin.pandacraftutils.modules.protection.NoPvpProtectManager;
+import net.mc_pandacraft.java.plugin.pandacraftutils.modules.protection.SurvivalCuboManager;
+import net.mc_pandacraft.java.plugin.pandacraftutils.modules.protection.TamedEntityProtectManager;
+import net.mc_pandacraft.java.plugin.pandacraftutils.modules.protection.WorldBorderManager;
+import net.mc_pandacraft.java.plugin.pandacraftutils.modules.staff.StaffQueueManager;
 import net.mc_pandacraft.java.plugin.pandacraftutils.network_api.NetworkAPI;
 import net.mc_pandacraft.java.plugin.pandacraftutils.players.OnlinePlayer;
 import net.mc_pandacraft.java.plugin.pandacraftutils.players.OnlinePlayerManager;
@@ -79,7 +79,7 @@ public class PandacraftUtils extends JavaPlugin {
 		
 		ConfigManager.loadNewInstance();
 		OnlinePlayerManager.loadNewInstance();
-		CommandsManager.loadNewInstance();
+		PandacraftUtilsCommandsManager.loadNewInstance();
 		
 		
 		afkManager = new AfkManager();
diff --git a/src/net/mc_pandacraft/java/plugin/pandacraftutils/commands/CommandAnimal.java b/src/net/mc_pandacraft/java/plugin/pandacraftutils/commands/CommandAnimal.java
index 8fd8582..cb18f66 100644
--- a/src/net/mc_pandacraft/java/plugin/pandacraftutils/commands/CommandAnimal.java
+++ b/src/net/mc_pandacraft/java/plugin/pandacraftutils/commands/CommandAnimal.java
@@ -1,6 +1,6 @@
 package net.mc_pandacraft.java.plugin.pandacraftutils.commands;
 
-import net.mc_pandacraft.java.plugin.pandacraftutils.modules.cheat_protect.TamedEntityProtectManager;
+import net.mc_pandacraft.java.plugin.pandacraftutils.modules.protection.TamedEntityProtectManager;
 import net.mc_pandacraft.java.plugin.pandacraftutils.players.OnlinePlayer;
 import net.mc_pandacraft.java.plugin.pandacraftutils.players.OnlinePlayerManager;
 
diff --git a/src/net/mc_pandacraft/java/plugin/pandacraftutils/commands/CommandStaff.java b/src/net/mc_pandacraft/java/plugin/pandacraftutils/commands/CommandStaff.java
index 8003306..373dadd 100644
--- a/src/net/mc_pandacraft/java/plugin/pandacraftutils/commands/CommandStaff.java
+++ b/src/net/mc_pandacraft/java/plugin/pandacraftutils/commands/CommandStaff.java
@@ -2,8 +2,8 @@ package net.mc_pandacraft.java.plugin.pandacraftutils.commands;
 
 import java.util.Date;
 
-import net.mc_pandacraft.java.plugin.pandacraftutils.modules.StaffQueueManager;
-import net.mc_pandacraft.java.plugin.pandacraftutils.modules.StaffQueueManager.WaitingPlayer;
+import net.mc_pandacraft.java.plugin.pandacraftutils.modules.staff.StaffQueueManager;
+import net.mc_pandacraft.java.plugin.pandacraftutils.modules.staff.StaffQueueManager.WaitingPlayer;
 import net.mc_pandacraft.java.plugin.pandacraftutils.players.OnlinePlayerManager;
 import net.mc_pandacraft.java.util.TimeUtil;
 
diff --git a/src/net/mc_pandacraft/java/plugin/pandacraftutils/commands/CommandsManager.java b/src/net/mc_pandacraft/java/plugin/pandacraftutils/commands/PandacraftUtilsCommandsManager.java
similarity index 82%
rename from src/net/mc_pandacraft/java/plugin/pandacraftutils/commands/CommandsManager.java
rename to src/net/mc_pandacraft/java/plugin/pandacraftutils/commands/PandacraftUtilsCommandsManager.java
index 7163351..d1efc21 100644
--- a/src/net/mc_pandacraft/java/plugin/pandacraftutils/commands/CommandsManager.java
+++ b/src/net/mc_pandacraft/java/plugin/pandacraftutils/commands/PandacraftUtilsCommandsManager.java
@@ -5,22 +5,22 @@ import java.util.HashMap;
 /**
  * Initialise et stoque toutes les instances des classes exécutant les commandes Minecraft, géré par le plugin
  */
-public class CommandsManager {
+public class PandacraftUtilsCommandsManager {
 	
-	private static CommandsManager instance;
+	private static PandacraftUtilsCommandsManager instance;
 	
 	/**
 	 * Retourne l'unique instance de la classe. Si elle n'existe pas, on tente de créer
 	 * @return L'unique instance de la classe
 	 */
-	public synchronized static CommandsManager getInstance() {
+	public synchronized static PandacraftUtilsCommandsManager getInstance() {
 		if (instance == null)
 			loadNewInstance();
 		return instance;
 	}
 	
 	public synchronized static void loadNewInstance() {
-		instance = new CommandsManager();
+		instance = new PandacraftUtilsCommandsManager();
 	}
 	
 	
@@ -35,7 +35,7 @@ public class CommandsManager {
 	
 	private HashMap<String, AbstractCommandExecutor> commandExecutors = new HashMap<String, AbstractCommandExecutor>();
 	
-	private CommandsManager() {
+	private PandacraftUtilsCommandsManager() {
 		
 		/*
 		 * Initialisation des commandes
diff --git a/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/HeartThrowManager.java b/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/fun/HeartThrowManager.java
similarity index 93%
rename from src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/HeartThrowManager.java
rename to src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/fun/HeartThrowManager.java
index 51f016b..c69c7ee 100644
--- a/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/HeartThrowManager.java
+++ b/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/fun/HeartThrowManager.java
@@ -1,4 +1,4 @@
-package net.mc_pandacraft.java.plugin.pandacraftutils.modules;
+package net.mc_pandacraft.java.plugin.pandacraftutils.modules.fun;
 
 import java.util.Collection;
 
diff --git a/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/AfkManager.java b/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/player_control/AfkManager.java
similarity index 98%
rename from src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/AfkManager.java
rename to src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/player_control/AfkManager.java
index fa26174..f00bc48 100644
--- a/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/AfkManager.java
+++ b/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/player_control/AfkManager.java
@@ -1,4 +1,4 @@
-package net.mc_pandacraft.java.plugin.pandacraftutils.modules;
+package net.mc_pandacraft.java.plugin.pandacraftutils.modules.player_control;
 
 
 import java.util.Collection;
diff --git a/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/ChatAnalysisManager.java b/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/player_control/ChatAnalysisManager.java
similarity index 99%
rename from src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/ChatAnalysisManager.java
rename to src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/player_control/ChatAnalysisManager.java
index bf5664d..fcb5581 100644
--- a/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/ChatAnalysisManager.java
+++ b/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/player_control/ChatAnalysisManager.java
@@ -1,4 +1,4 @@
-package net.mc_pandacraft.java.plugin.pandacraftutils.modules;
+package net.mc_pandacraft.java.plugin.pandacraftutils.modules.player_control;
 
 import net.mc_pandacraft.java.plugin.pandacraftutils.ConfigManager;
 import net.mc_pandacraft.java.plugin.pandacraftutils.PandacraftUtils;
diff --git a/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/cheat_protect/CreativCheatManager.java b/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/protection/CreativCheatManager.java
similarity index 92%
rename from src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/cheat_protect/CreativCheatManager.java
rename to src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/protection/CreativCheatManager.java
index b6b2eb7..5ed2a05 100644
--- a/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/cheat_protect/CreativCheatManager.java
+++ b/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/protection/CreativCheatManager.java
@@ -1,4 +1,4 @@
-package net.mc_pandacraft.java.plugin.pandacraftutils.modules.cheat_protect;
+package net.mc_pandacraft.java.plugin.pandacraftutils.modules.protection;
 
 import net.mc_pandacraft.java.plugin.pandacraftutils.PandacraftUtils;
 
diff --git a/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/cheat_protect/EntitySpamManager.java b/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/protection/EntitySpamManager.java
similarity index 96%
rename from src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/cheat_protect/EntitySpamManager.java
rename to src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/protection/EntitySpamManager.java
index 811c590..c4b538b 100644
--- a/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/cheat_protect/EntitySpamManager.java
+++ b/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/protection/EntitySpamManager.java
@@ -1,4 +1,4 @@
-package net.mc_pandacraft.java.plugin.pandacraftutils.modules.cheat_protect;
+package net.mc_pandacraft.java.plugin.pandacraftutils.modules.protection;
 
 import org.bukkit.Chunk;
 import org.bukkit.Location;
diff --git a/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/cheat_protect/NoPvpProtectManager.java b/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/protection/NoPvpProtectManager.java
similarity index 99%
rename from src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/cheat_protect/NoPvpProtectManager.java
rename to src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/protection/NoPvpProtectManager.java
index 8c287bb..b9831f4 100644
--- a/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/cheat_protect/NoPvpProtectManager.java
+++ b/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/protection/NoPvpProtectManager.java
@@ -1,4 +1,4 @@
-package net.mc_pandacraft.java.plugin.pandacraftutils.modules.cheat_protect;
+package net.mc_pandacraft.java.plugin.pandacraftutils.modules.protection;
 
 
 import java.util.List;
diff --git a/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/SurvivalCuboManager.java b/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/protection/SurvivalCuboManager.java
similarity index 97%
rename from src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/SurvivalCuboManager.java
rename to src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/protection/SurvivalCuboManager.java
index b7f4d6b..6a150df 100644
--- a/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/SurvivalCuboManager.java
+++ b/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/protection/SurvivalCuboManager.java
@@ -1,4 +1,4 @@
-package net.mc_pandacraft.java.plugin.pandacraftutils.modules;
+package net.mc_pandacraft.java.plugin.pandacraftutils.modules.protection;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/cheat_protect/TamedEntityProtectManager.java b/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/protection/TamedEntityProtectManager.java
similarity index 98%
rename from src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/cheat_protect/TamedEntityProtectManager.java
rename to src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/protection/TamedEntityProtectManager.java
index 51a3bea..4f1af9f 100644
--- a/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/cheat_protect/TamedEntityProtectManager.java
+++ b/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/protection/TamedEntityProtectManager.java
@@ -1,4 +1,4 @@
-package net.mc_pandacraft.java.plugin.pandacraftutils.modules.cheat_protect;
+package net.mc_pandacraft.java.plugin.pandacraftutils.modules.protection;
 
 import net.mc_pandacraft.java.plugin.pandacraftutils.PandacraftUtils;
 import net.mc_pandacraft.java.plugin.pandacraftutils.players.OnlinePlayerManager;
diff --git a/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/WorldBorderManager.java b/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/protection/WorldBorderManager.java
similarity index 98%
rename from src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/WorldBorderManager.java
rename to src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/protection/WorldBorderManager.java
index 1139445..0b9902c 100644
--- a/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/WorldBorderManager.java
+++ b/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/protection/WorldBorderManager.java
@@ -1,4 +1,4 @@
-package net.mc_pandacraft.java.plugin.pandacraftutils.modules;
+package net.mc_pandacraft.java.plugin.pandacraftutils.modules.protection;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/StaffQueueManager.java b/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/staff/StaffQueueManager.java
similarity index 98%
rename from src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/StaffQueueManager.java
rename to src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/staff/StaffQueueManager.java
index 82946dd..a6f276b 100644
--- a/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/StaffQueueManager.java
+++ b/src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/staff/StaffQueueManager.java
@@ -1,4 +1,4 @@
-package net.mc_pandacraft.java.plugin.pandacraftutils.modules;
+package net.mc_pandacraft.java.plugin.pandacraftutils.modules.staff;
 
 import java.util.ArrayList;
 import java.util.Date;