From 87179d262a5c5dfbe386c75b7277c7d4119f661c Mon Sep 17 00:00:00 2001
From: Driftay <saser_elite@yahoo.com>
Date: Mon, 1 Jul 2019 21:26:13 -0400
Subject: [PATCH] Class Cleanup for easier navigation

---
 javadoc/com/massivecraft/factions/cmd/CmdClaimLine.html      | 2 +-
 javadoc/com/massivecraft/factions/cmd/CmdDemote.html         | 4 ++--
 javadoc/com/massivecraft/factions/cmd/CmdMoney.html          | 2 +-
 javadoc/com/massivecraft/factions/cmd/CmdMoneyBalance.html   | 2 +-
 javadoc/com/massivecraft/factions/cmd/CmdMoneyDeposit.html   | 2 +-
 .../com/massivecraft/factions/cmd/CmdMoneyTransferFf.html    | 2 +-
 .../com/massivecraft/factions/cmd/CmdMoneyTransferFp.html    | 2 +-
 .../com/massivecraft/factions/cmd/CmdMoneyTransferPf.html    | 2 +-
 javadoc/com/massivecraft/factions/cmd/CmdMoneyWithdraw.html  | 2 +-
 javadoc/com/massivecraft/factions/cmd/CmdPromote.html        | 4 ++--
 javadoc/com/massivecraft/factions/cmd/CmdRelationAlly.html   | 4 ++--
 javadoc/com/massivecraft/factions/cmd/CmdRelationEnemy.html  | 4 ++--
 .../com/massivecraft/factions/cmd/CmdRelationNeutral.html    | 4 ++--
 javadoc/com/massivecraft/factions/cmd/CmdRelationTruce.html  | 4 ++--
 javadoc/com/massivecraft/factions/cmd/CmdSafeunclaimall.html | 2 +-
 javadoc/com/massivecraft/factions/cmd/CmdUnclaim.html        | 2 +-
 javadoc/com/massivecraft/factions/cmd/CmdUnclaimall.html     | 2 +-
 javadoc/com/massivecraft/factions/cmd/CmdWarunclaimall.html  | 2 +-
 javadoc/com/massivecraft/factions/cmd/FPromoteCommand.html   | 2 +-
 javadoc/com/massivecraft/factions/cmd/FRelationCommand.html  | 2 +-
 .../com/massivecraft/factions/cmd/{ => alts}/CmdAlts.java    | 3 ++-
 .../massivecraft/factions/cmd/{ => alts}/CmdAltsList.java    | 5 +++--
 .../massivecraft/factions/cmd/{ => alts}/CmdInviteAlt.java   | 3 ++-
 .../com/massivecraft/factions/cmd/{ => alts}/CmdKickAlt.java | 5 +++--
 .../massivecraft/factions/cmd/{ => claim}/CmdClaimLine.java  | 3 ++-
 .../com/massivecraft/factions/cmd/{ => claim}/CmdCorner.java | 3 ++-
 .../factions/cmd/{ => claim}/CmdSafeunclaimall.java          | 3 ++-
 .../massivecraft/factions/cmd/{ => claim}/CmdUnclaim.java    | 3 ++-
 .../massivecraft/factions/cmd/{ => claim}/CmdUnclaimall.java | 3 ++-
 .../factions/cmd/{ => claim}/CmdWarunclaimall.java           | 3 ++-
 .../com/massivecraft/factions/cmd/{ => econ}/CmdMoney.java   | 3 ++-
 .../factions/cmd/{ => econ}/CmdMoneyBalance.java             | 3 ++-
 .../factions/cmd/{ => econ}/CmdMoneyDeposit.java             | 3 ++-
 .../factions/cmd/{ => econ}/CmdMoneyTransferFf.java          | 3 ++-
 .../factions/cmd/{ => econ}/CmdMoneyTransferFp.java          | 3 ++-
 .../factions/cmd/{ => econ}/CmdMoneyTransferPf.java          | 3 ++-
 .../factions/cmd/{ => econ}/CmdMoneyWithdraw.java            | 3 ++-
 .../massivecraft/factions/cmd/{ => points}/CmdPoints.java    | 3 ++-
 .../massivecraft/factions/cmd/{ => points}/CmdPointsAdd.java | 3 ++-
 .../factions/cmd/{ => points}/CmdPointsRemove.java           | 3 ++-
 .../massivecraft/factions/cmd/{ => points}/CmdPointsSet.java | 5 +++--
 .../factions/cmd/{ => relational}/CmdRelationAlly.java       | 2 +-
 .../factions/cmd/{ => relational}/CmdRelationEnemy.java      | 2 +-
 .../factions/cmd/{ => relational}/CmdRelationNeutral.java    | 2 +-
 .../factions/cmd/{ => relational}/CmdRelationTruce.java      | 2 +-
 .../factions/cmd/{ => relational}/FRelationCommand.java      | 3 ++-
 .../com/massivecraft/factions/cmd/{ => roles}/CmdDemote.java | 2 +-
 .../massivecraft/factions/cmd/{ => roles}/CmdPromote.java    | 2 +-
 .../factions/cmd/{ => roles}/FPromoteCommand.java            | 3 ++-
 49 files changed, 81 insertions(+), 58 deletions(-)
 rename src/main/java/com/massivecraft/factions/cmd/{ => alts}/CmdAlts.java (93%)
 rename src/main/java/com/massivecraft/factions/cmd/{ => alts}/CmdAltsList.java (92%)
 rename src/main/java/com/massivecraft/factions/cmd/{ => alts}/CmdInviteAlt.java (97%)
 rename src/main/java/com/massivecraft/factions/cmd/{ => alts}/CmdKickAlt.java (97%)
 rename src/main/java/com/massivecraft/factions/cmd/{ => claim}/CmdClaimLine.java (95%)
 rename src/main/java/com/massivecraft/factions/cmd/{ => claim}/CmdCorner.java (96%)
 rename src/main/java/com/massivecraft/factions/cmd/{ => claim}/CmdSafeunclaimall.java (93%)
 rename src/main/java/com/massivecraft/factions/cmd/{ => claim}/CmdUnclaim.java (98%)
 rename src/main/java/com/massivecraft/factions/cmd/{ => claim}/CmdUnclaimall.java (95%)
 rename src/main/java/com/massivecraft/factions/cmd/{ => claim}/CmdWarunclaimall.java (93%)
 rename src/main/java/com/massivecraft/factions/cmd/{ => econ}/CmdMoney.java (94%)
 rename src/main/java/com/massivecraft/factions/cmd/{ => econ}/CmdMoneyBalance.java (92%)
 rename src/main/java/com/massivecraft/factions/cmd/{ => econ}/CmdMoneyDeposit.java (93%)
 rename src/main/java/com/massivecraft/factions/cmd/{ => econ}/CmdMoneyTransferFf.java (95%)
 rename src/main/java/com/massivecraft/factions/cmd/{ => econ}/CmdMoneyTransferFp.java (94%)
 rename src/main/java/com/massivecraft/factions/cmd/{ => econ}/CmdMoneyTransferPf.java (94%)
 rename src/main/java/com/massivecraft/factions/cmd/{ => econ}/CmdMoneyWithdraw.java (95%)
 rename src/main/java/com/massivecraft/factions/cmd/{ => points}/CmdPoints.java (92%)
 rename src/main/java/com/massivecraft/factions/cmd/{ => points}/CmdPointsAdd.java (93%)
 rename src/main/java/com/massivecraft/factions/cmd/{ => points}/CmdPointsRemove.java (93%)
 rename src/main/java/com/massivecraft/factions/cmd/{ => points}/CmdPointsSet.java (90%)
 rename src/main/java/com/massivecraft/factions/cmd/{ => relational}/CmdRelationAlly.java (79%)
 rename src/main/java/com/massivecraft/factions/cmd/{ => relational}/CmdRelationEnemy.java (80%)
 rename src/main/java/com/massivecraft/factions/cmd/{ => relational}/CmdRelationNeutral.java (80%)
 rename src/main/java/com/massivecraft/factions/cmd/{ => relational}/CmdRelationTruce.java (80%)
 rename src/main/java/com/massivecraft/factions/cmd/{ => relational}/FRelationCommand.java (97%)
 rename src/main/java/com/massivecraft/factions/cmd/{ => roles}/CmdDemote.java (73%)
 rename src/main/java/com/massivecraft/factions/cmd/{ => roles}/CmdPromote.java (77%)
 rename src/main/java/com/massivecraft/factions/cmd/{ => roles}/FPromoteCommand.java (96%)

