Splitting permissions and ranks (renamed from groups)

Deleted all old permissions handlers, since we fully use superperms now

108 files changed, 187 insertions, 1056 deletions

diff --git a/Essentials/src/com/earth2me/essentials/Economy.java b/Essentials/src/com/earth2me/essentials/Economy.java
index 4edf9b17a..c14f75d63 100644
--- a/Essentials/src/com/earth2me/essentials/Economy.java
+++ b/Essentials/src/com/earth2me/essentials/Economy.java
@@ -1,7 +1,7 @@
 package com.earth2me.essentials;
 
 import com.earth2me.essentials.api.*;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import com.earth2me.essentials.settings.MoneyHolder;
 import java.util.HashMap;
 import java.util.Locale;
diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java
index 911a41cd7..dad6b9467 100644
--- a/Essentials/src/com/earth2me/essentials/Essentials.java
+++ b/Essentials/src/com/earth2me/essentials/Essentials.java
@@ -21,7 +21,7 @@ import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.api.*;
 import com.earth2me.essentials.listener.*;
 import com.earth2me.essentials.register.payment.Methods;
-import com.earth2me.essentials.settings.GroupsHolder;
+import com.earth2me.essentials.ranks.RanksStorage;
 import com.earth2me.essentials.settings.SettingsHolder;
 import com.earth2me.essentials.settings.SpawnsHolder;
 import com.earth2me.essentials.user.UserMap;
@@ -64,7 +64,7 @@ public class Essentials extends JavaPlugin implements IEssentials
 	private transient List<IReload> reloadList;
 	private transient IBackup backup;
 	private transient IItemDb itemDb;
-	private transient IGroups groups;
+	private transient IRanks groups;
 	private transient SpawnsHolder spawns;
 	private transient final Methods paymentMethod = new Methods();
 	//private transient PermissionsHandler permissionsHandler;
@@ -156,8 +156,8 @@ public class Essentials extends JavaPlugin implements IEssentials
 			userMap = new UserMap(this);
 			reloadList.add(userMap);
 			execTimer.mark("Init(Usermap)");
-			groups = new GroupsHolder(this);
-			reloadList.add((GroupsHolder)groups);
+			groups = new RanksStorage(this);
+			reloadList.add((RanksStorage)groups);
 			warps = new Warps(this);
 			reloadList.add(warps);
 			execTimer.mark("Init(Spawn/Warp)");
@@ -406,7 +406,7 @@ public class Essentials extends JavaPlugin implements IEssentials
 	}
 
 	@Override
-	public IGroups getGroups()
+	public IRanks getRanks()
 	{
 		return groups;
 	}
@@ -418,7 +418,7 @@ public class Essentials extends JavaPlugin implements IEssentials
 	}
 
 	@Override
-	public void setGroups(final IGroups groups)
+	public void setRanks(final IRanks groups)
 	{
 		this.groups = groups;
 	}
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsTimer.java b/Essentials/src/com/earth2me/essentials/EssentialsTimer.java
index aa3b02862..d773b3d43 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsTimer.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsTimer.java
@@ -4,7 +4,7 @@ import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.ISettings;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import com.earth2me.essentials.user.UserData.TimestampType;
 import java.util.HashSet;
 import java.util.Iterator;
diff --git a/Essentials/src/com/earth2me/essentials/ItemDb.java b/Essentials/src/com/earth2me/essentials/ItemDb.java
index 22c08d294..cfcc00dd2 100644
--- a/Essentials/src/com/earth2me/essentials/ItemDb.java
+++ b/Essentials/src/com/earth2me/essentials/ItemDb.java
@@ -5,7 +5,7 @@ import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.IItemDb;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
diff --git a/Essentials/src/com/earth2me/essentials/Teleport.java b/Essentials/src/com/earth2me/essentials/Teleport.java
index 971b11ba5..468ed41b8 100644
--- a/Essentials/src/com/earth2me/essentials/Teleport.java
+++ b/Essentials/src/com/earth2me/essentials/Teleport.java
@@ -5,7 +5,7 @@ import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.ITeleport;
 import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import com.earth2me.essentials.user.CooldownException;
 import com.earth2me.essentials.user.UserData.TimestampType;
 import java.util.Calendar;
