diff --git a/javadoc/com/massivecraft/factions/cmd/CmdAutoClaim.html b/javadoc/com/massivecraft/factions/cmd/CmdAutoClaim.html
index fee33c9b..499d39e0 100644
--- a/javadoc/com/massivecraft/factions/cmd/CmdAutoClaim.html
+++ b/javadoc/com/massivecraft/factions/cmd/CmdAutoClaim.html
@@ -108,7 +108,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../com/massivecraft/factions/cmd/FCommand.html" title="class in com.massivecraft.factions.cmd">com.massivecraft.factions.cmd.FCommand</a></li>
 <li>
 <ul class="inheritance">
-<li>com.massivecraft.factions.cmd.CmdAutoClaim</li>
+<li>com.massivecraft.factions.cmd.claim.CmdAutoClaim</li>
 </ul>
 </li>
 </ul>
diff --git a/javadoc/com/massivecraft/factions/cmd/CmdClaim.html b/javadoc/com/massivecraft/factions/cmd/CmdClaim.html
index 1597ee59..c10970c4 100644
--- a/javadoc/com/massivecraft/factions/cmd/CmdClaim.html
+++ b/javadoc/com/massivecraft/factions/cmd/CmdClaim.html
@@ -108,7 +108,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../com/massivecraft/factions/cmd/FCommand.html" title="class in com.massivecraft.factions.cmd">com.massivecraft.factions.cmd.FCommand</a></li>
 <li>
 <ul class="inheritance">
-<li>com.massivecraft.factions.cmd.CmdClaim</li>
+<li>com.massivecraft.factions.cmd.claim.CmdClaim</li>
 </ul>
 </li>
 </ul>
diff --git a/javadoc/com/massivecraft/factions/cmd/CmdClaimAt.html b/javadoc/com/massivecraft/factions/cmd/CmdClaimAt.html
index 033b19d0..ee001bee 100644
--- a/javadoc/com/massivecraft/factions/cmd/CmdClaimAt.html
+++ b/javadoc/com/massivecraft/factions/cmd/CmdClaimAt.html
@@ -108,7 +108,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../com/massivecraft/factions/cmd/FCommand.html" title="class in com.massivecraft.factions.cmd">com.massivecraft.factions.cmd.FCommand</a></li>
 <li>
 <ul class="inheritance">
-<li>com.massivecraft.factions.cmd.CmdClaimAt</li>
+<li>com.massivecraft.factions.cmd.claim.CmdClaimAt</li>
 </ul>
 </li>
 </ul>
diff --git a/src/main/java/com/massivecraft/factions/cmd/FCmdRoot.java b/src/main/java/com/massivecraft/factions/cmd/FCmdRoot.java
index a9c6524b..70a346c5 100644
--- a/src/main/java/com/massivecraft/factions/cmd/FCmdRoot.java
+++ b/src/main/java/com/massivecraft/factions/cmd/FCmdRoot.java
@@ -2,6 +2,16 @@ package com.massivecraft.factions.cmd;
 
 import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.SaberFactions;
+import com.massivecraft.factions.cmd.alts.CmdAlts;
+import com.massivecraft.factions.cmd.claim.*;
+import com.massivecraft.factions.cmd.econ.CmdMoney;
+import com.massivecraft.factions.cmd.points.CmdPoints;
+import com.massivecraft.factions.cmd.relational.CmdRelationAlly;
+import com.massivecraft.factions.cmd.relational.CmdRelationEnemy;
+import com.massivecraft.factions.cmd.relational.CmdRelationNeutral;
+import com.massivecraft.factions.cmd.relational.CmdRelationTruce;
+import com.massivecraft.factions.cmd.roles.CmdDemote;
+import com.massivecraft.factions.cmd.roles.CmdPromote;
 import com.massivecraft.factions.zcore.util.TL;
 import org.bukkit.Bukkit;
 
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdAutoClaim.java b/src/main/java/com/massivecraft/factions/cmd/claim/CmdAutoClaim.java
similarity index 93%
rename from src/main/java/com/massivecraft/factions/cmd/CmdAutoClaim.java
rename to src/main/java/com/massivecraft/factions/cmd/claim/CmdAutoClaim.java
index f6e864d3..101591aa 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdAutoClaim.java
+++ b/src/main/java/com/massivecraft/factions/cmd/claim/CmdAutoClaim.java
@@ -1,6 +1,7 @@
-package com.massivecraft.factions.cmd;
+package com.massivecraft.factions.cmd.claim;
 
 import com.massivecraft.factions.Faction;
+import com.massivecraft.factions.cmd.FCommand;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.struct.Role;
 import com.massivecraft.factions.zcore.util.TL;
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdClaim.java b/src/main/java/com/massivecraft/factions/cmd/claim/CmdClaim.java
similarity index 96%
rename from src/main/java/com/massivecraft/factions/cmd/CmdClaim.java
rename to src/main/java/com/massivecraft/factions/cmd/claim/CmdClaim.java
index eb0a0e9a..0bb79b65 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdClaim.java
+++ b/src/main/java/com/massivecraft/factions/cmd/claim/CmdClaim.java
@@ -1,8 +1,9 @@
-package com.massivecraft.factions.cmd;
+package com.massivecraft.factions.cmd.claim;
 
 import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.FLocation;
 import com.massivecraft.factions.Faction;
+import com.massivecraft.factions.cmd.FCommand;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.struct.Role;
 import com.massivecraft.factions.util.SpiralTask;
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdClaimAt.java b/src/main/java/com/massivecraft/factions/cmd/claim/CmdClaimAt.java
similarity index 90%
rename from src/main/java/com/massivecraft/factions/cmd/CmdClaimAt.java
rename to src/main/java/com/massivecraft/factions/cmd/claim/CmdClaimAt.java
index 2b2bf2b3..caa3fb68 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdClaimAt.java
+++ b/src/main/java/com/massivecraft/factions/cmd/claim/CmdClaimAt.java
@@ -1,6 +1,7 @@
-package com.massivecraft.factions.cmd;
+package com.massivecraft.factions.cmd.claim;
 
 import com.massivecraft.factions.FLocation;
+import com.massivecraft.factions.cmd.FCommand;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.zcore.util.TL;