diff --git a/javadoc/com/massivecraft/factions/cmd/CmdClaimLine.html b/javadoc/com/massivecraft/factions/cmd/CmdClaimLine.html
index 6b7fad47..6471ceb2 100644
--- a/javadoc/com/massivecraft/factions/cmd/CmdClaimLine.html
+++ b/javadoc/com/massivecraft/factions/cmd/CmdClaimLine.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.CmdClaimLine</li>
+<li>com.massivecraft.factions.cmd.claim.CmdClaimLine</li>
 </ul>
 </li>
 </ul>
diff --git a/javadoc/com/massivecraft/factions/cmd/CmdDemote.html b/javadoc/com/massivecraft/factions/cmd/CmdDemote.html
index c7363216..da336f59 100644
--- a/javadoc/com/massivecraft/factions/cmd/CmdDemote.html
+++ b/javadoc/com/massivecraft/factions/cmd/CmdDemote.html
@@ -102,10 +102,10 @@
 <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><a href="../../../../com/massivecraft/factions/cmd/FPromoteCommand.html" title="class in com.massivecraft.factions.cmd">com.massivecraft.factions.cmd.FPromoteCommand</a></li>
+<li><a href="../../../../com/massivecraft/factions/cmd/FPromoteCommand.html" title="class in com.massivecraft.factions.cmd">com.massivecraft.factions.cmd.roles.FPromoteCommand</a></li>
 <li>
 <ul class="inheritance">
-<li>com.massivecraft.factions.cmd.CmdDemote</li>
+<li>com.massivecraft.factions.cmd.roles.CmdDemote</li>
 </ul>
 </li>
 </ul>
diff --git a/javadoc/com/massivecraft/factions/cmd/CmdMoney.html b/javadoc/com/massivecraft/factions/cmd/CmdMoney.html
index 6e428188..850a967f 100644
--- a/javadoc/com/massivecraft/factions/cmd/CmdMoney.html
+++ b/javadoc/com/massivecraft/factions/cmd/CmdMoney.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.CmdMoney</li>
+<li>com.massivecraft.factions.cmd.econ.CmdMoney</li>
 </ul>
 </li>
 </ul>
diff --git a/javadoc/com/massivecraft/factions/cmd/CmdMoneyBalance.html b/javadoc/com/massivecraft/factions/cmd/CmdMoneyBalance.html
index 122125d8..d0e106e3 100644
--- a/javadoc/com/massivecraft/factions/cmd/CmdMoneyBalance.html
+++ b/javadoc/com/massivecraft/factions/cmd/CmdMoneyBalance.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.CmdMoneyBalance</li>
+<li>com.massivecraft.factions.cmd.econ.CmdMoneyBalance</li>
 </ul>
 </li>
 </ul>
diff --git a/javadoc/com/massivecraft/factions/cmd/CmdMoneyDeposit.html b/javadoc/com/massivecraft/factions/cmd/CmdMoneyDeposit.html
index 4e5a2d24..3c6b8bc4 100644
--- a/javadoc/com/massivecraft/factions/cmd/CmdMoneyDeposit.html
+++ b/javadoc/com/massivecraft/factions/cmd/CmdMoneyDeposit.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.CmdMoneyDeposit</li>
+<li>com.massivecraft.factions.cmd.econ.CmdMoneyDeposit</li>
 </ul>
 </li>
 </ul>