@@ -153,7 +153,7 @@ public class Teleport implements Runnable, ITeleport
 	{
 		try
 		{
-			user.checkCooldown(TimestampType.LASTTELEPORT, ess.getGroups().getTeleportCooldown(user), !check, Permissions.TELEPORT_COOLDOWN_BYPASS);
+			user.checkCooldown(TimestampType.LASTTELEPORT, ess.getRanks().getTeleportCooldown(user), !check, Permissions.TELEPORT_COOLDOWN_BYPASS);
 		}
 		catch (CooldownException ex)
 		{
@@ -204,7 +204,7 @@ public class Teleport implements Runnable, ITeleport
 
 	private void teleport(Target target, Trade chargeFor, TeleportCause cause) throws Exception
 	{
-		double delay = ess.getGroups().getTeleportDelay(user);
+		double delay = ess.getRanks().getTeleportDelay(user);
 
 		if (chargeFor != null)
 		{
diff --git a/Essentials/src/com/earth2me/essentials/Trade.java b/Essentials/src/com/earth2me/essentials/Trade.java
index c01e62037..4a04087a2 100644
--- a/Essentials/src/com/earth2me/essentials/Trade.java
+++ b/Essentials/src/com/earth2me/essentials/Trade.java
@@ -7,8 +7,8 @@ import com.earth2me.essentials.api.ISettings;
 import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
 import com.earth2me.essentials.craftbukkit.SetExpFix;
-import com.earth2me.essentials.perm.NoCommandCostPermissions;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.NoCommandCostPermissions;
+import com.earth2me.essentials.permissions.Permissions;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
diff --git a/Essentials/src/com/earth2me/essentials/api/IEssentials.java b/Essentials/src/com/earth2me/essentials/api/IEssentials.java
index 7a793a1e7..e7c323f5c 100644
--- a/Essentials/src/com/earth2me/essentials/api/IEssentials.java
+++ b/Essentials/src/com/earth2me/essentials/api/IEssentials.java
@@ -21,7 +21,7 @@ public interface IEssentials extends Plugin
 
 	ISettings getSettings();
 
-	IGroups getGroups();
+	IRanks getRanks();
 
 	IJails getJails();
 
@@ -56,7 +56,7 @@ public interface IEssentials extends Plugin
 
 	TntExplodeListener getTNTListener();
 
-	void setGroups(IGroups groups);
+	void setRanks(IRanks groups);
 
 	void removeReloadListener(IReload groups);
 
diff --git a/Essentials/src/com/earth2me/essentials/api/IGroups.java b/Essentials/src/com/earth2me/essentials/api/IRanks.java
index ec8986ea0..e29b31302 100644
--- a/Essentials/src/com/earth2me/essentials/api/IGroups.java
+++ b/Essentials/src/com/earth2me/essentials/api/IRanks.java
@@ -3,7 +3,7 @@ package com.earth2me.essentials.api;
 import java.text.MessageFormat;
 
 
-public interface IGroups
+public interface IRanks
 {
 	String getMainGroup(IUser player);
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandafk.java b/Essentials/src/com/earth2me/essentials/commands/Commandafk.java
index d238b0ed8..1bda185b3 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandafk.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandafk.java
@@ -2,7 +2,7 @@ package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandbalance.java b/Essentials/src/com/earth2me/essentials/commands/Commandbalance.java
index f276b82d5..790ca7571 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandbalance.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandbalance.java
@@ -3,7 +3,7 @@ package com.earth2me.essentials.commands;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Util;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import org.bukkit.command.CommandSender;
 
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandban.java b/Essentials/src/com/earth2me/essentials/commands/Commandban.java
index 3969a023c..1feffd135 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandban.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandban.java
@@ -3,7 +3,7 @@ package com.earth2me.essentials.commands;
 import com.earth2me.essentials.Console;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import com.earth2me.essentials.user.Ban;
 import lombok.Cleanup;
 import org.bukkit.command.CommandSender;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandbreak.java b/Essentials/src/com/earth2me/essentials/commands/Commandbreak.java
index 2b7d550d6..6f6139b59 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandbreak.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandbreak.java
@@ -1,7 +1,7 @@
 package com.earth2me.essentials.commands;
 
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import static com.earth2me.essentials.I18n._;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandclearinventory.java b/Essentials/src/com/earth2me/essentials/commands/Commandclearinventory.java
index aaabd7825..fea6c024f 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandclearinventory.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandclearinventory.java
@@ -2,7 +2,7 @@ package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import java.util.List;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commanddelhome.java b/Essentials/src/com/earth2me/essentials/commands/Commanddelhome.java
index 8e2b4ed1e..629d00592 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commanddelhome.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commanddelhome.java
@@ -2,7 +2,7 @@ package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import java.util.Locale;
 import lombok.Cleanup;
 import org.bukkit.command.CommandSender;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandenchant.java b/Essentials/src/com/earth2me/essentials/commands/Commandenchant.java
index 28a809844..323b15d74 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandenchant.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandenchant.java
@@ -4,7 +4,7 @@ import com.earth2me.essentials.Enchantments;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Util;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.EnchantPermissions;
+import com.earth2me.essentials.permissions.EnchantPermissions;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandfeed.java b/Essentials/src/com/earth2me/essentials/commands/Commandfeed.java
index cfaf27c1a..e7c8f9fe4 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandfeed.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandfeed.java
@@ -2,7 +2,7 @@ package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import java.util.List;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandgamemode.java b/Essentials/src/com/earth2me/essentials/commands/Commandgamemode.java
index 46365cafc..7bccf6df3 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandgamemode.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandgamemode.java
@@ -2,7 +2,7 @@ package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import java.util.Locale;
 import org.bukkit.GameMode;
 import org.bukkit.command.CommandSender;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandgetpos.java b/Essentials/src/com/earth2me/essentials/commands/Commandgetpos.java
index a286ce78b..88a817bd3 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandgetpos.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandgetpos.java
@@ -1,7 +1,7 @@
 package com.earth2me.essentials.commands;
 
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandgive.java b/Essentials/src/com/earth2me/essentials/commands/Commandgive.java
index 057e8fca9..75dce1b3c 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandgive.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandgive.java
@@ -1,7 +1,7 @@
 package com.earth2me.essentials.commands;
 
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.GivePermissions;
+import com.earth2me.essentials.permissions.GivePermissions;
 import static com.earth2me.essentials.I18n._;
 import java.util.Locale;
 import org.bukkit.ChatColor;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandgod.java b/Essentials/src/com/earth2me/essentials/commands/Commandgod.java
index 42968b796..037c8cb50 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandgod.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandgod.java
@@ -2,7 +2,7 @@ package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandheal.java b/Essentials/src/com/earth2me/essentials/commands/Commandheal.java
index c145efec7..fe620b390 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandheal.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandheal.java
@@ -2,7 +2,7 @@ package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import com.earth2me.essentials.user.UserData.TimestampType;
 import java.util.List;
 import org.bukkit.command.CommandSender;
@@ -17,13 +17,13 @@ public class Commandheal extends EssentialsCommand
 
 		if (args.length > 0 && Permissions.HEAL_OTHERS.isAuthorized(user))
 		{
-			user.checkCooldown(TimestampType.LASTHEAL, ess.getGroups().getHealCooldown(user), true, Permissions.HEAL_COOLDOWN_BYPASS);
+			user.checkCooldown(TimestampType.LASTHEAL, ess.getRanks().getHealCooldown(user), true, Permissions.HEAL_COOLDOWN_BYPASS);
 
 			healOtherPlayers(user, args[0]);
 			return;
 		}
 
-		user.checkCooldown(TimestampType.LASTHEAL, ess.getGroups().getHealCooldown(user), true, Permissions.HEAL_COOLDOWN_BYPASS);
+		user.checkCooldown(TimestampType.LASTHEAL, ess.getRanks().getHealCooldown(user), true, Permissions.HEAL_COOLDOWN_BYPASS);
 
 		user.setHealth(20);
 		user.setFoodLevel(20);
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandhelpop.java b/Essentials/src/com/earth2me/essentials/commands/Commandhelpop.java
index c4b97d59b..d8da79ff5 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandhelpop.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandhelpop.java
@@ -3,7 +3,7 @@ package com.earth2me.essentials.commands;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Util;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import java.util.logging.Level;
 import org.bukkit.entity.Player;
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandhome.java b/Essentials/src/com/earth2me/essentials/commands/Commandhome.java
index f67c1815e..15d9aa899 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandhome.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandhome.java
@@ -4,7 +4,7 @@ import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.Util;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import java.util.List;
 import java.util.Locale;
 import org.bukkit.Location;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commanditem.java b/Essentials/src/com/earth2me/essentials/commands/Commanditem.java
index a8c8a4828..18af6cb78 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commanditem.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commanditem.java
@@ -2,7 +2,7 @@ package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.ItemPermissions;
+import com.earth2me.essentials.permissions.ItemPermissions;
 import java.util.Locale;
 import org.bukkit.Material;
 import org.bukkit.enchantments.Enchantment;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkick.java b/Essentials/src/com/earth2me/essentials/commands/Commandkick.java
index e1c44b606..fe11efcea 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandkick.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandkick.java
@@ -3,7 +3,7 @@ package com.earth2me.essentials.commands;
 import com.earth2me.essentials.Console;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkit.java b/Essentials/src/com/earth2me/essentials/commands/Commandkit.java
index 269536f45..10571e8c2 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandkit.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandkit.java
@@ -4,7 +4,7 @@ import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.Util;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.KitPermissions;
+import com.earth2me.essentials.permissions.KitPermissions;
 import com.earth2me.essentials.settings.Kit;
 import java.util.Collection;
 import java.util.Locale;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandlightning.java b/Essentials/src/com/earth2me/essentials/commands/Commandlightning.java
index f7323a20f..3eda786c9 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandlightning.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandlightning.java
@@ -3,7 +3,7 @@ package com.earth2me.essentials.commands;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.api.ISettings;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import lombok.Cleanup;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.LightningStrike;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandlist.java b/Essentials/src/com/earth2me/essentials/commands/Commandlist.java
index 12c4f4f19..d0d0b4fad 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandlist.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandlist.java
@@ -4,7 +4,7 @@ import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Util;
 import com.earth2me.essentials.api.ISettings;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import java.util.*;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -62,7 +62,7 @@ public class Commandlist extends EssentialsCommand
 				{
 					continue;
 				}
-				final String group = ess.getGroups().getMainGroup(player);
+				final String group = ess.getRanks().getMainGroup(player);
 				List<IUser> list = sort.get(group);
 				if (list == null)
 				{
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmail.java b/Essentials/src/com/earth2me/essentials/commands/Commandmail.java
index 983810449..80f9fcc18 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandmail.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandmail.java
@@ -3,7 +3,7 @@ package com.earth2me.essentials.commands;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Util;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import java.util.List;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandme.java b/Essentials/src/com/earth2me/essentials/commands/Commandme.java
index 8ac6b10ad..52100b188 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandme.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandme.java
@@ -3,7 +3,7 @@ package com.earth2me.essentials.commands;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Util;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 
 
 public class Commandme extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmore.java b/Essentials/src/com/earth2me/essentials/commands/Commandmore.java
index 74e4b2509..bbf9ede4c 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandmore.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandmore.java
@@ -3,8 +3,8 @@ package com.earth2me.essentials.commands;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.api.ISettings;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.ItemPermissions;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.ItemPermissions;
+import com.earth2me.essentials.permissions.Permissions;
 import java.util.Locale;
 import org.bukkit.inventory.ItemStack;
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmsg.java b/Essentials/src/com/earth2me/essentials/commands/Commandmsg.java
index f33adc1ee..499754f3c 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandmsg.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandmsg.java
@@ -5,7 +5,7 @@ import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Util;
 import com.earth2me.essentials.api.IReplyTo;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import java.util.List;
 import lombok.Cleanup;
 import org.bukkit.command.CommandSender;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmute.java b/Essentials/src/com/earth2me/essentials/commands/Commandmute.java
index 20bd18e2b..0bba1f936 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandmute.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandmute.java
@@ -3,7 +3,7 @@ package com.earth2me.essentials.commands;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Util;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import com.earth2me.essentials.user.UserData.TimestampType;
 import lombok.Cleanup;
 import org.bukkit.command.CommandSender;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandnear.java b/Essentials/src/com/earth2me/essentials/commands/Commandnear.java
index 738370c96..fc1450445 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandnear.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandnear.java
@@ -2,7 +2,7 @@ package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandnick.java b/Essentials/src/com/earth2me/essentials/commands/Commandnick.java
index 5b863ba01..db0a87f5f 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandnick.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandnick.java
@@ -4,7 +4,7 @@ import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Util;
 import com.earth2me.essentials.api.ISettings;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import java.util.Locale;
 import lombok.Cleanup;
 import org.bukkit.Server;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandpowertool.java b/Essentials/src/com/earth2me/essentials/commands/Commandpowertool.java
index b450552b1..b889cf34e 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandpowertool.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandpowertool.java
@@ -3,7 +3,7 @@ package com.earth2me.essentials.commands;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Util;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandptime.java b/Essentials/src/com/earth2me/essentials/commands/Commandptime.java
index 1ad065214..1b3b883e5 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandptime.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandptime.java
@@ -3,7 +3,7 @@ package com.earth2me.essentials.commands;
 import com.earth2me.essentials.DescParseTickFormat;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import java.util.*;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandr.java b/Essentials/src/com/earth2me/essentials/commands/Commandr.java
index 5cb324027..bd59c5517 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandr.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandr.java
@@ -5,7 +5,7 @@ import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Util;
 import com.earth2me.essentials.api.IReplyTo;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java b/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java
index a135be491..55a7d7e95 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java
@@ -5,7 +5,7 @@ import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.Util;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandseen.java b/Essentials/src/com/earth2me/essentials/commands/Commandseen.java
index 83c5b1f31..cee687e3b 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandseen.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandseen.java
@@ -3,7 +3,7 @@ package com.earth2me.essentials.commands;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Util;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import com.earth2me.essentials.user.UserData.TimestampType;
 import lombok.Cleanup;
 import org.bukkit.command.CommandSender;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsethome.java b/Essentials/src/com/earth2me/essentials/commands/Commandsethome.java
index fb4da82b5..bc2ed632d 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandsethome.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandsethome.java
@@ -2,7 +2,7 @@ package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import java.util.HashMap;
 import java.util.Locale;
 import lombok.Cleanup;
@@ -29,7 +29,7 @@ public class Commandsethome extends EssentialsCommand
 					if ("bed".equals(args[0].toLowerCase(Locale.ENGLISH))) {
 						throw new NotEnoughArgumentsException();
 					}
-					if ((user.getHomes().size() < ess.getGroups().getHomeLimit(user))
+					if ((user.getHomes().size() < ess.getRanks().getHomeLimit(user))
 						|| (user.getHomes().contains(args[0].toLowerCase(Locale.ENGLISH))))
 					{
 						user.acquireWriteLock();
@@ -41,7 +41,7 @@ public class Commandsethome extends EssentialsCommand
 					}
 					else
 					{
-						throw new Exception(_("maxHomes", ess.getGroups().getHomeLimit(user)));
+						throw new Exception(_("maxHomes", ess.getRanks().getHomeLimit(user)));
 					}
 
 				}
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandspawn.java b/Essentials/src/com/earth2me/essentials/commands/Commandspawn.java
index 0fb4d928e..b0f242ce2 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandspawn.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandspawn.java
@@ -3,7 +3,7 @@ package com.earth2me.essentials.commands;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import com.earth2me.essentials.settings.SpawnsHolder;
 import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
@@ -49,7 +49,7 @@ public class Commandspawn extends EssentialsCommand
 	private void respawn(final IUser user, final Trade charge) throws Exception
 	{
 		final SpawnsHolder spawns = (SpawnsHolder)this.module;
-		final Location spawn = spawns.getSpawn(ess.getGroups().getMainGroup(user));
+		final Location spawn = spawns.getSpawn(ess.getRanks().getMainGroup(user));
 		user.getTeleport().teleport(spawn, charge, TeleportCause.COMMAND);
 	}
 }
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandspawner.java b/Essentials/src/com/earth2me/essentials/commands/Commandspawner.java
index 2c8cb2b3e..16b3b93f6 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandspawner.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandspawner.java
@@ -5,7 +5,7 @@ import com.earth2me.essentials.Mob;
 import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.Util;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.SpawnerPermissions;
+import com.earth2me.essentials.permissions.SpawnerPermissions;
 import java.util.Locale;
 import org.bukkit.Location;
 import org.bukkit.Material;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java b/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java
index d075ac7c3..78f17d231 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java
@@ -6,7 +6,7 @@ import com.earth2me.essentials.Mob.MobException;
 import com.earth2me.essentials.Util;
 import com.earth2me.essentials.api.ISettings;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.SpawnmobPermissions;
+import com.earth2me.essentials.permissions.SpawnmobPermissions;
 import java.util.*;
 import org.bukkit.DyeColor;
 import org.bukkit.Location;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsudo.java b/Essentials/src/com/earth2me/essentials/commands/Commandsudo.java
index 59b7ececf..bf1857c1c 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandsudo.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandsudo.java
@@ -1,7 +1,7 @@
 package com.earth2me.essentials.commands;
 
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Util;
 import org.bukkit.command.CommandSender;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtempban.java b/Essentials/src/com/earth2me/essentials/commands/Commandtempban.java
index 748d2b830..a2e891864 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtempban.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandtempban.java
@@ -4,7 +4,7 @@ import com.earth2me.essentials.Console;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Util;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import com.earth2me.essentials.user.Ban;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtime.java b/Essentials/src/com/earth2me/essentials/commands/Commandtime.java
index 0f5e7a1a5..fccdc8bbf 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtime.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandtime.java
@@ -3,7 +3,7 @@ package com.earth2me.essentials.commands;
 import com.earth2me.essentials.DescParseTickFormat;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import java.util.*;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java b/Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java
index 3c76c3a60..dd7beccbf 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java
@@ -3,7 +3,7 @@ package com.earth2me.essentials.commands;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Util;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import com.earth2me.essentials.user.UserData.TimestampType;
 import lombok.Cleanup;
 import org.bukkit.OfflinePlayer;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtp.java b/Essentials/src/com/earth2me/essentials/commands/Commandtp.java
index 92b2c6c8b..a9713246a 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtp.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandtp.java
@@ -4,7 +4,7 @@ import com.earth2me.essentials.Console;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import lombok.Cleanup;
 import org.bukkit.command.CommandSender;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java b/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java
index 291d3d73c..4afe2e211 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java
@@ -4,7 +4,7 @@ import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.api.ISettings;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpo.java b/Essentials/src/com/earth2me/essentials/commands/Commandtpo.java
index 8fefb0abd..5c6cfb195 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtpo.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandtpo.java
@@ -2,7 +2,7 @@ package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpohere.java b/Essentials/src/com/earth2me/essentials/commands/Commandtpohere.java
index c6421e90a..009d0f191 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtpohere.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandtpohere.java
@@ -2,7 +2,7 @@ package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandunlimited.java b/Essentials/src/com/earth2me/essentials/commands/Commandunlimited.java
index 8c822ff8e..a6f6ae477 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandunlimited.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandunlimited.java
@@ -3,8 +3,8 @@ package com.earth2me.essentials.commands;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
-import com.earth2me.essentials.perm.Permissions;
-import com.earth2me.essentials.perm.UnlimitedItemPermissions;
+import com.earth2me.essentials.permissions.Permissions;
+import com.earth2me.essentials.permissions.UnlimitedItemPermissions;
 import java.util.Locale;
 import java.util.Set;
 import lombok.Cleanup;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandwarp.java b/Essentials/src/com/earth2me/essentials/commands/Commandwarp.java
index 0b1bfbcd1..d55adbca9 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandwarp.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandwarp.java
@@ -5,8 +5,8 @@ import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.Util;
 import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.api.IWarps;
-import com.earth2me.essentials.perm.Permissions;
-import com.earth2me.essentials.perm.WarpPermissions;
+import com.earth2me.essentials.permissions.Permissions;
+import com.earth2me.essentials.permissions.WarpPermissions;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java b/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java
index 402ac2018..4ad204978 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java
@@ -4,7 +4,7 @@ import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Util;
 import com.earth2me.essentials.api.ISettings;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import com.earth2me.essentials.user.UserData;
 import java.util.Locale;
 import lombok.Cleanup;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandworld.java b/Essentials/src/com/earth2me/essentials/commands/Commandworld.java
index b11aa8bac..f95b3b43a 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandworld.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandworld.java
@@ -3,7 +3,7 @@ package com.earth2me.essentials.commands;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.WorldPermissions;
+import com.earth2me.essentials.permissions.WorldPermissions;
 import java.util.List;
 import org.bukkit.Location;
 import org.bukkit.World;
diff --git a/Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java b/Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java
index c5b7c5ad9..7c931333f 100644
--- a/Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java
+++ b/Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java
@@ -5,7 +5,7 @@ import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.IEssentialsModule;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.AbstractSuperpermsPermission;
+import com.earth2me.essentials.permissions.AbstractSuperpermsPermission;
 import java.util.List;
 import java.util.logging.Logger;
 import org.bukkit.Server;
diff --git a/Essentials/src/com/earth2me/essentials/listener/EssentialsEntityListener.java b/Essentials/src/com/earth2me/essentials/listener/EssentialsEntityListener.java
index c5a967378..036da57d2 100644
--- a/Essentials/src/com/earth2me/essentials/listener/EssentialsEntityListener.java
+++ b/Essentials/src/com/earth2me/essentials/listener/EssentialsEntityListener.java
@@ -4,7 +4,7 @@ import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.ISettings;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import java.util.List;
 import lombok.Cleanup;
 import org.bukkit.Material;
diff --git a/Essentials/src/com/earth2me/essentials/listener/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/listener/EssentialsPlayerListener.java
index f008cb435..7e3e42e7f 100644
--- a/Essentials/src/com/earth2me/essentials/listener/EssentialsPlayerListener.java
+++ b/Essentials/src/com/earth2me/essentials/listener/EssentialsPlayerListener.java
@@ -5,7 +5,7 @@ import com.earth2me.essentials.Util;
 import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.ISettings;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import com.earth2me.essentials.textreader.IText;
 import com.earth2me.essentials.textreader.KeywordReplacer;
 import com.earth2me.essentials.textreader.TextInput;
diff --git a/Essentials/src/com/earth2me/essentials/listener/EssentialsPluginListener.java b/Essentials/src/com/earth2me/essentials/listener/EssentialsPluginListener.java
index 39941b6f2..6830dc9eb 100644
--- a/Essentials/src/com/earth2me/essentials/listener/EssentialsPluginListener.java
+++ b/Essentials/src/com/earth2me/essentials/listener/EssentialsPluginListener.java
@@ -3,11 +3,11 @@ package com.earth2me.essentials.listener;
 import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.IReload;
 import com.earth2me.essentials.api.ISettings;
-import com.earth2me.essentials.perm.GMGroups;
-import com.earth2me.essentials.perm.VaultGroups;
+import com.earth2me.essentials.ranks.GMGroups;
+import com.earth2me.essentials.ranks.VaultGroups;
 import com.earth2me.essentials.register.payment.Methods;
 import com.earth2me.essentials.settings.General;
-import com.earth2me.essentials.settings.GroupsHolder;
+import com.earth2me.essentials.ranks.RanksStorage;
 import java.util.logging.Level;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -78,33 +78,33 @@ public class EssentialsPluginListener implements Listener, IReload
 		if (storage == General.GroupStorage.GROUPMANAGER)
 		{
 			Plugin groupManager = ess.getServer().getPluginManager().getPlugin("GroupManager");
-			if (groupManager != null && groupManager.isEnabled() && !(ess.getGroups() instanceof GMGroups))
+			if (groupManager != null && groupManager.isEnabled() && !(ess.getRanks() instanceof GMGroups))
 			{
-				if (ess.getGroups() instanceof GroupsHolder)
+				if (ess.getRanks() instanceof RanksStorage)
 				{
-					ess.removeReloadListener((GroupsHolder)ess.getGroups());
+					ess.removeReloadListener((RanksStorage)ess.getRanks());
 				}
-				ess.setGroups(new GMGroups(ess, groupManager));
+				ess.setRanks(new GMGroups(ess, groupManager));
 				return;
 			}
 		}
 		if (storage == General.GroupStorage.VAULT)
 		{
 			Plugin vault = ess.getServer().getPluginManager().getPlugin("Vault");
-			if (vault != null && vault.isEnabled() && !(ess.getGroups() instanceof VaultGroups))
+			if (vault != null && vault.isEnabled() && !(ess.getRanks() instanceof VaultGroups))
 			{
-				if (ess.getGroups() instanceof GroupsHolder)
+				if (ess.getRanks() instanceof RanksStorage)
 				{
-					ess.removeReloadListener((GroupsHolder)ess.getGroups());
+					ess.removeReloadListener((RanksStorage)ess.getRanks());
 				}
-				ess.setGroups(new VaultGroups(ess));
+				ess.setRanks(new VaultGroups(ess));
 				return;
 			}
 		}
-		if (!(ess.getGroups() instanceof GroupsHolder))
+		if (!(ess.getRanks() instanceof RanksStorage))
 		{
-			ess.setGroups(new GroupsHolder(ess));
-			ess.addReloadListener((GroupsHolder)ess.getGroups());
+			ess.setRanks(new RanksStorage(ess));
+			ess.addReloadListener((RanksStorage)ess.getRanks());
 		}
 	}
 }
diff --git a/Essentials/src/com/earth2me/essentials/perm/AbstractPermissionsHandler.java b/Essentials/src/com/earth2me/essentials/perm/AbstractPermissionsHandler.java
deleted file mode 100644
index 6c01d7de1..000000000
--- a/Essentials/src/com/earth2me/essentials/perm/AbstractPermissionsHandler.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.earth2me.essentials.perm;
-
-
-public abstract class AbstractPermissionsHandler implements IPermissionsHandler
-{
-	@Override
-	public void checkPermissions()
-	{
-	}
-}
diff --git a/Essentials/src/com/earth2me/essentials/perm/BPermissions2Handler.java b/Essentials/src/com/earth2me/essentials/perm/BPermissions2Handler.java
deleted file mode 100644
index ad2016049..000000000
--- a/Essentials/src/com/earth2me/essentials/perm/BPermissions2Handler.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.earth2me.essentials.perm;
-
-import de.bananaco.bpermissions.api.ApiLayer;
-import de.bananaco.bpermissions.api.util.CalculableType;
-import java.util.Arrays;
-import java.util.List;
-import org.bukkit.entity.Player;
-
-
-public class BPermissions2Handler extends SuperpermsHandler
-{
-	public BPermissions2Handler()
-	{
-	}
-
-	@Override
-	public String getGroup(final Player base)
-	{
-		final List<String> groups = getGroups(base);
-		if (groups == null || groups.isEmpty())
-		{
-			return null;
-		}
-		return groups.get(0);
-	}
-
-	@Override
-	public List<String> getGroups(final Player base)
-	{
-		final String[] groups = ApiLayer.getGroups(base.getWorld().getName(), CalculableType.USER, base.getName());
-		return Arrays.asList(groups);
-	}
-
-	@Override
-	public boolean inGroup(final Player base, final String group)
-	{
-		return ApiLayer.hasGroup(base.getWorld().getName(), CalculableType.USER, base.getName(), group);
-	}
-
-	@Override
-	public boolean canBuild(final Player base, final String group)
-	{
-		return hasPermission(base, "essentials.build") || hasPermission(base, "bPermissions.build");
-	}
-
-	@Override
-	public String getPrefix(final Player base)
-	{
-		return ApiLayer.getValue(base.getWorld().getName(), CalculableType.USER, base.getName(), "prefix");
-	}
-
-	@Override
-	public String getSuffix(final Player base)
-	{
-		return ApiLayer.getValue(base.getWorld().getName(), CalculableType.USER, base.getName(), "suffix");
-	}
-}
diff --git a/Essentials/src/com/earth2me/essentials/perm/BPermissionsHandler.java b/Essentials/src/com/earth2me/essentials/perm/BPermissionsHandler.java
deleted file mode 100644
index 3f80f25cf..000000000
--- a/Essentials/src/com/earth2me/essentials/perm/BPermissionsHandler.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.earth2me.essentials.perm;
-
-import de.bananaco.permissions.Permissions;
-import de.bananaco.permissions.info.InfoReader;
-import de.bananaco.permissions.interfaces.PermissionSet;
-import de.bananaco.permissions.worlds.WorldPermissionsManager;
-import java.util.List;
-import org.bukkit.entity.Player;
-
-
-public class BPermissionsHandler extends SuperpermsHandler
-{
-	private final transient WorldPermissionsManager wpm;
-	private final transient InfoReader info;
-
-	public BPermissionsHandler()
-	{
-		wpm = Permissions.getWorldPermissionsManager();
-		info = new InfoReader();
-		info.instantiate();
-	}
-
-	@Override
-	public String getGroup(final Player base)
-	{
-		final List<String> groups = getGroups(base);
-		if (groups == null || groups.isEmpty())
-		{
-			return null;
-		}
-		return groups.get(0);
-	}
-
-	@Override
-	public List<String> getGroups(final Player base)
-	{
-		final PermissionSet pset = wpm.getPermissionSet(base.getWorld());
-		if (pset == null)
-		{
-			return null;
-		}
-		return pset.getGroups(base);
-	}
-
-	@Override
-	public boolean inGroup(final Player base, final String group)
-	{
-		final List<String> groups = getGroups(base);
-		if (groups == null || groups.isEmpty())
-		{
-			return false;
-		}
-		return groups.contains(group);
-	}
-
-	@Override
-	public boolean canBuild(final Player base, final String group)
-	{
-		return hasPermission(base, "essentials.build") || hasPermission(base, "bPermissions.build");
-	}
-
-	@Override
-	public String getPrefix(final Player base)
-	{
-		return info.getPrefix(base);
-	}
-
-	@Override
-	public String getSuffix(final Player base)
-	{
-		return info.getSuffix(base);
-	}
-}
diff --git a/Essentials/src/com/earth2me/essentials/perm/ConfigPermissionsHandler.java b/Essentials/src/com/earth2me/essentials/perm/ConfigPermissionsHandler.java
deleted file mode 100644
index 4cee6b5ad..000000000
--- a/Essentials/src/com/earth2me/essentials/perm/ConfigPermissionsHandler.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.earth2me.essentials.perm;
-
-import com.earth2me.essentials.api.IEssentials;
-import java.util.List;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-
-
-/*public class ConfigPermissionsHandler extends AbstractPermissionsHandler
-{
-	private final transient IEssentials ess;
-
-	public ConfigPermissionsHandler(final Plugin ess)
-	{
-		this.ess = (IEssentials)ess;
-	}
-
-	@Override
-	public String getGroup(final Player base)
-	{
-		return null;
-	}
-
-	@Override
-	public List<String> getGroups(final Player base)
-	{
-		return null;
-	}
-
-	@Override
-	public boolean canBuild(final Player base, final String group)
-	{
-		return true;
-	}
-
-	@Override
-	public boolean inGroup(final Player base, final String group)
-	{
-		return false;
-	}
-
-	@Override
-	public boolean hasPermission(final Player base, final String node)
-	{
-		final String[] cmds = node.split("\\.", 2);
-		return !ess.getSettings().isCommandRestricted(cmds[cmds.length - 1])
-			   && ess.getSettings().isPlayerCommand(cmds[cmds.length - 1]);
-	}
-
-	@Override
-	public String getPrefix(final Player base)
-	{
-		return null;
-	}
-
-	@Override
-	public String getSuffix(final Player base)
-	{
-		return null;
-	}
-}*/
diff --git a/Essentials/src/com/earth2me/essentials/perm/GroupManagerHandler.java b/Essentials/src/com/earth2me/essentials/perm/GroupManagerHandler.java
deleted file mode 100644
index 9e9c25e1f..000000000
--- a/Essentials/src/com/earth2me/essentials/perm/GroupManagerHandler.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.earth2me.essentials.perm;
-
-import java.util.Arrays;
-import java.util.List;
-import org.anjocaido.groupmanager.GroupManager;
-import org.anjocaido.groupmanager.permissions.AnjoPermissionsHandler;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-
-
-public class GroupManagerHandler extends AbstractPermissionsHandler
-{
-	private final transient GroupManager groupManager;
-
-	public GroupManagerHandler(final Plugin permissionsPlugin)
-	{
-		groupManager = ((GroupManager)permissionsPlugin);
-	}
-
-	@Override
-	public String getGroup(final Player base)
-	{
-		final AnjoPermissionsHandler handler = groupManager.getWorldsHolder().getWorldPermissions(base);
-		if (handler == null)
-		{
-			return null;
-		}
-		return handler.getGroup(base.getName());
-	}
-
-	@Override
-	public List<String> getGroups(final Player base)
-	{
-		final AnjoPermissionsHandler handler = groupManager.getWorldsHolder().getWorldPermissions(base);
-		if (handler == null)
-		{
-			return null;
-		}
-		return Arrays.asList(handler.getGroups(base.getName()));
-	}
-
-	@Override
-	public boolean canBuild(final Player base, final String group)
-	{
-		final AnjoPermissionsHandler handler = groupManager.getWorldsHolder().getWorldPermissions(base);
-		if (handler == null)
-		{
-			return false;
-		}
-		return handler.canUserBuild(base.getName());
-	}
-
-	@Override
-	public boolean inGroup(final Player base, final String group)
-	{
-		AnjoPermissionsHandler handler = groupManager.getWorldsHolder().getWorldPermissions(base);
-		if (handler == null)
-		{
-			return false;
-		}
-		return handler.inGroup(base.getName(), group);
-	}
-
-	@Override
-	public boolean hasPermission(final Player base, final String node)
-	{
-		AnjoPermissionsHandler handler = groupManager.getWorldsHolder().getWorldPermissions(base);
-		if (handler == null)
-		{
-			return false;
-		}
-		return handler.has(base, node);
-	}
-
-	@Override
-	public String getPrefix(final Player base)
-	{
-		AnjoPermissionsHandler handler = groupManager.getWorldsHolder().getWorldPermissions(base);
-		if (handler == null)
-		{
-			return null;
-		}
-		return handler.getUserPrefix(base.getName());
-	}
-
-	@Override
-	public String getSuffix(final Player base)
-	{
-		AnjoPermissionsHandler handler = groupManager.getWorldsHolder().getWorldPermissions(base);
-		if (handler == null)
-		{
-			return null;
-		}
-		return handler.getUserSuffix(base.getName());
-	}
-}
diff --git a/Essentials/src/com/earth2me/essentials/perm/IPermissionsHandler.java b/Essentials/src/com/earth2me/essentials/perm/IPermissionsHandler.java
deleted file mode 100644
index d769eddd7..000000000
--- a/Essentials/src/com/earth2me/essentials/perm/IPermissionsHandler.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.earth2me.essentials.perm;
-
-import java.util.List;
-import org.bukkit.entity.Player;
-
-
-public interface IPermissionsHandler
-{
-	String getGroup(Player base);
-
-	List<String> getGroups(Player base);
-
-	boolean canBuild(Player base, String group);
-
-	boolean inGroup(Player base, String group);
-
-	boolean hasPermission(Player base, String node);
-
-	String getPrefix(Player base);
-
-	String getSuffix(Player base);
-
-	public void checkPermissions();
-}
diff --git a/Essentials/src/com/earth2me/essentials/perm/NullPermissionsHandler.java b/Essentials/src/com/earth2me/essentials/perm/NullPermissionsHandler.java
deleted file mode 100644
index 5a931ef14..000000000
--- a/Essentials/src/com/earth2me/essentials/perm/NullPermissionsHandler.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.earth2me.essentials.perm;
-
-import java.util.Collections;
-import java.util.List;
-import org.bukkit.entity.Player;
-
-
-public class NullPermissionsHandler extends AbstractPermissionsHandler
-{
-	@Override
-	public String getGroup(final Player base)
-	{
-		return null;
-	}
-
-	@Override
-	public List<String> getGroups(final Player base)
-	{
-		return Collections.emptyList();
-	}
-
-	@Override
-	public boolean canBuild(final Player base, final String group)
-	{
-		return false;
-	}
-
-	@Override
-	public boolean inGroup(final Player base, final String group)
-	{
-		return false;
-	}
-
-	@Override
-	public boolean hasPermission(final Player base, final String node)
-	{
-		return false;
-	}
-
-	@Override
-	public String getPrefix(final Player base)
-	{
-		return null;
-	}
-
-	@Override
-	public String getSuffix(final Player base)
-	{
-		return null;
-	}
-}
diff --git a/Essentials/src/com/earth2me/essentials/perm/PermissionsBukkitHandler.java b/Essentials/src/com/earth2me/essentials/perm/PermissionsBukkitHandler.java
deleted file mode 100644
index b3cc62979..000000000
--- a/Essentials/src/com/earth2me/essentials/perm/PermissionsBukkitHandler.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.earth2me.essentials.perm;
-
-import com.platymuus.bukkit.permissions.Group;
-import com.platymuus.bukkit.permissions.PermissionInfo;
-import com.platymuus.bukkit.permissions.PermissionsPlugin;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-
-
-public class PermissionsBukkitHandler extends SuperpermsHandler
-{
-	private final transient PermissionsPlugin plugin;
-
-	public PermissionsBukkitHandler(final Plugin plugin)
-	{
-		this.plugin = (PermissionsPlugin)plugin;
-	}
-
-	@Override
-	public String getGroup(final Player base)
-	{
-		final List<Group> groups = getPBGroups(base);
-		if (groups == null || groups.isEmpty())
-		{
-			return null;
-		}
-		return groups.get(0).getName();
-	}
-
-	@Override
-	public List<String> getGroups(final Player base)
-	{
-		final List<Group> groups = getPBGroups(base);
-		if (groups.size() == 1)
-		{
-			return Collections.singletonList(groups.get(0).getName());
-		}
-		final List<String> groupNames = new ArrayList<String>(groups.size());
-		for (Group group : groups)
-		{
-			groupNames.add(group.getName());
-		}
-		return groupNames;
-	}
-
-	private List<Group> getPBGroups(final Player base)
-	{
-		final PermissionInfo info = plugin.getPlayerInfo(base.getName());
-		if (info == null)
-		{
-			return Collections.emptyList();
-		}
-		final List<Group> groups = info.getGroups();
-		if (groups == null || groups.isEmpty())
-		{
-			return Collections.emptyList();
-		}
-		return groups;
-	}
-
-	@Override
-	public boolean inGroup(final Player base, final String group)
-	{
-		final List<Group> groups = getPBGroups(base);
-		for (Group group1 : groups)
-		{
-			if (group1.getName().equalsIgnoreCase(group))
-			{
-				return true;
-			}
-		}
-		return false;
-	}
-
-	@Override
-	public boolean canBuild(Player base, String group)
-	{
-		return base.hasPermission("essentials.build") || base.hasPermission("permissions.build");
-	}
-}
diff --git a/Essentials/src/com/earth2me/essentials/perm/PermissionsExHandler.java b/Essentials/src/com/earth2me/essentials/perm/PermissionsExHandler.java
deleted file mode 100644
index 6d7fbf777..000000000
--- a/Essentials/src/com/earth2me/essentials/perm/PermissionsExHandler.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.earth2me.essentials.perm;
-
-import java.util.Arrays;
-import java.util.List;
-import org.bukkit.entity.Player;
-import ru.tehkode.permissions.PermissionManager;
-import ru.tehkode.permissions.PermissionUser;
-import ru.tehkode.permissions.bukkit.PermissionsEx;
-
-
-public class PermissionsExHandler extends AbstractPermissionsHandler
-{
-	private final transient PermissionManager manager;
-
-	public PermissionsExHandler()
-	{
-		manager = PermissionsEx.getPermissionManager();
-	}
-
-	@Override
-	public String getGroup(final Player base)
-	{
-		final PermissionUser user = manager.getUser(base.getName());
-		if (user == null)
-		{
-			return null;
-		}
-		return user.getGroupsNames()[0];
-	}
-
-	@Override
-	public List<String> getGroups(final Player base)
-	{
-		final PermissionUser user = manager.getUser(base.getName());
-		if (user == null)
-		{
-			return null;
-		}
-		return Arrays.asList(user.getGroupsNames());
-	}
-
-	@Override
-	public boolean canBuild(final Player base, final String group)
-	{
-		final PermissionUser user = manager.getUser(base.getName());
-		if (user == null)
-		{
-			return true;
-		}
-
-		return user.getOptionBoolean("build", base.getWorld().getName(), true);
-	}
-
-	@Override
-	public boolean inGroup(final Player base, final String group)
-	{
-		final PermissionUser user = manager.getUser(base.getName());
-		if (user == null)
-		{
-			return false;
-		}
-
-		return user.inGroup(group);
-	}
-
-	@Override
-	public boolean hasPermission(final Player base, final String node)
-	{
-		return manager.has(base.getName(), node, base.getWorld().getName());
-	}
-
-	@Override
-	public String getPrefix(final Player base)
-	{
-		final PermissionUser user = manager.getUser(base.getName());
-		if (user == null)
-		{
-			return null;
-		}
-		return user.getPrefix(base.getWorld().getName());
-	}
-
-	@Override
-	public String getSuffix(final Player base)
-	{
-		final PermissionUser user = manager.getUser(base.getName());
-		if (user == null)
-		{
-			return null;
-		}
-
-		return user.getSuffix(base.getWorld().getName());
-	}
-}
diff --git a/Essentials/src/com/earth2me/essentials/perm/PermissionsHandler.java b/Essentials/src/com/earth2me/essentials/perm/PermissionsHandler.java
deleted file mode 100644
index 4cce85f83..000000000
--- a/Essentials/src/com/earth2me/essentials/perm/PermissionsHandler.java
+++ /dev/null
@@ -1,193 +0,0 @@
-package com.earth2me.essentials.perm;
-
-import com.earth2me.essentials.Util;
-import java.util.Collections;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.PluginManager;
-
-
-public class PermissionsHandler implements IPermissionsHandler
-{
-	private transient IPermissionsHandler handler = new NullPermissionsHandler();
-	private transient String defaultGroup = "default";
-	private final transient Plugin plugin;
-	private final static Logger LOGGER = Logger.getLogger("Minecraft");
-	//private transient boolean useSuperperms = false;
-
-	public PermissionsHandler(final Plugin plugin)
-	{
-		this.plugin = plugin;
-	}
-
-	/*public PermissionsHandler(final Plugin plugin, final boolean useSuperperms)
-	{
-		this.plugin = plugin;
-		this.useSuperperms = useSuperperms;
-	}*/
-
-	public PermissionsHandler(final Plugin plugin, final String defaultGroup)
-	{
-		this.plugin = plugin;
-		this.defaultGroup = defaultGroup;
-	}
-
-	@Override
-	public String getGroup(final Player base)
-	{
-		String group = handler.getGroup(base);
-		if (group == null)
-		{
-			group = defaultGroup;
-		}
-		return group;
-	}
-
-	@Override
-	public List<String> getGroups(final Player base)
-	{
-		List<String> groups = handler.getGroups(base);
-		if (groups == null || groups.isEmpty())
-		{
-			groups = Collections.singletonList(defaultGroup);
-		}
-		return Collections.unmodifiableList(groups);
-	}
-
-	@Override
-	public boolean canBuild(final Player base, final String group)
-	{
-		return handler.canBuild(base, group);
-	}
-
-	@Override
-	public boolean inGroup(final Player base, final String group)
-	{
-		return handler.inGroup(base, group);
-	}
-
-	@Override
-	public boolean hasPermission(final Player base, final String node)
-	{
-		return handler.hasPermission(base, node);
-	}
-
-	@Override
-	public String getPrefix(final Player base)
-	{
-		String prefix = handler.getPrefix(base);
-		if (prefix == null)
-		{
-			prefix = "";
-		}
-		return prefix;
-	}
-
-	@Override
-	public String getSuffix(final Player base)
-	{
-		String suffix = handler.getSuffix(base);
-		if (suffix == null)
-		{
-			suffix = "";
-		}
-		return suffix;
-	}
-
-	@Override
-	public void checkPermissions()
-	{
-		final PluginManager pluginManager = plugin.getServer().getPluginManager();
-
-		final Plugin permExPlugin = pluginManager.getPlugin("PermissionsEx");
-		if (permExPlugin != null && permExPlugin.isEnabled())
-		{
-			if (!(handler instanceof PermissionsExHandler))
-			{
-				LOGGER.log(Level.INFO, "Essentials: Using PermissionsEx based permissions.");
-				handler = new PermissionsExHandler();
-			}
-			return;
-		}
-
-		final Plugin GMplugin = pluginManager.getPlugin("GroupManager");
-		if (GMplugin != null && GMplugin.isEnabled())
-		{
-			if (!(handler instanceof GroupManagerHandler))
-			{
-				LOGGER.log(Level.INFO, "Essentials: Using GroupManager based permissions.");
-				handler = new GroupManagerHandler(GMplugin);
-			}
-			return;
-		}
-
-		final Plugin permBukkitPlugin = pluginManager.getPlugin("PermissionsBukkit");
-		if (permBukkitPlugin != null && permBukkitPlugin.isEnabled())
-		{
-			if (!(handler instanceof PermissionsBukkitHandler))
-			{
-				LOGGER.log(Level.INFO, "Essentials: Using PermissionsBukkit based permissions.");
-				handler = new PermissionsBukkitHandler(permBukkitPlugin);
-			}
-			return;
-		}
-
-		final Plugin privPlugin = pluginManager.getPlugin("Privileges");
-		if (privPlugin != null && privPlugin.isEnabled())
-		{
-			if (!(handler instanceof PrivilegesHandler))
-			{
-				LOGGER.log(Level.INFO, "Essentials: Using Privileges based permissions.");
-				handler = new PrivilegesHandler(privPlugin);
-			}
-			return;
-		}
-
-		final Plugin bPermPlugin = pluginManager.getPlugin("bPermissions");
-		if (bPermPlugin != null && bPermPlugin.isEnabled())
-		{
-			final String bVer = bPermPlugin.getDescription().getVersion().replace(".", "");
-			if (Util.isInt(bVer) && Integer.parseInt(bVer) < 284)
-			{
-				if (!(handler instanceof BPermissionsHandler))
-				{
-					LOGGER.log(Level.INFO, "Essentials: Using bPermissions based permissions.");
-					handler = new BPermissionsHandler();
-				}
-				return;
-			}
-			if (!(handler instanceof BPermissions2Handler))
-			{
-				LOGGER.log(Level.INFO, "Essentials: Using bPermissions2 based permissions.");
-				handler = new BPermissions2Handler();
-			}
-			return;
-
-		}
-
-		//if (useSuperperms)
-		//{
-			if (!(handler instanceof SuperpermsHandler))
-			{
-				LOGGER.log(Level.INFO, "Essentials: Using superperms based permissions.");
-				handler = new SuperpermsHandler();
-			}
-		/*}
-		else
-		{
-			if (!(handler instanceof ConfigPermissionsHandler))
-			{
-				LOGGER.log(Level.INFO, "Essentials: Using config based permissions. Enable superperms in config.");
-				handler = new ConfigPermissionsHandler(plugin);
-			}
-		}*/
-	}
-
-	/*public void setUseSuperperms(final boolean useSuperperms)
-	{
-		this.useSuperperms = useSuperperms;
-	}*/
-}
diff --git a/Essentials/src/com/earth2me/essentials/perm/PrivilegesHandler.java b/Essentials/src/com/earth2me/essentials/perm/PrivilegesHandler.java
deleted file mode 100644
index c81f93cbc..000000000
--- a/Essentials/src/com/earth2me/essentials/perm/PrivilegesHandler.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.earth2me.essentials.perm;
-
-import java.util.ArrayList;
-import java.util.List;
-import net.krinsoft.privileges.Privileges;
-import net.krinsoft.privileges.groups.Group;
-import net.krinsoft.privileges.groups.GroupManager;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-
-public class PrivilegesHandler extends SuperpermsHandler
-{
-	private final transient Privileges plugin;
-	private final GroupManager manager;
-
-	public PrivilegesHandler(final Plugin plugin)
-	{
-		this.plugin = (Privileges) plugin;
-		this.manager = this.plugin.getGroupManager();
-	}
-
-	@Override
-	public String getGroup(final Player base)
-	{
-		Group group = manager.getGroup(base);
-		if (group == null)
-		{
-			return null;
-		}
-		return group.getName();
-	}
-
-	@Override
-	public List<String> getGroups(final Player base)
-	{
-		Group group = manager.getGroup(base);
-		if (group == null)
-		{
-			return new ArrayList<String>();
-		}
-		return group.getGroupTree();
-	}
-
-	@Override
-	public boolean inGroup(final Player base, final String group)
-	{
-		Group pGroup = manager.getGroup(base);
-		if (pGroup == null)
-		{
-			return false;
-		}
-		return pGroup.isMemberOf(group);
-	}
-
-	@Override
-	public boolean canBuild(Player base, String group)
-	{
-		return base.hasPermission("essentials.build") || base.hasPermission("privileges.build");
-	}
-
-}
diff --git a/Essentials/src/com/earth2me/essentials/perm/SuperpermsHandler.java b/Essentials/src/com/earth2me/essentials/perm/SuperpermsHandler.java
deleted file mode 100644
index f597d1cef..000000000
--- a/Essentials/src/com/earth2me/essentials/perm/SuperpermsHandler.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.earth2me.essentials.perm;
-
-import java.util.List;
-import org.bukkit.entity.Player;
-
-
-public class SuperpermsHandler extends AbstractPermissionsHandler
-{
-	@Override
-	public String getGroup(final Player base)
-	{
-		return null;
-	}
-
-	@Override
-	public List<String> getGroups(final Player base)
-	{
-		return null;
-	}
-
-	@Override
-	public boolean canBuild(final Player base, final String group)
-	{
-		return hasPermission(base, "essentials.build");
-	}
-
-	@Override
-	public boolean inGroup(final Player base, final String group)
-	{
-		return hasPermission(base, "group." + group);
-	}
-
-	@Override
-	public boolean hasPermission(final Player base, final String node)
-	{
-		if (base.hasPermission("-" + node))
-		{
-			return false;
-		}
-		final String[] parts = node.split("\\.");
-		final StringBuilder builder = new StringBuilder(node.length());
-		for (String part : parts)
-		{
-			builder.append('*');
-			if (base.hasPermission(builder.toString()))
-			{
-				return true;
-			}
-			builder.deleteCharAt(builder.length() - 1);
-			builder.append(part).append('.');
-		}
-		return base.hasPermission(node);
-	}
-
-	@Override
-	public String getPrefix(final Player base)
-	{
-		return null;
-	}
-
-	@Override
-	public String getSuffix(final Player base)
-	{
-		return null;
-	}
-}
diff --git a/Essentials/src/com/earth2me/essentials/perm/AbstractSuperpermsPermission.java b/Essentials/src/com/earth2me/essentials/permissions/AbstractSuperpermsPermission.java
index e6ba3fdab..9dde08239 100644
--- a/Essentials/src/com/earth2me/essentials/perm/AbstractSuperpermsPermission.java
+++ b/Essentials/src/com/earth2me/essentials/permissions/AbstractSuperpermsPermission.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.perm;
+package com.earth2me.essentials.permissions;
 
 import com.earth2me.essentials.Util;
 import com.earth2me.essentials.api.IPermission;
diff --git a/Essentials/src/com/earth2me/essentials/perm/BasePermission.java b/Essentials/src/com/earth2me/essentials/permissions/BasePermission.java
index fb512fb16..3c033913f 100644
--- a/Essentials/src/com/earth2me/essentials/perm/BasePermission.java
+++ b/Essentials/src/com/earth2me/essentials/permissions/BasePermission.java
@@ -1,12 +1,12 @@
-package com.earth2me.essentials.perm;
+package com.earth2me.essentials.permissions;
 
 public class BasePermission extends AbstractSuperpermsPermission {
 	protected String permission;
 
 	public BasePermission(String base, String permission)
 	{
+		super();
 		this.permission = base + permission;
-		
 	}
 
 	public String getPermission()
diff --git a/Essentials/src/com/earth2me/essentials/perm/EnchantPermissions.java b/Essentials/src/com/earth2me/essentials/permissions/EnchantPermissions.java
index debb4a979..c31aa6f62 100644
--- a/Essentials/src/com/earth2me/essentials/perm/EnchantPermissions.java
+++ b/Essentials/src/com/earth2me/essentials/permissions/EnchantPermissions.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.perm;
+package com.earth2me.essentials.permissions;
 
 import com.earth2me.essentials.api.IPermission;
 import java.util.HashMap;
diff --git a/Essentials/src/com/earth2me/essentials/perm/GivePermissions.java b/Essentials/src/com/earth2me/essentials/permissions/GivePermissions.java
index 0748fe707..162ec46c0 100644
--- a/Essentials/src/com/earth2me/essentials/perm/GivePermissions.java
+++ b/Essentials/src/com/earth2me/essentials/permissions/GivePermissions.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.perm;
+package com.earth2me.essentials.permissions;
 
 import com.earth2me.essentials.api.IPermission;
 import java.util.EnumMap;
diff --git a/Essentials/src/com/earth2me/essentials/perm/GroupsPermissions.java b/Essentials/src/com/earth2me/essentials/permissions/GroupsPermissions.java
index 8305c0daa..ed3ca92ff 100644
--- a/Essentials/src/com/earth2me/essentials/perm/GroupsPermissions.java
+++ b/Essentials/src/com/earth2me/essentials/permissions/GroupsPermissions.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.perm;
+package com.earth2me.essentials.permissions;
 
 import com.earth2me.essentials.api.IPermission;
 import java.util.HashMap;
diff --git a/Essentials/src/com/earth2me/essentials/perm/HelpPermissions.java b/Essentials/src/com/earth2me/essentials/permissions/HelpPermissions.java
index 8079201b0..aae5e0ce7 100644
--- a/Essentials/src/com/earth2me/essentials/perm/HelpPermissions.java
+++ b/Essentials/src/com/earth2me/essentials/permissions/HelpPermissions.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.perm;
+package com.earth2me.essentials.permissions;
 
 import com.earth2me.essentials.api.IPermission;
 import java.util.HashMap;
diff --git a/Essentials/src/com/earth2me/essentials/perm/ItemPermissions.java b/Essentials/src/com/earth2me/essentials/permissions/ItemPermissions.java
index b36e5643d..980af104f 100644
--- a/Essentials/src/com/earth2me/essentials/perm/ItemPermissions.java
+++ b/Essentials/src/com/earth2me/essentials/permissions/ItemPermissions.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.perm;
+package com.earth2me.essentials.permissions;
 
 import com.earth2me.essentials.api.IPermission;
 import java.util.EnumMap;
diff --git a/Essentials/src/com/earth2me/essentials/perm/KitPermissions.java b/Essentials/src/com/earth2me/essentials/permissions/KitPermissions.java
index 5440436d0..b21e0712d 100644
--- a/Essentials/src/com/earth2me/essentials/perm/KitPermissions.java
+++ b/Essentials/src/com/earth2me/essentials/permissions/KitPermissions.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.perm;
+package com.earth2me.essentials.permissions;
 
 import com.earth2me.essentials.api.IPermission;
 import java.util.HashMap;
diff --git a/Essentials/src/com/earth2me/essentials/perm/NoCommandCostPermissions.java b/Essentials/src/com/earth2me/essentials/permissions/NoCommandCostPermissions.java
index 286240dfa..77511e198 100644
--- a/Essentials/src/com/earth2me/essentials/perm/NoCommandCostPermissions.java
+++ b/Essentials/src/com/earth2me/essentials/permissions/NoCommandCostPermissions.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.perm;
+package com.earth2me.essentials.permissions;
 
 import com.earth2me.essentials.api.IPermission;
 import java.util.HashMap;
diff --git a/Essentials/src/com/earth2me/essentials/perm/Permissions.java b/Essentials/src/com/earth2me/essentials/permissions/Permissions.java
index de0da1879..09068787a 100644
--- a/Essentials/src/com/earth2me/essentials/perm/Permissions.java
+++ b/Essentials/src/com/earth2me/essentials/permissions/Permissions.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.perm;
+package com.earth2me.essentials.permissions;
 
 import com.earth2me.essentials.Util;
 import com.earth2me.essentials.api.IPermission;
diff --git a/Essentials/src/com/earth2me/essentials/perm/SpawnerPermissions.java b/Essentials/src/com/earth2me/essentials/permissions/SpawnerPermissions.java
index 2e70d9dcf..17f8243cf 100644
--- a/Essentials/src/com/earth2me/essentials/perm/SpawnerPermissions.java
+++ b/Essentials/src/com/earth2me/essentials/permissions/SpawnerPermissions.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.perm;
+package com.earth2me.essentials.permissions;
 
 import com.earth2me.essentials.api.IPermission;
 import java.util.HashMap;
diff --git a/Essentials/src/com/earth2me/essentials/perm/SpawnmobPermissions.java b/Essentials/src/com/earth2me/essentials/permissions/SpawnmobPermissions.java
index 4535ab4d4..fa1e26fa0 100644
--- a/Essentials/src/com/earth2me/essentials/perm/SpawnmobPermissions.java
+++ b/Essentials/src/com/earth2me/essentials/permissions/SpawnmobPermissions.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.perm;
+package com.earth2me.essentials.permissions;
 
 import com.earth2me.essentials.api.IPermission;
 import java.util.HashMap;
diff --git a/Essentials/src/com/earth2me/essentials/perm/UnlimitedItemPermissions.java b/Essentials/src/com/earth2me/essentials/permissions/UnlimitedItemPermissions.java
index e3e8d9c65..dbe7df95b 100644
--- a/Essentials/src/com/earth2me/essentials/perm/UnlimitedItemPermissions.java
+++ b/Essentials/src/com/earth2me/essentials/permissions/UnlimitedItemPermissions.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.perm;
+package com.earth2me.essentials.permissions;
 
 import com.earth2me.essentials.api.IPermission;
 import java.util.EnumMap;
diff --git a/Essentials/src/com/earth2me/essentials/perm/WarpPermissions.java b/Essentials/src/com/earth2me/essentials/permissions/WarpPermissions.java
index ffd3e10b8..7f08ad3a2 100644
--- a/Essentials/src/com/earth2me/essentials/perm/WarpPermissions.java
+++ b/Essentials/src/com/earth2me/essentials/permissions/WarpPermissions.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.perm;
+package com.earth2me.essentials.permissions;
 
 import com.earth2me.essentials.api.IPermission;
 import java.util.HashMap;
diff --git a/Essentials/src/com/earth2me/essentials/perm/WorldPermissions.java b/Essentials/src/com/earth2me/essentials/permissions/WorldPermissions.java
index b67c11e63..303a7214d 100644
--- a/Essentials/src/com/earth2me/essentials/perm/WorldPermissions.java
+++ b/Essentials/src/com/earth2me/essentials/permissions/WorldPermissions.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.perm;
+package com.earth2me.essentials.permissions;
 
 import com.earth2me.essentials.api.IPermission;
 import java.util.HashMap;
diff --git a/Essentials/src/com/earth2me/essentials/perm/GMGroups.java b/Essentials/src/com/earth2me/essentials/ranks/GMGroups.java
index f301af3ca..ad40b9867 100644
--- a/Essentials/src/com/earth2me/essentials/perm/GMGroups.java
+++ b/Essentials/src/com/earth2me/essentials/ranks/GMGroups.java
@@ -1,8 +1,8 @@
-package com.earth2me.essentials.perm;
+package com.earth2me.essentials.ranks;
 
 import com.earth2me.essentials.Util;
 import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.IGroups;
+import com.earth2me.essentials.api.IRanks;
 import com.earth2me.essentials.api.ISettings;
 import com.earth2me.essentials.api.IUser;
 import java.text.MessageFormat;
@@ -11,7 +11,7 @@ import org.anjocaido.groupmanager.GroupManager;
 import org.anjocaido.groupmanager.permissions.AnjoPermissionsHandler;
 import org.bukkit.plugin.Plugin;
 
-public class GMGroups implements IGroups {
+public class GMGroups implements IRanks {
 	private final transient IEssentials ess;
 	private final transient GroupManager groupManager;
 
diff --git a/Essentials/src/com/earth2me/essentials/settings/GroupOptions.java b/Essentials/src/com/earth2me/essentials/ranks/RankOptions.java
index 7b16a471b..5fa011f9c 100644
--- a/Essentials/src/com/earth2me/essentials/settings/GroupOptions.java
+++ b/Essentials/src/com/earth2me/essentials/ranks/RankOptions.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.settings;
+package com.earth2me.essentials.ranks;
 
 import com.earth2me.essentials.storage.Comment;
 import com.earth2me.essentials.storage.StorageObject;
@@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class GroupOptions implements StorageObject
+public class RankOptions implements StorageObject
 {
 	@Comment("Message format of chat messages")
 	private String messageFormat;
diff --git a/Essentials/src/com/earth2me/essentials/ranks/Ranks.java b/Essentials/src/com/earth2me/essentials/ranks/Ranks.java
new file mode 100644
index 000000000..cc11aff2a
--- /dev/null
+++ b/Essentials/src/com/earth2me/essentials/ranks/Ranks.java
@@ -0,0 +1,28 @@
+package com.earth2me.essentials.ranks;
+
+import com.earth2me.essentials.storage.Comment;
+import com.earth2me.essentials.storage.MapValueType;
+import com.earth2me.essentials.storage.StorageObject;
+import java.util.LinkedHashMap;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class Ranks implements StorageObject
+{
+	public Ranks()
+	{
+		final RankOptions defaultOptions = new RankOptions();
+		ranks.put("default", defaultOptions);
+	}
+	@Comment(
+	{
+		"The order of the ranks matters, the ranks are checked from top to bottom.",
+		"All rank names have to be lower case.",
+		"The ranks can be connected to users using the permission essentials.ranks.rankname"
+	})
+	@MapValueType(RankOptions.class)
+	private LinkedHashMap<String, RankOptions> ranks = new LinkedHashMap<String, RankOptions>();
+}
diff --git a/Essentials/src/com/earth2me/essentials/settings/GroupsHolder.java b/Essentials/src/com/earth2me/essentials/ranks/RanksStorage.java
index 00ecfec27..5be4d230d 100644
--- a/Essentials/src/com/earth2me/essentials/settings/GroupsHolder.java
+++ b/Essentials/src/com/earth2me/essentials/ranks/RanksStorage.java
@@ -1,11 +1,11 @@
-package com.earth2me.essentials.settings;
+package com.earth2me.essentials.ranks;
 
 import com.earth2me.essentials.Util;
 import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.IGroups;
+import com.earth2me.essentials.api.IRanks;
 import com.earth2me.essentials.api.ISettings;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.GroupsPermissions;
+import com.earth2me.essentials.permissions.GroupsPermissions;
 import com.earth2me.essentials.storage.AsyncStorageObjectHolder;
 import java.io.File;
 import java.text.MessageFormat;
@@ -17,32 +17,32 @@ import java.util.Map.Entry;
 import lombok.Cleanup;
 
 
-public class GroupsHolder extends AsyncStorageObjectHolder<Groups> implements IGroups
+public class RanksStorage extends AsyncStorageObjectHolder<Ranks> implements IRanks
 {
-	public GroupsHolder(final IEssentials ess)
+	public RanksStorage(final IEssentials ess)
 	{
-		super(ess, Groups.class);
+		super(ess, Ranks.class);
 		onReload();
 	}
 
 	@Override
 	public File getStorageFile()
 	{
-		return new File(ess.getDataFolder(), "groups.yml");
+		return new File(ess.getDataFolder(), "ranks.yml");
 	}
 	
-	public Collection<Entry<String, GroupOptions>> getGroups(final IUser player)
+	public Collection<Entry<String, RankOptions>> getGroups(final IUser player)
 	{
 		acquireReadLock();
 		try
 		{
-			final Map<String, GroupOptions> groups = getData().getGroups();
+			final Map<String, RankOptions> groups = getData().getRanks();
 			if (groups == null || groups.isEmpty())
 			{
 				return Collections.emptyList();
 			}
-			final ArrayList<Entry<String, GroupOptions>> list = new ArrayList();
-			for (Entry<String, GroupOptions> entry : groups.entrySet())
+			final ArrayList<Entry<String, RankOptions>> list = new ArrayList();
+			for (Entry<String, RankOptions> entry : groups.entrySet())
 			{
 				if (GroupsPermissions.getPermission(entry.getKey()).isAuthorized(player))
 				{
@@ -63,7 +63,7 @@ public class GroupsHolder extends AsyncStorageObjectHolder<Groups> implements IG
 	@Override
 	public double getHealCooldown(final IUser player)
 	{
-		for (Entry<String, GroupOptions> groupOptions : getGroups(player))
+		for (Entry<String, RankOptions> groupOptions : getGroups(player))
 		{
 			if (groupOptions.getValue().getHealCooldown() != null)
 			{
@@ -76,7 +76,7 @@ public class GroupsHolder extends AsyncStorageObjectHolder<Groups> implements IG
 	@Override
 	public double getTeleportCooldown(final IUser player)
 	{
-		for (Entry<String, GroupOptions> groupOptions : getGroups(player))
+		for (Entry<String, RankOptions> groupOptions : getGroups(player))
 		{
 			if (groupOptions.getValue().getTeleportCooldown() != null)
 			{
@@ -89,7 +89,7 @@ public class GroupsHolder extends AsyncStorageObjectHolder<Groups> implements IG
 	@Override
 	public double getTeleportDelay(final IUser player)
 	{
-		for (Entry<String, GroupOptions> groupOptions : getGroups(player))
+		for (Entry<String, RankOptions> groupOptions : getGroups(player))
 		{
 			if (groupOptions.getValue().getTeleportDelay() != null)
 			{
@@ -102,7 +102,7 @@ public class GroupsHolder extends AsyncStorageObjectHolder<Groups> implements IG
 	@Override
 	public String getPrefix(final IUser player)
 	{
-		for (Entry<String, GroupOptions> groupOptions : getGroups(player))
+		for (Entry<String, RankOptions> groupOptions : getGroups(player))
 		{
 			if (groupOptions.getValue().getPrefix() != null)
 			{
@@ -115,7 +115,7 @@ public class GroupsHolder extends AsyncStorageObjectHolder<Groups> implements IG
 	@Override
 	public String getSuffix(final IUser player)
 	{
-		for (Entry<String, GroupOptions> groupOptions : getGroups(player))
+		for (Entry<String, RankOptions> groupOptions : getGroups(player))
 		{
 			if (groupOptions.getValue().getSuffix() != null)
 			{
@@ -128,7 +128,7 @@ public class GroupsHolder extends AsyncStorageObjectHolder<Groups> implements IG
 	@Override
 	public int getHomeLimit(final IUser player)
 	{
-		for (Entry<String, GroupOptions> groupOptions : getGroups(player))
+		for (Entry<String, RankOptions> groupOptions : getGroups(player))
 		{
 			if (groupOptions.getValue().getHomes() != null)
 			{
@@ -156,7 +156,7 @@ public class GroupsHolder extends AsyncStorageObjectHolder<Groups> implements IG
 	
 	private String getRawChatFormat(final IUser player)
 	{
-		for (Entry<String, GroupOptions> groupOptions : getGroups(player))
+		for (Entry<String, RankOptions> groupOptions : getGroups(player))
 		{
 			if (groupOptions.getValue().getMessageFormat() != null)
 			{
@@ -172,7 +172,7 @@ public class GroupsHolder extends AsyncStorageObjectHolder<Groups> implements IG
 	@Override
 	public boolean inGroup(IUser player, String groupname)
 	{
-		for (Entry<String, GroupOptions> groupOptions : getGroups(player))
+		for (Entry<String, RankOptions> groupOptions : getGroups(player))
 		{
 			if (groupOptions.getKey().equalsIgnoreCase(groupname))
 			{
@@ -185,7 +185,7 @@ public class GroupsHolder extends AsyncStorageObjectHolder<Groups> implements IG
 	@Override
 	public String getMainGroup(IUser player)
 	{
-		for (Entry<String, GroupOptions> groupOptions : getGroups(player))
+		for (Entry<String, RankOptions> groupOptions : getGroups(player))
 		{
 			return groupOptions.getKey();
 		}
diff --git a/Essentials/src/com/earth2me/essentials/perm/VaultGroups.java b/Essentials/src/com/earth2me/essentials/ranks/VaultGroups.java
index 765367c8a..01ea5c39d 100644
--- a/Essentials/src/com/earth2me/essentials/perm/VaultGroups.java
+++ b/Essentials/src/com/earth2me/essentials/ranks/VaultGroups.java
@@ -1,8 +1,8 @@
-package com.earth2me.essentials.perm;
+package com.earth2me.essentials.ranks;
 
 import com.earth2me.essentials.Util;
 import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.IGroups;
+import com.earth2me.essentials.api.IRanks;
 import com.earth2me.essentials.api.ISettings;
 import com.earth2me.essentials.api.IUser;
 import java.text.MessageFormat;
@@ -11,7 +11,7 @@ import net.milkbowl.vault.chat.Chat;
 import org.bukkit.plugin.RegisteredServiceProvider;
 
 
-public class VaultGroups implements IGroups
+public class VaultGroups implements IRanks
 {
 	private final IEssentials ess;
 
diff --git a/Essentials/src/com/earth2me/essentials/settings/Groups.java b/Essentials/src/com/earth2me/essentials/settings/Groups.java
deleted file mode 100644
index 5e67db890..000000000
--- a/Essentials/src/com/earth2me/essentials/settings/Groups.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.earth2me.essentials.settings;
-
-import com.earth2me.essentials.storage.Comment;
-import com.earth2me.essentials.storage.MapValueType;
-import com.earth2me.essentials.storage.StorageObject;
-import java.util.LinkedHashMap;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class Groups implements StorageObject
-{
-	public Groups()
-	{
-		GroupOptions defaultOptions = new GroupOptions();
-		groups.put("default", defaultOptions);
-	}
-	@Comment(
-	{
-		"The order of the groups matters, the groups are checked from top to bottom.",
-		"All group names have to be lower case.",
-		"The groups can be connected to users using the permission essentials.groups.groupname"
-	})
-	@MapValueType(GroupOptions.class)
-	private LinkedHashMap<String, GroupOptions> groups = new LinkedHashMap<String, GroupOptions>();
-}
diff --git a/Essentials/src/com/earth2me/essentials/settings/SpawnsHolder.java b/Essentials/src/com/earth2me/essentials/settings/SpawnsHolder.java
index 099ca46f4..eb648097d 100644
--- a/Essentials/src/com/earth2me/essentials/settings/SpawnsHolder.java
+++ b/Essentials/src/com/earth2me/essentials/settings/SpawnsHolder.java
@@ -167,7 +167,7 @@ public class SpawnsHolder extends AsyncStorageObjectHolder<Spawns> implements IE
 		acquireReadLock();
 		try
 		{
-			return getData().getNewPlayerAnnouncement().replace('&', '§').replace("§§", "&").replace("{PLAYER}", user.getDisplayName()).replace("{DISPLAYNAME}", user.getDisplayName()).replace("{GROUP}", ess.getGroups().getMainGroup(user)).replace("{USERNAME}", user.getName()).replace("{ADDRESS}", user.getAddress().toString());
+			return getData().getNewPlayerAnnouncement().replace('&', '�').replace("��", "&").replace("{PLAYER}", user.getDisplayName()).replace("{DISPLAYNAME}", user.getDisplayName()).replace("{GROUP}", ess.getRanks().getMainGroup(user)).replace("{USERNAME}", user.getName()).replace("{ADDRESS}", user.getAddress().toString());
 		}
 		finally
 		{
@@ -242,7 +242,7 @@ public class SpawnsHolder extends AsyncStorageObjectHolder<Spawns> implements IE
 					return;
 				}
 			}
-			final Location spawn = spawns.getSpawn(ess.getGroups().getMainGroup(user));
+			final Location spawn = spawns.getSpawn(ess.getRanks().getMainGroup(user));
 			if (spawn != null)
 			{
 				event.setRespawnLocation(spawn);
diff --git a/Essentials/src/com/earth2me/essentials/textreader/HelpInput.java b/Essentials/src/com/earth2me/essentials/textreader/HelpInput.java
index d33b54a2c..f455800fb 100644
--- a/Essentials/src/com/earth2me/essentials/textreader/HelpInput.java
+++ b/Essentials/src/com/earth2me/essentials/textreader/HelpInput.java
@@ -4,7 +4,7 @@ import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.ISettings;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.HelpPermissions;
+import com.earth2me.essentials.permissions.HelpPermissions;
 import java.io.IOException;
 import java.util.*;
 import java.util.logging.Level;
diff --git a/Essentials/src/com/earth2me/essentials/textreader/TextInput.java b/Essentials/src/com/earth2me/essentials/textreader/TextInput.java
index eb07a912c..c334b4774 100644
--- a/Essentials/src/com/earth2me/essentials/textreader/TextInput.java
+++ b/Essentials/src/com/earth2me/essentials/textreader/TextInput.java
@@ -33,7 +33,7 @@ public class TextInput implements IText
 				file = new File(ess.getDataFolder(), filename + "_" + Util.sanitizeFileName(user.getName()) + ".txt");
 				if (!file.exists())
 				{
-					file = new File(ess.getDataFolder(), filename + "_" + Util.sanitizeFileName(ess.getGroups().getMainGroup(user)) + ".txt");
+					file = new File(ess.getDataFolder(), filename + "_" + Util.sanitizeFileName(ess.getRanks().getMainGroup(user)) + ".txt");
 				}
 			}
 			catch (InvalidNameException ex)
@@ -85,9 +85,9 @@ public class TextInput implements IText
 						if (line.length() > 0 && line.charAt(0) == '#')
 						{
 							bookmarks.put(line.substring(1).toLowerCase(Locale.ENGLISH).replaceAll("&[0-9a-f]", ""), lineNumber);
-							chapters.add(line.substring(1).replace('&', '§').replace("§", "&"));
+							chapters.add(line.substring(1).replace('&', '�').replace("�", "&"));
 						}
-						lines.add(line.replace('&', '§').replace("§", "&"));
+						lines.add(line.replace('&', '�').replace("�", "&"));
 						lineNumber++;
 					}
 				}
diff --git a/Essentials/src/com/earth2me/essentials/user/User.java b/Essentials/src/com/earth2me/essentials/user/User.java
index 769bb8dff..18c9b6387 100644
--- a/Essentials/src/com/earth2me/essentials/user/User.java
+++ b/Essentials/src/com/earth2me/essentials/user/User.java
@@ -7,7 +7,7 @@ import com.earth2me.essentials.Teleport;
 import com.earth2me.essentials.Util;
 import com.earth2me.essentials.api.*;
 import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import com.earth2me.essentials.register.payment.Method;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
@@ -208,7 +208,7 @@ public class User extends UserBase implements IUser
 			@Cleanup
 			final ISettings settings = ess.getSettings();
 			settings.acquireReadLock();
-			final IGroups groups = ess.getGroups();
+			final IRanks groups = ess.getRanks();
 			// default: {PREFIX}{NICKNAMEPREFIX}{NAME}{SUFFIX}
 			String displayname = settings.getData().getChat().getDisplaynameFormat();
 			if (settings.getData().getCommands().isDisabled("nick") || nick == null || nick.isEmpty() || nick.equals(getName()))
diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/ChatPermissions.java b/EssentialsChat/src/com/earth2me/essentials/chat/ChatPermissions.java
index 5b98002c5..9a8bd9e88 100644
--- a/EssentialsChat/src/com/earth2me/essentials/chat/ChatPermissions.java
+++ b/EssentialsChat/src/com/earth2me/essentials/chat/ChatPermissions.java
@@ -1,7 +1,7 @@
 package com.earth2me.essentials.chat;
 
 import com.earth2me.essentials.api.IPermission;
-import com.earth2me.essentials.perm.BasePermission;
+import com.earth2me.essentials.permissions.BasePermission;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java
index c1f423e58..c2501f898 100644
--- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java
+++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java
@@ -5,10 +5,10 @@ import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.Util;
 import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.IGroups;
+import com.earth2me.essentials.api.IRanks;
 import com.earth2me.essentials.api.ISettings;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import java.util.Locale;
 import java.util.Map;
 import java.util.logging.Logger;
@@ -82,10 +82,10 @@ public abstract class EssentialsChatPlayer implements Listener
 		{
 			event.setMessage(Util.stripColor(event.getMessage()));
 		}
-		String group = ess.getGroups().getMainGroup(user);
+		String group = ess.getRanks().getMainGroup(user);
 		String world = user.getWorld().getName();
 
-		IGroups groupSettings = ess.getGroups();
+		IRanks groupSettings = ess.getRanks();
 		event.setFormat(groupSettings.getChatFormat(user).format(new Object[]
 				{
 					group, world, world.substring(0, 1).toUpperCase(Locale.ENGLISH)
diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEventListener.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEventListener.java
index 1eb589ff1..401fa1142 100644
--- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEventListener.java
+++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEventListener.java
@@ -3,7 +3,7 @@ package com.earth2me.essentials.chat;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import java.util.logging.Logger;
 import org.bukkit.Location;
 import org.bukkit.Server;
diff --git a/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java b/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java
index 45d21d89c..158457155 100644
--- a/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java
+++ b/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java
@@ -4,7 +4,7 @@ import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.IReload;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.permissions.Permissions;
 import com.maxmind.geoip.Location;
 import com.maxmind.geoip.LookupService;
 import com.maxmind.geoip.regionName;
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/BlockBreakPermissions.java b/EssentialsProtect/src/com/earth2me/essentials/protect/BlockBreakPermissions.java
index 74ebe38dc..b6a74df22 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/BlockBreakPermissions.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/BlockBreakPermissions.java
@@ -1,7 +1,7 @@
 package com.earth2me.essentials.protect;
 
 import com.earth2me.essentials.api.IPermission;
-import com.earth2me.essentials.perm.AbstractSuperpermsPermission;
+import com.earth2me.essentials.permissions.AbstractSuperpermsPermission;
 import java.util.EnumMap;
 import java.util.Locale;
 import java.util.Map;
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/BlockPlacePermissions.java b/EssentialsProtect/src/com/earth2me/essentials/protect/BlockPlacePermissions.java
index 23ce7e053..00f7d6c4e 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/BlockPlacePermissions.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/BlockPlacePermissions.java
@@ -1,7 +1,7 @@
 package com.earth2me.essentials.protect;
 
 import com.earth2me.essentials.api.IPermission;
-import com.earth2me.essentials.perm.AbstractSuperpermsPermission;
+import com.earth2me.essentials.permissions.AbstractSuperpermsPermission;
 import java.util.EnumMap;
 import java.util.Locale;
 import java.util.Map;
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/ItemUsePermissions.java b/EssentialsProtect/src/com/earth2me/essentials/protect/ItemUsePermissions.java
index 258a93761..7cd147aee 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/ItemUsePermissions.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/ItemUsePermissions.java
@@ -1,7 +1,7 @@
 package com.earth2me.essentials.protect;
 
 import com.earth2me.essentials.api.IPermission;
-import com.earth2me.essentials.perm.AbstractSuperpermsPermission;
+import com.earth2me.essentials.permissions.AbstractSuperpermsPermission;
 import java.util.EnumMap;
 import java.util.Locale;
 import java.util.Map;
diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignKit.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignKit.java
index e150edfa2..e54e837bd 100644
--- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignKit.java
+++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignKit.java
@@ -4,7 +4,7 @@ import com.earth2me.essentials.api.ChargeException;
 import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.KitPermissions;
+import com.earth2me.essentials.permissions.KitPermissions;
 import com.earth2me.essentials.settings.Kit;
 import java.util.Locale;
 
@@ -52,7 +52,7 @@ public class SignKit extends EssentialsSign
 	{
 		final String kitName = sign.getLine(1).toLowerCase(Locale.ENGLISH);
 		final String group = sign.getLine(2);
-		if ((!group.isEmpty() && ("§2Everyone".equals(group) || ess.getGroups().inGroup(player, group)))
+		if ((!group.isEmpty() && ("§2Everyone".equals(group) || ess.getRanks().inGroup(player, group)))
 			|| (group.isEmpty() && KitPermissions.getPermission(kitName).isAuthorized(player)))
 		{
 			final Trade charge = getTrade(sign, 3, ess);
diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignProtection.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignProtection.java
index 4b343c977..0131e06c6 100644
--- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignProtection.java
+++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignProtection.java
@@ -154,7 +154,7 @@ public class SignProtection extends EssentialsSign
 		for (int i = 1; i <= 2; i++)
 		{
 			final String line = sign.getLine(i);
-			if (line.startsWith("(") && line.endsWith(")") && ess.getGroups().inGroup(user, line.substring(1, line.length() - 1)))
+			if (line.startsWith("(") && line.endsWith(")") && ess.getRanks().inGroup(user, line.substring(1, line.length() - 1)))
 			{
 				return SignProtectionState.ALLOWED;
 			}
diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignWarp.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignWarp.java
index caabbfb04..281618ce6 100644
--- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignWarp.java
+++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignWarp.java
@@ -4,7 +4,7 @@ import com.earth2me.essentials.api.ChargeException;
 import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.WarpPermissions;
+import com.earth2me.essentials.permissions.WarpPermissions;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
@@ -51,7 +51,7 @@ public class SignWarp extends EssentialsSign
 		final String warpName = sign.getLine(1);
 		final String group = sign.getLine(2);
 
-		if ((!group.isEmpty() && ("§2Everyone".equals(group) || ess.getGroups().inGroup(player, group)))
+		if ((!group.isEmpty() && ("§2Everyone".equals(group) || ess.getRanks().inGroup(player, group)))
 			|| (group.isEmpty() && WarpPermissions.getPermission(warpName).isAuthorized(player)))
 		{
 			final Trade charge = getTrade(sign, 3, ess);
diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignsPermissions.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignsPermissions.java
index 82c9bdca9..eb8025f5b 100644
--- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignsPermissions.java
+++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignsPermissions.java
@@ -1,7 +1,7 @@
 package com.earth2me.essentials.signs;
 
 import com.earth2me.essentials.api.IPermission;
-import com.earth2me.essentials.perm.BasePermission;
+import com.earth2me.essentials.permissions.BasePermission;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;