diff --git a/javadoc/com/massivecraft/factions/cmd/CmdMoneyTransferFf.html b/javadoc/com/massivecraft/factions/cmd/CmdMoneyTransferFf.html
index be15783b..a968a807 100644
--- a/javadoc/com/massivecraft/factions/cmd/CmdMoneyTransferFf.html
+++ b/javadoc/com/massivecraft/factions/cmd/CmdMoneyTransferFf.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.CmdMoneyTransferFf</li>
+<li>com.massivecraft.factions.cmd.econ.CmdMoneyTransferFf</li>
 </ul>
 </li>
 </ul>
diff --git a/javadoc/com/massivecraft/factions/cmd/CmdMoneyTransferFp.html b/javadoc/com/massivecraft/factions/cmd/CmdMoneyTransferFp.html
index 7986e31e..a1cf1549 100644
--- a/javadoc/com/massivecraft/factions/cmd/CmdMoneyTransferFp.html
+++ b/javadoc/com/massivecraft/factions/cmd/CmdMoneyTransferFp.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.CmdMoneyTransferFp</li>
+<li>com.massivecraft.factions.cmd.econ.CmdMoneyTransferFp</li>
 </ul>
 </li>
 </ul>
diff --git a/javadoc/com/massivecraft/factions/cmd/CmdMoneyTransferPf.html b/javadoc/com/massivecraft/factions/cmd/CmdMoneyTransferPf.html
index fe678db6..cc17547d 100644
--- a/javadoc/com/massivecraft/factions/cmd/CmdMoneyTransferPf.html
+++ b/javadoc/com/massivecraft/factions/cmd/CmdMoneyTransferPf.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.CmdMoneyTransferPf</li>
+<li>com.massivecraft.factions.cmd.econ.CmdMoneyTransferPf</li>
 </ul>
 </li>
 </ul>
diff --git a/javadoc/com/massivecraft/factions/cmd/CmdMoneyWithdraw.html b/javadoc/com/massivecraft/factions/cmd/CmdMoneyWithdraw.html
index e16f88ab..65b42feb 100644
--- a/javadoc/com/massivecraft/factions/cmd/CmdMoneyWithdraw.html
+++ b/javadoc/com/massivecraft/factions/cmd/CmdMoneyWithdraw.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.CmdMoneyWithdraw</li>
+<li>com.massivecraft.factions.cmd.econ.CmdMoneyWithdraw</li>
 </ul>
 </li>
 </ul>
diff --git a/javadoc/com/massivecraft/factions/cmd/CmdPromote.html b/javadoc/com/massivecraft/factions/cmd/CmdPromote.html
index 8cdb7a6b..dc0b638e 100644
--- a/javadoc/com/massivecraft/factions/cmd/CmdPromote.html
+++ b/javadoc/com/massivecraft/factions/cmd/CmdPromote.html
@@ -102,10 +102,10 @@
 <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><a href="../../../../com/massivecraft/factions/cmd/FPromoteCommand.html" title="class in com.massivecraft.factions.cmd">com.massivecraft.factions.cmd.FPromoteCommand</a></li>
+<li><a href="../../../../com/massivecraft/factions/cmd/FPromoteCommand.html" title="class in com.massivecraft.factions.cmd">com.massivecraft.factions.cmd.roles.FPromoteCommand</a></li>
 <li>
 <ul class="inheritance">
-<li>com.massivecraft.factions.cmd.CmdPromote</li>
+<li>com.massivecraft.factions.cmd.roles.CmdPromote</li>
 </ul>
 </li>
 </ul>
diff --git a/javadoc/com/massivecraft/factions/cmd/CmdRelationAlly.html b/javadoc/com/massivecraft/factions/cmd/CmdRelationAlly.html
index eae49020..2b0babfe 100644
--- a/javadoc/com/massivecraft/factions/cmd/CmdRelationAlly.html
+++ b/javadoc/com/massivecraft/factions/cmd/CmdRelationAlly.html
@@ -102,10 +102,10 @@
 <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><a href="../../../../com/massivecraft/factions/cmd/FRelationCommand.html" title="class in com.massivecraft.factions.cmd">com.massivecraft.factions.cmd.FRelationCommand</a></li>
+<li><a href="../../../../com/massivecraft/factions/cmd/FRelationCommand.html" title="class in com.massivecraft.factions.cmd">com.massivecraft.factions.cmd.relational.FRelationCommand</a></li>
 <li>
 <ul class="inheritance">
-<li>com.massivecraft.factions.cmd.CmdRelationAlly</li>
+<li>com.massivecraft.factions.cmd.relational.CmdRelationAlly</li>
 </ul>
 </li>
 </ul>
diff --git a/javadoc/com/massivecraft/factions/cmd/CmdRelationEnemy.html b/javadoc/com/massivecraft/factions/cmd/CmdRelationEnemy.html
index 482bc1a2..4507e540 100644
--- a/javadoc/com/massivecraft/factions/cmd/CmdRelationEnemy.html
+++ b/javadoc/com/massivecraft/factions/cmd/CmdRelationEnemy.html
@@ -102,10 +102,10 @@
 <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><a href="../../../../com/massivecraft/factions/cmd/FRelationCommand.html" title="class in com.massivecraft.factions.cmd">com.massivecraft.factions.cmd.FRelationCommand</a></li>
+<li><a href="../../../../com/massivecraft/factions/cmd/FRelationCommand.html" title="class in com.massivecraft.factions.cmd">com.massivecraft.factions.cmd.relational.FRelationCommand</a></li>
 <li>
 <ul class="inheritance">
-<li>com.massivecraft.factions.cmd.CmdRelationEnemy</li>
+<li>com.massivecraft.factions.cmd.relational.CmdRelationEnemy</li>
 </ul>
 </li>
 </ul>
diff --git a/javadoc/com/massivecraft/factions/cmd/CmdRelationNeutral.html b/javadoc/com/massivecraft/factions/cmd/CmdRelationNeutral.html
index d75e2185..cbad6b88 100644
--- a/javadoc/com/massivecraft/factions/cmd/CmdRelationNeutral.html
+++ b/javadoc/com/massivecraft/factions/cmd/CmdRelationNeutral.html
@@ -102,10 +102,10 @@
 <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><a href="../../../../com/massivecraft/factions/cmd/FRelationCommand.html" title="class in com.massivecraft.factions.cmd">com.massivecraft.factions.cmd.FRelationCommand</a></li>
+<li><a href="../../../../com/massivecraft/factions/cmd/FRelationCommand.html" title="class in com.massivecraft.factions.cmd">com.massivecraft.factions.cmd.relational.FRelationCommand</a></li>
 <li>
 <ul class="inheritance">
-<li>com.massivecraft.factions.cmd.CmdRelationNeutral</li>
+<li>com.massivecraft.factions.cmd.relational.CmdRelationNeutral</li>
 </ul>
 </li>
 </ul>
diff --git a/javadoc/com/massivecraft/factions/cmd/CmdRelationTruce.html b/javadoc/com/massivecraft/factions/cmd/CmdRelationTruce.html
index 050470f2..853c2cf2 100644
--- a/javadoc/com/massivecraft/factions/cmd/CmdRelationTruce.html
+++ b/javadoc/com/massivecraft/factions/cmd/CmdRelationTruce.html
@@ -102,10 +102,10 @@
 <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><a href="../../../../com/massivecraft/factions/cmd/FRelationCommand.html" title="class in com.massivecraft.factions.cmd">com.massivecraft.factions.cmd.FRelationCommand</a></li>
+<li><a href="../../../../com/massivecraft/factions/cmd/FRelationCommand.html" title="class in com.massivecraft.factions.cmd">com.massivecraft.factions.cmd.relational.FRelationCommand</a></li>
 <li>
 <ul class="inheritance">
-<li>com.massivecraft.factions.cmd.CmdRelationTruce</li>
+<li>com.massivecraft.factions.cmd.relational.CmdRelationTruce</li>
 </ul>
 </li>
 </ul>
diff --git a/javadoc/com/massivecraft/factions/cmd/CmdSafeunclaimall.html b/javadoc/com/massivecraft/factions/cmd/CmdSafeunclaimall.html
index a4564bd9..e73e1cdd 100644
--- a/javadoc/com/massivecraft/factions/cmd/CmdSafeunclaimall.html
+++ b/javadoc/com/massivecraft/factions/cmd/CmdSafeunclaimall.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.CmdSafeunclaimall</li>
+<li>com.massivecraft.factions.cmd.claim.CmdSafeunclaimall</li>
 </ul>
 </li>
 </ul>
diff --git a/javadoc/com/massivecraft/factions/cmd/CmdUnclaim.html b/javadoc/com/massivecraft/factions/cmd/CmdUnclaim.html
index f185cb3e..7b85b500 100644
--- a/javadoc/com/massivecraft/factions/cmd/CmdUnclaim.html
+++ b/javadoc/com/massivecraft/factions/cmd/CmdUnclaim.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.CmdUnclaim</li>
+<li>com.massivecraft.factions.cmd.claim.CmdUnclaim</li>
 </ul>
 </li>
 </ul>
diff --git a/javadoc/com/massivecraft/factions/cmd/CmdUnclaimall.html b/javadoc/com/massivecraft/factions/cmd/CmdUnclaimall.html
index 5316722c..a6c81f7d 100644
--- a/javadoc/com/massivecraft/factions/cmd/CmdUnclaimall.html
+++ b/javadoc/com/massivecraft/factions/cmd/CmdUnclaimall.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.CmdUnclaimall</li>
+<li>com.massivecraft.factions.cmd.claim.CmdUnclaimall</li>
 </ul>
 </li>
 </ul>
diff --git a/javadoc/com/massivecraft/factions/cmd/CmdWarunclaimall.html b/javadoc/com/massivecraft/factions/cmd/CmdWarunclaimall.html
index ba2d1dab..e94717c6 100644
--- a/javadoc/com/massivecraft/factions/cmd/CmdWarunclaimall.html
+++ b/javadoc/com/massivecraft/factions/cmd/CmdWarunclaimall.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.CmdWarunclaimall</li>
+<li>com.massivecraft.factions.cmd.claim.CmdWarunclaimall</li>
 </ul>
 </li>
 </ul>
diff --git a/javadoc/com/massivecraft/factions/cmd/FPromoteCommand.html b/javadoc/com/massivecraft/factions/cmd/FPromoteCommand.html
index 116359cf..0ddac01f 100644
--- a/javadoc/com/massivecraft/factions/cmd/FPromoteCommand.html
+++ b/javadoc/com/massivecraft/factions/cmd/FPromoteCommand.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.FPromoteCommand</li>
+<li>com.massivecraft.factions.cmd.roles.FPromoteCommand</li>
 </ul>
 </li>
 </ul>
diff --git a/javadoc/com/massivecraft/factions/cmd/FRelationCommand.html b/javadoc/com/massivecraft/factions/cmd/FRelationCommand.html
index 3e4e44c8..eddd4693 100644
--- a/javadoc/com/massivecraft/factions/cmd/FRelationCommand.html
+++ b/javadoc/com/massivecraft/factions/cmd/FRelationCommand.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.FRelationCommand</li>
+<li>com.massivecraft.factions.cmd.relational.FRelationCommand</li>
 </ul>
 </li>
 </ul>
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdAlts.java b/src/main/java/com/massivecraft/factions/cmd/alts/CmdAlts.java
similarity index 93%
rename from src/main/java/com/massivecraft/factions/cmd/CmdAlts.java
rename to src/main/java/com/massivecraft/factions/cmd/alts/CmdAlts.java
index e4abaa42..a1657e79 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdAlts.java
+++ b/src/main/java/com/massivecraft/factions/cmd/alts/CmdAlts.java
@@ -1,6 +1,7 @@
-package com.massivecraft.factions.cmd;
+package com.massivecraft.factions.cmd.alts;
 
 import com.massivecraft.factions.SaberFactions;
+import com.massivecraft.factions.cmd.FCommand;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.zcore.util.TL;
 
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdAltsList.java b/src/main/java/com/massivecraft/factions/cmd/alts/CmdAltsList.java
similarity index 92%
rename from src/main/java/com/massivecraft/factions/cmd/CmdAltsList.java
rename to src/main/java/com/massivecraft/factions/cmd/alts/CmdAltsList.java
index 1b76f88a..44573274 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdAltsList.java
+++ b/src/main/java/com/massivecraft/factions/cmd/alts/CmdAltsList.java
@@ -1,6 +1,7 @@
-package com.massivecraft.factions.cmd;
+package com.massivecraft.factions.cmd.alts;
 
 import com.massivecraft.factions.FPlayer;
+import com.massivecraft.factions.cmd.FCommand;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.zcore.util.TL;
 import org.apache.commons.lang.time.DurationFormatUtils;
@@ -8,7 +9,7 @@ import org.bukkit.ChatColor;
 
 import java.util.ArrayList;
 
-public class CmdAltsList extends FCommand{
+public class CmdAltsList extends FCommand {
 
 
     public CmdAltsList() {
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdInviteAlt.java b/src/main/java/com/massivecraft/factions/cmd/alts/CmdInviteAlt.java
similarity index 97%
rename from src/main/java/com/massivecraft/factions/cmd/CmdInviteAlt.java
rename to src/main/java/com/massivecraft/factions/cmd/alts/CmdInviteAlt.java
index ca3ada58..bfb5ee01 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdInviteAlt.java
+++ b/src/main/java/com/massivecraft/factions/cmd/alts/CmdInviteAlt.java
@@ -1,8 +1,9 @@
-package com.massivecraft.factions.cmd;
+package com.massivecraft.factions.cmd.alts;
 
 import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.SaberFactions;
+import com.massivecraft.factions.cmd.FCommand;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.struct.Role;
 import com.massivecraft.factions.zcore.fperms.Access;
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdKickAlt.java b/src/main/java/com/massivecraft/factions/cmd/alts/CmdKickAlt.java
similarity index 97%
rename from src/main/java/com/massivecraft/factions/cmd/CmdKickAlt.java
rename to src/main/java/com/massivecraft/factions/cmd/alts/CmdKickAlt.java
index 4d9a420b..ea607800 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdKickAlt.java
+++ b/src/main/java/com/massivecraft/factions/cmd/alts/CmdKickAlt.java
@@ -1,9 +1,10 @@
-package com.massivecraft.factions.cmd;
+package com.massivecraft.factions.cmd.alts;
 
 import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.SaberFactions;
+import com.massivecraft.factions.cmd.FCommand;
 import com.massivecraft.factions.event.FPlayerLeaveEvent;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.struct.Role;
@@ -12,7 +13,7 @@ import com.massivecraft.factions.zcore.fperms.PermissableAction;
 import com.massivecraft.factions.zcore.util.TL;
 import org.bukkit.Bukkit;
 
-public class CmdKickAlt extends FCommand{
+public class CmdKickAlt extends FCommand {
 
     public CmdKickAlt(){
         super();
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdClaimLine.java b/src/main/java/com/massivecraft/factions/cmd/claim/CmdClaimLine.java
similarity index 95%
rename from src/main/java/com/massivecraft/factions/cmd/CmdClaimLine.java
rename to src/main/java/com/massivecraft/factions/cmd/claim/CmdClaimLine.java
index fad5124f..45c89340 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdClaimLine.java
+++ b/src/main/java/com/massivecraft/factions/cmd/claim/CmdClaimLine.java
@@ -1,7 +1,8 @@
-package com.massivecraft.factions.cmd;
+package com.massivecraft.factions.cmd.claim;
 
 import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.Faction;
+import com.massivecraft.factions.cmd.FCommand;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.zcore.util.TL;
 import org.bukkit.Location;
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdCorner.java b/src/main/java/com/massivecraft/factions/cmd/claim/CmdCorner.java
similarity index 96%
rename from src/main/java/com/massivecraft/factions/cmd/CmdCorner.java
rename to src/main/java/com/massivecraft/factions/cmd/claim/CmdCorner.java
index fa8df053..21d42b02 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdCorner.java
+++ b/src/main/java/com/massivecraft/factions/cmd/claim/CmdCorner.java
@@ -1,7 +1,8 @@
-package com.massivecraft.factions.cmd;
+package com.massivecraft.factions.cmd.claim;
 
 
 import com.massivecraft.factions.*;
+import com.massivecraft.factions.cmd.FCommand;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.util.CornerTask;
 import com.massivecraft.factions.zcore.util.TL;
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdSafeunclaimall.java b/src/main/java/com/massivecraft/factions/cmd/claim/CmdSafeunclaimall.java
similarity index 93%
rename from src/main/java/com/massivecraft/factions/cmd/CmdSafeunclaimall.java
rename to src/main/java/com/massivecraft/factions/cmd/claim/CmdSafeunclaimall.java
index a712ba75..aa289fbe 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdSafeunclaimall.java
+++ b/src/main/java/com/massivecraft/factions/cmd/claim/CmdSafeunclaimall.java
@@ -1,9 +1,10 @@
-package com.massivecraft.factions.cmd;
+package com.massivecraft.factions.cmd.claim;
 
 import com.massivecraft.factions.Board;
 import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.Factions;
 import com.massivecraft.factions.SaberFactions;
+import com.massivecraft.factions.cmd.FCommand;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.zcore.util.TL;
 import org.bukkit.Bukkit;
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdUnclaim.java b/src/main/java/com/massivecraft/factions/cmd/claim/CmdUnclaim.java
similarity index 98%
rename from src/main/java/com/massivecraft/factions/cmd/CmdUnclaim.java
rename to src/main/java/com/massivecraft/factions/cmd/claim/CmdUnclaim.java
index f1cbf9ab..7944c08f 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdUnclaim.java
+++ b/src/main/java/com/massivecraft/factions/cmd/claim/CmdUnclaim.java
@@ -1,6 +1,7 @@
-package com.massivecraft.factions.cmd;
+package com.massivecraft.factions.cmd.claim;
 
 import com.massivecraft.factions.*;
+import com.massivecraft.factions.cmd.FCommand;
 import com.massivecraft.factions.event.LandUnclaimEvent;
 import com.massivecraft.factions.integration.Econ;
 import com.massivecraft.factions.struct.Permission;
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdUnclaimall.java b/src/main/java/com/massivecraft/factions/cmd/claim/CmdUnclaimall.java
similarity index 95%
rename from src/main/java/com/massivecraft/factions/cmd/CmdUnclaimall.java
rename to src/main/java/com/massivecraft/factions/cmd/claim/CmdUnclaimall.java
index 4e9bdeac..c1a43dbb 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdUnclaimall.java
+++ b/src/main/java/com/massivecraft/factions/cmd/claim/CmdUnclaimall.java
@@ -1,8 +1,9 @@
-package com.massivecraft.factions.cmd;
+package com.massivecraft.factions.cmd.claim;
 
 import com.massivecraft.factions.Board;
 import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.SaberFactions;
+import com.massivecraft.factions.cmd.FCommand;
 import com.massivecraft.factions.event.LandUnclaimAllEvent;
 import com.massivecraft.factions.integration.Econ;
 import com.massivecraft.factions.struct.Permission;
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdWarunclaimall.java b/src/main/java/com/massivecraft/factions/cmd/claim/CmdWarunclaimall.java
similarity index 93%
rename from src/main/java/com/massivecraft/factions/cmd/CmdWarunclaimall.java
rename to src/main/java/com/massivecraft/factions/cmd/claim/CmdWarunclaimall.java
index f46215ec..cc3be652 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdWarunclaimall.java
+++ b/src/main/java/com/massivecraft/factions/cmd/claim/CmdWarunclaimall.java
@@ -1,9 +1,10 @@
-package com.massivecraft.factions.cmd;
+package com.massivecraft.factions.cmd.claim;
 
 import com.massivecraft.factions.Board;
 import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.Factions;
 import com.massivecraft.factions.SaberFactions;
+import com.massivecraft.factions.cmd.FCommand;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.zcore.util.TL;
 import org.bukkit.Bukkit;
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdMoney.java b/src/main/java/com/massivecraft/factions/cmd/econ/CmdMoney.java
similarity index 94%
rename from src/main/java/com/massivecraft/factions/cmd/CmdMoney.java
rename to src/main/java/com/massivecraft/factions/cmd/econ/CmdMoney.java
index 78ca911b..70be643b 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdMoney.java
+++ b/src/main/java/com/massivecraft/factions/cmd/econ/CmdMoney.java
@@ -1,6 +1,7 @@
-package com.massivecraft.factions.cmd;
+package com.massivecraft.factions.cmd.econ;
 
 import com.massivecraft.factions.SaberFactions;
+import com.massivecraft.factions.cmd.FCommand;
 import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdMoney extends FCommand {
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdMoneyBalance.java b/src/main/java/com/massivecraft/factions/cmd/econ/CmdMoneyBalance.java
similarity index 92%
rename from src/main/java/com/massivecraft/factions/cmd/CmdMoneyBalance.java
rename to src/main/java/com/massivecraft/factions/cmd/econ/CmdMoneyBalance.java
index 83699a5e..65f37a05 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdMoneyBalance.java
+++ b/src/main/java/com/massivecraft/factions/cmd/econ/CmdMoneyBalance.java
@@ -1,6 +1,7 @@
-package com.massivecraft.factions.cmd;
+package com.massivecraft.factions.cmd.econ;
 
 import com.massivecraft.factions.Faction;
+import com.massivecraft.factions.cmd.FCommand;
 import com.massivecraft.factions.integration.Econ;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.zcore.util.TL;
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdMoneyDeposit.java b/src/main/java/com/massivecraft/factions/cmd/econ/CmdMoneyDeposit.java
similarity index 93%
rename from src/main/java/com/massivecraft/factions/cmd/CmdMoneyDeposit.java
rename to src/main/java/com/massivecraft/factions/cmd/econ/CmdMoneyDeposit.java
index eb69692b..2f0e2c71 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdMoneyDeposit.java
+++ b/src/main/java/com/massivecraft/factions/cmd/econ/CmdMoneyDeposit.java
@@ -1,7 +1,8 @@
-package com.massivecraft.factions.cmd;
+package com.massivecraft.factions.cmd.econ;
 
 import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.SaberFactions;
+import com.massivecraft.factions.cmd.FCommand;
 import com.massivecraft.factions.iface.EconomyParticipator;
 import com.massivecraft.factions.integration.Econ;
 import com.massivecraft.factions.struct.Permission;
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferFf.java b/src/main/java/com/massivecraft/factions/cmd/econ/CmdMoneyTransferFf.java
similarity index 95%
rename from src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferFf.java
rename to src/main/java/com/massivecraft/factions/cmd/econ/CmdMoneyTransferFf.java
index 4b366d65..094ab850 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferFf.java
+++ b/src/main/java/com/massivecraft/factions/cmd/econ/CmdMoneyTransferFf.java
@@ -1,7 +1,8 @@
-package com.massivecraft.factions.cmd;
+package com.massivecraft.factions.cmd.econ;
 
 import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.SaberFactions;
+import com.massivecraft.factions.cmd.FCommand;
 import com.massivecraft.factions.iface.EconomyParticipator;
 import com.massivecraft.factions.integration.Econ;
 import com.massivecraft.factions.struct.Permission;
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferFp.java b/src/main/java/com/massivecraft/factions/cmd/econ/CmdMoneyTransferFp.java
similarity index 94%
rename from src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferFp.java
rename to src/main/java/com/massivecraft/factions/cmd/econ/CmdMoneyTransferFp.java
index bde2ed03..aaff5490 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferFp.java
+++ b/src/main/java/com/massivecraft/factions/cmd/econ/CmdMoneyTransferFp.java
@@ -1,7 +1,8 @@
-package com.massivecraft.factions.cmd;
+package com.massivecraft.factions.cmd.econ;
 
 import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.SaberFactions;
+import com.massivecraft.factions.cmd.FCommand;
 import com.massivecraft.factions.iface.EconomyParticipator;
 import com.massivecraft.factions.integration.Econ;
 import com.massivecraft.factions.struct.Permission;
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferPf.java b/src/main/java/com/massivecraft/factions/cmd/econ/CmdMoneyTransferPf.java
similarity index 94%
rename from src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferPf.java
rename to src/main/java/com/massivecraft/factions/cmd/econ/CmdMoneyTransferPf.java
index f4842515..88137bf9 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferPf.java
+++ b/src/main/java/com/massivecraft/factions/cmd/econ/CmdMoneyTransferPf.java
@@ -1,7 +1,8 @@
-package com.massivecraft.factions.cmd;
+package com.massivecraft.factions.cmd.econ;
 
 import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.SaberFactions;
+import com.massivecraft.factions.cmd.FCommand;
 import com.massivecraft.factions.iface.EconomyParticipator;
 import com.massivecraft.factions.integration.Econ;
 import com.massivecraft.factions.struct.Permission;
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdMoneyWithdraw.java b/src/main/java/com/massivecraft/factions/cmd/econ/CmdMoneyWithdraw.java
similarity index 95%
rename from src/main/java/com/massivecraft/factions/cmd/CmdMoneyWithdraw.java
rename to src/main/java/com/massivecraft/factions/cmd/econ/CmdMoneyWithdraw.java
index 7e8cc5be..e87e1867 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdMoneyWithdraw.java
+++ b/src/main/java/com/massivecraft/factions/cmd/econ/CmdMoneyWithdraw.java
@@ -1,7 +1,8 @@
-package com.massivecraft.factions.cmd;
+package com.massivecraft.factions.cmd.econ;
 
 import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.SaberFactions;
+import com.massivecraft.factions.cmd.FCommand;
 import com.massivecraft.factions.iface.EconomyParticipator;
 import com.massivecraft.factions.integration.Econ;
 import com.massivecraft.factions.struct.Permission;
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdPoints.java b/src/main/java/com/massivecraft/factions/cmd/points/CmdPoints.java
similarity index 92%
rename from src/main/java/com/massivecraft/factions/cmd/CmdPoints.java
rename to src/main/java/com/massivecraft/factions/cmd/points/CmdPoints.java
index 4455038d..ed4e4f6b 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdPoints.java
+++ b/src/main/java/com/massivecraft/factions/cmd/points/CmdPoints.java
@@ -1,6 +1,7 @@
-package com.massivecraft.factions.cmd;
+package com.massivecraft.factions.cmd.points;
 
 import com.massivecraft.factions.SaberFactions;
+import com.massivecraft.factions.cmd.FCommand;
 import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdPoints extends FCommand {
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdPointsAdd.java b/src/main/java/com/massivecraft/factions/cmd/points/CmdPointsAdd.java
similarity index 93%
rename from src/main/java/com/massivecraft/factions/cmd/CmdPointsAdd.java
rename to src/main/java/com/massivecraft/factions/cmd/points/CmdPointsAdd.java
index 548a0cbd..613140e8 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdPointsAdd.java
+++ b/src/main/java/com/massivecraft/factions/cmd/points/CmdPointsAdd.java
@@ -1,7 +1,8 @@
-package com.massivecraft.factions.cmd;
+package com.massivecraft.factions.cmd.points;
 
 import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.Factions;
+import com.massivecraft.factions.cmd.FCommand;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.zcore.util.TL;
 
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdPointsRemove.java b/src/main/java/com/massivecraft/factions/cmd/points/CmdPointsRemove.java
similarity index 93%
rename from src/main/java/com/massivecraft/factions/cmd/CmdPointsRemove.java
rename to src/main/java/com/massivecraft/factions/cmd/points/CmdPointsRemove.java
index d0b457a0..a814f419 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdPointsRemove.java
+++ b/src/main/java/com/massivecraft/factions/cmd/points/CmdPointsRemove.java
@@ -1,7 +1,8 @@
-package com.massivecraft.factions.cmd;
+package com.massivecraft.factions.cmd.points;
 
 import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.Factions;
+import com.massivecraft.factions.cmd.FCommand;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.zcore.util.TL;
 
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdPointsSet.java b/src/main/java/com/massivecraft/factions/cmd/points/CmdPointsSet.java
similarity index 90%
rename from src/main/java/com/massivecraft/factions/cmd/CmdPointsSet.java
rename to src/main/java/com/massivecraft/factions/cmd/points/CmdPointsSet.java
index 6c614ca8..4277782c 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdPointsSet.java
+++ b/src/main/java/com/massivecraft/factions/cmd/points/CmdPointsSet.java
@@ -1,11 +1,12 @@
-package com.massivecraft.factions.cmd;
+package com.massivecraft.factions.cmd.points;
 
 import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.Factions;
+import com.massivecraft.factions.cmd.FCommand;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.zcore.util.TL;
 
-public class CmdPointsSet extends FCommand{
+public class CmdPointsSet extends FCommand {
 
     public CmdPointsSet() {
         super();
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdRelationAlly.java b/src/main/java/com/massivecraft/factions/cmd/relational/CmdRelationAlly.java
similarity index 79%
rename from src/main/java/com/massivecraft/factions/cmd/CmdRelationAlly.java
rename to src/main/java/com/massivecraft/factions/cmd/relational/CmdRelationAlly.java
index c66d907c..305bff72 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdRelationAlly.java
+++ b/src/main/java/com/massivecraft/factions/cmd/relational/CmdRelationAlly.java
@@ -1,4 +1,4 @@
-package com.massivecraft.factions.cmd;
+package com.massivecraft.factions.cmd.relational;
 
 import com.massivecraft.factions.struct.Relation;
 
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdRelationEnemy.java b/src/main/java/com/massivecraft/factions/cmd/relational/CmdRelationEnemy.java
similarity index 80%
rename from src/main/java/com/massivecraft/factions/cmd/CmdRelationEnemy.java
rename to src/main/java/com/massivecraft/factions/cmd/relational/CmdRelationEnemy.java
index 0da925c3..09aa71c1 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdRelationEnemy.java
+++ b/src/main/java/com/massivecraft/factions/cmd/relational/CmdRelationEnemy.java
@@ -1,4 +1,4 @@
-package com.massivecraft.factions.cmd;
+package com.massivecraft.factions.cmd.relational;
 
 import com.massivecraft.factions.struct.Relation;
 
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdRelationNeutral.java b/src/main/java/com/massivecraft/factions/cmd/relational/CmdRelationNeutral.java
similarity index 80%
rename from src/main/java/com/massivecraft/factions/cmd/CmdRelationNeutral.java
rename to src/main/java/com/massivecraft/factions/cmd/relational/CmdRelationNeutral.java
index 104186e6..b360d9ca 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdRelationNeutral.java
+++ b/src/main/java/com/massivecraft/factions/cmd/relational/CmdRelationNeutral.java
@@ -1,4 +1,4 @@
-package com.massivecraft.factions.cmd;
+package com.massivecraft.factions.cmd.relational;
 
 import com.massivecraft.factions.struct.Relation;
 
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdRelationTruce.java b/src/main/java/com/massivecraft/factions/cmd/relational/CmdRelationTruce.java
similarity index 80%
rename from src/main/java/com/massivecraft/factions/cmd/CmdRelationTruce.java
rename to src/main/java/com/massivecraft/factions/cmd/relational/CmdRelationTruce.java
index 6cbe2a1e..95f0e16c 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdRelationTruce.java
+++ b/src/main/java/com/massivecraft/factions/cmd/relational/CmdRelationTruce.java
@@ -1,4 +1,4 @@
-package com.massivecraft.factions.cmd;
+package com.massivecraft.factions.cmd.relational;
 
 import com.massivecraft.factions.struct.Relation;
 
diff --git a/src/main/java/com/massivecraft/factions/cmd/FRelationCommand.java b/src/main/java/com/massivecraft/factions/cmd/relational/FRelationCommand.java
similarity index 97%
rename from src/main/java/com/massivecraft/factions/cmd/FRelationCommand.java
rename to src/main/java/com/massivecraft/factions/cmd/relational/FRelationCommand.java
index 4455a4c1..bb730476 100644
--- a/src/main/java/com/massivecraft/factions/cmd/FRelationCommand.java
+++ b/src/main/java/com/massivecraft/factions/cmd/relational/FRelationCommand.java
@@ -1,8 +1,9 @@
-package com.massivecraft.factions.cmd;
+package com.massivecraft.factions.cmd.relational;
 
 import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.SaberFactions;
+import com.massivecraft.factions.cmd.FCommand;
 import com.massivecraft.factions.event.FactionRelationEvent;
 import com.massivecraft.factions.event.FactionRelationWishEvent;
 import com.massivecraft.factions.scoreboards.FTeamWrapper;
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdDemote.java b/src/main/java/com/massivecraft/factions/cmd/roles/CmdDemote.java
similarity index 73%
rename from src/main/java/com/massivecraft/factions/cmd/CmdDemote.java
rename to src/main/java/com/massivecraft/factions/cmd/roles/CmdDemote.java
index 0378de1c..8a0c1f09 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdDemote.java
+++ b/src/main/java/com/massivecraft/factions/cmd/roles/CmdDemote.java
@@ -1,4 +1,4 @@
-package com.massivecraft.factions.cmd;
+package com.massivecraft.factions.cmd.roles;
 
 public class CmdDemote extends FPromoteCommand {
 
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdPromote.java b/src/main/java/com/massivecraft/factions/cmd/roles/CmdPromote.java
similarity index 77%
rename from src/main/java/com/massivecraft/factions/cmd/CmdPromote.java
rename to src/main/java/com/massivecraft/factions/cmd/roles/CmdPromote.java
index 9bb67d32..2cd75ea6 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdPromote.java
+++ b/src/main/java/com/massivecraft/factions/cmd/roles/CmdPromote.java
@@ -1,4 +1,4 @@
-package com.massivecraft.factions.cmd;
+package com.massivecraft.factions.cmd.roles;
 
 public class CmdPromote extends FPromoteCommand {
 
diff --git a/src/main/java/com/massivecraft/factions/cmd/FPromoteCommand.java b/src/main/java/com/massivecraft/factions/cmd/roles/FPromoteCommand.java
similarity index 96%
rename from src/main/java/com/massivecraft/factions/cmd/FPromoteCommand.java
rename to src/main/java/com/massivecraft/factions/cmd/roles/FPromoteCommand.java
index f1037756..3ae19f50 100644
--- a/src/main/java/com/massivecraft/factions/cmd/FPromoteCommand.java
+++ b/src/main/java/com/massivecraft/factions/cmd/roles/FPromoteCommand.java
@@ -1,6 +1,7 @@
-package com.massivecraft.factions.cmd;
+package com.massivecraft.factions.cmd.roles;
 
 import com.massivecraft.factions.FPlayer;
+import com.massivecraft.factions.cmd.FCommand;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.struct.Role;
 import com.massivecraft.factions.zcore.fperms.Access;