Package Renames

295 files changed, 1162 insertions, 1297 deletions

diff --git a/Essentials/src/com/earth2me/essentials/api/IWarp.java b/Essentials/src/com/earth2me/essentials/api/IWarp.java
deleted file mode 100644
index f08e5757d..000000000
--- a/Essentials/src/com/earth2me/essentials/api/IWarp.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.earth2me.essentials.api;
-
-import com.earth2me.essentials.settings.Warp;
-import com.earth2me.essentials.storage.IStorageObjectHolder;
-
-
-public interface IWarp extends IStorageObjectHolder<Warp>
-{
-}
diff --git a/Essentials/src/com/earth2me/essentials/storage/StorageObject.java b/Essentials/src/com/earth2me/essentials/storage/StorageObject.java
deleted file mode 100644
index 0c66fefcf..000000000
--- a/Essentials/src/com/earth2me/essentials/storage/StorageObject.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.earth2me.essentials.storage;
-
-
-public interface StorageObject
-{
-}
diff --git a/Essentials/src/com/earth2me/essentials/user/IOfflineUser.java b/Essentials/src/com/earth2me/essentials/user/IOfflineUser.java
deleted file mode 100644
index 144955f57..000000000
--- a/Essentials/src/com/earth2me/essentials/user/IOfflineUser.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.earth2me.essentials.user;
-
-import com.earth2me.essentials.storage.IStorageObjectHolder;
-
-
-public interface IOfflineUser extends IStorageObjectHolder<UserData>//, IOfflinePlayer
-{
-	
-}
diff --git a/Essentials/src/com/earth2me/essentials/Console.java b/Essentials/src/net/ess3/Console.java
index 296ff380f..4639a531a 100644
--- a/Essentials/src/com/earth2me/essentials/Console.java
+++ b/Essentials/src/net/ess3/Console.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials;
+package net.ess3;
 
-import com.earth2me.essentials.api.IReplyTo;
-import com.earth2me.essentials.api.server.CommandSender;
+import net.ess3.api.IReplyTo;
+import net.ess3.api.server.CommandSender;
 
 
 public final class Console implements IReplyTo
diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/net/ess3/Essentials.java
index ff0086dda..12526ffef 100644
--- a/Essentials/src/com/earth2me/essentials/Essentials.java
+++ b/Essentials/src/net/ess3/Essentials.java
@@ -15,26 +15,25 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.*;
-import com.earth2me.essentials.api.server.Player;
-import com.earth2me.essentials.api.server.IPlugin;
-import com.earth2me.essentials.api.server.IServer;
-import com.earth2me.essentials.api.server.World;
-import com.earth2me.essentials.backup.Backup;
-import com.earth2me.essentials.commands.EssentialsCommandHandler;
-import com.earth2me.essentials.economy.Economy;
-import com.earth2me.essentials.economy.Trade;
-import com.earth2me.essentials.economy.WorthHolder;
-import com.earth2me.essentials.economy.register.Methods;
-import com.earth2me.essentials.listener.*;
-import com.earth2me.essentials.ranks.RanksStorage;
-import com.earth2me.essentials.settings.SettingsHolder;
-import com.earth2me.essentials.settings.SpawnsHolder;
-import com.earth2me.essentials.user.UserMap;
-import com.earth2me.essentials.utils.ExecuteTimer;
+package net.ess3;
+
+import net.ess3.api.*;
+import net.ess3.api.server.Player;
+import net.ess3.api.server.IPlugin;
+import net.ess3.api.server.IServer;
+import net.ess3.api.server.World;
+import net.ess3.backup.Backup;
+import net.ess3.commands.EssentialsCommandHandler;
+import net.ess3.economy.Economy;
+import net.ess3.economy.Trade;
+import net.ess3.economy.WorthHolder;
+import net.ess3.economy.register.Methods;
+import net.ess3.listener.*;
+import net.ess3.ranks.RanksStorage;
+import net.ess3.settings.SettingsHolder;
+import net.ess3.settings.SpawnsHolder;
+import net.ess3.user.UserMap;
+import net.ess3.utils.ExecuteTimer;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -108,7 +107,7 @@ public class Essentials implements IEssentials
 			throw new IOException();
 		}
 
-		logger.log(Level.INFO, _("usingTempFolderForTesting"));
+		logger.log(Level.INFO, I18n._("usingTempFolderForTesting"));
 		logger.log(Level.INFO, dataFolder.toString());
 		//this.initialize(null, server, new PluginDescriptionFile(new FileReader(new File("src" + File.separator + "plugin.yml"))), dataFolder, null, null);
 		settings = new SettingsHolder(this);
@@ -154,7 +153,7 @@ public class Essentials implements IEssentials
 			execTimer.mark("Init(Worth/ItemDB)");
 			kits = new Kits(this);
 			reloadList.add(kits);
-			commandHandler = new EssentialsCommandHandler(Essentials.class.getClassLoader(), "com.earth2me.essentials.commands.Command", "essentials.", this);
+			commandHandler = new EssentialsCommandHandler(Essentials.class.getClassLoader(), "net.ess3.commands.Command", "essentials.", this);
 			reloadList.add(commandHandler);
 			economy = new Economy(this);
 			reloadList.add(economy);
@@ -166,11 +165,11 @@ public class Essentials implements IEssentials
 		{
 			if (pm.getPlugin("EssentialsUpdate") != null)
 			{
-				logger.log(Level.SEVERE, _("essentialsHelp2"));
+				logger.log(Level.SEVERE, I18n._("essentialsHelp2"));
 			}
 			else
 			{
-				logger.log(Level.SEVERE, _("essentialsHelp1"));
+				logger.log(Level.SEVERE, I18n._("essentialsHelp1"));
 			}
 			logger.log(Level.SEVERE, exception.toString());
 			pm.registerEvents(new Listener()
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsTimer.java b/Essentials/src/net/ess3/EssentialsTimer.java
index 8bbcb4c66..bab8e9e0c 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsTimer.java
+++ b/Essentials/src/net/ess3/EssentialsTimer.java
@@ -1,18 +1,15 @@
-package com.earth2me.essentials;
+package net.ess3;
 
-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.api.server.Player;
-import com.earth2me.essentials.permissions.Permissions;
-import com.earth2me.essentials.user.UserData.TimestampType;
+import net.ess3.api.IEssentials;
+import net.ess3.api.ISettings;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
+import net.ess3.user.UserData.TimestampType;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 import java.util.logging.Level;
-import org.bukkit.entity.Player;
 
 
 public class EssentialsTimer implements Runnable
@@ -56,7 +53,7 @@ public class EssentialsTimer implements Runnable
 					final List<String> mail = user.getMails();
 					if (mail != null && !mail.isEmpty())
 					{
-						user.sendMessage(_("youHaveNewMail", mail.size()));
+						user.sendMessage(I18n._("youHaveNewMail", mail.size()));
 					}
 				}
 			}
diff --git a/Essentials/src/com/earth2me/essentials/I18n.java b/Essentials/src/net/ess3/I18n.java
index 6eb164dd4..1aa1906ba 100644
--- a/Essentials/src/com/earth2me/essentials/I18n.java
+++ b/Essentials/src/net/ess3/I18n.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials;
+package net.ess3;
 
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.II18n;
+import net.ess3.api.IEssentials;
+import net.ess3.api.II18n;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
diff --git a/Essentials/src/com/earth2me/essentials/ItemDb.java b/Essentials/src/net/ess3/ItemDb.java
index 479119a31..1ccc063b1 100644
--- a/Essentials/src/com/earth2me/essentials/ItemDb.java
+++ b/Essentials/src/net/ess3/ItemDb.java
@@ -1,13 +1,13 @@
-package com.earth2me.essentials;
-
-import com.earth2me.essentials.storage.ManagedFile;
-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.api.server.ItemStack;
-import com.earth2me.essentials.api.server.Material;
-import com.earth2me.essentials.permissions.Permissions;
+package net.ess3;
+
+import net.ess3.storage.ManagedFile;
+import static net.ess3.I18n._;
+import net.ess3.api.IEssentials;
+import net.ess3.api.IItemDb;
+import net.ess3.api.IUser;
+import net.ess3.api.server.ItemStack;
+import net.ess3.api.server.Material;
+import net.ess3.permissions.Permissions;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -67,7 +67,7 @@ public class ItemDb implements IItemDb
 		final ItemStack stack = get(id.toLowerCase(Locale.ENGLISH));
 
 		@Cleanup
-		com.earth2me.essentials.api.ISettings settings = ess.getSettings();
+		net.ess3.api.ISettings settings = ess.getSettings();
 		settings.acquireReadLock();
 
 		final int defaultStackSize = settings.getData().getGeneral().getDefaultStacksize();
diff --git a/Essentials/src/com/earth2me/essentials/Jails.java b/Essentials/src/net/ess3/Jails.java
index cc95da8aa..2c3f31bca 100644
--- a/Essentials/src/com/earth2me/essentials/Jails.java
+++ b/Essentials/src/net/ess3/Jails.java
@@ -1,10 +1,10 @@
-package com.earth2me.essentials;
+package net.ess3;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.IJails;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.storage.AsyncStorageObjectHolder;
+import static net.ess3.I18n._;
+import net.ess3.api.IEssentials;
+import net.ess3.api.IJails;
+import net.ess3.api.IUser;
+import net.ess3.storage.AsyncStorageObjectHolder;
 import java.io.File;
 import java.util.*;
 import java.util.logging.Level;
@@ -26,13 +26,13 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import org.bukkit.plugin.PluginManager;
 
 
-public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.settings.Jails> implements IJails
+public class Jails extends AsyncStorageObjectHolder<net.ess3.settings.Jails> implements IJails
 {
 	private static final transient Logger LOGGER = Bukkit.getLogger();
 
 	public Jails(final IEssentials ess)
 	{
-		super(ess, com.earth2me.essentials.settings.Jails.class);
+		super(ess, net.ess3.settings.Jails.class);
 		onReload();
 		registerListeners();
 	}
@@ -147,9 +147,9 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
 		{
 			if (getData().getJails() == null)
 			{
-				getData().setJails(new HashMap<String, com.earth2me.essentials.storage.StoredLocation>());
+				getData().setJails(new HashMap<String, net.ess3.storage.StoredLocation>());
 			}
-			getData().getJails().put(jailName.toLowerCase(Locale.ENGLISH), new com.earth2me.essentials.storage.StoredLocation(loc));
+			getData().getJails().put(jailName.toLowerCase(Locale.ENGLISH), new net.ess3.storage.StoredLocation(loc));
 		}
 		finally
 		{
diff --git a/Essentials/src/com/earth2me/essentials/Kits.java b/Essentials/src/net/ess3/Kits.java
index 2f12188eb..e286eb847 100644
--- a/Essentials/src/com/earth2me/essentials/Kits.java
+++ b/Essentials/src/net/ess3/Kits.java
@@ -1,22 +1,22 @@
-package com.earth2me.essentials;
+package net.ess3;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.IKits;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.settings.Kit;
-import com.earth2me.essentials.storage.AsyncStorageObjectHolder;
+import static net.ess3.I18n._;
+import net.ess3.api.IEssentials;
+import net.ess3.api.IKits;
+import net.ess3.api.IUser;
+import net.ess3.settings.Kit;
+import net.ess3.storage.AsyncStorageObjectHolder;
 import java.io.File;
 import java.io.IOException;
 import java.util.*;
 import org.bukkit.inventory.ItemStack;
 
 
-public class Kits extends AsyncStorageObjectHolder<com.earth2me.essentials.settings.Kits> implements IKits
+public class Kits extends AsyncStorageObjectHolder<net.ess3.settings.Kits> implements IKits
 {
 	public Kits(final IEssentials ess)
 	{
-		super(ess, com.earth2me.essentials.settings.Kits.class);
+		super(ess, net.ess3.settings.Kits.class);
 		onReload();
 	}
 
diff --git a/Essentials/src/com/earth2me/essentials/Teleport.java b/Essentials/src/net/ess3/Teleport.java
index 4d79183e1..83eb8a842 100644
--- a/Essentials/src/com/earth2me/essentials/Teleport.java
+++ b/Essentials/src/net/ess3/Teleport.java
@@ -1,18 +1,18 @@
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.ITeleport;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.Player;
-import com.earth2me.essentials.api.server.Location;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import com.earth2me.essentials.economy.Trade;
-import com.earth2me.essentials.permissions.Permissions;
-import com.earth2me.essentials.user.CooldownException;
-import com.earth2me.essentials.user.UserData.TimestampType;
-import com.earth2me.essentials.utils.DateUtil;
-import com.earth2me.essentials.utils.LocationUtil;
+package net.ess3;
+
+import static net.ess3.I18n._;
+import net.ess3.api.IEssentials;
+import net.ess3.api.ITeleport;
+import net.ess3.api.IUser;
+import net.ess3.api.server.Player;
+import net.ess3.api.server.Location;
+import net.ess3.commands.NotEnoughArgumentsException;
+import net.ess3.economy.Trade;
+import net.ess3.permissions.Permissions;
+import net.ess3.user.CooldownException;
+import net.ess3.user.UserData.TimestampType;
+import net.ess3.utils.DateUtil;
+import net.ess3.utils.LocationUtil;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.logging.Logger;
diff --git a/Essentials/src/com/earth2me/essentials/Warps.java b/Essentials/src/net/ess3/Warps.java
index 017fd2d3e..08398b8e1 100644
--- a/Essentials/src/com/earth2me/essentials/Warps.java
+++ b/Essentials/src/net/ess3/Warps.java
@@ -1,17 +1,16 @@
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.IWarp;
-import com.earth2me.essentials.api.IWarps;
-import com.earth2me.essentials.api.InvalidNameException;
-import com.earth2me.essentials.api.server.Location;
-import com.earth2me.essentials.commands.WarpNotFoundException;
-import com.earth2me.essentials.settings.WarpHolder;
-import com.earth2me.essentials.storage.StorageObjectMap;
+package net.ess3;
+
+import static net.ess3.I18n._;
+import net.ess3.api.IEssentials;
+import net.ess3.api.IWarp;
+import net.ess3.api.IWarps;
+import net.ess3.api.InvalidNameException;
+import net.ess3.api.server.Location;
+import net.ess3.commands.WarpNotFoundException;
+import net.ess3.settings.WarpHolder;
+import net.ess3.storage.StorageObjectMap;
 import java.io.File;
 import java.util.*;
-import java.util.logging.Logger;
 
 
 public class Warps extends StorageObjectMap<IWarp> implements IWarps
@@ -74,10 +73,10 @@ public class Warps extends StorageObjectMap<IWarp> implements IWarps
 	@Override
 	public void setWarp(final String name, final Location loc) throws Exception
 	{
-		setWarp(name, new com.earth2me.essentials.storage.StoredLocation(loc));
+		setWarp(name, new net.ess3.storage.StoredLocation(loc));
 	}
 	
-	public void setWarp(final String name, final com.earth2me.essentials.storage.StoredLocation loc) throws Exception
+	public void setWarp(final String name, final net.ess3.storage.StoredLocation loc) throws Exception
 	{
 		IWarp warp = getObject(name);
 		if (warp == null)
diff --git a/Essentials/src/com/earth2me/essentials/api/ChargeException.java b/Essentials/src/net/ess3/api/ChargeException.java
index 5b157ce63..48a004791 100644
--- a/Essentials/src/com/earth2me/essentials/api/ChargeException.java
+++ b/Essentials/src/net/ess3/api/ChargeException.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
 
 public class ChargeException extends Exception
diff --git a/Essentials2Compat/src/com/earth2me/essentials/api/Economy.java b/Essentials/src/net/ess3/api/Economy.java
index cf8cb640c..b16db0556 100644
--- a/Essentials2Compat/src/com/earth2me/essentials/api/Economy.java
+++ b/Essentials/src/net/ess3/api/Economy.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
-import com.earth2me.essentials.utils.Util;
+import net.ess3.utils.Util;
 
 
 /**
diff --git a/Essentials/src/com/earth2me/essentials/api/IBackup.java b/Essentials/src/net/ess3/api/IBackup.java
index 8af074c54..03fb232eb 100644
--- a/Essentials/src/com/earth2me/essentials/api/IBackup.java
+++ b/Essentials/src/net/ess3/api/IBackup.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
 
 public interface IBackup extends Runnable
diff --git a/Essentials/src/com/earth2me/essentials/api/ICommandHandler.java b/Essentials/src/net/ess3/api/ICommandHandler.java
index b515f9f38..be7a9e6c4 100644
--- a/Essentials/src/com/earth2me/essentials/api/ICommandHandler.java
+++ b/Essentials/src/net/ess3/api/ICommandHandler.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
-import com.earth2me.essentials.api.server.CommandSender;
+import net.ess3.api.server.CommandSender;
 import java.util.Map;
 import org.bukkit.command.Command;
 import org.bukkit.plugin.Plugin;
diff --git a/Essentials/src/com/earth2me/essentials/api/IComponent.java b/Essentials/src/net/ess3/api/IComponent.java
index ae3c2a9c2..a25a19f81 100644
--- a/Essentials/src/com/earth2me/essentials/api/IComponent.java
+++ b/Essentials/src/net/ess3/api/IComponent.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
 public interface IComponent extends IReload {
 	/**
diff --git a/Essentials/src/com/earth2me/essentials/api/IEconomy.java b/Essentials/src/net/ess3/api/IEconomy.java
index 092d86c88..f0cf6f7fe 100644
--- a/Essentials/src/com/earth2me/essentials/api/IEconomy.java
+++ b/Essentials/src/net/ess3/api/IEconomy.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
 
 public interface IEconomy extends IReload
diff --git a/Essentials/src/com/earth2me/essentials/api/IEssentials.java b/Essentials/src/net/ess3/api/IEssentials.java
index 2a3b21147..286d00037 100644
--- a/Essentials/src/com/earth2me/essentials/api/IEssentials.java
+++ b/Essentials/src/net/ess3/api/IEssentials.java
@@ -1,11 +1,10 @@
-package com.earth2me.essentials.api;
-
-import com.earth2me.essentials.api.server.Player;
-import com.earth2me.essentials.api.server.IPlugin;
-import com.earth2me.essentials.api.server.IServer;
-import com.earth2me.essentials.api.server.World;
-import com.earth2me.essentials.economy.register.Methods;
-import com.earth2me.essentials.listener.TntExplodeListener;
+package net.ess3.api;
+
+import net.ess3.api.server.IPlugin;
+import net.ess3.api.server.IServer;
+import net.ess3.api.server.World;
+import net.ess3.economy.register.Methods;
+import net.ess3.listener.TntExplodeListener;
 import java.util.logging.Logger;
 
 
diff --git a/Essentials/src/com/earth2me/essentials/api/IEssentialsModule.java b/Essentials/src/net/ess3/api/IEssentialsModule.java
index cc185980a..c4c6f3a45 100644
--- a/Essentials/src/com/earth2me/essentials/api/IEssentialsModule.java
+++ b/Essentials/src/net/ess3/api/IEssentialsModule.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
 
 public interface IEssentialsModule
diff --git a/Essentials/src/com/earth2me/essentials/api/II18n.java b/Essentials/src/net/ess3/api/II18n.java
index 567d4e59e..198ee47c4 100644
--- a/Essentials/src/com/earth2me/essentials/api/II18n.java
+++ b/Essentials/src/net/ess3/api/II18n.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
 import java.util.Locale;
 
diff --git a/Essentials/src/com/earth2me/essentials/api/IItemDb.java b/Essentials/src/net/ess3/api/IItemDb.java
index b792e02d2..fa9e1d868 100644
--- a/Essentials/src/com/earth2me/essentials/api/IItemDb.java
+++ b/Essentials/src/net/ess3/api/IItemDb.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
-import com.earth2me.essentials.api.server.ItemStack;
+import net.ess3.api.server.ItemStack;
 
 
 public interface IItemDb extends IReload
diff --git a/Essentials/src/com/earth2me/essentials/api/IJails.java b/Essentials/src/net/ess3/api/IJails.java
index caa1ee0a8..c7b01dfdc 100644
--- a/Essentials/src/com/earth2me/essentials/api/IJails.java
+++ b/Essentials/src/net/ess3/api/IJails.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
 import java.util.Collection;
 import org.bukkit.Location;
diff --git a/Essentials/src/com/earth2me/essentials/api/IKits.java b/Essentials/src/net/ess3/api/IKits.java
index 85ca4cdea..33a609c46 100644
--- a/Essentials/src/com/earth2me/essentials/api/IKits.java
+++ b/Essentials/src/net/ess3/api/IKits.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
-import com.earth2me.essentials.settings.Kit;
+import net.ess3.settings.Kit;
 import java.util.Collection;
 
 
diff --git a/Essentials/src/com/earth2me/essentials/api/IPermission.java b/Essentials/src/net/ess3/api/IPermission.java
index d20e900fd..60b0bdb42 100644
--- a/Essentials/src/com/earth2me/essentials/api/IPermission.java
+++ b/Essentials/src/net/ess3/api/IPermission.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.api.server.Permission;
+import net.ess3.api.server.CommandSender;
+import net.ess3.api.server.Permission;
 
 
 public interface IPermission
diff --git a/Essentials/src/com/earth2me/essentials/api/IRanks.java b/Essentials/src/net/ess3/api/IRanks.java
index e29b31302..4785bbb70 100644
--- a/Essentials/src/com/earth2me/essentials/api/IRanks.java
+++ b/Essentials/src/net/ess3/api/IRanks.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
 import java.text.MessageFormat;
 
diff --git a/Essentials/src/com/earth2me/essentials/api/IReload.java b/Essentials/src/net/ess3/api/IReload.java
index 75403b55c..964d88841 100644
--- a/Essentials/src/com/earth2me/essentials/api/IReload.java
+++ b/Essentials/src/net/ess3/api/IReload.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
 
 public interface IReload
diff --git a/Essentials/src/com/earth2me/essentials/api/IReplyTo.java b/Essentials/src/net/ess3/api/IReplyTo.java
index ec07139cb..6e96166bb 100644
--- a/Essentials/src/com/earth2me/essentials/api/IReplyTo.java
+++ b/Essentials/src/net/ess3/api/IReplyTo.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
-import com.earth2me.essentials.api.server.CommandSender;
+import net.ess3.api.server.CommandSender;
 
 
 public interface IReplyTo
diff --git a/Essentials/src/com/earth2me/essentials/api/ISettings.java b/Essentials/src/net/ess3/api/ISettings.java
index a445d21b4..971f96871 100644
--- a/Essentials/src/com/earth2me/essentials/api/ISettings.java
+++ b/Essentials/src/net/ess3/api/ISettings.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
-import com.earth2me.essentials.settings.Settings;
-import com.earth2me.essentials.storage.IStorageObjectHolder;
+import net.ess3.settings.Settings;
+import net.ess3.storage.IStorageObjectHolder;
 
 
 public interface ISettings extends IStorageObjectHolder<Settings>
diff --git a/Essentials/src/com/earth2me/essentials/api/ITeleport.java b/Essentials/src/net/ess3/api/ITeleport.java
index 3a5f25f78..559a05f39 100644
--- a/Essentials/src/com/earth2me/essentials/api/ITeleport.java
+++ b/Essentials/src/net/ess3/api/ITeleport.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
-import com.earth2me.essentials.economy.Trade;
+import net.ess3.economy.Trade;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
diff --git a/Essentials/src/com/earth2me/essentials/api/IUser.java b/Essentials/src/net/ess3/api/IUser.java
index 928dc41b2..30d3fc4f8 100644
--- a/Essentials/src/com/earth2me/essentials/api/IUser.java
+++ b/Essentials/src/net/ess3/api/IUser.java
@@ -1,12 +1,12 @@
-package com.earth2me.essentials.api;
-
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.api.server.Player;
-import com.earth2me.essentials.api.server.ItemStack;
-import com.earth2me.essentials.api.server.Location;
-import com.earth2me.essentials.storage.IStorageObjectHolder;
-import com.earth2me.essentials.user.CooldownException;
-import com.earth2me.essentials.user.UserData;
+package net.ess3.api;
+
+import net.ess3.api.server.CommandSender;
+import net.ess3.api.server.Player;
+import net.ess3.api.server.ItemStack;
+import net.ess3.api.server.Location;
+import net.ess3.storage.IStorageObjectHolder;
+import net.ess3.user.CooldownException;
+import net.ess3.user.UserData;
 import java.util.List;
 
 
diff --git a/Essentials/src/com/earth2me/essentials/api/IUserMap.java b/Essentials/src/net/ess3/api/IUserMap.java
index bdbf084c7..887791f7b 100644
--- a/Essentials/src/com/earth2me/essentials/api/IUserMap.java
+++ b/Essentials/src/net/ess3/api/IUserMap.java
@@ -1,9 +1,8 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
-import com.earth2me.essentials.api.server.Player;
-import com.earth2me.essentials.user.TooManyMatchesException;
+import net.ess3.api.server.Player;
+import net.ess3.user.TooManyMatchesException;
 import java.io.File;
-import java.util.List;
 import java.util.Set;
 
 
diff --git a/Essentials/src/net/ess3/api/IWarp.java b/Essentials/src/net/ess3/api/IWarp.java
new file mode 100644
index 000000000..149a9cfc6
--- /dev/null
+++ b/Essentials/src/net/ess3/api/IWarp.java
@@ -0,0 +1,9 @@
+package net.ess3.api;
+
+import net.ess3.settings.Warp;
+import net.ess3.storage.IStorageObjectHolder;
+
+
+public interface IWarp extends IStorageObjectHolder<Warp>
+{
+}
diff --git a/Essentials/src/com/earth2me/essentials/api/IWarps.java b/Essentials/src/net/ess3/api/IWarps.java
index 3c3c4a2e4..00939ff7e 100644
--- a/Essentials/src/com/earth2me/essentials/api/IWarps.java
+++ b/Essentials/src/net/ess3/api/IWarps.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
-import com.earth2me.essentials.api.server.Location;
+import net.ess3.api.server.Location;
 import java.io.File;
 import java.util.Collection;
 
diff --git a/Essentials/src/com/earth2me/essentials/api/IWorth.java b/Essentials/src/net/ess3/api/IWorth.java
index 6a1ba2e9a..770170c31 100644
--- a/Essentials/src/com/earth2me/essentials/api/IWorth.java
+++ b/Essentials/src/net/ess3/api/IWorth.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
-import com.earth2me.essentials.api.server.ItemStack;
+import net.ess3.api.server.ItemStack;
 
 
 
diff --git a/Essentials/src/com/earth2me/essentials/api/InvalidNameException.java b/Essentials/src/net/ess3/api/InvalidNameException.java
index 951c66b17..7d08d73ad 100644
--- a/Essentials/src/com/earth2me/essentials/api/InvalidNameException.java
+++ b/Essentials/src/net/ess3/api/InvalidNameException.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
 
 public class InvalidNameException extends Exception
diff --git a/Essentials/src/com/earth2me/essentials/api/NoLoanPermittedException.java b/Essentials/src/net/ess3/api/NoLoanPermittedException.java
index f21bf98cc..88a3ec6c7 100644
--- a/Essentials/src/com/earth2me/essentials/api/NoLoanPermittedException.java
+++ b/Essentials/src/net/ess3/api/NoLoanPermittedException.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
 
 
 public class NoLoanPermittedException extends Exception
diff --git a/Essentials/src/com/earth2me/essentials/api/UserDoesNotExistException.java b/Essentials/src/net/ess3/api/UserDoesNotExistException.java
index 531d9ead6..e18502dd1 100644
--- a/Essentials/src/com/earth2me/essentials/api/UserDoesNotExistException.java
+++ b/Essentials/src/net/ess3/api/UserDoesNotExistException.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
 
 
 public class UserDoesNotExistException extends Exception
diff --git a/Essentials/src/com/earth2me/essentials/api/server/CommandSender.java b/Essentials/src/net/ess3/api/server/CommandSender.java
index 37f9c0e1a..768dde9bb 100644
--- a/Essentials/src/com/earth2me/essentials/api/server/CommandSender.java
+++ b/Essentials/src/net/ess3/api/server/CommandSender.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.api.server;
+package net.ess3.api.server;
 
 public interface CommandSender {
 	boolean isPlayer();
diff --git a/Essentials/src/com/earth2me/essentials/api/server/Enchantment.java b/Essentials/src/net/ess3/api/server/Enchantment.java
index 0aff6843a..3e7baa0cf 100644
--- a/Essentials/src/com/earth2me/essentials/api/server/Enchantment.java
+++ b/Essentials/src/net/ess3/api/server/Enchantment.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.api.server;
+package net.ess3.api.server;
 
 public abstract class Enchantment {
 
diff --git a/Essentials/src/com/earth2me/essentials/api/server/IInventory.java b/Essentials/src/net/ess3/api/server/IInventory.java
index 301f040da..783495864 100644
--- a/Essentials/src/com/earth2me/essentials/api/server/IInventory.java
+++ b/Essentials/src/net/ess3/api/server/IInventory.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.api.server;
+package net.ess3.api.server;
 
 import java.util.Map;
 
diff --git a/Essentials/src/com/earth2me/essentials/api/server/IPlugin.java b/Essentials/src/net/ess3/api/server/IPlugin.java
index 61dadcbd6..d1f8719f1 100644
--- a/Essentials/src/com/earth2me/essentials/api/server/IPlugin.java
+++ b/Essentials/src/net/ess3/api/server/IPlugin.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.api.server;
+package net.ess3.api.server;
 
 import java.io.File;
 import java.io.InputStream;
diff --git a/Essentials/src/com/earth2me/essentials/api/server/IServer.java b/Essentials/src/net/ess3/api/server/IServer.java
index f83518116..8bd23bb9d 100644
--- a/Essentials/src/com/earth2me/essentials/api/server/IServer.java
+++ b/Essentials/src/net/ess3/api/server/IServer.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.api.server;
+package net.ess3.api.server;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/Essentials/src/com/earth2me/essentials/api/server/ItemStack.java b/Essentials/src/net/ess3/api/server/ItemStack.java
index cb40fafc3..d8315974c 100644
--- a/Essentials/src/com/earth2me/essentials/api/server/ItemStack.java
+++ b/Essentials/src/net/ess3/api/server/ItemStack.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.api.server;
+package net.ess3.api.server;
 
 
 public abstract class ItemStack implements Cloneable
diff --git a/Essentials/src/com/earth2me/essentials/api/server/Location.java b/Essentials/src/net/ess3/api/server/Location.java
index 39cc71ca5..825e2f814 100644
--- a/Essentials/src/com/earth2me/essentials/api/server/Location.java
+++ b/Essentials/src/net/ess3/api/server/Location.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.api.server;
+package net.ess3.api.server;
 
 
 public abstract class Location
diff --git a/Essentials/src/com/earth2me/essentials/api/server/Material.java b/Essentials/src/net/ess3/api/server/Material.java
index d8486ef6d..bfda30775 100644
--- a/Essentials/src/com/earth2me/essentials/api/server/Material.java
+++ b/Essentials/src/net/ess3/api/server/Material.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.api.server;
+package net.ess3.api.server;
 
 public abstract class Material {
 	
diff --git a/Essentials/src/com/earth2me/essentials/api/server/Permission.java b/Essentials/src/net/ess3/api/server/Permission.java
index 71b045d53..f4fb37cc4 100644
--- a/Essentials/src/com/earth2me/essentials/api/server/Permission.java
+++ b/Essentials/src/net/ess3/api/server/Permission.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.api.server;
+package net.ess3.api.server;
 
 
 public abstract class Permission
diff --git a/Essentials/src/com/earth2me/essentials/api/server/Player.java b/Essentials/src/net/ess3/api/server/Player.java
index 7da3b80fc..152c3f0c8 100644
--- a/Essentials/src/com/earth2me/essentials/api/server/Player.java
+++ b/Essentials/src/net/ess3/api/server/Player.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.api.server;
+package net.ess3.api.server;
 
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IUser;
 
 
 public interface Player extends CommandSender
diff --git a/Essentials/src/com/earth2me/essentials/api/server/World.java b/Essentials/src/net/ess3/api/server/World.java
index ca3bb04c5..ecd129609 100644
--- a/Essentials/src/com/earth2me/essentials/api/server/World.java
+++ b/Essentials/src/net/ess3/api/server/World.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.api.server;
+package net.ess3.api.server;
 
 import java.util.UUID;
 import org.bukkit.TreeType;
diff --git a/Essentials/src/com/earth2me/essentials/backup/Backup.java b/Essentials/src/net/ess3/backup/Backup.java
index 68eca4566..3aea269e4 100644
--- a/Essentials/src/com/earth2me/essentials/backup/Backup.java
+++ b/Essentials/src/net/ess3/backup/Backup.java
@@ -1,11 +1,11 @@
-package com.earth2me.essentials.backup;
+package net.ess3.backup;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IBackup;
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.ISettings;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.api.server.IServer;
+import static net.ess3.I18n._;
+import net.ess3.api.IBackup;
+import net.ess3.api.IEssentials;
+import net.ess3.api.ISettings;
+import net.ess3.api.server.CommandSender;
+import net.ess3.api.server.IServer;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
diff --git a/Essentials/src/com/earth2me/essentials/bukkit/BukkitCommandSender.java b/Essentials/src/net/ess3/bukkit/BukkitCommandSender.java
index 70e209691..60302badc 100644
--- a/Essentials/src/com/earth2me/essentials/bukkit/BukkitCommandSender.java
+++ b/Essentials/src/net/ess3/bukkit/BukkitCommandSender.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.bukkit;
+package net.ess3.bukkit;
 
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.api.server.Permission;
+import net.ess3.api.server.CommandSender;
+import net.ess3.api.server.Permission;
 import lombok.Delegate;
 import lombok.Getter;
 
diff --git a/Essentials/src/com/earth2me/essentials/bukkit/BukkitItemStack.java b/Essentials/src/net/ess3/bukkit/BukkitItemStack.java
index 4e8f18185..819cc734b 100644
--- a/Essentials/src/com/earth2me/essentials/bukkit/BukkitItemStack.java
+++ b/Essentials/src/net/ess3/bukkit/BukkitItemStack.java
@@ -1,13 +1,13 @@
-package com.earth2me.essentials.bukkit;
+package net.ess3.bukkit;
 
-import com.earth2me.essentials.api.server.Enchantment;
-import com.earth2me.essentials.api.server.ItemStack;
-import com.earth2me.essentials.api.server.Material;
+import net.ess3.api.server.Enchantment;
+import net.ess3.api.server.ItemStack;
+import net.ess3.api.server.Material;
 import lombok.Delegate;
 import lombok.Getter;
 
 
-public class BukkitItemStack extends com.earth2me.essentials.api.server.ItemStack
+public class BukkitItemStack extends net.ess3.api.server.ItemStack
 {
 	public static class BukkitItemStackFactory implements ItemStackFactory
 	{
diff --git a/Essentials/src/com/earth2me/essentials/bukkit/BukkitLocation.java b/Essentials/src/net/ess3/bukkit/BukkitLocation.java
index c948bb442..21021873c 100644
--- a/Essentials/src/com/earth2me/essentials/bukkit/BukkitLocation.java
+++ b/Essentials/src/net/ess3/bukkit/BukkitLocation.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.bukkit;
+package net.ess3.bukkit;
 
-import com.earth2me.essentials.api.server.World;
-import com.earth2me.essentials.api.server.Location;
+import net.ess3.api.server.World;
+import net.ess3.api.server.Location;
 import lombok.Delegate;
 import lombok.Getter;
 
diff --git a/Essentials/src/com/earth2me/essentials/bukkit/BukkitMaterial.java b/Essentials/src/net/ess3/bukkit/BukkitMaterial.java
index 84e485642..b01d68754 100644
--- a/Essentials/src/com/earth2me/essentials/bukkit/BukkitMaterial.java
+++ b/Essentials/src/net/ess3/bukkit/BukkitMaterial.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.bukkit;
+package net.ess3.bukkit;
 
-import com.earth2me.essentials.api.server.Material;
+import net.ess3.api.server.Material;
 import java.util.EnumMap;
 import lombok.Delegate;
 
diff --git a/Essentials/src/com/earth2me/essentials/bukkit/BukkitPermission.java b/Essentials/src/net/ess3/bukkit/BukkitPermission.java
index b1cbbe7ca..49f705ccc 100644
--- a/Essentials/src/com/earth2me/essentials/bukkit/BukkitPermission.java
+++ b/Essentials/src/net/ess3/bukkit/BukkitPermission.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.bukkit;
+package net.ess3.bukkit;
 
-import com.earth2me.essentials.api.server.Permission;
+import net.ess3.api.server.Permission;
 import java.util.regex.Pattern;
 import lombok.Delegate;
 import lombok.Getter;
diff --git a/Essentials/src/com/earth2me/essentials/bukkit/BukkitPlayer.java b/Essentials/src/net/ess3/bukkit/BukkitPlayer.java
index 5ca9d1da0..588ad242d 100644
--- a/Essentials/src/com/earth2me/essentials/bukkit/BukkitPlayer.java
+++ b/Essentials/src/net/ess3/bukkit/BukkitPlayer.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.bukkit;
+package net.ess3.bukkit;
 
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.*;
+import net.ess3.api.IUser;
+import net.ess3.api.server.*;
 import lombok.Delegate;
 import lombok.Getter;
 import org.bukkit.OfflinePlayer;
diff --git a/Essentials/src/com/earth2me/essentials/bukkit/BukkitWorld.java b/Essentials/src/net/ess3/bukkit/BukkitWorld.java
index 883be669a..d754de4c9 100644
--- a/Essentials/src/com/earth2me/essentials/bukkit/BukkitWorld.java
+++ b/Essentials/src/net/ess3/bukkit/BukkitWorld.java
@@ -1,8 +1,8 @@
-package com.earth2me.essentials.bukkit;
+package net.ess3.bukkit;
 
-import com.earth2me.essentials.api.server.World;
-import com.earth2me.essentials.api.server.ItemStack;
-import com.earth2me.essentials.api.server.Location;
+import net.ess3.api.server.World;
+import net.ess3.api.server.ItemStack;
+import net.ess3.api.server.Location;
 import lombok.Delegate;
 import lombok.Getter;
 import org.bukkit.TreeType;
diff --git a/Essentials/src/com/earth2me/essentials/bukkit/Enchantments.java b/Essentials/src/net/ess3/bukkit/Enchantments.java
index 21c763a30..f4890848f 100644
--- a/Essentials/src/com/earth2me/essentials/bukkit/Enchantments.java
+++ b/Essentials/src/net/ess3/bukkit/Enchantments.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.bukkit;
+package net.ess3.bukkit;
 
 import java.util.HashMap;
 import java.util.Locale;
diff --git a/Essentials/src/com/earth2me/essentials/bukkit/EssentialsPlugin.java b/Essentials/src/net/ess3/bukkit/EssentialsPlugin.java
index 7e3dde434..4f262f329 100644
--- a/Essentials/src/com/earth2me/essentials/bukkit/EssentialsPlugin.java
+++ b/Essentials/src/net/ess3/bukkit/EssentialsPlugin.java
@@ -1,8 +1,8 @@
-package com.earth2me.essentials.bukkit;
+package net.ess3.bukkit;
 
-import com.earth2me.essentials.Essentials;
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.server.*;
+import net.ess3.Essentials;
+import static net.ess3.I18n._;
+import net.ess3.api.server.*;
 import java.util.logging.Level;
 import org.bukkit.command.Command;
 import org.bukkit.entity.Player;
diff --git a/Essentials/src/com/earth2me/essentials/bukkit/Inventory.java b/Essentials/src/net/ess3/bukkit/Inventory.java
index fc33ea619..30ddaae52 100644
--- a/Essentials/src/com/earth2me/essentials/bukkit/Inventory.java
+++ b/Essentials/src/net/ess3/bukkit/Inventory.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.bukkit;
+package net.ess3.bukkit;
 
-import com.earth2me.essentials.api.server.IInventory;
-import com.earth2me.essentials.api.server.ItemStack;
+import net.ess3.api.server.IInventory;
+import net.ess3.api.server.ItemStack;
 import java.util.Map;
 import lombok.Delegate;
 import org.bukkit.inventory.PlayerInventory;
diff --git a/Essentials/src/com/earth2me/essentials/bukkit/Mob.java b/Essentials/src/net/ess3/bukkit/Mob.java
index 3d78b2a82..c618a1038 100644
--- a/Essentials/src/com/earth2me/essentials/bukkit/Mob.java
+++ b/Essentials/src/net/ess3/bukkit/Mob.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.bukkit;
+package net.ess3.bukkit;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Locale;
diff --git a/Essentials/src/com/earth2me/essentials/bukkit/Plugin.java b/Essentials/src/net/ess3/bukkit/Plugin.java
index 3dbb452b6..ea3f85366 100644
--- a/Essentials/src/com/earth2me/essentials/bukkit/Plugin.java
+++ b/Essentials/src/net/ess3/bukkit/Plugin.java
@@ -1,8 +1,8 @@
-package com.earth2me.essentials.bukkit;
+package net.ess3.bukkit;
 
-import com.earth2me.essentials.api.server.Player;
-import com.earth2me.essentials.api.server.IPlugin;
-import com.earth2me.essentials.api.server.Location;
+import net.ess3.api.server.Player;
+import net.ess3.api.server.IPlugin;
+import net.ess3.api.server.Location;
 import java.io.File;
 import lombok.Delegate;
 import org.bukkit.event.entity.EntityDamageEvent;
diff --git a/Essentials/src/com/earth2me/essentials/bukkit/Server.java b/Essentials/src/net/ess3/bukkit/Server.java
index b673b2dae..e59d7d4f9 100644
--- a/Essentials/src/com/earth2me/essentials/bukkit/Server.java
+++ b/Essentials/src/net/ess3/bukkit/Server.java
@@ -1,10 +1,10 @@
-package com.earth2me.essentials.bukkit;
+package net.ess3.bukkit;
 
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.api.server.Player;
-import com.earth2me.essentials.api.server.IServer;
-import com.earth2me.essentials.api.server.World;
+import net.ess3.api.IEssentials;
+import net.ess3.api.server.CommandSender;
+import net.ess3.api.server.Player;
+import net.ess3.api.server.IServer;
+import net.ess3.api.server.World;
 import java.util.*;
 import lombok.Delegate;
 import lombok.Getter;
diff --git a/Essentials/src/com/earth2me/essentials/bukkit/VersionCheck.java b/Essentials/src/net/ess3/bukkit/VersionCheck.java
index 516514fa8..0413e15ba 100644
--- a/Essentials/src/com/earth2me/essentials/bukkit/VersionCheck.java
+++ b/Essentials/src/net/ess3/bukkit/VersionCheck.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.bukkit;
+package net.ess3.bukkit;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
 import java.util.logging.Level;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandafk.java b/Essentials/src/net/ess3/commands/Commandafk.java
index 1bda185b3..07b452917 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandafk.java
+++ b/Essentials/src/net/ess3/commands/Commandafk.java
@@ -1,8 +1,8 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.permissions.Permissions;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandantioch.java b/Essentials/src/net/ess3/commands/Commandantioch.java
index eea30448d..818d1c97f 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandantioch.java
+++ b/Essentials/src/net/ess3/commands/Commandantioch.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.utils.LocationUtil;
+import net.ess3.api.IUser;
+import net.ess3.utils.LocationUtil;
 import org.bukkit.Location;
 import org.bukkit.entity.TNTPrimed;
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandback.java b/Essentials/src/net/ess3/commands/Commandback.java
index a23b5409c..58537fa11 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandback.java
+++ b/Essentials/src/net/ess3/commands/Commandback.java
@@ -1,8 +1,8 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.economy.Trade;
-import com.earth2me.essentials.api.IUser;
+import static net.ess3.I18n._;
+import net.ess3.economy.Trade;
+import net.ess3.api.IUser;
 
 
 public class Commandback extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandbackup.java b/Essentials/src/net/ess3/commands/Commandbackup.java
index ab749f9ee..38f57ee2c 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandbackup.java
+++ b/Essentials/src/net/ess3/commands/Commandbackup.java
@@ -1,9 +1,7 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IBackup;
-import com.earth2me.essentials.api.server.CommandSender;
-import org.bukkit.command.CommandSender;
+import static net.ess3.I18n._;
+import net.ess3.api.IBackup;
 
 
 public class Commandbackup extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandbalance.java b/Essentials/src/net/ess3/commands/Commandbalance.java
index 957536832..d910dfda4 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandbalance.java
+++ b/Essentials/src/net/ess3/commands/Commandbalance.java
@@ -1,11 +1,9 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.utils.Util;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.permissions.Permissions;
-import org.bukkit.command.CommandSender;
+import static net.ess3.I18n._;
+import net.ess3.utils.Util;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
 
 
 public class Commandbalance extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandbalancetop.java b/Essentials/src/net/ess3/commands/Commandbalancetop.java
index 4f0f0b9b3..e72ef955e 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandbalancetop.java
+++ b/Essentials/src/net/ess3/commands/Commandbalancetop.java
@@ -1,16 +1,14 @@
-package com.earth2me.essentials.commands;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.utils.Util;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.utils.textreader.ArrayListInput;
-import com.earth2me.essentials.utils.textreader.TextPager;
+package net.ess3.commands;
+
+import static net.ess3.I18n._;
+import net.ess3.utils.Util;
+import net.ess3.api.IUser;
+import net.ess3.utils.textreader.ArrayListInput;
+import net.ess3.utils.textreader.TextPager;
 import java.text.DateFormat;
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
-import org.bukkit.command.CommandSender;
 
 
 public class Commandbalancetop extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandban.java b/Essentials/src/net/ess3/commands/Commandban.java
index f26f1e0eb..6b6aee9ae 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandban.java
+++ b/Essentials/src/net/ess3/commands/Commandban.java
@@ -1,15 +1,11 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import com.earth2me.essentials.Console;
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.api.server.Player;
-import com.earth2me.essentials.permissions.Permissions;
-import com.earth2me.essentials.user.Ban;
+import net.ess3.Console;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
+import net.ess3.user.Ban;
 import lombok.Cleanup;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 
 public class Commandban extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandbanip.java b/Essentials/src/net/ess3/commands/Commandbanip.java
index e5ede1e91..97f61167d 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandbanip.java
+++ b/Essentials/src/net/ess3/commands/Commandbanip.java
@@ -1,10 +1,8 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.CommandSender;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
 import lombok.Cleanup;
-import org.bukkit.command.CommandSender;
 
 
 public class Commandbanip extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandbigtree.java b/Essentials/src/net/ess3/commands/Commandbigtree.java
index de63fdc29..645113eb3 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandbigtree.java
+++ b/Essentials/src/net/ess3/commands/Commandbigtree.java
@@ -1,9 +1,9 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.Location;
-import com.earth2me.essentials.utils.LocationUtil;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.api.server.Location;
+import net.ess3.utils.LocationUtil;
 import org.bukkit.TreeType;
 
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandbreak.java b/Essentials/src/net/ess3/commands/Commandbreak.java
index 6f6139b59..340cdea40 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandbreak.java
+++ b/Essentials/src/net/ess3/commands/Commandbreak.java
@@ -1,8 +1,8 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.permissions.Permissions;
-import static com.earth2me.essentials.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
+import static net.ess3.I18n._;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.event.block.BlockBreakEvent;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandbroadcast.java b/Essentials/src/net/ess3/commands/Commandbroadcast.java
index fe757c99b..8490e8605 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandbroadcast.java
+++ b/Essentials/src/net/ess3/commands/Commandbroadcast.java
@@ -1,8 +1,6 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.server.CommandSender;
-import org.bukkit.command.CommandSender;
+import static net.ess3.I18n._;
 
 
 public class Commandbroadcast extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandburn.java b/Essentials/src/net/ess3/commands/Commandburn.java
index e98cc1c48..098538feb 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandburn.java
+++ b/Essentials/src/net/ess3/commands/Commandburn.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.server.CommandSender;
+import static net.ess3.I18n._;
+import net.ess3.api.server.CommandSender;
 import org.bukkit.entity.Player;
 
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandclearinventory.java b/Essentials/src/net/ess3/commands/Commandclearinventory.java
index 6be785b33..e5599a91f 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandclearinventory.java
+++ b/Essentials/src/net/ess3/commands/Commandclearinventory.java
@@ -1,9 +1,9 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.permissions.Permissions;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.api.server.CommandSender;
+import net.ess3.permissions.Permissions;
 import java.util.List;
 import org.bukkit.entity.Player;
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandcompass.java b/Essentials/src/net/ess3/commands/Commandcompass.java
index 7314f8b6e..8554c4608 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandcompass.java
+++ b/Essentials/src/net/ess3/commands/Commandcompass.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
 
 
 public class Commandcompass extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commanddelhome.java b/Essentials/src/net/ess3/commands/Commanddelhome.java
index a6f8816f0..7b0e85c50 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commanddelhome.java
+++ b/Essentials/src/net/ess3/commands/Commanddelhome.java
@@ -1,12 +1,10 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.permissions.Permissions;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
 import java.util.Locale;
 import lombok.Cleanup;
-import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commanddeljail.java b/Essentials/src/net/ess3/commands/Commanddeljail.java
index 08649acc3..f8fdc8594 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commanddeljail.java
+++ b/Essentials/src/net/ess3/commands/Commanddeljail.java
@@ -1,8 +1,6 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.server.CommandSender;
-import org.bukkit.command.CommandSender;
+import static net.ess3.I18n._;
 
 
 public class Commanddeljail extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commanddelwarp.java b/Essentials/src/net/ess3/commands/Commanddelwarp.java
index f22c60949..9e3ec97fb 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commanddelwarp.java
+++ b/Essentials/src/net/ess3/commands/Commanddelwarp.java
@@ -1,8 +1,6 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.server.CommandSender;
-import org.bukkit.command.CommandSender;
+import static net.ess3.I18n._;
 
 
 public class Commanddelwarp extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commanddepth.java b/Essentials/src/net/ess3/commands/Commanddepth.java
index 73d3c7150..31f621767 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commanddepth.java
+++ b/Essentials/src/net/ess3/commands/Commanddepth.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
 
 
 public class Commanddepth extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandeco.java b/Essentials/src/net/ess3/commands/Commandeco.java
index 5e350bd87..a5a9fbce0 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandeco.java
+++ b/Essentials/src/net/ess3/commands/Commandeco.java
@@ -1,14 +1,11 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
+
+import net.ess3.api.ISettings;
+import net.ess3.api.IUser;
+import static net.ess3.I18n._;
 
-import com.earth2me.essentials.api.ISettings;
-import com.earth2me.essentials.api.IUser;
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.api.server.Player;
 import java.util.Locale;
 import lombok.Cleanup;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 
 public class Commandeco extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandenchant.java b/Essentials/src/net/ess3/commands/Commandenchant.java
index 114f51a4d..7e38d13fc 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandenchant.java
+++ b/Essentials/src/net/ess3/commands/Commandenchant.java
@@ -1,10 +1,10 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import com.earth2me.essentials.bukkit.Enchantments;
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.utils.Util;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.permissions.EnchantPermissions;
+import net.ess3.bukkit.Enchantments;
+import static net.ess3.I18n._;
+import net.ess3.utils.Util;
+import net.ess3.api.IUser;
+import net.ess3.permissions.EnchantPermissions;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandessentials.java b/Essentials/src/net/ess3/commands/Commandessentials.java
index fa449be12..44cf8536c 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandessentials.java
+++ b/Essentials/src/net/ess3/commands/Commandessentials.java
@@ -1,15 +1,13 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.api.server.Player;
+import static net.ess3.I18n._;
+
+import net.ess3.api.server.Player;
 import java.util.HashMap;
 import java.util.Map;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.ConsoleCommandSender;
 
 
 public class Commandessentials extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandext.java b/Essentials/src/net/ess3/commands/Commandext.java
index 50d6a7d5c..1f7c1a51b 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandext.java
+++ b/Essentials/src/net/ess3/commands/Commandext.java
@@ -1,8 +1,8 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.CommandSender;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.api.server.CommandSender;
 import org.bukkit.entity.Player;
 
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandfeed.java b/Essentials/src/net/ess3/commands/Commandfeed.java
index cf494b03f..21e47682f 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandfeed.java
+++ b/Essentials/src/net/ess3/commands/Commandfeed.java
@@ -1,8 +1,8 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.permissions.Permissions;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
 import java.util.List;
 import org.bukkit.entity.Player;
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandfireball.java b/Essentials/src/net/ess3/commands/Commandfireball.java
index f13f3ee75..8882f0106 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandfireball.java
+++ b/Essentials/src/net/ess3/commands/Commandfireball.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IUser;
 import org.bukkit.entity.Fireball;
 import org.bukkit.entity.SmallFireball;
 import org.bukkit.util.Vector;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandgamemode.java b/Essentials/src/net/ess3/commands/Commandgamemode.java
index 10a976c1e..3a708d0cf 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandgamemode.java
+++ b/Essentials/src/net/ess3/commands/Commandgamemode.java
@@ -1,12 +1,10 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.permissions.Permissions;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
 import java.util.Locale;
 import org.bukkit.GameMode;
-import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandgc.java b/Essentials/src/net/ess3/commands/Commandgc.java
index 92a128d9e..a440d0474 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandgc.java
+++ b/Essentials/src/net/ess3/commands/Commandgc.java
@@ -1,10 +1,6 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.api.server.World;
-import org.bukkit.World;
-import org.bukkit.command.CommandSender;
+import static net.ess3.I18n._;
 
 
 public class Commandgc extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandgetpos.java b/Essentials/src/net/ess3/commands/Commandgetpos.java
index e50e1e39d..202b7b2b4 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandgetpos.java
+++ b/Essentials/src/net/ess3/commands/Commandgetpos.java
@@ -1,10 +1,8 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.permissions.Permissions;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
 import org.bukkit.Location;
-import org.bukkit.command.CommandSender;
 
 
 public class Commandgetpos extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandgive.java b/Essentials/src/net/ess3/commands/Commandgive.java
index 5612c35f6..b42323d4a 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandgive.java
+++ b/Essentials/src/net/ess3/commands/Commandgive.java
@@ -1,13 +1,12 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
+
+import net.ess3.api.IUser;
+import net.ess3.permissions.GivePermissions;
+import static net.ess3.I18n._;
 
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.permissions.GivePermissions;
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.server.CommandSender;
 import java.util.Locale;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
-import org.bukkit.command.CommandSender;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandgod.java b/Essentials/src/net/ess3/commands/Commandgod.java
index 9bfc74fca..f2f3164da 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandgod.java
+++ b/Essentials/src/net/ess3/commands/Commandgod.java
@@ -1,10 +1,8 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.permissions.Permissions;
-import org.bukkit.command.CommandSender;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
 import org.bukkit.entity.Player;
 
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandheal.java b/Essentials/src/net/ess3/commands/Commandheal.java
index 06fe3de3c..eb5f34854 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandheal.java
+++ b/Essentials/src/net/ess3/commands/Commandheal.java
@@ -1,10 +1,10 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.permissions.Permissions;
-import com.earth2me.essentials.user.UserData.TimestampType;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.api.server.CommandSender;
+import net.ess3.permissions.Permissions;
+import net.ess3.user.UserData.TimestampType;
 import java.util.List;
 import org.bukkit.entity.Player;
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandhelp.java b/Essentials/src/net/ess3/commands/Commandhelp.java
index fa32ceada..401259fa2 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandhelp.java
+++ b/Essentials/src/net/ess3/commands/Commandhelp.java
@@ -1,15 +1,13 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import com.earth2me.essentials.utils.textreader.TextInput;
-import com.earth2me.essentials.utils.textreader.IText;
-import com.earth2me.essentials.utils.textreader.TextPager;
-import com.earth2me.essentials.utils.textreader.HelpInput;
-import com.earth2me.essentials.utils.textreader.KeywordReplacer;
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.utils.Util;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.CommandSender;
-import org.bukkit.command.CommandSender;
+import net.ess3.utils.textreader.TextInput;
+import net.ess3.utils.textreader.IText;
+import net.ess3.utils.textreader.TextPager;
+import net.ess3.utils.textreader.HelpInput;
+import net.ess3.utils.textreader.KeywordReplacer;
+import static net.ess3.I18n._;
+import net.ess3.utils.Util;
+import net.ess3.api.IUser;
 
 
 public class Commandhelp extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandhelpop.java b/Essentials/src/net/ess3/commands/Commandhelpop.java
index 33fa81b9e..e36cb1871 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandhelpop.java
+++ b/Essentials/src/net/ess3/commands/Commandhelpop.java
@@ -1,12 +1,10 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.utils.Util;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.Player;
-import com.earth2me.essentials.permissions.Permissions;
+import static net.ess3.I18n._;
+import net.ess3.utils.Util;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
 import java.util.logging.Level;
-import org.bukkit.entity.Player;
 
 
 public class Commandhelpop extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandhome.java b/Essentials/src/net/ess3/commands/Commandhome.java
index f2403b92a..755676609 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandhome.java
+++ b/Essentials/src/net/ess3/commands/Commandhome.java
@@ -1,10 +1,10 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.economy.Trade;
-import com.earth2me.essentials.utils.Util;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.permissions.Permissions;
+import static net.ess3.I18n._;
+import net.ess3.economy.Trade;
+import net.ess3.utils.Util;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
 import java.util.List;
 import java.util.Locale;
 import org.bukkit.Location;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandignore.java b/Essentials/src/net/ess3/commands/Commandignore.java
index 9b3ff71cc..82bb57cae 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandignore.java
+++ b/Essentials/src/net/ess3/commands/Commandignore.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
 
 
 public class Commandignore extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandinfo.java b/Essentials/src/net/ess3/commands/Commandinfo.java
index 2188a9296..c38039b55 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandinfo.java
+++ b/Essentials/src/net/ess3/commands/Commandinfo.java
@@ -1,11 +1,9 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.utils.textreader.IText;
-import com.earth2me.essentials.utils.textreader.KeywordReplacer;
-import com.earth2me.essentials.utils.textreader.TextInput;
-import com.earth2me.essentials.utils.textreader.TextPager;
-import org.bukkit.command.CommandSender;
+import net.ess3.utils.textreader.IText;
+import net.ess3.utils.textreader.KeywordReplacer;
+import net.ess3.utils.textreader.TextInput;
+import net.ess3.utils.textreader.TextPager;
 
 
 public class Commandinfo extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandinvsee.java b/Essentials/src/net/ess3/commands/Commandinvsee.java
index 4b772e0ec..4fa7ceb90 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandinvsee.java
+++ b/Essentials/src/net/ess3/commands/Commandinvsee.java
@@ -1,8 +1,8 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.user.Inventory;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.user.Inventory;
 import java.util.Arrays;
 import org.bukkit.inventory.ItemStack;
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commanditem.java b/Essentials/src/net/ess3/commands/Commanditem.java
index b66377722..132e1d4aa 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commanditem.java
+++ b/Essentials/src/net/ess3/commands/Commanditem.java
@@ -1,10 +1,10 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.Enchantment;
-import com.earth2me.essentials.api.server.ItemStack;
-import com.earth2me.essentials.permissions.ItemPermissions;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.api.server.Enchantment;
+import net.ess3.api.server.ItemStack;
+import net.ess3.permissions.ItemPermissions;
 import java.util.Locale;
 
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commanditemdb.java b/Essentials/src/net/ess3/commands/Commanditemdb.java
index 205cdf072..2c4129fd5 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commanditemdb.java
+++ b/Essentials/src/net/ess3/commands/Commanditemdb.java
@@ -1,7 +1,5 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import com.earth2me.essentials.api.server.CommandSender;
-import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandjails.java b/Essentials/src/net/ess3/commands/Commandjails.java
index b1563d799..ae443e19d 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandjails.java
+++ b/Essentials/src/net/ess3/commands/Commandjails.java
@@ -1,8 +1,6 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.utils.Util;
-import org.bukkit.command.CommandSender;
+import net.ess3.utils.Util;
 
 
 public class Commandjails extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandjump.java b/Essentials/src/net/ess3/commands/Commandjump.java
index ae4832d1d..4e9eb491e 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandjump.java
+++ b/Essentials/src/net/ess3/commands/Commandjump.java
@@ -1,10 +1,10 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.economy.Trade;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.ILocation;
-import com.earth2me.essentials.utils.LocationUtil;
+import static net.ess3.I18n._;
+import net.ess3.economy.Trade;
+import net.ess3.api.IUser;
+import net.ess3.api.server.ILocation;
+import net.ess3.utils.LocationUtil;
 import org.bukkit.Location;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkick.java b/Essentials/src/net/ess3/commands/Commandkick.java
index 2b149a6d6..b4164f46e 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandkick.java
+++ b/Essentials/src/net/ess3/commands/Commandkick.java
@@ -1,12 +1,10 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import com.earth2me.essentials.Console;
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.api.server.Player;
-import com.earth2me.essentials.permissions.Permissions;
-import org.bukkit.entity.Player;
+import net.ess3.Console;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.api.server.CommandSender;
+import net.ess3.permissions.Permissions;
 
 
 public class Commandkick extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkickall.java b/Essentials/src/net/ess3/commands/Commandkickall.java
index 8556f58ff..e66409f69 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandkickall.java
+++ b/Essentials/src/net/ess3/commands/Commandkickall.java
@@ -1,8 +1,8 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.api.server.Player;
+import static net.ess3.I18n._;
+import net.ess3.api.server.CommandSender;
+import net.ess3.api.server.Player;
 
 
 public class Commandkickall extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkill.java b/Essentials/src/net/ess3/commands/Commandkill.java
index 1a0ba3965..401302177 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandkill.java
+++ b/Essentials/src/net/ess3/commands/Commandkill.java
@@ -1,8 +1,7 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
+
+import static net.ess3.I18n._;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.server.CommandSender;
-import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.event.entity.EntityDamageEvent;
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkillall.java b/Essentials/src/net/ess3/commands/Commandkillall.java
index 2b2fc2c3b..b3b3390b4 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandkillall.java
+++ b/Essentials/src/net/ess3/commands/Commandkillall.java
@@ -1,13 +1,12 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.bukkit.Mob;
+import static net.ess3.I18n._;
+
+import net.ess3.bukkit.Mob;
 import java.util.Collections;
 import java.util.Locale;
 import org.bukkit.Chunk;
 import org.bukkit.World;
-import org.bukkit.command.CommandSender;
 import org.bukkit.entity.*;
 import org.bukkit.event.entity.EntityDeathEvent;
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkit.java b/Essentials/src/net/ess3/commands/Commandkit.java
index 1bd9e770d..f3ea78ce1 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandkit.java
+++ b/Essentials/src/net/ess3/commands/Commandkit.java
@@ -1,11 +1,11 @@
-package com.earth2me.essentials.commands;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.economy.Trade;
-import com.earth2me.essentials.utils.Util;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.permissions.KitPermissions;
-import com.earth2me.essentials.settings.Kit;
+package net.ess3.commands;
+
+import static net.ess3.I18n._;
+import net.ess3.economy.Trade;
+import net.ess3.utils.Util;
+import net.ess3.api.IUser;
+import net.ess3.permissions.KitPermissions;
+import net.ess3.settings.Kit;
 import java.util.Collection;
 import java.util.Locale;
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkittycannon.java b/Essentials/src/net/ess3/commands/Commandkittycannon.java
index 4c56c81af..fc625e986 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandkittycannon.java
+++ b/Essentials/src/net/ess3/commands/Commandkittycannon.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import com.earth2me.essentials.bukkit.Mob;
-import com.earth2me.essentials.api.IUser;
+import net.ess3.bukkit.Mob;
+import net.ess3.api.IUser;
 import java.util.Random;
 import org.bukkit.Location;
 import org.bukkit.entity.Ocelot;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandlightning.java b/Essentials/src/net/ess3/commands/Commandlightning.java
index 82ae1b720..07d8ec10b 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandlightning.java
+++ b/Essentials/src/net/ess3/commands/Commandlightning.java
@@ -1,12 +1,10 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.ISettings;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.permissions.Permissions;
+import static net.ess3.I18n._;
+import net.ess3.api.ISettings;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
 import lombok.Cleanup;
-import org.bukkit.command.CommandSender;
 import org.bukkit.entity.LightningStrike;
 import org.bukkit.entity.Player;
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandlist.java b/Essentials/src/net/ess3/commands/Commandlist.java
index 7525b68cc..1a026d970 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandlist.java
+++ b/Essentials/src/net/ess3/commands/Commandlist.java
@@ -1,15 +1,11 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.utils.Util;
-import com.earth2me.essentials.api.ISettings;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.api.server.Player;
-import com.earth2me.essentials.permissions.Permissions;
+import static net.ess3.I18n._;
+import net.ess3.utils.Util;
+import net.ess3.api.ISettings;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
 import java.util.*;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 
 public class Commandlist extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmail.java b/Essentials/src/net/ess3/commands/Commandmail.java
index 95abc5b46..4f94f067c 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandmail.java
+++ b/Essentials/src/net/ess3/commands/Commandmail.java
@@ -1,10 +1,10 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.utils.Util;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.permissions.Permissions;
+import static net.ess3.I18n._;
+import net.ess3.utils.Util;
+import net.ess3.api.IUser;
+import net.ess3.api.server.CommandSender;
+import net.ess3.permissions.Permissions;
 import java.util.List;
 import org.bukkit.entity.Player;
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandme.java b/Essentials/src/net/ess3/commands/Commandme.java
index ad70231fd..7b756a592 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandme.java
+++ b/Essentials/src/net/ess3/commands/Commandme.java
@@ -1,9 +1,9 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.utils.Util;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.permissions.Permissions;
+import static net.ess3.I18n._;
+import net.ess3.utils.Util;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
 
 
 public class Commandme extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmore.java b/Essentials/src/net/ess3/commands/Commandmore.java
index fe4985832..78269a022 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandmore.java
+++ b/Essentials/src/net/ess3/commands/Commandmore.java
@@ -1,13 +1,11 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.ISettings;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.ItemStack;
-import com.earth2me.essentials.permissions.ItemPermissions;
-import com.earth2me.essentials.permissions.Permissions;
+import static net.ess3.I18n._;
+import net.ess3.api.ISettings;
+import net.ess3.api.IUser;
+import net.ess3.permissions.ItemPermissions;
+import net.ess3.permissions.Permissions;
 import java.util.Locale;
-import org.bukkit.inventory.ItemStack;
 
 
 public class Commandmore extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmotd.java b/Essentials/src/net/ess3/commands/Commandmotd.java
index daf30e8cc..91470a1af 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandmotd.java
+++ b/Essentials/src/net/ess3/commands/Commandmotd.java
@@ -1,11 +1,9 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.utils.textreader.IText;
-import com.earth2me.essentials.utils.textreader.KeywordReplacer;
-import com.earth2me.essentials.utils.textreader.TextInput;
-import com.earth2me.essentials.utils.textreader.TextPager;
-import org.bukkit.command.CommandSender;
+import net.ess3.utils.textreader.IText;
+import net.ess3.utils.textreader.KeywordReplacer;
+import net.ess3.utils.textreader.TextInput;
+import net.ess3.utils.textreader.TextPager;
 
 
 public class Commandmotd extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmsg.java b/Essentials/src/net/ess3/commands/Commandmsg.java
index 2b1d12561..77705d36c 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandmsg.java
+++ b/Essentials/src/net/ess3/commands/Commandmsg.java
@@ -1,15 +1,14 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import com.earth2me.essentials.Console;
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.utils.Util;
-import com.earth2me.essentials.api.IReplyTo;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.permissions.Permissions;
+import net.ess3.Console;
+import static net.ess3.I18n._;
+
+import net.ess3.utils.Util;
+import net.ess3.api.IReplyTo;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
 import java.util.List;
 import lombok.Cleanup;
-import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmute.java b/Essentials/src/net/ess3/commands/Commandmute.java
index 2426df151..d0e257b33 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandmute.java
+++ b/Essentials/src/net/ess3/commands/Commandmute.java
@@ -1,14 +1,12 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.utils.Util;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.permissions.Permissions;
-import com.earth2me.essentials.user.UserData.TimestampType;
-import com.earth2me.essentials.utils.DateUtil;
+import static net.ess3.I18n._;
+
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
+import net.ess3.user.UserData.TimestampType;
+import net.ess3.utils.DateUtil;
 import lombok.Cleanup;
-import org.bukkit.command.CommandSender;
 
 
 public class Commandmute extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandnear.java b/Essentials/src/net/ess3/commands/Commandnear.java
index f5cd7a777..1ea933474 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandnear.java
+++ b/Essentials/src/net/ess3/commands/Commandnear.java
@@ -1,12 +1,10 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.permissions.Permissions;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
 import org.bukkit.Location;
 import org.bukkit.World;
-import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandnick.java b/Essentials/src/net/ess3/commands/Commandnick.java
index 1ff098e2c..96455e85e 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandnick.java
+++ b/Essentials/src/net/ess3/commands/Commandnick.java
@@ -1,15 +1,13 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.utils.Util;
-import com.earth2me.essentials.api.ISettings;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.permissions.Permissions;
+import static net.ess3.I18n._;
+import net.ess3.utils.Util;
+import net.ess3.api.ISettings;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
 import java.util.Locale;
 import lombok.Cleanup;
 import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandnuke.java b/Essentials/src/net/ess3/commands/Commandnuke.java
index ec7bc54aa..bde21f7e1 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandnuke.java
+++ b/Essentials/src/net/ess3/commands/Commandnuke.java
@@ -1,13 +1,12 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
+
+import static net.ess3.I18n._;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.server.CommandSender;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import org.bukkit.Location;
 import org.bukkit.World;
-import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.TNTPrimed;
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandpay.java b/Essentials/src/net/ess3/commands/Commandpay.java
index f79f0150b..f1894d337 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandpay.java
+++ b/Essentials/src/net/ess3/commands/Commandpay.java
@@ -1,8 +1,8 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.economy.Trade;
-import com.earth2me.essentials.api.IUser;
+import static net.ess3.I18n._;
+import net.ess3.economy.Trade;
+import net.ess3.api.IUser;
 import org.bukkit.entity.Player;
 
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandping.java b/Essentials/src/net/ess3/commands/Commandping.java
index 9594c3228..77b7a82c0 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandping.java
+++ b/Essentials/src/net/ess3/commands/Commandping.java
@@ -1,8 +1,8 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.utils.Util;
-import com.earth2me.essentials.api.IUser;
+import static net.ess3.I18n._;
+import net.ess3.utils.Util;
+import net.ess3.api.IUser;
 
 
 public class Commandping extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandpowertool.java b/Essentials/src/net/ess3/commands/Commandpowertool.java
index 5fab91383..ad201f5c8 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandpowertool.java
+++ b/Essentials/src/net/ess3/commands/Commandpowertool.java
@@ -1,9 +1,9 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.utils.Util;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.permissions.Permissions;
+import static net.ess3.I18n._;
+import net.ess3.utils.Util;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandpowertooltoggle.java b/Essentials/src/net/ess3/commands/Commandpowertooltoggle.java
index 24481bcec..a7875e1b7 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandpowertooltoggle.java
+++ b/Essentials/src/net/ess3/commands/Commandpowertooltoggle.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
 
 
 public class Commandpowertooltoggle extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandptime.java b/Essentials/src/net/ess3/commands/Commandptime.java
index 35c1a1595..f3185c25e 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandptime.java
+++ b/Essentials/src/net/ess3/commands/Commandptime.java
@@ -1,13 +1,11 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import com.earth2me.essentials.utils.DescParseTickFormat;
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.permissions.Permissions;
+import net.ess3.utils.DescParseTickFormat;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
 import java.util.*;
 import org.bukkit.World;
-import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandr.java b/Essentials/src/net/ess3/commands/Commandr.java
index d8bed8769..0dc62ea6d 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandr.java
+++ b/Essentials/src/net/ess3/commands/Commandr.java
@@ -1,13 +1,11 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import com.earth2me.essentials.Console;
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.utils.Util;
-import com.earth2me.essentials.api.IReplyTo;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.permissions.Permissions;
-import org.bukkit.command.CommandSender;
+import net.ess3.Console;
+import static net.ess3.I18n._;
+import net.ess3.utils.Util;
+import net.ess3.api.IReplyTo;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
 import org.bukkit.entity.Player;
 
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandrealname.java b/Essentials/src/net/ess3/commands/Commandrealname.java
index 8c088b044..f699f2417 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandrealname.java
+++ b/Essentials/src/net/ess3/commands/Commandrealname.java
@@ -1,13 +1,12 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
+
+import static net.ess3.I18n._;
+import net.ess3.utils.Util;
+import net.ess3.api.ISettings;
+import net.ess3.api.IUser;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.utils.Util;
-import com.earth2me.essentials.api.ISettings;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.CommandSender;
 import java.util.Locale;
 import lombok.Cleanup;
-import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandremove.java b/Essentials/src/net/ess3/commands/Commandremove.java
index 0a513ff74..8339b13a2 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandremove.java
+++ b/Essentials/src/net/ess3/commands/Commandremove.java
@@ -1,12 +1,11 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
+
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.CommandSender;
 import java.util.Locale;
 import org.bukkit.Chunk;
 import org.bukkit.World;
-import org.bukkit.command.CommandSender;
 import org.bukkit.entity.*;
 
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java b/Essentials/src/net/ess3/commands/Commandrepair.java
index 4503e2416..e1845e76b 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java
+++ b/Essentials/src/net/ess3/commands/Commandrepair.java
@@ -1,11 +1,11 @@
-package com.earth2me.essentials.commands;
-
-import com.earth2me.essentials.api.ChargeException;
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.economy.Trade;
-import com.earth2me.essentials.utils.Util;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.permissions.Permissions;
+package net.ess3.commands;
+
+import net.ess3.api.ChargeException;
+import static net.ess3.I18n._;
+import net.ess3.economy.Trade;
+import net.ess3.utils.Util;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandrules.java b/Essentials/src/net/ess3/commands/Commandrules.java
index dce0b9b00..7681b987e 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandrules.java
+++ b/Essentials/src/net/ess3/commands/Commandrules.java
@@ -1,11 +1,9 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.utils.textreader.IText;
-import com.earth2me.essentials.utils.textreader.KeywordReplacer;
-import com.earth2me.essentials.utils.textreader.TextInput;
-import com.earth2me.essentials.utils.textreader.TextPager;
-import org.bukkit.command.CommandSender;
+import net.ess3.utils.textreader.IText;
+import net.ess3.utils.textreader.KeywordReplacer;
+import net.ess3.utils.textreader.TextInput;
+import net.ess3.utils.textreader.TextPager;
 
 
 public class Commandrules extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandseen.java b/Essentials/src/net/ess3/commands/Commandseen.java
index 40b8898cf..9c5889bdd 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandseen.java
+++ b/Essentials/src/net/ess3/commands/Commandseen.java
@@ -1,14 +1,12 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.utils.Util;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.permissions.Permissions;
-import com.earth2me.essentials.user.UserData.TimestampType;
-import com.earth2me.essentials.utils.DateUtil;
+import static net.ess3.I18n._;
+
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
+import net.ess3.user.UserData.TimestampType;
+import net.ess3.utils.DateUtil;
 import lombok.Cleanup;
-import org.bukkit.command.CommandSender;
 
 
 public class Commandseen extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsell.java b/Essentials/src/net/ess3/commands/Commandsell.java
index 0b56843cd..a4e73661d 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandsell.java
+++ b/Essentials/src/net/ess3/commands/Commandsell.java
@@ -1,10 +1,10 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.economy.Trade;
-import com.earth2me.essentials.utils.Util;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
+import static net.ess3.I18n._;
+import net.ess3.economy.Trade;
+import net.ess3.utils.Util;
+import net.ess3.api.IUser;
+import net.ess3.craftbukkit.InventoryWorkaround;
 import java.util.Locale;
 import java.util.logging.Level;
 import org.bukkit.Material;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsethome.java b/Essentials/src/net/ess3/commands/Commandsethome.java
index 0591b152d..91b07286d 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandsethome.java
+++ b/Essentials/src/net/ess3/commands/Commandsethome.java
@@ -1,8 +1,8 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.permissions.Permissions;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
 import java.util.HashMap;
 import java.util.Locale;
 import lombok.Cleanup;
@@ -35,9 +35,9 @@ public class Commandsethome extends EssentialsCommand
 						user.acquireWriteLock();
 						if (user.getData().getHomes() == null)
 						{
-							user.getData().setHomes(new HashMap<String, com.earth2me.essentials.storage.StoredLocation>());
+							user.getData().setHomes(new HashMap<String, net.ess3.storage.StoredLocation>());
 						}
-						user.getData().getHomes().put(args[0].toLowerCase(Locale.ENGLISH), new com.earth2me.essentials.storage.StoredLocation(user.getLocation()));
+						user.getData().getHomes().put(args[0].toLowerCase(Locale.ENGLISH), new net.ess3.storage.StoredLocation(user.getLocation()));
 					}
 					else
 					{
@@ -72,9 +72,9 @@ public class Commandsethome extends EssentialsCommand
 					usersHome.acquireWriteLock();
 					if (usersHome.getData().getHomes() == null)
 					{
-						usersHome.getData().setHomes(new HashMap<String, com.earth2me.essentials.storage.StoredLocation>());
+						usersHome.getData().setHomes(new HashMap<String, net.ess3.storage.StoredLocation>());
 					}
-					usersHome.getData().getHomes().put(name, new com.earth2me.essentials.storage.StoredLocation(user.getLocation()));
+					usersHome.getData().getHomes().put(name, new net.ess3.storage.StoredLocation(user.getLocation()));
 				}
 			}
 		}
@@ -83,9 +83,9 @@ public class Commandsethome extends EssentialsCommand
 			user.acquireWriteLock();
 			if (user.getData().getHomes() == null)
 			{
-				user.getData().setHomes(new HashMap<String, com.earth2me.essentials.storage.StoredLocation>());
+				user.getData().setHomes(new HashMap<String, net.ess3.storage.StoredLocation>());
 			}
-			user.getData().getHomes().put("home", new com.earth2me.essentials.storage.StoredLocation(user.getLocation()));
+			user.getData().getHomes().put("home", new net.ess3.storage.StoredLocation(user.getLocation()));
 		}
 		user.sendMessage(_("homeSet"));
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsetjail.java b/Essentials/src/net/ess3/commands/Commandsetjail.java
index 2fcad7bd2..344b41fc9 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandsetjail.java
+++ b/Essentials/src/net/ess3/commands/Commandsetjail.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
 
 
 public class Commandsetjail extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsetspawn.java b/Essentials/src/net/ess3/commands/Commandsetspawn.java
index 3af7e711f..ccf319892 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandsetspawn.java
+++ b/Essentials/src/net/ess3/commands/Commandsetspawn.java
@@ -1,8 +1,8 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.settings.SpawnsHolder;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.settings.SpawnsHolder;
 
 
 public class Commandsetspawn extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsetwarp.java b/Essentials/src/net/ess3/commands/Commandsetwarp.java
index 5a0599789..5ec5382c1 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandsetwarp.java
+++ b/Essentials/src/net/ess3/commands/Commandsetwarp.java
@@ -1,8 +1,8 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.IWarps;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.api.IWarps;
 import org.bukkit.Location;
 
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsetworth.java b/Essentials/src/net/ess3/commands/Commandsetworth.java
index 5c41af83a..3ea844f69 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandsetworth.java
+++ b/Essentials/src/net/ess3/commands/Commandsetworth.java
@@ -1,9 +1,7 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.CommandSender;
-import org.bukkit.command.CommandSender;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
 import org.bukkit.inventory.ItemStack;
 
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsocialspy.java b/Essentials/src/net/ess3/commands/Commandsocialspy.java
index 86ae15fc8..c466af842 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandsocialspy.java
+++ b/Essentials/src/net/ess3/commands/Commandsocialspy.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
 
 
 public class Commandsocialspy extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandspawn.java b/Essentials/src/net/ess3/commands/Commandspawn.java
index f2ced2336..5772cf821 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandspawn.java
+++ b/Essentials/src/net/ess3/commands/Commandspawn.java
@@ -1,13 +1,11 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.economy.Trade;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.permissions.Permissions;
-import com.earth2me.essentials.settings.SpawnsHolder;
+import static net.ess3.I18n._;
+import net.ess3.economy.Trade;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
+import net.ess3.settings.SpawnsHolder;
 import org.bukkit.Location;
-import org.bukkit.command.CommandSender;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandspawner.java b/Essentials/src/net/ess3/commands/Commandspawner.java
index 1a3b52e1f..8d0993cb1 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandspawner.java
+++ b/Essentials/src/net/ess3/commands/Commandspawner.java
@@ -1,12 +1,12 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.bukkit.Mob;
-import com.earth2me.essentials.economy.Trade;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.permissions.SpawnerPermissions;
-import com.earth2me.essentials.utils.LocationUtil;
-import com.earth2me.essentials.utils.Util;
+import static net.ess3.I18n._;
+import net.ess3.bukkit.Mob;
+import net.ess3.economy.Trade;
+import net.ess3.api.IUser;
+import net.ess3.permissions.SpawnerPermissions;
+import net.ess3.utils.LocationUtil;
+import net.ess3.utils.Util;
 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/net/ess3/commands/Commandspawnmob.java
index 717a578e2..c836589da 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java
+++ b/Essentials/src/net/ess3/commands/Commandspawnmob.java
@@ -1,13 +1,13 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.bukkit.Mob;
-import com.earth2me.essentials.bukkit.Mob.MobException;
-import com.earth2me.essentials.api.ISettings;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.permissions.SpawnmobPermissions;
-import com.earth2me.essentials.utils.LocationUtil;
-import com.earth2me.essentials.utils.Util;
+import static net.ess3.I18n._;
+import net.ess3.bukkit.Mob;
+import net.ess3.bukkit.Mob.MobException;
+import net.ess3.api.ISettings;
+import net.ess3.api.IUser;
+import net.ess3.permissions.SpawnmobPermissions;
+import net.ess3.utils.LocationUtil;
+import net.ess3.utils.Util;
 import java.util.HashSet;
 import java.util.Locale;
 import java.util.Random;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsudo.java b/Essentials/src/net/ess3/commands/Commandsudo.java
index e7bc50c7e..d77241348 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandsudo.java
+++ b/Essentials/src/net/ess3/commands/Commandsudo.java
@@ -1,9 +1,9 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.permissions.Permissions;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.api.server.CommandSender;
+import net.ess3.permissions.Permissions;
 
 
 public class Commandsudo extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java b/Essentials/src/net/ess3/commands/Commandsuicide.java
index cf89f1c68..d1d666d7c 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java
+++ b/Essentials/src/net/ess3/commands/Commandsuicide.java
@@ -1,8 +1,7 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import org.bukkit.event.entity.EntityDamageEvent;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
 
 
 public class Commandsuicide extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtempban.java b/Essentials/src/net/ess3/commands/Commandtempban.java
index 774f6957b..209ab8098 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtempban.java
+++ b/Essentials/src/net/ess3/commands/Commandtempban.java
@@ -1,15 +1,12 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import com.earth2me.essentials.Console;
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.utils.Util;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.permissions.Permissions;
-import com.earth2me.essentials.user.Ban;
-import com.earth2me.essentials.utils.DateUtil;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.command.CommandSender;
+import net.ess3.Console;
+import static net.ess3.I18n._;
+
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
+import net.ess3.user.Ban;
+import net.ess3.utils.DateUtil;
 import org.bukkit.entity.Player;
 
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandthunder.java b/Essentials/src/net/ess3/commands/Commandthunder.java
index 23c2e13b9..eb7d9e1e2 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandthunder.java
+++ b/Essentials/src/net/ess3/commands/Commandthunder.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
 import org.bukkit.World;
 
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtime.java b/Essentials/src/net/ess3/commands/Commandtime.java
index 43ba15ac2..8ba2ff13f 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtime.java
+++ b/Essentials/src/net/ess3/commands/Commandtime.java
@@ -1,13 +1,11 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import com.earth2me.essentials.utils.DescParseTickFormat;
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.permissions.Permissions;
+import net.ess3.utils.DescParseTickFormat;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
 import java.util.*;
 import org.bukkit.World;
-import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java b/Essentials/src/net/ess3/commands/Commandtogglejail.java
index e2b011c5f..ca781c23f 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java
+++ b/Essentials/src/net/ess3/commands/Commandtogglejail.java
@@ -1,15 +1,12 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.utils.Util;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.permissions.Permissions;
-import com.earth2me.essentials.user.UserData.TimestampType;
-import com.earth2me.essentials.utils.DateUtil;
+import static net.ess3.I18n._;
+
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
+import net.ess3.user.UserData.TimestampType;
+import net.ess3.utils.DateUtil;
 import lombok.Cleanup;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.command.CommandSender;
 
 
 public class Commandtogglejail extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtop.java b/Essentials/src/net/ess3/commands/Commandtop.java
index 1e9926ecd..3298f8acd 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtop.java
+++ b/Essentials/src/net/ess3/commands/Commandtop.java
@@ -1,8 +1,8 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.economy.Trade;
-import com.earth2me.essentials.api.IUser;
+import static net.ess3.I18n._;
+import net.ess3.economy.Trade;
+import net.ess3.api.IUser;
 import org.bukkit.Location;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtp.java b/Essentials/src/net/ess3/commands/Commandtp.java
index a0fe7e8b4..93bd2a798 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtp.java
+++ b/Essentials/src/net/ess3/commands/Commandtp.java
@@ -1,13 +1,11 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import com.earth2me.essentials.Console;
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.economy.Trade;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.permissions.Permissions;
+import net.ess3.Console;
+import static net.ess3.I18n._;
+import net.ess3.economy.Trade;
+import net.ess3.api.IUser;
+import net.ess3.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/Commandtpa.java b/Essentials/src/net/ess3/commands/Commandtpa.java
index 6790883c6..84f674538 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtpa.java
+++ b/Essentials/src/net/ess3/commands/Commandtpa.java
@@ -1,8 +1,8 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.ISettings;
-import com.earth2me.essentials.api.IUser;
+import static net.ess3.I18n._;
+import net.ess3.api.ISettings;
+import net.ess3.api.IUser;
 import lombok.Cleanup;
 
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpaall.java b/Essentials/src/net/ess3/commands/Commandtpaall.java
index 70b55bc41..0dbbdd59a 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtpaall.java
+++ b/Essentials/src/net/ess3/commands/Commandtpaall.java
@@ -1,11 +1,9 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.ISettings;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.CommandSender;
+import static net.ess3.I18n._;
+import net.ess3.api.ISettings;
+import net.ess3.api.IUser;
 import lombok.Cleanup;
-import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java b/Essentials/src/net/ess3/commands/Commandtpaccept.java
index 2953b9c93..7aaa58f3e 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java
+++ b/Essentials/src/net/ess3/commands/Commandtpaccept.java
@@ -1,11 +1,10 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.economy.Trade;
-import com.earth2me.essentials.api.ISettings;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.permissions.Permissions;
-import org.bukkit.OfflinePlayer;
+import static net.ess3.I18n._;
+import net.ess3.economy.Trade;
+import net.ess3.api.ISettings;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpahere.java b/Essentials/src/net/ess3/commands/Commandtpahere.java
index b28898cd6..fc4a30083 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtpahere.java
+++ b/Essentials/src/net/ess3/commands/Commandtpahere.java
@@ -1,8 +1,8 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.ISettings;
-import com.earth2me.essentials.api.IUser;
+import static net.ess3.I18n._;
+import net.ess3.api.ISettings;
+import net.ess3.api.IUser;
 import lombok.Cleanup;
 
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpall.java b/Essentials/src/net/ess3/commands/Commandtpall.java
index b34f042a7..db0c676be 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtpall.java
+++ b/Essentials/src/net/ess3/commands/Commandtpall.java
@@ -1,9 +1,7 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.CommandSender;
-import org.bukkit.command.CommandSender;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpdeny.java b/Essentials/src/net/ess3/commands/Commandtpdeny.java
index 15d3f7728..e7744939b 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtpdeny.java
+++ b/Essentials/src/net/ess3/commands/Commandtpdeny.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
 
 
 public class Commandtpdeny extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtphere.java b/Essentials/src/net/ess3/commands/Commandtphere.java
index ee137fb38..c628c3519 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtphere.java
+++ b/Essentials/src/net/ess3/commands/Commandtphere.java
@@ -1,8 +1,8 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.economy.Trade;
-import com.earth2me.essentials.api.IUser;
+import static net.ess3.I18n._;
+import net.ess3.economy.Trade;
+import net.ess3.api.IUser;
 import lombok.Cleanup;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpo.java b/Essentials/src/net/ess3/commands/Commandtpo.java
index 5c6cfb195..529fbd8f8 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtpo.java
+++ b/Essentials/src/net/ess3/commands/Commandtpo.java
@@ -1,8 +1,8 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.permissions.Permissions;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpohere.java b/Essentials/src/net/ess3/commands/Commandtpohere.java
index 009d0f191..a3f9fcb74 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtpohere.java
+++ b/Essentials/src/net/ess3/commands/Commandtpohere.java
@@ -1,8 +1,8 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.permissions.Permissions;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtppos.java b/Essentials/src/net/ess3/commands/Commandtppos.java
index 79d803cd1..abbdeaae9 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtppos.java
+++ b/Essentials/src/net/ess3/commands/Commandtppos.java
@@ -1,8 +1,8 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.economy.Trade;
-import com.earth2me.essentials.api.IUser;
+import static net.ess3.I18n._;
+import net.ess3.economy.Trade;
+import net.ess3.api.IUser;
 import org.bukkit.Location;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtptoggle.java b/Essentials/src/net/ess3/commands/Commandtptoggle.java
index 2c39271ac..0b525baa3 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtptoggle.java
+++ b/Essentials/src/net/ess3/commands/Commandtptoggle.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
 
 
 public class Commandtptoggle extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtree.java b/Essentials/src/net/ess3/commands/Commandtree.java
index b4e47fbb6..dd498d66a 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtree.java
+++ b/Essentials/src/net/ess3/commands/Commandtree.java
@@ -1,8 +1,8 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.utils.LocationUtil;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.utils.LocationUtil;
 import org.bukkit.Location;
 import org.bukkit.TreeType;
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandunban.java b/Essentials/src/net/ess3/commands/Commandunban.java
index 0aa627ff5..b8e43e93b 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandunban.java
+++ b/Essentials/src/net/ess3/commands/Commandunban.java
@@ -1,10 +1,8 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.CommandSender;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
 import lombok.Cleanup;
-import org.bukkit.command.CommandSender;
 
 
 public class Commandunban extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandunbanip.java b/Essentials/src/net/ess3/commands/Commandunbanip.java
index 8cbb5c9b8..77017c244 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandunbanip.java
+++ b/Essentials/src/net/ess3/commands/Commandunbanip.java
@@ -1,10 +1,8 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.CommandSender;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
 import lombok.Cleanup;
-import org.bukkit.command.CommandSender;
 
 
 public class Commandunbanip extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandunlimited.java b/Essentials/src/net/ess3/commands/Commandunlimited.java
index eedbd054b..d3a53d1cb 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandunlimited.java
+++ b/Essentials/src/net/ess3/commands/Commandunlimited.java
@@ -1,12 +1,11 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.ItemStack;
-import com.earth2me.essentials.api.server.Material;
-import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
-import com.earth2me.essentials.permissions.Permissions;
-import com.earth2me.essentials.permissions.UnlimitedItemPermissions;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.api.server.ItemStack;
+import net.ess3.api.server.Material;
+import net.ess3.permissions.Permissions;
+import net.ess3.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/net/ess3/commands/Commandwarp.java
index 58a716fce..93fa4a003 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandwarp.java
+++ b/Essentials/src/net/ess3/commands/Commandwarp.java
@@ -1,18 +1,17 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.economy.Trade;
-import com.earth2me.essentials.utils.Util;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.IWarps;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.permissions.Permissions;
-import com.earth2me.essentials.permissions.WarpPermissions;
+import static net.ess3.I18n._;
+import net.ess3.economy.Trade;
+import net.ess3.utils.Util;
+import net.ess3.api.IUser;
+import net.ess3.api.IWarps;
+import net.ess3.permissions.Permissions;
+import net.ess3.permissions.WarpPermissions;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
-import org.bukkit.command.CommandSender;
+
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandweather.java b/Essentials/src/net/ess3/commands/Commandweather.java
index 64f24645a..7ed487873 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandweather.java
+++ b/Essentials/src/net/ess3/commands/Commandweather.java
@@ -1,9 +1,9 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.api.server.World;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.api.server.CommandSender;
+import net.ess3.api.server.World;
 
 
 public class Commandweather extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java b/Essentials/src/net/ess3/commands/Commandwhois.java
index b1811b947..4344d5f11 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java
+++ b/Essentials/src/net/ess3/commands/Commandwhois.java
@@ -1,14 +1,14 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.utils.Util;
-import com.earth2me.essentials.api.ISettings;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.api.server.Player;
-import com.earth2me.essentials.permissions.Permissions;
-import com.earth2me.essentials.user.UserData;
-import com.earth2me.essentials.utils.DateUtil;
+import static net.ess3.I18n._;
+import net.ess3.utils.Util;
+import net.ess3.api.ISettings;
+import net.ess3.api.IUser;
+import net.ess3.api.server.CommandSender;
+import net.ess3.api.server.Player;
+import net.ess3.permissions.Permissions;
+import net.ess3.user.UserData;
+import net.ess3.utils.DateUtil;
 import java.util.Locale;
 import lombok.Cleanup;
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandworld.java b/Essentials/src/net/ess3/commands/Commandworld.java
index 063ca33e3..261b2914e 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandworld.java
+++ b/Essentials/src/net/ess3/commands/Commandworld.java
@@ -1,11 +1,11 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.economy.Trade;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.World;
-import com.earth2me.essentials.api.server.Location;
-import com.earth2me.essentials.permissions.WorldPermissions;
+import static net.ess3.I18n._;
+import net.ess3.economy.Trade;
+import net.ess3.api.IUser;
+import net.ess3.api.server.World;
+import net.ess3.api.server.Location;
+import net.ess3.permissions.WorldPermissions;
 import java.util.List;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandworth.java b/Essentials/src/net/ess3/commands/Commandworth.java
index 990bfe5a6..9b0939f8f 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandworth.java
+++ b/Essentials/src/net/ess3/commands/Commandworth.java
@@ -1,12 +1,10 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.utils.Util;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.api.server.ItemStack;
+import static net.ess3.I18n._;
+import net.ess3.utils.Util;
+import net.ess3.api.IUser;
+import net.ess3.api.server.ItemStack;
 import java.util.Locale;
-import org.bukkit.command.CommandSender;
 
 
 public class Commandworth extends EssentialsCommand
diff --git a/Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java b/Essentials/src/net/ess3/commands/EssentialsCommand.java
index a7deaac71..d54e3d309 100644
--- a/Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java
+++ b/Essentials/src/net/ess3/commands/EssentialsCommand.java
@@ -1,14 +1,14 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.IEssentialsModule;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.api.server.IServer;
-import com.earth2me.essentials.api.server.Player;
-import com.earth2me.essentials.economy.Trade;
-import com.earth2me.essentials.permissions.AbstractSuperpermsPermission;
+import static net.ess3.I18n._;
+import net.ess3.api.IEssentials;
+import net.ess3.api.IEssentialsModule;
+import net.ess3.api.IUser;
+import net.ess3.api.server.CommandSender;
+import net.ess3.api.server.IServer;
+import net.ess3.api.server.Player;
+import net.ess3.economy.Trade;
+import net.ess3.permissions.AbstractSuperpermsPermission;
 import java.util.List;
 import java.util.logging.Logger;
 import org.bukkit.command.Command;
diff --git a/Essentials/src/com/earth2me/essentials/commands/EssentialsCommandHandler.java b/Essentials/src/net/ess3/commands/EssentialsCommandHandler.java
index 0971b764a..c4ef7bd78 100644
--- a/Essentials/src/com/earth2me/essentials/commands/EssentialsCommandHandler.java
+++ b/Essentials/src/net/ess3/commands/EssentialsCommandHandler.java
@@ -1,19 +1,14 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
+
+import static net.ess3.I18n._;
+import net.ess3.api.*;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.*;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.commands.EssentialsCommand;
-import com.earth2me.essentials.commands.IEssentialsCommand;
-import com.earth2me.essentials.commands.NoChargeException;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
 import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.command.PluginCommandYamlParser;
 import org.bukkit.entity.Player;
@@ -88,7 +83,7 @@ public class EssentialsCommandHandler implements ICommandHandler
 					final ArrayList<StackTraceElement> toRemove = new ArrayList<StackTraceElement>();
 					for (final StackTraceElement e : elements)
 					{
-						if (e.getClassName().equals("com.earth2me.essentials.Essentials"))
+						if (e.getClassName().equals("net.ess3.Essentials"))
 						{
 							toRemove.add(e);
 						}
diff --git a/Essentials/src/com/earth2me/essentials/commands/IEssentialsCommand.java b/Essentials/src/net/ess3/commands/IEssentialsCommand.java
index 97b5f2767..2466b4c55 100644
--- a/Essentials/src/com/earth2me/essentials/commands/IEssentialsCommand.java
+++ b/Essentials/src/net/ess3/commands/IEssentialsCommand.java
@@ -1,10 +1,10 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.IEssentialsModule;
-import com.earth2me.essentials.api.IPermission;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.CommandSender;
+import net.ess3.api.IEssentials;
+import net.ess3.api.IEssentialsModule;
+import net.ess3.api.IPermission;
+import net.ess3.api.IUser;
+import net.ess3.api.server.CommandSender;
 import org.bukkit.command.Command;
 
 
diff --git a/Essentials/src/com/earth2me/essentials/commands/NoChargeException.java b/Essentials/src/net/ess3/commands/NoChargeException.java
index bb0088792..e3cd20131 100644
--- a/Essentials/src/com/earth2me/essentials/commands/NoChargeException.java
+++ b/Essentials/src/net/ess3/commands/NoChargeException.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
 
 public class NoChargeException extends Exception
diff --git a/Essentials/src/com/earth2me/essentials/commands/NotEnoughArgumentsException.java b/Essentials/src/net/ess3/commands/NotEnoughArgumentsException.java
index 0c47b9893..38a2915c7 100644
--- a/Essentials/src/com/earth2me/essentials/commands/NotEnoughArgumentsException.java
+++ b/Essentials/src/net/ess3/commands/NotEnoughArgumentsException.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
 
 public class NotEnoughArgumentsException extends Exception
diff --git a/Essentials/src/com/earth2me/essentials/commands/WarpNotFoundException.java b/Essentials/src/net/ess3/commands/WarpNotFoundException.java
index 6caea6dd2..4c948560d 100644
--- a/Essentials/src/com/earth2me/essentials/commands/WarpNotFoundException.java
+++ b/Essentials/src/net/ess3/commands/WarpNotFoundException.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
 
 public class WarpNotFoundException extends Exception
diff --git a/Essentials/src/com/earth2me/essentials/craftbukkit/FakeExplosion.java b/Essentials/src/net/ess3/craftbukkit/FakeExplosion.java
index 934d94fa2..01f117cfa 100644
--- a/Essentials/src/com/earth2me/essentials/craftbukkit/FakeExplosion.java
+++ b/Essentials/src/net/ess3/craftbukkit/FakeExplosion.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.craftbukkit;
+package net.ess3.craftbukkit;
 
 import java.util.ArrayList;
 import java.util.HashSet;
diff --git a/Essentials/src/com/earth2me/essentials/craftbukkit/FakeInventory.java b/Essentials/src/net/ess3/craftbukkit/FakeInventory.java
index 01e7bd5b2..9d07c9dbd 100644
--- a/Essentials/src/com/earth2me/essentials/craftbukkit/FakeInventory.java
+++ b/Essentials/src/net/ess3/craftbukkit/FakeInventory.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.craftbukkit;
+package net.ess3.craftbukkit;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/Essentials/src/com/earth2me/essentials/craftbukkit/InventoryWorkaround.java b/Essentials/src/net/ess3/craftbukkit/InventoryWorkaround.java
index a6d5d4fbc..c8f070bab 100644
--- a/Essentials/src/com/earth2me/essentials/craftbukkit/InventoryWorkaround.java
+++ b/Essentials/src/net/ess3/craftbukkit/InventoryWorkaround.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.craftbukkit;
+package net.ess3.craftbukkit;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/Essentials/src/com/earth2me/essentials/craftbukkit/SetExpFix.java b/Essentials/src/net/ess3/craftbukkit/SetExpFix.java
index d4db5d1a8..2bf6ec32e 100644
--- a/Essentials/src/com/earth2me/essentials/craftbukkit/SetExpFix.java
+++ b/Essentials/src/net/ess3/craftbukkit/SetExpFix.java
@@ -1,6 +1,4 @@
-package com.earth2me.essentials.craftbukkit;
-
-import org.bukkit.entity.Player;
+package net.ess3.craftbukkit;
 
 
 public class SetExpFix
diff --git a/Essentials/src/com/earth2me/essentials/economy/Economy.java b/Essentials/src/net/ess3/economy/Economy.java
index 12bc9414c..4ba48a3d9 100644
--- a/Essentials/src/com/earth2me/essentials/economy/Economy.java
+++ b/Essentials/src/net/ess3/economy/Economy.java
@@ -1,8 +1,8 @@
-package com.earth2me.essentials.economy;
+package net.ess3.economy;
 
-import com.earth2me.essentials.utils.Util;
-import com.earth2me.essentials.api.*;
-import com.earth2me.essentials.permissions.Permissions;
+import net.ess3.utils.Util;
+import net.ess3.api.*;
+import net.ess3.permissions.Permissions;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
diff --git a/Essentials/src/com/earth2me/essentials/economy/Money.java b/Essentials/src/net/ess3/economy/Money.java
index ff081e609..20eea3544 100644
--- a/Essentials/src/com/earth2me/essentials/economy/Money.java
+++ b/Essentials/src/net/ess3/economy/Money.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.economy;
+package net.ess3.economy;
 
-import com.earth2me.essentials.storage.MapValueType;
-import com.earth2me.essentials.storage.StorageObject;
+import net.ess3.storage.MapValueType;
+import net.ess3.storage.StorageObject;
 import java.util.HashMap;
 import java.util.Map;
 import lombok.Data;
diff --git a/Essentials/src/com/earth2me/essentials/economy/MoneyHolder.java b/Essentials/src/net/ess3/economy/MoneyHolder.java
index 6adfa6c2d..b4355edd8 100644
--- a/Essentials/src/com/earth2me/essentials/economy/MoneyHolder.java
+++ b/Essentials/src/net/ess3/economy/MoneyHolder.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.economy;
+package net.ess3.economy;
 
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.storage.AsyncStorageObjectHolder;
+import net.ess3.api.IEssentials;
+import net.ess3.storage.AsyncStorageObjectHolder;
 import java.io.File;
 import java.io.IOException;
 
diff --git a/Essentials/src/com/earth2me/essentials/economy/Trade.java b/Essentials/src/net/ess3/economy/Trade.java
index 2e217580d..a760d5730 100644
--- a/Essentials/src/com/earth2me/essentials/economy/Trade.java
+++ b/Essentials/src/net/ess3/economy/Trade.java
@@ -1,14 +1,14 @@
-package com.earth2me.essentials.economy;
+package net.ess3.economy;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.ChargeException;
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.ISettings;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.ItemStack;
-import com.earth2me.essentials.api.server.Location;
-import com.earth2me.essentials.permissions.NoCommandCostPermissions;
-import com.earth2me.essentials.permissions.Permissions;
+import static net.ess3.I18n._;
+import net.ess3.api.ChargeException;
+import net.ess3.api.IEssentials;
+import net.ess3.api.ISettings;
+import net.ess3.api.IUser;
+import net.ess3.api.server.ItemStack;
+import net.ess3.api.server.Location;
+import net.ess3.permissions.NoCommandCostPermissions;
+import net.ess3.permissions.Permissions;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
diff --git a/Essentials/src/com/earth2me/essentials/economy/Worth.java b/Essentials/src/net/ess3/economy/Worth.java
index c8f6a39ae..91fa254b7 100644
--- a/Essentials/src/com/earth2me/essentials/economy/Worth.java
+++ b/Essentials/src/net/ess3/economy/Worth.java
@@ -1,9 +1,9 @@
-package com.earth2me.essentials.economy;
+package net.ess3.economy;
 
-import com.earth2me.essentials.storage.EnchantmentLevel;
-import com.earth2me.essentials.storage.MapKeyType;
-import com.earth2me.essentials.storage.MapValueType;
-import com.earth2me.essentials.storage.StorageObject;
+import net.ess3.storage.EnchantmentLevel;
+import net.ess3.storage.MapKeyType;
+import net.ess3.storage.MapValueType;
+import net.ess3.storage.StorageObject;
 import java.util.HashMap;
 import java.util.Map;
 import lombok.Data;
diff --git a/Essentials/src/com/earth2me/essentials/economy/WorthHolder.java b/Essentials/src/net/ess3/economy/WorthHolder.java
index c49c705f0..f43441f0d 100644
--- a/Essentials/src/com/earth2me/essentials/economy/WorthHolder.java
+++ b/Essentials/src/net/ess3/economy/WorthHolder.java
@@ -1,10 +1,10 @@
-package com.earth2me.essentials.economy;
+package net.ess3.economy;
 
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.IWorth;
-import com.earth2me.essentials.api.server.ItemStack;
-import com.earth2me.essentials.storage.AsyncStorageObjectHolder;
-import com.earth2me.essentials.storage.EnchantmentLevel;
+import net.ess3.api.IEssentials;
+import net.ess3.api.IWorth;
+import net.ess3.api.server.ItemStack;
+import net.ess3.storage.AsyncStorageObjectHolder;
+import net.ess3.storage.EnchantmentLevel;
 import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
@@ -13,11 +13,11 @@ import org.bukkit.enchantments.Enchantment;
 import org.bukkit.material.MaterialData;
 
 
-public class WorthHolder extends AsyncStorageObjectHolder<com.earth2me.essentials.economy.Worth> implements IWorth
+public class WorthHolder extends AsyncStorageObjectHolder<net.ess3.economy.Worth> implements IWorth
 {
 	public WorthHolder(final IEssentials ess)
 	{
-		super(ess, com.earth2me.essentials.economy.Worth.class);
+		super(ess, net.ess3.economy.Worth.class);
 		onReload(false);
 	}
 
diff --git a/Essentials/src/com/earth2me/essentials/economy/register/Method.java b/Essentials/src/net/ess3/economy/register/Method.java
index 2b22bfd3f..228e92569 100644
--- a/Essentials/src/com/earth2me/essentials/economy/register/Method.java
+++ b/Essentials/src/net/ess3/economy/register/Method.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.economy.register;
+package net.ess3.economy.register;
 
 import org.bukkit.plugin.Plugin;
 
diff --git a/Essentials/src/com/earth2me/essentials/economy/register/Methods.java b/Essentials/src/net/ess3/economy/register/Methods.java
index eb3138473..04208b4cb 100644
--- a/Essentials/src/com/earth2me/essentials/economy/register/Methods.java
+++ b/Essentials/src/net/ess3/economy/register/Methods.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.economy.register;
+package net.ess3.economy.register;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -45,14 +45,14 @@ public class Methods
 	 */
 	private static void _init()
 	{
-		addMethod("iConomy", new com.earth2me.essentials.economy.register.methods.iCo6());
-		addMethod("iConomy", new com.earth2me.essentials.economy.register.methods.iCo5());
-		addMethod("iConomy", new com.earth2me.essentials.economy.register.methods.iCo4());
-		addMethod("BOSEconomy", new com.earth2me.essentials.economy.register.methods.BOSE6());
-		addMethod("BOSEconomy", new com.earth2me.essentials.economy.register.methods.BOSE7());
-		addMethod("Currency", new com.earth2me.essentials.economy.register.methods.MCUR());
+		addMethod("iConomy", new net.ess3.economy.register.methods.iCo6());
+		addMethod("iConomy", new net.ess3.economy.register.methods.iCo5());
+		addMethod("iConomy", new net.ess3.economy.register.methods.iCo4());
+		addMethod("BOSEconomy", new net.ess3.economy.register.methods.BOSE6());
+		addMethod("BOSEconomy", new net.ess3.economy.register.methods.BOSE7());
+		addMethod("Currency", new net.ess3.economy.register.methods.MCUR());
 		Dependencies.add("MultiCurrency");
-		addMethod("Vault", new com.earth2me.essentials.economy.register.methods.VaultEco());
+		addMethod("Vault", new net.ess3.economy.register.methods.VaultEco());
 	}
 
 	/**
diff --git a/Essentials/src/com/earth2me/essentials/economy/register/methods/BOSE6.java b/Essentials/src/net/ess3/economy/register/methods/BOSE6.java
index 0fd7bb167..051ac92a3 100644
--- a/Essentials/src/com/earth2me/essentials/economy/register/methods/BOSE6.java
+++ b/Essentials/src/net/ess3/economy/register/methods/BOSE6.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.economy.register.methods;
+package net.ess3.economy.register.methods;
 
-import com.earth2me.essentials.economy.register.Method;
+import net.ess3.economy.register.Method;
 import cosine.boseconomy.BOSEconomy;
 import org.bukkit.plugin.Plugin;
 
diff --git a/Essentials/src/com/earth2me/essentials/economy/register/methods/BOSE7.java b/Essentials/src/net/ess3/economy/register/methods/BOSE7.java
index aa06589d3..59e2f5bb5 100644
--- a/Essentials/src/com/earth2me/essentials/economy/register/methods/BOSE7.java
+++ b/Essentials/src/net/ess3/economy/register/methods/BOSE7.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.economy.register.methods;
+package net.ess3.economy.register.methods;
 
-import com.earth2me.essentials.economy.register.Method;
+import net.ess3.economy.register.Method;
 import cosine.boseconomy.BOSEconomy;
 import org.bukkit.plugin.Plugin;
 
diff --git a/Essentials/src/com/earth2me/essentials/economy/register/methods/MCUR.java b/Essentials/src/net/ess3/economy/register/methods/MCUR.java
index 2c49c3233..e7c1287eb 100644
--- a/Essentials/src/com/earth2me/essentials/economy/register/methods/MCUR.java
+++ b/Essentials/src/net/ess3/economy/register/methods/MCUR.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.economy.register.methods;
+package net.ess3.economy.register.methods;
 
-import com.earth2me.essentials.economy.register.Method;
+import net.ess3.economy.register.Method;
 import me.ashtheking.currency.Currency;
 import me.ashtheking.currency.CurrencyList;
 import org.bukkit.plugin.Plugin;
diff --git a/Essentials/src/com/earth2me/essentials/economy/register/methods/VaultEco.java b/Essentials/src/net/ess3/economy/register/methods/VaultEco.java
index fe4c2f513..804770773 100644
--- a/Essentials/src/com/earth2me/essentials/economy/register/methods/VaultEco.java
+++ b/Essentials/src/net/ess3/economy/register/methods/VaultEco.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.economy.register.methods;
+package net.ess3.economy.register.methods;
 
-import com.earth2me.essentials.economy.register.Method;
+import net.ess3.economy.register.Method;
 import net.milkbowl.vault.Vault;
 import net.milkbowl.vault.economy.Economy;
 import org.bukkit.plugin.Plugin;
diff --git a/Essentials/src/com/earth2me/essentials/economy/register/methods/iCo4.java b/Essentials/src/net/ess3/economy/register/methods/iCo4.java
index 1d2aa111b..adb1c5eb1 100644
--- a/Essentials/src/com/earth2me/essentials/economy/register/methods/iCo4.java
+++ b/Essentials/src/net/ess3/economy/register/methods/iCo4.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.economy.register.methods;
+package net.ess3.economy.register.methods;
 
-import com.earth2me.essentials.economy.register.Method;
+import net.ess3.economy.register.Method;
 import com.nijiko.coelho.iConomy.iConomy;
 import com.nijiko.coelho.iConomy.system.Account;
 import org.bukkit.plugin.Plugin;
diff --git a/Essentials/src/com/earth2me/essentials/economy/register/methods/iCo5.java b/Essentials/src/net/ess3/economy/register/methods/iCo5.java
index 2b1c02dfe..7867446de 100644
--- a/Essentials/src/com/earth2me/essentials/economy/register/methods/iCo5.java
+++ b/Essentials/src/net/ess3/economy/register/methods/iCo5.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.economy.register.methods;
+package net.ess3.economy.register.methods;
 
-import com.earth2me.essentials.economy.register.Method;
+import net.ess3.economy.register.Method;
 import com.iConomy.iConomy;
 import com.iConomy.system.Account;
 import com.iConomy.system.BankAccount;
diff --git a/Essentials/src/com/earth2me/essentials/economy/register/methods/iCo6.java b/Essentials/src/net/ess3/economy/register/methods/iCo6.java
index d615a4888..961aadef4 100644
--- a/Essentials/src/com/earth2me/essentials/economy/register/methods/iCo6.java
+++ b/Essentials/src/net/ess3/economy/register/methods/iCo6.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.economy.register.methods;
+package net.ess3.economy.register.methods;
 
-import com.earth2me.essentials.economy.register.Method;
+import net.ess3.economy.register.Method;
 import com.iCo6.iConomy;
 import com.iCo6.system.Account;
 import com.iCo6.system.Accounts;
diff --git a/Essentials/src/com/earth2me/essentials/listener/EssentialsBlockListener.java b/Essentials/src/net/ess3/listener/EssentialsBlockListener.java
index 4b0dad5e5..9393d8dbe 100644
--- a/Essentials/src/com/earth2me/essentials/listener/EssentialsBlockListener.java
+++ b/Essentials/src/net/ess3/listener/EssentialsBlockListener.java
@@ -1,8 +1,8 @@
-package com.earth2me.essentials.listener;
+package net.ess3.listener;
 
-import com.earth2me.essentials.utils.Util;
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.IUser;
+import net.ess3.utils.Util;
+import net.ess3.api.IEssentials;
+import net.ess3.api.IUser;
 import org.bukkit.GameMode;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
diff --git a/Essentials/src/com/earth2me/essentials/listener/EssentialsEntityListener.java b/Essentials/src/net/ess3/listener/EssentialsEntityListener.java
index 036da57d2..14fcd74ff 100644
--- a/Essentials/src/com/earth2me/essentials/listener/EssentialsEntityListener.java
+++ b/Essentials/src/net/ess3/listener/EssentialsEntityListener.java
@@ -1,10 +1,10 @@
-package com.earth2me.essentials.listener;
+package net.ess3.listener;
 
-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.permissions.Permissions;
+import static net.ess3.I18n._;
+import net.ess3.api.IEssentials;
+import net.ess3.api.ISettings;
+import net.ess3.api.IUser;
+import net.ess3.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/net/ess3/listener/EssentialsPlayerListener.java
index 978794b75..129178b84 100644
--- a/Essentials/src/com/earth2me/essentials/listener/EssentialsPlayerListener.java
+++ b/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java
@@ -1,16 +1,16 @@
-package com.earth2me.essentials.listener;
+package net.ess3.listener;
 
-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.permissions.Permissions;
-import com.earth2me.essentials.utils.textreader.IText;
-import com.earth2me.essentials.utils.textreader.KeywordReplacer;
-import com.earth2me.essentials.utils.textreader.TextInput;
-import com.earth2me.essentials.utils.textreader.TextPager;
-import com.earth2me.essentials.user.UserData.TimestampType;
-import com.earth2me.essentials.utils.LocationUtil;
+import static net.ess3.I18n._;
+import net.ess3.api.IEssentials;
+import net.ess3.api.ISettings;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
+import net.ess3.utils.textreader.IText;
+import net.ess3.utils.textreader.KeywordReplacer;
+import net.ess3.utils.textreader.TextInput;
+import net.ess3.utils.textreader.TextPager;
+import net.ess3.user.UserData.TimestampType;
+import net.ess3.utils.LocationUtil;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Iterator;
diff --git a/Essentials/src/com/earth2me/essentials/listener/EssentialsPluginListener.java b/Essentials/src/net/ess3/listener/EssentialsPluginListener.java
index edb839aa2..2d5e7a9d4 100644
--- a/Essentials/src/com/earth2me/essentials/listener/EssentialsPluginListener.java
+++ b/Essentials/src/net/ess3/listener/EssentialsPluginListener.java
@@ -1,13 +1,13 @@
-package com.earth2me.essentials.listener;
+package net.ess3.listener;
 
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.IReload;
-import com.earth2me.essentials.api.ISettings;
-import com.earth2me.essentials.ranks.GMGroups;
-import com.earth2me.essentials.ranks.VaultGroups;
-import com.earth2me.essentials.economy.register.Methods;
-import com.earth2me.essentials.settings.General;
-import com.earth2me.essentials.ranks.RanksStorage;
+import net.ess3.api.IEssentials;
+import net.ess3.api.IReload;
+import net.ess3.api.ISettings;
+import net.ess3.ranks.GMGroups;
+import net.ess3.ranks.VaultGroups;
+import net.ess3.economy.register.Methods;
+import net.ess3.settings.General;
+import net.ess3.ranks.RanksStorage;
 import java.util.logging.Level;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
diff --git a/Essentials/src/com/earth2me/essentials/listener/TntExplodeListener.java b/Essentials/src/net/ess3/listener/TntExplodeListener.java
index 2bcabb2d4..5a423a027 100644
--- a/Essentials/src/com/earth2me/essentials/listener/TntExplodeListener.java
+++ b/Essentials/src/net/ess3/listener/TntExplodeListener.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.listener;
+package net.ess3.listener;
 
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.craftbukkit.FakeExplosion;
+import net.ess3.api.IEssentials;
+import net.ess3.craftbukkit.FakeExplosion;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.event.EventHandler;
diff --git a/Essentials/src/com/earth2me/essentials/permissions/AbstractSuperpermsPermission.java b/Essentials/src/net/ess3/permissions/AbstractSuperpermsPermission.java
index 66aba8f9c..291284f87 100644
--- a/Essentials/src/com/earth2me/essentials/permissions/AbstractSuperpermsPermission.java
+++ b/Essentials/src/net/ess3/permissions/AbstractSuperpermsPermission.java
@@ -1,9 +1,8 @@
-package com.earth2me.essentials.permissions;
+package net.ess3.permissions;
 
-import com.earth2me.essentials.utils.Util;
-import com.earth2me.essentials.api.IPermission;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.api.server.Permission;
+import net.ess3.api.IPermission;
+import net.ess3.api.server.CommandSender;
+import net.ess3.api.server.Permission;
 
 
 public abstract class AbstractSuperpermsPermission implements IPermission
diff --git a/Essentials/src/com/earth2me/essentials/permissions/BasePermission.java b/Essentials/src/net/ess3/permissions/BasePermission.java
index 973b06d97..c8198c1e2 100644
--- a/Essentials/src/com/earth2me/essentials/permissions/BasePermission.java
+++ b/Essentials/src/net/ess3/permissions/BasePermission.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.permissions;
+package net.ess3.permissions;
 
 public class BasePermission extends AbstractSuperpermsPermission {
 	protected String permission;
diff --git a/Essentials/src/com/earth2me/essentials/permissions/EnchantPermissions.java b/Essentials/src/net/ess3/permissions/EnchantPermissions.java
index c31aa6f62..996477338 100644
--- a/Essentials/src/com/earth2me/essentials/permissions/EnchantPermissions.java
+++ b/Essentials/src/net/ess3/permissions/EnchantPermissions.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.permissions;
+package net.ess3.permissions;
 
-import com.earth2me.essentials.api.IPermission;
+import net.ess3.api.IPermission;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
diff --git a/Essentials/src/com/earth2me/essentials/permissions/GivePermissions.java b/Essentials/src/net/ess3/permissions/GivePermissions.java
index aa9b354c3..a3ced5155 100644
--- a/Essentials/src/com/earth2me/essentials/permissions/GivePermissions.java
+++ b/Essentials/src/net/ess3/permissions/GivePermissions.java
@@ -1,8 +1,8 @@
-package com.earth2me.essentials.permissions;
+package net.ess3.permissions;
 
-import com.earth2me.essentials.api.IPermission;
-import com.earth2me.essentials.api.server.Material;
-import com.earth2me.essentials.api.server.Permission;
+import net.ess3.api.IPermission;
+import net.ess3.api.server.Material;
+import net.ess3.api.server.Permission;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
diff --git a/Essentials/src/com/earth2me/essentials/permissions/GroupsPermissions.java b/Essentials/src/net/ess3/permissions/GroupsPermissions.java
index ed3ca92ff..330cb7fb8 100644
--- a/Essentials/src/com/earth2me/essentials/permissions/GroupsPermissions.java
+++ b/Essentials/src/net/ess3/permissions/GroupsPermissions.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.permissions;
+package net.ess3.permissions;
 
-import com.earth2me.essentials.api.IPermission;
+import net.ess3.api.IPermission;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
diff --git a/Essentials/src/com/earth2me/essentials/permissions/HelpPermissions.java b/Essentials/src/net/ess3/permissions/HelpPermissions.java
index aae5e0ce7..3e7b251bd 100644
--- a/Essentials/src/com/earth2me/essentials/permissions/HelpPermissions.java
+++ b/Essentials/src/net/ess3/permissions/HelpPermissions.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.permissions;
+package net.ess3.permissions;
 
-import com.earth2me.essentials.api.IPermission;
+import net.ess3.api.IPermission;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
diff --git a/Essentials/src/com/earth2me/essentials/permissions/ItemPermissions.java b/Essentials/src/net/ess3/permissions/ItemPermissions.java
index fa4932cca..c0d4b587d 100644
--- a/Essentials/src/com/earth2me/essentials/permissions/ItemPermissions.java
+++ b/Essentials/src/net/ess3/permissions/ItemPermissions.java
@@ -1,8 +1,8 @@
-package com.earth2me.essentials.permissions;
+package net.ess3.permissions;
 
-import com.earth2me.essentials.api.IPermission;
-import com.earth2me.essentials.api.server.Material;
-import com.earth2me.essentials.api.server.Permission;
+import net.ess3.api.IPermission;
+import net.ess3.api.server.Material;
+import net.ess3.api.server.Permission;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
diff --git a/Essentials/src/com/earth2me/essentials/permissions/KitPermissions.java b/Essentials/src/net/ess3/permissions/KitPermissions.java
index 420f1abd5..fb02392c0 100644
--- a/Essentials/src/com/earth2me/essentials/permissions/KitPermissions.java
+++ b/Essentials/src/net/ess3/permissions/KitPermissions.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.permissions;
+package net.ess3.permissions;
 
-import com.earth2me.essentials.api.IPermission;
-import com.earth2me.essentials.api.server.Permission;
+import net.ess3.api.IPermission;
+import net.ess3.api.server.Permission;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
diff --git a/Essentials/src/com/earth2me/essentials/permissions/NoCommandCostPermissions.java b/Essentials/src/net/ess3/permissions/NoCommandCostPermissions.java
index 77511e198..54cd18624 100644
--- a/Essentials/src/com/earth2me/essentials/permissions/NoCommandCostPermissions.java
+++ b/Essentials/src/net/ess3/permissions/NoCommandCostPermissions.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.permissions;
+package net.ess3.permissions;
 
-import com.earth2me.essentials.api.IPermission;
+import net.ess3.api.IPermission;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
diff --git a/Essentials/src/com/earth2me/essentials/permissions/Permissions.java b/Essentials/src/net/ess3/permissions/Permissions.java
index a9df9e04a..2f1c83dfe 100644
--- a/Essentials/src/com/earth2me/essentials/permissions/Permissions.java
+++ b/Essentials/src/net/ess3/permissions/Permissions.java
@@ -1,9 +1,8 @@
-package com.earth2me.essentials.permissions;
+package net.ess3.permissions;
 
-import com.earth2me.essentials.utils.Util;
-import com.earth2me.essentials.api.IPermission;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.api.server.Permission;
+import net.ess3.api.IPermission;
+import net.ess3.api.server.CommandSender;
+import net.ess3.api.server.Permission;
 import java.util.Locale;
 
 
diff --git a/Essentials/src/com/earth2me/essentials/permissions/SpawnerPermissions.java b/Essentials/src/net/ess3/permissions/SpawnerPermissions.java
index 17f8243cf..67674370a 100644
--- a/Essentials/src/com/earth2me/essentials/permissions/SpawnerPermissions.java
+++ b/Essentials/src/net/ess3/permissions/SpawnerPermissions.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.permissions;
+package net.ess3.permissions;
 
-import com.earth2me.essentials.api.IPermission;
+import net.ess3.api.IPermission;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
diff --git a/Essentials/src/com/earth2me/essentials/permissions/SpawnmobPermissions.java b/Essentials/src/net/ess3/permissions/SpawnmobPermissions.java
index fa1e26fa0..ce8441706 100644
--- a/Essentials/src/com/earth2me/essentials/permissions/SpawnmobPermissions.java
+++ b/Essentials/src/net/ess3/permissions/SpawnmobPermissions.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.permissions;
+package net.ess3.permissions;
 
-import com.earth2me.essentials.api.IPermission;
+import net.ess3.api.IPermission;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
diff --git a/Essentials/src/com/earth2me/essentials/permissions/UnlimitedItemPermissions.java b/Essentials/src/net/ess3/permissions/UnlimitedItemPermissions.java
index 2907d77a6..4387e6ba2 100644
--- a/Essentials/src/com/earth2me/essentials/permissions/UnlimitedItemPermissions.java
+++ b/Essentials/src/net/ess3/permissions/UnlimitedItemPermissions.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.permissions;
+package net.ess3.permissions;
 
-import com.earth2me.essentials.api.IPermission;
-import com.earth2me.essentials.api.server.Material;
+import net.ess3.api.IPermission;
+import net.ess3.api.server.Material;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
diff --git a/Essentials/src/com/earth2me/essentials/permissions/WarpPermissions.java b/Essentials/src/net/ess3/permissions/WarpPermissions.java
index 83c56a881..fe977ccce 100644
--- a/Essentials/src/com/earth2me/essentials/permissions/WarpPermissions.java
+++ b/Essentials/src/net/ess3/permissions/WarpPermissions.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.permissions;
+package net.ess3.permissions;
 
-import com.earth2me.essentials.api.IPermission;
-import com.earth2me.essentials.api.server.Permission;
+import net.ess3.api.IPermission;
+import net.ess3.api.server.Permission;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
diff --git a/Essentials/src/com/earth2me/essentials/permissions/WorldPermissions.java b/Essentials/src/net/ess3/permissions/WorldPermissions.java
index 303a7214d..d86e22546 100644
--- a/Essentials/src/com/earth2me/essentials/permissions/WorldPermissions.java
+++ b/Essentials/src/net/ess3/permissions/WorldPermissions.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.permissions;
+package net.ess3.permissions;
 
-import com.earth2me.essentials.api.IPermission;
+import net.ess3.api.IPermission;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
diff --git a/Essentials/src/com/earth2me/essentials/ranks/GMGroups.java b/Essentials/src/net/ess3/ranks/GMGroups.java
index 244ff8410..976cd89ea 100644
--- a/Essentials/src/com/earth2me/essentials/ranks/GMGroups.java
+++ b/Essentials/src/net/ess3/ranks/GMGroups.java
@@ -1,10 +1,10 @@
-package com.earth2me.essentials.ranks;
+package net.ess3.ranks;
 
-import com.earth2me.essentials.utils.Util;
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.IRanks;
-import com.earth2me.essentials.api.ISettings;
-import com.earth2me.essentials.api.IUser;
+import net.ess3.utils.Util;
+import net.ess3.api.IEssentials;
+import net.ess3.api.IRanks;
+import net.ess3.api.ISettings;
+import net.ess3.api.IUser;
 import java.text.MessageFormat;
 import lombok.Cleanup;
 import org.anjocaido.groupmanager.GroupManager;
diff --git a/Essentials/src/com/earth2me/essentials/ranks/RankOptions.java b/Essentials/src/net/ess3/ranks/RankOptions.java
index 5fa011f9c..a8a8c3298 100644
--- a/Essentials/src/com/earth2me/essentials/ranks/RankOptions.java
+++ b/Essentials/src/net/ess3/ranks/RankOptions.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.ranks;
+package net.ess3.ranks;
 
-import com.earth2me.essentials.storage.Comment;
-import com.earth2me.essentials.storage.StorageObject;
+import net.ess3.storage.Comment;
+import net.ess3.storage.StorageObject;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/Essentials/src/com/earth2me/essentials/ranks/Ranks.java b/Essentials/src/net/ess3/ranks/Ranks.java
index cc11aff2a..a77f09846 100644
--- a/Essentials/src/com/earth2me/essentials/ranks/Ranks.java
+++ b/Essentials/src/net/ess3/ranks/Ranks.java
@@ -1,8 +1,8 @@
-package com.earth2me.essentials.ranks;
+package net.ess3.ranks;
 
-import com.earth2me.essentials.storage.Comment;
-import com.earth2me.essentials.storage.MapValueType;
-import com.earth2me.essentials.storage.StorageObject;
+import net.ess3.storage.Comment;
+import net.ess3.storage.MapValueType;
+import net.ess3.storage.StorageObject;
 import java.util.LinkedHashMap;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/Essentials/src/com/earth2me/essentials/ranks/RanksStorage.java b/Essentials/src/net/ess3/ranks/RanksStorage.java
index 5a38a51aa..2e6096837 100644
--- a/Essentials/src/com/earth2me/essentials/ranks/RanksStorage.java
+++ b/Essentials/src/net/ess3/ranks/RanksStorage.java
@@ -1,12 +1,12 @@
-package com.earth2me.essentials.ranks;
+package net.ess3.ranks;
 
-import com.earth2me.essentials.utils.Util;
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.IRanks;
-import com.earth2me.essentials.api.ISettings;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.permissions.GroupsPermissions;
-import com.earth2me.essentials.storage.AsyncStorageObjectHolder;
+import net.ess3.utils.Util;
+import net.ess3.api.IEssentials;
+import net.ess3.api.IRanks;
+import net.ess3.api.ISettings;
+import net.ess3.api.IUser;
+import net.ess3.permissions.GroupsPermissions;
+import net.ess3.storage.AsyncStorageObjectHolder;
 import java.io.File;
 import java.text.MessageFormat;
 import java.util.ArrayList;
diff --git a/Essentials/src/com/earth2me/essentials/ranks/VaultGroups.java b/Essentials/src/net/ess3/ranks/VaultGroups.java
index 51be20432..eddc367f8 100644
--- a/Essentials/src/com/earth2me/essentials/ranks/VaultGroups.java
+++ b/Essentials/src/net/ess3/ranks/VaultGroups.java
@@ -1,14 +1,13 @@
-package com.earth2me.essentials.ranks;
+package net.ess3.ranks;
 
-import com.earth2me.essentials.utils.Util;
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.IRanks;
-import com.earth2me.essentials.api.ISettings;
-import com.earth2me.essentials.api.IUser;
+import net.ess3.utils.Util;
+import net.ess3.api.IEssentials;
+import net.ess3.api.IRanks;
+import net.ess3.api.ISettings;
+import net.ess3.api.IUser;
 import java.text.MessageFormat;
 import lombok.Cleanup;
 import net.milkbowl.vault.chat.Chat;
-import org.bukkit.plugin.RegisteredServiceProvider;
 
 
 public class VaultGroups implements IRanks
diff --git a/Essentials/src/com/earth2me/essentials/settings/Backup.java b/Essentials/src/net/ess3/settings/Backup.java
index f43af47c0..9b2ce28cf 100644
--- a/Essentials/src/com/earth2me/essentials/settings/Backup.java
+++ b/Essentials/src/net/ess3/settings/Backup.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.settings;
+package net.ess3.settings;
 
-import com.earth2me.essentials.storage.Comment;
-import com.earth2me.essentials.storage.StorageObject;
+import net.ess3.storage.Comment;
+import net.ess3.storage.StorageObject;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/Essentials/src/com/earth2me/essentials/settings/Chat.java b/Essentials/src/net/ess3/settings/Chat.java
index bbd02ce8e..44bafc395 100644
--- a/Essentials/src/com/earth2me/essentials/settings/Chat.java
+++ b/Essentials/src/net/ess3/settings/Chat.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.settings;
+package net.ess3.settings;
 
-import com.earth2me.essentials.storage.Comment;
-import com.earth2me.essentials.storage.StorageObject;
+import net.ess3.storage.Comment;
+import net.ess3.storage.StorageObject;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/Essentials/src/com/earth2me/essentials/settings/Commands.java b/Essentials/src/net/ess3/settings/Commands.java
index 1b738d4c9..899ba6b1d 100644
--- a/Essentials/src/com/earth2me/essentials/settings/Commands.java
+++ b/Essentials/src/net/ess3/settings/Commands.java
@@ -1,9 +1,9 @@
-package com.earth2me.essentials.settings;
+package net.ess3.settings;
 
-import com.earth2me.essentials.settings.commands.*;
-import com.earth2me.essentials.storage.Comment;
-import com.earth2me.essentials.storage.ListType;
-import com.earth2me.essentials.storage.StorageObject;
+import net.ess3.settings.commands.*;
+import net.ess3.storage.Comment;
+import net.ess3.storage.ListType;
+import net.ess3.storage.StorageObject;
 import java.util.ArrayList;
 import java.util.List;
 import lombok.Data;
@@ -20,7 +20,7 @@ public class Commands implements StorageObject
 	private Help help = new Help();
 	private Home home = new Home();
 	private Lightning lightning = new Lightning();
-	private com.earth2me.essentials.settings.commands.List list = new com.earth2me.essentials.settings.commands.List();
+	private net.ess3.settings.commands.List list = new net.ess3.settings.commands.List();
 	private Spawnmob spawnmob = new Spawnmob();
 	private Tpa tpa = new Tpa();
 	@ListType
diff --git a/Essentials/src/com/earth2me/essentials/settings/Economy.java b/Essentials/src/net/ess3/settings/Economy.java
index ea106f13f..d1eced963 100644
--- a/Essentials/src/com/earth2me/essentials/settings/Economy.java
+++ b/Essentials/src/net/ess3/settings/Economy.java
@@ -1,9 +1,9 @@
-package com.earth2me.essentials.settings;
+package net.ess3.settings;
 
-import com.earth2me.essentials.economy.Worth;
-import com.earth2me.essentials.storage.Comment;
-import com.earth2me.essentials.storage.MapValueType;
-import com.earth2me.essentials.storage.StorageObject;
+import net.ess3.economy.Worth;
+import net.ess3.storage.Comment;
+import net.ess3.storage.MapValueType;
+import net.ess3.storage.StorageObject;
 import java.util.HashMap;
 import java.util.Map;
 import lombok.Data;
diff --git a/Essentials/src/com/earth2me/essentials/settings/General.java b/Essentials/src/net/ess3/settings/General.java
index 85238977f..eb20ba4f4 100644
--- a/Essentials/src/com/earth2me/essentials/settings/General.java
+++ b/Essentials/src/net/ess3/settings/General.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.settings;
+package net.ess3.settings;
 
-import com.earth2me.essentials.storage.Comment;
-import com.earth2me.essentials.storage.StorageObject;
+import net.ess3.storage.Comment;
+import net.ess3.storage.StorageObject;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/Essentials/src/com/earth2me/essentials/settings/Jails.java b/Essentials/src/net/ess3/settings/Jails.java
index 5793f7d2c..69bf76643 100644
--- a/Essentials/src/com/earth2me/essentials/settings/Jails.java
+++ b/Essentials/src/net/ess3/settings/Jails.java
@@ -1,8 +1,8 @@
-package com.earth2me.essentials.settings;
+package net.ess3.settings;
 
-import com.earth2me.essentials.storage.StoredLocation;
-import com.earth2me.essentials.storage.MapValueType;
-import com.earth2me.essentials.storage.StorageObject;
+import net.ess3.storage.StoredLocation;
+import net.ess3.storage.MapValueType;
+import net.ess3.storage.StorageObject;
 import java.util.HashMap;
 import java.util.Map;
 import lombok.Data;
diff --git a/Essentials/src/com/earth2me/essentials/settings/Kit.java b/Essentials/src/net/ess3/settings/Kit.java
index 19267e6f3..6d7800e00 100644
--- a/Essentials/src/com/earth2me/essentials/settings/Kit.java
+++ b/Essentials/src/net/ess3/settings/Kit.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.settings;
+package net.ess3.settings;
 
-import com.earth2me.essentials.storage.ListType;
-import com.earth2me.essentials.storage.StorageObject;
+import net.ess3.storage.ListType;
+import net.ess3.storage.StorageObject;
 import java.util.ArrayList;
 import java.util.List;
 import lombok.Data;
diff --git a/Essentials/src/com/earth2me/essentials/settings/Kits.java b/Essentials/src/net/ess3/settings/Kits.java
index f943c2bb9..7992b9867 100644
--- a/Essentials/src/com/earth2me/essentials/settings/Kits.java
+++ b/Essentials/src/net/ess3/settings/Kits.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.settings;
+package net.ess3.settings;
 
-import com.earth2me.essentials.storage.MapValueType;
-import com.earth2me.essentials.storage.StorageObject;
+import net.ess3.storage.MapValueType;
+import net.ess3.storage.StorageObject;
 import java.util.HashMap;
 import java.util.Map;
 import lombok.Data;
diff --git a/Essentials/src/com/earth2me/essentials/settings/Settings.java b/Essentials/src/net/ess3/settings/Settings.java
index 6e5ec9793..11705f493 100644
--- a/Essentials/src/com/earth2me/essentials/settings/Settings.java
+++ b/Essentials/src/net/ess3/settings/Settings.java
@@ -1,8 +1,8 @@
-package com.earth2me.essentials.settings;
+package net.ess3.settings;
 
-import com.earth2me.essentials.storage.Comment;
-import com.earth2me.essentials.storage.MapValueType;
-import com.earth2me.essentials.storage.StorageObject;
+import net.ess3.storage.Comment;
+import net.ess3.storage.MapValueType;
+import net.ess3.storage.StorageObject;
 import java.util.HashMap;
 import java.util.Map;
 import lombok.Data;
diff --git a/Essentials/src/com/earth2me/essentials/settings/SettingsHolder.java b/Essentials/src/net/ess3/settings/SettingsHolder.java
index 22a398a3c..22238ffa9 100644
--- a/Essentials/src/com/earth2me/essentials/settings/SettingsHolder.java
+++ b/Essentials/src/net/ess3/settings/SettingsHolder.java
@@ -1,8 +1,8 @@
-package com.earth2me.essentials.settings;
+package net.ess3.settings;
 
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.ISettings;
-import com.earth2me.essentials.storage.AsyncStorageObjectHolder;
+import net.ess3.api.IEssentials;
+import net.ess3.api.ISettings;
+import net.ess3.storage.AsyncStorageObjectHolder;
 import java.io.File;
 import java.util.concurrent.atomic.AtomicBoolean;
 
diff --git a/Essentials/src/com/earth2me/essentials/settings/Spawns.java b/Essentials/src/net/ess3/settings/Spawns.java
index c8fcf38b1..ec3b6fe5d 100644
--- a/Essentials/src/com/earth2me/essentials/settings/Spawns.java
+++ b/Essentials/src/net/ess3/settings/Spawns.java
@@ -1,9 +1,9 @@
-package com.earth2me.essentials.settings;
+package net.ess3.settings;
 
-import com.earth2me.essentials.storage.Comment;
-import com.earth2me.essentials.storage.StoredLocation;
-import com.earth2me.essentials.storage.MapValueType;
-import com.earth2me.essentials.storage.StorageObject;
+import net.ess3.storage.Comment;
+import net.ess3.storage.StoredLocation;
+import net.ess3.storage.MapValueType;
+import net.ess3.storage.StorageObject;
 import java.util.HashMap;
 import java.util.Map;
 import lombok.Data;
diff --git a/Essentials/src/com/earth2me/essentials/settings/SpawnsHolder.java b/Essentials/src/net/ess3/settings/SpawnsHolder.java
index e969b8705..652ff8f49 100644
--- a/Essentials/src/com/earth2me/essentials/settings/SpawnsHolder.java
+++ b/Essentials/src/net/ess3/settings/SpawnsHolder.java
@@ -1,16 +1,16 @@
-package com.earth2me.essentials.settings;
+package net.ess3.settings;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.IEssentialsModule;
-import com.earth2me.essentials.api.ISettings;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.storage.AsyncStorageObjectHolder;
-import com.earth2me.essentials.storage.StoredLocation.WorldNotLoadedException;
-import com.earth2me.essentials.utils.textreader.IText;
-import com.earth2me.essentials.utils.textreader.KeywordReplacer;
-import com.earth2me.essentials.utils.textreader.SimpleTextInput;
-import com.earth2me.essentials.utils.textreader.SimpleTextPager;
+import static net.ess3.I18n._;
+import net.ess3.api.IEssentials;
+import net.ess3.api.IEssentialsModule;
+import net.ess3.api.ISettings;
+import net.ess3.api.IUser;
+import net.ess3.storage.AsyncStorageObjectHolder;
+import net.ess3.storage.StoredLocation.WorldNotLoadedException;
+import net.ess3.utils.textreader.IText;
+import net.ess3.utils.textreader.KeywordReplacer;
+import net.ess3.utils.textreader.SimpleTextInput;
+import net.ess3.utils.textreader.SimpleTextPager;
 import java.io.File;
 import java.util.HashMap;
 import java.util.Locale;
@@ -49,9 +49,9 @@ public class SpawnsHolder extends AsyncStorageObjectHolder<Spawns> implements IE
 		{
 			if (getData().getSpawns() == null)
 			{
-				getData().setSpawns(new HashMap<String, com.earth2me.essentials.storage.StoredLocation>());
+				getData().setSpawns(new HashMap<String, net.ess3.storage.StoredLocation>());
 			}
-			getData().getSpawns().put(group.toLowerCase(Locale.ENGLISH), new com.earth2me.essentials.storage.StoredLocation(loc));
+			getData().getSpawns().put(group.toLowerCase(Locale.ENGLISH), new net.ess3.storage.StoredLocation(loc));
 		}
 		finally
 		{
@@ -73,7 +73,7 @@ public class SpawnsHolder extends AsyncStorageObjectHolder<Spawns> implements IE
 			{
 				return getWorldSpawn();
 			}
-			final Map<String, com.earth2me.essentials.storage.StoredLocation> spawnMap = getData().getSpawns();
+			final Map<String, net.ess3.storage.StoredLocation> spawnMap = getData().getSpawns();
 			String groupName = group.toLowerCase(Locale.ENGLISH);
 			if (!spawnMap.containsKey(groupName))
 			{
diff --git a/Essentials/src/com/earth2me/essentials/settings/Warp.java b/Essentials/src/net/ess3/settings/Warp.java
index 171f7075f..30384a83e 100644
--- a/Essentials/src/com/earth2me/essentials/settings/Warp.java
+++ b/Essentials/src/net/ess3/settings/Warp.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.settings;
+package net.ess3.settings;
 
-import com.earth2me.essentials.storage.StoredLocation;
-import com.earth2me.essentials.storage.StorageObject;
+import net.ess3.storage.StoredLocation;
+import net.ess3.storage.StorageObject;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/Essentials/src/com/earth2me/essentials/settings/WarpHolder.java b/Essentials/src/net/ess3/settings/WarpHolder.java
index b6a9f2879..a02d77e41 100644
--- a/Essentials/src/com/earth2me/essentials/settings/WarpHolder.java
+++ b/Essentials/src/net/ess3/settings/WarpHolder.java
@@ -1,9 +1,9 @@
-package com.earth2me.essentials.settings;
+package net.ess3.settings;
 
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.IWarp;
-import com.earth2me.essentials.api.InvalidNameException;
-import com.earth2me.essentials.storage.AsyncStorageObjectHolder;
+import net.ess3.api.IEssentials;
+import net.ess3.api.IWarp;
+import net.ess3.api.InvalidNameException;
+import net.ess3.storage.AsyncStorageObjectHolder;
 import java.io.File;
 import java.io.IOException;
 
diff --git a/Essentials/src/com/earth2me/essentials/settings/WorldOptions.java b/Essentials/src/net/ess3/settings/WorldOptions.java
index 33271b460..cc75a0e63 100644
--- a/Essentials/src/com/earth2me/essentials/settings/WorldOptions.java
+++ b/Essentials/src/net/ess3/settings/WorldOptions.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.settings;
+package net.ess3.settings;
 
-import com.earth2me.essentials.storage.Comment;
-import com.earth2me.essentials.storage.StorageObject;
+import net.ess3.storage.Comment;
+import net.ess3.storage.StorageObject;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/Essentials/src/com/earth2me/essentials/settings/Worlds.java b/Essentials/src/net/ess3/settings/Worlds.java
index ed865d94b..0d9fdb754 100644
--- a/Essentials/src/com/earth2me/essentials/settings/Worlds.java
+++ b/Essentials/src/net/ess3/settings/Worlds.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.settings;
+package net.ess3.settings;
 
-import com.earth2me.essentials.storage.StorageObject;
+import net.ess3.storage.StorageObject;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/Essentials/src/com/earth2me/essentials/settings/commands/Afk.java b/Essentials/src/net/ess3/settings/commands/Afk.java
index f46e52d52..0b337e049 100644
--- a/Essentials/src/com/earth2me/essentials/settings/commands/Afk.java
+++ b/Essentials/src/net/ess3/settings/commands/Afk.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.settings.commands;
+package net.ess3.settings.commands;
 
-import com.earth2me.essentials.storage.Comment;
-import com.earth2me.essentials.storage.StorageObject;
+import net.ess3.storage.Comment;
+import net.ess3.storage.StorageObject;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/Essentials/src/com/earth2me/essentials/settings/commands/Back.java b/Essentials/src/net/ess3/settings/commands/Back.java
index bd2afdd62..54a4aa246 100644
--- a/Essentials/src/com/earth2me/essentials/settings/commands/Back.java
+++ b/Essentials/src/net/ess3/settings/commands/Back.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.settings.commands;
+package net.ess3.settings.commands;
 
-import com.earth2me.essentials.storage.Comment;
-import com.earth2me.essentials.storage.StorageObject;
+import net.ess3.storage.Comment;
+import net.ess3.storage.StorageObject;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/Essentials/src/com/earth2me/essentials/settings/commands/God.java b/Essentials/src/net/ess3/settings/commands/God.java
index a6f5dbfc3..32ab65c97 100644
--- a/Essentials/src/com/earth2me/essentials/settings/commands/God.java
+++ b/Essentials/src/net/ess3/settings/commands/God.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.settings.commands;
+package net.ess3.settings.commands;
 
-import com.earth2me.essentials.storage.Comment;
-import com.earth2me.essentials.storage.StorageObject;
+import net.ess3.storage.Comment;
+import net.ess3.storage.StorageObject;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/Essentials/src/com/earth2me/essentials/settings/commands/Help.java b/Essentials/src/net/ess3/settings/commands/Help.java
index 0b4787471..92d5774c7 100644
--- a/Essentials/src/com/earth2me/essentials/settings/commands/Help.java
+++ b/Essentials/src/net/ess3/settings/commands/Help.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.settings.commands;
+package net.ess3.settings.commands;
 
-import com.earth2me.essentials.storage.Comment;
-import com.earth2me.essentials.storage.StorageObject;
+import net.ess3.storage.Comment;
+import net.ess3.storage.StorageObject;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/Essentials/src/com/earth2me/essentials/settings/commands/Home.java b/Essentials/src/net/ess3/settings/commands/Home.java
index b856c881b..f23af4646 100644
--- a/Essentials/src/com/earth2me/essentials/settings/commands/Home.java
+++ b/Essentials/src/net/ess3/settings/commands/Home.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.settings.commands;
+package net.ess3.settings.commands;
 
-import com.earth2me.essentials.storage.Comment;
-import com.earth2me.essentials.storage.StorageObject;
+import net.ess3.storage.Comment;
+import net.ess3.storage.StorageObject;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/Essentials/src/com/earth2me/essentials/settings/commands/Lightning.java b/Essentials/src/net/ess3/settings/commands/Lightning.java
index e40e645da..ee0d2ba3e 100644
--- a/Essentials/src/com/earth2me/essentials/settings/commands/Lightning.java
+++ b/Essentials/src/net/ess3/settings/commands/Lightning.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.settings.commands;
+package net.ess3.settings.commands;
 
-import com.earth2me.essentials.storage.Comment;
-import com.earth2me.essentials.storage.StorageObject;
+import net.ess3.storage.Comment;
+import net.ess3.storage.StorageObject;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/Essentials/src/com/earth2me/essentials/settings/commands/List.java b/Essentials/src/net/ess3/settings/commands/List.java
index ca2c61d2d..6258123f8 100644
--- a/Essentials/src/com/earth2me/essentials/settings/commands/List.java
+++ b/Essentials/src/net/ess3/settings/commands/List.java
@@ -1,8 +1,8 @@
-package com.earth2me.essentials.settings.commands;
+package net.ess3.settings.commands;
 
 
-import com.earth2me.essentials.storage.Comment;
-import com.earth2me.essentials.storage.StorageObject;
+import net.ess3.storage.Comment;
+import net.ess3.storage.StorageObject;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/Essentials/src/com/earth2me/essentials/settings/commands/Spawnmob.java b/Essentials/src/net/ess3/settings/commands/Spawnmob.java
index 37d41c296..4f9a524f2 100644
--- a/Essentials/src/com/earth2me/essentials/settings/commands/Spawnmob.java
+++ b/Essentials/src/net/ess3/settings/commands/Spawnmob.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.settings.commands;
+package net.ess3.settings.commands;
 
-import com.earth2me.essentials.storage.Comment;
-import com.earth2me.essentials.storage.StorageObject;
+import net.ess3.storage.Comment;
+import net.ess3.storage.StorageObject;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/Essentials/src/com/earth2me/essentials/settings/commands/Tpa.java b/Essentials/src/net/ess3/settings/commands/Tpa.java
index 88cbc9a6b..b11e71035 100644
--- a/Essentials/src/com/earth2me/essentials/settings/commands/Tpa.java
+++ b/Essentials/src/net/ess3/settings/commands/Tpa.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.settings.commands;
+package net.ess3.settings.commands;
 
-import com.earth2me.essentials.storage.Comment;
-import com.earth2me.essentials.storage.StorageObject;
+import net.ess3.storage.Comment;
+import net.ess3.storage.StorageObject;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/Essentials/src/com/earth2me/essentials/settings/geoip/Database.java b/Essentials/src/net/ess3/settings/geoip/Database.java
index 0e883d0bd..3573a9e16 100644
--- a/Essentials/src/com/earth2me/essentials/settings/geoip/Database.java
+++ b/Essentials/src/net/ess3/settings/geoip/Database.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.settings.geoip;
+package net.ess3.settings.geoip;
 
-import com.earth2me.essentials.storage.StorageObject;
+import net.ess3.storage.StorageObject;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/Essentials/src/com/earth2me/essentials/settings/geoip/GeoIP.java b/Essentials/src/net/ess3/settings/geoip/GeoIP.java
index 65a909ed4..c245dcd7a 100644
--- a/Essentials/src/com/earth2me/essentials/settings/geoip/GeoIP.java
+++ b/Essentials/src/net/ess3/settings/geoip/GeoIP.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.settings.geoip;
+package net.ess3.settings.geoip;
 
-import com.earth2me.essentials.storage.StorageObject;
+import net.ess3.storage.StorageObject;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/Essentials/src/com/earth2me/essentials/settings/protect/Prevent.java b/Essentials/src/net/ess3/settings/protect/Prevent.java
index 192e93ac1..e52be9f54 100644
--- a/Essentials/src/com/earth2me/essentials/settings/protect/Prevent.java
+++ b/Essentials/src/net/ess3/settings/protect/Prevent.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.settings.protect;
+package net.ess3.settings.protect;
 
-import com.earth2me.essentials.storage.*;
+import net.ess3.storage.*;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
diff --git a/Essentials/src/com/earth2me/essentials/settings/protect/Protect.java b/Essentials/src/net/ess3/settings/protect/Protect.java
index bb745ad8f..1f7b3b9c6 100644
--- a/Essentials/src/com/earth2me/essentials/settings/protect/Protect.java
+++ b/Essentials/src/net/ess3/settings/protect/Protect.java
@@ -1,8 +1,8 @@
-package com.earth2me.essentials.settings.protect;
+package net.ess3.settings.protect;
 
-import com.earth2me.essentials.storage.Comment;
-import com.earth2me.essentials.storage.ListType;
-import com.earth2me.essentials.storage.StorageObject;
+import net.ess3.storage.Comment;
+import net.ess3.storage.ListType;
+import net.ess3.storage.StorageObject;
 import java.util.HashSet;
 import java.util.Set;
 import lombok.Data;
diff --git a/Essentials/src/com/earth2me/essentials/settings/protect/SignsAndRails.java b/Essentials/src/net/ess3/settings/protect/SignsAndRails.java
index dae3897c2..aba39305d 100644
--- a/Essentials/src/com/earth2me/essentials/settings/protect/SignsAndRails.java
+++ b/Essentials/src/net/ess3/settings/protect/SignsAndRails.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.settings.protect;
+package net.ess3.settings.protect;
 
-import com.earth2me.essentials.storage.Comment;
-import com.earth2me.essentials.storage.StorageObject;
+import net.ess3.storage.Comment;
+import net.ess3.storage.StorageObject;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/Essentials/src/com/earth2me/essentials/storage/AbstractDelayedYamlFileReader.java b/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileReader.java
index 6e342590f..a8d0ff158 100644
--- a/Essentials/src/com/earth2me/essentials/storage/AbstractDelayedYamlFileReader.java
+++ b/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileReader.java
@@ -1,7 +1,6 @@
-package com.earth2me.essentials.storage;
+package net.ess3.storage;
 
-import com.earth2me.essentials.Essentials;
-import com.earth2me.essentials.api.IEssentials;
+import net.ess3.api.IEssentials;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
@@ -9,7 +8,6 @@ import java.io.IOException;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.logging.Level;
 import org.bukkit.Bukkit;
-import org.bukkit.plugin.Plugin;
 
 
 public abstract class AbstractDelayedYamlFileReader<T extends StorageObject> implements Runnable
diff --git a/Essentials/src/com/earth2me/essentials/storage/AbstractDelayedYamlFileWriter.java b/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileWriter.java
index 6e264cad8..baeee2ce8 100644
--- a/Essentials/src/com/earth2me/essentials/storage/AbstractDelayedYamlFileWriter.java
+++ b/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileWriter.java
@@ -1,7 +1,6 @@
-package com.earth2me.essentials.storage;
+package net.ess3.storage;
 
-import com.earth2me.essentials.Essentials;
-import com.earth2me.essentials.api.IEssentials;
+import net.ess3.api.IEssentials;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -9,7 +8,6 @@ import java.io.PrintWriter;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.logging.Level;
 import org.bukkit.Bukkit;
-import org.bukkit.plugin.Plugin;
 
 
 public abstract class AbstractDelayedYamlFileWriter implements Runnable
diff --git a/Essentials/src/com/earth2me/essentials/storage/AsyncStorageObjectHolder.java b/Essentials/src/net/ess3/storage/AsyncStorageObjectHolder.java
index 8259dbd79..8e904dea9 100644
--- a/Essentials/src/com/earth2me/essentials/storage/AsyncStorageObjectHolder.java
+++ b/Essentials/src/net/ess3/storage/AsyncStorageObjectHolder.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.storage;
+package net.ess3.storage;
 
-import com.earth2me.essentials.api.IEssentials;
+import net.ess3.api.IEssentials;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
diff --git a/Essentials/src/com/earth2me/essentials/storage/BukkitConstructor.java b/Essentials/src/net/ess3/storage/BukkitConstructor.java
index d05552192..068d31608 100644
--- a/Essentials/src/com/earth2me/essentials/storage/BukkitConstructor.java
+++ b/Essentials/src/net/ess3/storage/BukkitConstructor.java
@@ -1,8 +1,8 @@
-package com.earth2me.essentials.storage;
+package net.ess3.storage;
 
-import com.earth2me.essentials.Essentials;
-import com.earth2me.essentials.api.server.IPlugin;
-import com.earth2me.essentials.api.server.Material;
+import net.ess3.Essentials;
+import net.ess3.api.server.IPlugin;
+import net.ess3.api.server.Material;
 import java.lang.reflect.Field;
 import java.util.List;
 import java.util.Locale;
diff --git a/Essentials/src/com/earth2me/essentials/storage/Comment.java b/Essentials/src/net/ess3/storage/Comment.java
index 8cb9d4d31..ed65e59ef 100644
--- a/Essentials/src/com/earth2me/essentials/storage/Comment.java
+++ b/Essentials/src/net/ess3/storage/Comment.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.storage;
+package net.ess3.storage;
 
 import java.lang.annotation.*;
 
diff --git a/Essentials/src/com/earth2me/essentials/storage/EnchantmentLevel.java b/Essentials/src/net/ess3/storage/EnchantmentLevel.java
index 2eb062ae8..ad583f17f 100644
--- a/Essentials/src/com/earth2me/essentials/storage/EnchantmentLevel.java
+++ b/Essentials/src/net/ess3/storage/EnchantmentLevel.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.storage;
+package net.ess3.storage;
 
 import java.util.Map.Entry;
 import org.bukkit.enchantments.Enchantment;
diff --git a/Essentials/src/com/earth2me/essentials/storage/IStorageObjectHolder.java b/Essentials/src/net/ess3/storage/IStorageObjectHolder.java
index 0d582ece8..da5e24c49 100644
--- a/Essentials/src/com/earth2me/essentials/storage/IStorageObjectHolder.java
+++ b/Essentials/src/net/ess3/storage/IStorageObjectHolder.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.storage;
+package net.ess3.storage;
 
-import com.earth2me.essentials.api.IReload;
+import net.ess3.api.IReload;
 
 
 public interface IStorageObjectHolder<T extends StorageObject> extends IReload
diff --git a/Essentials/src/com/earth2me/essentials/storage/IStorageObjectMap.java b/Essentials/src/net/ess3/storage/IStorageObjectMap.java
index 788d80e65..5facaf200 100644
--- a/Essentials/src/com/earth2me/essentials/storage/IStorageObjectMap.java
+++ b/Essentials/src/net/ess3/storage/IStorageObjectMap.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.storage;
+package net.ess3.storage;
 
-import com.earth2me.essentials.api.IReload;
-import com.earth2me.essentials.api.InvalidNameException;
+import net.ess3.api.IReload;
+import net.ess3.api.InvalidNameException;
 import java.io.File;
 import java.util.Set;
 
diff --git a/Essentials/src/com/earth2me/essentials/storage/IStorageReader.java b/Essentials/src/net/ess3/storage/IStorageReader.java
index e92774809..1d3d26f33 100644
--- a/Essentials/src/com/earth2me/essentials/storage/IStorageReader.java
+++ b/Essentials/src/net/ess3/storage/IStorageReader.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.storage;
+package net.ess3.storage;
 
 
 public interface IStorageReader
diff --git a/Essentials/src/com/earth2me/essentials/storage/IStorageWriter.java b/Essentials/src/net/ess3/storage/IStorageWriter.java
index 5b8498869..8cba4122b 100644
--- a/Essentials/src/com/earth2me/essentials/storage/IStorageWriter.java
+++ b/Essentials/src/net/ess3/storage/IStorageWriter.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.storage;
+package net.ess3.storage;
 
 
 public interface IStorageWriter
diff --git a/Essentials/src/com/earth2me/essentials/storage/ListType.java b/Essentials/src/net/ess3/storage/ListType.java
index 9bf6e2e64..17dd134a9 100644
--- a/Essentials/src/com/earth2me/essentials/storage/ListType.java
+++ b/Essentials/src/net/ess3/storage/ListType.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.storage;
+package net.ess3.storage;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/Essentials/src/com/earth2me/essentials/storage/ManagedFile.java b/Essentials/src/net/ess3/storage/ManagedFile.java
index aeb9c5dcf..bbe9bd212 100644
--- a/Essentials/src/com/earth2me/essentials/storage/ManagedFile.java
+++ b/Essentials/src/net/ess3/storage/ManagedFile.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.storage;
+package net.ess3.storage;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IEssentials;
+import static net.ess3.I18n._;
+import net.ess3.api.IEssentials;
 import java.io.*;
 import java.math.BigInteger;
 import java.security.DigestInputStream;
diff --git a/Essentials/src/com/earth2me/essentials/storage/MapKeyType.java b/Essentials/src/net/ess3/storage/MapKeyType.java
index aa162e51c..2da042f33 100644
--- a/Essentials/src/com/earth2me/essentials/storage/MapKeyType.java
+++ b/Essentials/src/net/ess3/storage/MapKeyType.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.storage;
+package net.ess3.storage;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/Essentials/src/com/earth2me/essentials/storage/MapValueType.java b/Essentials/src/net/ess3/storage/MapValueType.java
index 1b5fff978..5e0bee09b 100644
--- a/Essentials/src/com/earth2me/essentials/storage/MapValueType.java
+++ b/Essentials/src/net/ess3/storage/MapValueType.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.storage;
+package net.ess3.storage;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/Essentials/src/com/earth2me/essentials/storage/ObjectLoadException.java b/Essentials/src/net/ess3/storage/ObjectLoadException.java
index 8b804abc3..4ea962db2 100644
--- a/Essentials/src/com/earth2me/essentials/storage/ObjectLoadException.java
+++ b/Essentials/src/net/ess3/storage/ObjectLoadException.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.storage;
+package net.ess3.storage;
 
 
 public class ObjectLoadException extends Exception
diff --git a/Essentials/src/net/ess3/storage/StorageObject.java b/Essentials/src/net/ess3/storage/StorageObject.java
new file mode 100644
index 000000000..3a632224d
--- /dev/null
+++ b/Essentials/src/net/ess3/storage/StorageObject.java
@@ -0,0 +1,6 @@
+package net.ess3.storage;
+
+
+public interface StorageObject
+{
+}
diff --git a/Essentials/src/com/earth2me/essentials/storage/StorageObjectMap.java b/Essentials/src/net/ess3/storage/StorageObjectMap.java
index 3ad231c87..6c246e62f 100644
--- a/Essentials/src/com/earth2me/essentials/storage/StorageObjectMap.java
+++ b/Essentials/src/net/ess3/storage/StorageObjectMap.java
@@ -1,8 +1,8 @@
-package com.earth2me.essentials.storage;
+package net.ess3.storage;
 
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.InvalidNameException;
-import com.earth2me.essentials.utils.Util;
+import net.ess3.api.IEssentials;
+import net.ess3.api.InvalidNameException;
+import net.ess3.utils.Util;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
diff --git a/Essentials/src/com/earth2me/essentials/storage/StoredLocation.java b/Essentials/src/net/ess3/storage/StoredLocation.java
index d1c188b74..00ace6791 100644
--- a/Essentials/src/com/earth2me/essentials/storage/StoredLocation.java
+++ b/Essentials/src/net/ess3/storage/StoredLocation.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.storage;
+package net.ess3.storage;
 
-import com.earth2me.essentials.api.server.World;
-import com.earth2me.essentials.api.server.Location;
+import net.ess3.api.server.World;
+import net.ess3.api.server.Location;
 import java.lang.ref.WeakReference;
 import java.util.UUID;
 
diff --git a/Essentials/src/com/earth2me/essentials/storage/YamlStorageReader.java b/Essentials/src/net/ess3/storage/YamlStorageReader.java
index ea9d193fe..dc5c24d91 100644
--- a/Essentials/src/com/earth2me/essentials/storage/YamlStorageReader.java
+++ b/Essentials/src/net/ess3/storage/YamlStorageReader.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.storage;
+package net.ess3.storage;
 
-import com.earth2me.essentials.api.server.IPlugin;
+import net.ess3.api.server.IPlugin;
 import java.io.Reader;
 import java.lang.reflect.Field;
 import java.util.*;
diff --git a/Essentials/src/com/earth2me/essentials/storage/YamlStorageWriter.java b/Essentials/src/net/ess3/storage/YamlStorageWriter.java
index a693745b2..793ac67fd 100644
--- a/Essentials/src/com/earth2me/essentials/storage/YamlStorageWriter.java
+++ b/Essentials/src/net/ess3/storage/YamlStorageWriter.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.storage;
+package net.ess3.storage;
 
 import java.io.PrintWriter;
 import java.lang.reflect.Field;
diff --git a/Essentials/src/com/earth2me/essentials/user/Ban.java b/Essentials/src/net/ess3/user/Ban.java
index ba1c22333..3fd5d1192 100644
--- a/Essentials/src/com/earth2me/essentials/user/Ban.java
+++ b/Essentials/src/net/ess3/user/Ban.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.user;
+package net.ess3.user;
 
-import com.earth2me.essentials.storage.StorageObject;
+import net.ess3.storage.StorageObject;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/Essentials/src/com/earth2me/essentials/user/CooldownException.java b/Essentials/src/net/ess3/user/CooldownException.java
index b986a5552..6875e59cb 100644
--- a/Essentials/src/com/earth2me/essentials/user/CooldownException.java
+++ b/Essentials/src/net/ess3/user/CooldownException.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.user;
+package net.ess3.user;
 
 
 public class CooldownException extends Exception
diff --git a/Essentials/src/com/earth2me/essentials/user/IOfflinePlayer.java b/Essentials/src/net/ess3/user/IOfflinePlayer.java
index 434113f25..f594ad669 100644
--- a/Essentials/src/com/earth2me/essentials/user/IOfflinePlayer.java
+++ b/Essentials/src/net/ess3/user/IOfflinePlayer.java
@@ -1,6 +1,5 @@
-package com.earth2me.essentials.user;
+package net.ess3.user;
 
-import org.bukkit.Location;
 import org.bukkit.permissions.Permission;
 
 
diff --git a/Essentials/src/net/ess3/user/IOfflineUser.java b/Essentials/src/net/ess3/user/IOfflineUser.java
new file mode 100644
index 000000000..19431d982
--- /dev/null
+++ b/Essentials/src/net/ess3/user/IOfflineUser.java
@@ -0,0 +1,9 @@
+package net.ess3.user;
+
+import net.ess3.storage.IStorageObjectHolder;
+
+
+public interface IOfflineUser extends IStorageObjectHolder<UserData>//, IOfflinePlayer
+{
+	
+}
diff --git a/Essentials/src/com/earth2me/essentials/user/Inventory.java b/Essentials/src/net/ess3/user/Inventory.java
index 16ba39937..621163e33 100644
--- a/Essentials/src/com/earth2me/essentials/user/Inventory.java
+++ b/Essentials/src/net/ess3/user/Inventory.java
@@ -1,8 +1,8 @@
-package com.earth2me.essentials.user;
+package net.ess3.user;
 
-import com.earth2me.essentials.storage.MapKeyType;
-import com.earth2me.essentials.storage.MapValueType;
-import com.earth2me.essentials.storage.StorageObject;
+import net.ess3.storage.MapKeyType;
+import net.ess3.storage.MapValueType;
+import net.ess3.storage.StorageObject;
 import java.util.HashMap;
 import java.util.Map;
 import lombok.Data;
diff --git a/Essentials/src/com/earth2me/essentials/user/TooManyMatchesException.java b/Essentials/src/net/ess3/user/TooManyMatchesException.java
index 61e266958..d55e6b6c4 100644
--- a/Essentials/src/com/earth2me/essentials/user/TooManyMatchesException.java
+++ b/Essentials/src/net/ess3/user/TooManyMatchesException.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.user;
+package net.ess3.user;
 
 public class TooManyMatchesException extends Exception {
 
diff --git a/Essentials/src/com/earth2me/essentials/user/User.java b/Essentials/src/net/ess3/user/User.java
index 4120e4bdf..60bd802f0 100644
--- a/Essentials/src/com/earth2me/essentials/user/User.java
+++ b/Essentials/src/net/ess3/user/User.java
@@ -1,14 +1,14 @@
-package com.earth2me.essentials.user;
-
-import com.earth2me.essentials.Console;
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Teleport;
-import com.earth2me.essentials.api.*;
-import com.earth2me.essentials.api.server.*;
-import com.earth2me.essentials.economy.register.Method;
-import com.earth2me.essentials.permissions.Permissions;
-import com.earth2me.essentials.utils.DateUtil;
-import com.earth2me.essentials.utils.Util;
+package net.ess3.user;
+
+import net.ess3.Console;
+import static net.ess3.I18n._;
+import net.ess3.Teleport;
+import net.ess3.api.*;
+import net.ess3.api.server.*;
+import net.ess3.economy.register.Method;
+import net.ess3.permissions.Permissions;
+import net.ess3.utils.DateUtil;
+import net.ess3.utils.Util;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.List;
@@ -169,7 +169,7 @@ public class User extends UserBase implements IUser
 		acquireWriteLock();
 		try
 		{
-			getData().setLastLocation(new com.earth2me.essentials.storage.StoredLocation(getLocation()));
+			getData().setLastLocation(new net.ess3.storage.StoredLocation(getLocation()));
 		}
 		finally
 		{
diff --git a/Essentials/src/com/earth2me/essentials/user/UserBase.java b/Essentials/src/net/ess3/user/UserBase.java
index a48e8dc98..ebd0dc361 100644
--- a/Essentials/src/com/earth2me/essentials/user/UserBase.java
+++ b/Essentials/src/net/ess3/user/UserBase.java
@@ -1,14 +1,14 @@
-package com.earth2me.essentials.user;
+package net.ess3.user;
 
-import com.earth2me.essentials.utils.Util;
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.ISettings;
-import com.earth2me.essentials.api.InvalidNameException;
-import com.earth2me.essentials.api.server.Player;
-import com.earth2me.essentials.api.server.Location;
-import com.earth2me.essentials.storage.AsyncStorageObjectHolder;
-import com.earth2me.essentials.storage.IStorageObjectHolder;
-import com.earth2me.essentials.storage.StoredLocation.WorldNotLoadedException;
+import net.ess3.utils.Util;
+import net.ess3.api.IEssentials;
+import net.ess3.api.ISettings;
+import net.ess3.api.InvalidNameException;
+import net.ess3.api.server.Player;
+import net.ess3.api.server.Location;
+import net.ess3.storage.AsyncStorageObjectHolder;
+import net.ess3.storage.IStorageObjectHolder;
+import net.ess3.storage.StoredLocation.WorldNotLoadedException;
 import java.io.File;
 import java.io.IOException;
 import java.util.*;
@@ -151,13 +151,13 @@ public abstract class UserBase extends AsyncStorageObjectHolder<UserData> implem
 		acquireWriteLock();
 		try
 		{
-			Map<String, com.earth2me.essentials.storage.StoredLocation> homes = getData().getHomes();
+			Map<String, net.ess3.storage.StoredLocation> homes = getData().getHomes();
 			if (homes == null)
 			{
-				homes = new HashMap<String, com.earth2me.essentials.storage.StoredLocation>();
+				homes = new HashMap<String, net.ess3.storage.StoredLocation>();
 				getData().setHomes(homes);
 			}
-			homes.put(Util.sanitizeKey(name), new com.earth2me.essentials.storage.StoredLocation(loc));
+			homes.put(Util.sanitizeKey(name), new net.ess3.storage.StoredLocation(loc));
 		}
 		finally
 		{
@@ -325,7 +325,7 @@ public abstract class UserBase extends AsyncStorageObjectHolder<UserData> implem
 				return null;
 			}
 			ArrayList<Location> worldHomes = new ArrayList<Location>();
-			for (com.earth2me.essentials.storage.StoredLocation location : getData().getHomes().values())
+			for (net.ess3.storage.StoredLocation location : getData().getHomes().values())
 			{
 				if (location.getWorldName().equals(loc.getWorld().getName()))
 				{
diff --git a/Essentials/src/com/earth2me/essentials/user/UserData.java b/Essentials/src/net/ess3/user/UserData.java
index a7046f588..aecd32ced 100644
--- a/Essentials/src/com/earth2me/essentials/user/UserData.java
+++ b/Essentials/src/net/ess3/user/UserData.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.user;
+package net.ess3.user;
 
-import com.earth2me.essentials.api.server.Material;
-import com.earth2me.essentials.storage.*;
+import net.ess3.api.server.Material;
+import net.ess3.storage.*;
 import java.util.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/Essentials/src/com/earth2me/essentials/user/UserMap.java b/Essentials/src/net/ess3/user/UserMap.java
index d3ab7e17e..cac3985ab 100644
--- a/Essentials/src/com/earth2me/essentials/user/UserMap.java
+++ b/Essentials/src/net/ess3/user/UserMap.java
@@ -1,16 +1,15 @@
-package com.earth2me.essentials.user;
-
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.IUserMap;
-import com.earth2me.essentials.api.InvalidNameException;
-import com.earth2me.essentials.api.server.Player;
-import com.earth2me.essentials.storage.StorageObjectMap;
-import com.earth2me.essentials.utils.Util;
+package net.ess3.user;
+
+import net.ess3.api.IEssentials;
+import net.ess3.api.IUser;
+import net.ess3.api.IUserMap;
+import net.ess3.api.InvalidNameException;
+import net.ess3.api.server.Player;
+import net.ess3.storage.StorageObjectMap;
+import net.ess3.utils.Util;
 import java.io.File;
 import java.util.Collections;
 import java.util.LinkedHashSet;
-import java.util.List;
 import java.util.Locale;
 import java.util.Set;
 import org.bukkit.Bukkit;
diff --git a/Essentials/src/com/earth2me/essentials/utils/DateUtil.java b/Essentials/src/net/ess3/utils/DateUtil.java
index 3f925e6b5..02916139c 100644
--- a/Essentials/src/com/earth2me/essentials/utils/DateUtil.java
+++ b/Essentials/src/net/ess3/utils/DateUtil.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.utils;
+package net.ess3.utils;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.regex.Matcher;
diff --git a/Essentials/src/com/earth2me/essentials/utils/DescParseTickFormat.java b/Essentials/src/net/ess3/utils/DescParseTickFormat.java
index 987c59e7c..8c3fbadfe 100644
--- a/Essentials/src/com/earth2me/essentials/utils/DescParseTickFormat.java
+++ b/Essentials/src/net/ess3/utils/DescParseTickFormat.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.utils;
+package net.ess3.utils;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
diff --git a/Essentials/src/com/earth2me/essentials/utils/ExecuteTimer.java b/Essentials/src/net/ess3/utils/ExecuteTimer.java
index 9c8d71992..2f0c7a5f6 100644
--- a/Essentials/src/com/earth2me/essentials/utils/ExecuteTimer.java
+++ b/Essentials/src/net/ess3/utils/ExecuteTimer.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.utils;
+package net.ess3.utils;
 
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
diff --git a/Essentials/src/com/earth2me/essentials/utils/LocationUtil.java b/Essentials/src/net/ess3/utils/LocationUtil.java
index 49b256417..61cdcec6e 100644
--- a/Essentials/src/com/earth2me/essentials/utils/LocationUtil.java
+++ b/Essentials/src/net/ess3/utils/LocationUtil.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.utils;
+package net.ess3.utils;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
 import java.util.HashSet;
 import java.util.Set;
 import org.bukkit.Location;
diff --git a/Essentials/src/com/earth2me/essentials/utils/Util.java b/Essentials/src/net/ess3/utils/Util.java
index 720376c66..f00570685 100644
--- a/Essentials/src/com/earth2me/essentials/utils/Util.java
+++ b/Essentials/src/net/ess3/utils/Util.java
@@ -1,25 +1,20 @@
-package com.earth2me.essentials.utils;
+package net.ess3.utils;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.ISettings;
-import com.earth2me.essentials.api.InvalidNameException;
-import com.earth2me.essentials.utils.gnu.inet.encoding.Punycode;
-import com.earth2me.essentials.utils.gnu.inet.encoding.PunycodeException;
+import static net.ess3.I18n._;
+import net.ess3.api.IEssentials;
+import net.ess3.api.ISettings;
+import net.ess3.api.InvalidNameException;
+import net.ess3.utils.gnu.inet.encoding.Punycode;
+import net.ess3.utils.gnu.inet.encoding.PunycodeException;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.Locale;
-import java.util.Set;
 import java.util.regex.Pattern;
 import lombok.Cleanup;
 import org.bukkit.Bukkit;
-import org.bukkit.Location;
 import org.bukkit.Material;
-import org.bukkit.World;
 import org.bukkit.block.Block;
-import org.bukkit.entity.LivingEntity;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionDefault;
diff --git a/Essentials/src/com/earth2me/essentials/utils/gnu/inet/encoding/Punycode.java b/Essentials/src/net/ess3/utils/gnu/inet/encoding/Punycode.java
index fdca948f6..8d8aa3750 100644
--- a/Essentials/src/com/earth2me/essentials/utils/gnu/inet/encoding/Punycode.java
+++ b/Essentials/src/net/ess3/utils/gnu/inet/encoding/Punycode.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.utils.gnu.inet.encoding;
+package net.ess3.utils.gnu.inet.encoding;
 
 
 /**
diff --git a/Essentials/src/com/earth2me/essentials/utils/gnu/inet/encoding/PunycodeException.java b/Essentials/src/net/ess3/utils/gnu/inet/encoding/PunycodeException.java
index 9db00d10d..1f9649813 100644
--- a/Essentials/src/com/earth2me/essentials/utils/gnu/inet/encoding/PunycodeException.java
+++ b/Essentials/src/net/ess3/utils/gnu/inet/encoding/PunycodeException.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.utils.gnu.inet.encoding;
+package net.ess3.utils.gnu.inet.encoding;
 
 
 /**
diff --git a/Essentials/src/com/earth2me/essentials/utils/textreader/ArrayListInput.java b/Essentials/src/net/ess3/utils/textreader/ArrayListInput.java
index 5943387a5..4f3a915f2 100644
--- a/Essentials/src/com/earth2me/essentials/utils/textreader/ArrayListInput.java
+++ b/Essentials/src/net/ess3/utils/textreader/ArrayListInput.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.utils.textreader;
+package net.ess3.utils.textreader;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/Essentials/src/com/earth2me/essentials/utils/textreader/HelpInput.java b/Essentials/src/net/ess3/utils/textreader/HelpInput.java
index 67b946469..6f47dc90d 100644
--- a/Essentials/src/com/earth2me/essentials/utils/textreader/HelpInput.java
+++ b/Essentials/src/net/ess3/utils/textreader/HelpInput.java
@@ -1,10 +1,10 @@
-package com.earth2me.essentials.utils.textreader;
+package net.ess3.utils.textreader;
 
-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.permissions.HelpPermissions;
+import static net.ess3.I18n._;
+import net.ess3.api.IEssentials;
+import net.ess3.api.ISettings;
+import net.ess3.api.IUser;
+import net.ess3.permissions.HelpPermissions;
 import java.io.IOException;
 import java.util.*;
 import java.util.logging.Level;
diff --git a/Essentials/src/com/earth2me/essentials/utils/textreader/IText.java b/Essentials/src/net/ess3/utils/textreader/IText.java
index c70554b28..89e5de19f 100644
--- a/Essentials/src/com/earth2me/essentials/utils/textreader/IText.java
+++ b/Essentials/src/net/ess3/utils/textreader/IText.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.utils.textreader;
+package net.ess3.utils.textreader;
 
 import java.util.List;
 import java.util.Map;
diff --git a/Essentials/src/com/earth2me/essentials/utils/textreader/KeywordReplacer.java b/Essentials/src/net/ess3/utils/textreader/KeywordReplacer.java
index 52309a892..7bbff3fa3 100644
--- a/Essentials/src/com/earth2me/essentials/utils/textreader/KeywordReplacer.java
+++ b/Essentials/src/net/ess3/utils/textreader/KeywordReplacer.java
@@ -1,11 +1,11 @@
-package com.earth2me.essentials.utils.textreader;
+package net.ess3.utils.textreader;
 
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.api.server.Player;
-import com.earth2me.essentials.api.server.World;
-import com.earth2me.essentials.utils.DescParseTickFormat;
+import net.ess3.api.IEssentials;
+import net.ess3.api.IUser;
+import net.ess3.api.server.CommandSender;
+import net.ess3.api.server.Player;
+import net.ess3.api.server.World;
+import net.ess3.utils.DescParseTickFormat;
 import java.text.DateFormat;
 import java.util.ArrayList;
 import java.util.Date;
diff --git a/Essentials/src/com/earth2me/essentials/utils/textreader/SimpleTextInput.java b/Essentials/src/net/ess3/utils/textreader/SimpleTextInput.java
index 4a94126d3..8d392448e 100644
--- a/Essentials/src/com/earth2me/essentials/utils/textreader/SimpleTextInput.java
+++ b/Essentials/src/net/ess3/utils/textreader/SimpleTextInput.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.utils.textreader;
+package net.ess3.utils.textreader;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/Essentials/src/com/earth2me/essentials/utils/textreader/SimpleTextPager.java b/Essentials/src/net/ess3/utils/textreader/SimpleTextPager.java
index 3c9e9cb55..ea70010b6 100644
--- a/Essentials/src/com/earth2me/essentials/utils/textreader/SimpleTextPager.java
+++ b/Essentials/src/net/ess3/utils/textreader/SimpleTextPager.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.utils.textreader;
+package net.ess3.utils.textreader;
 
 import org.bukkit.command.CommandSender;
 
diff --git a/Essentials/src/com/earth2me/essentials/utils/textreader/TextInput.java b/Essentials/src/net/ess3/utils/textreader/TextInput.java
index 77e8aadb5..a56059992 100644
--- a/Essentials/src/com/earth2me/essentials/utils/textreader/TextInput.java
+++ b/Essentials/src/net/ess3/utils/textreader/TextInput.java
@@ -1,11 +1,11 @@
-package com.earth2me.essentials.utils.textreader;
+package net.ess3.utils.textreader;
 
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.InvalidNameException;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.api.server.Player;
-import com.earth2me.essentials.utils.Util;
+import net.ess3.api.IEssentials;
+import net.ess3.api.IUser;
+import net.ess3.api.InvalidNameException;
+import net.ess3.api.server.CommandSender;
+import net.ess3.api.server.Player;
+import net.ess3.utils.Util;
 import java.io.*;
 import java.lang.ref.SoftReference;
 import java.util.*;
diff --git a/Essentials/src/com/earth2me/essentials/utils/textreader/TextPager.java b/Essentials/src/net/ess3/utils/textreader/TextPager.java
index 117d6fd3c..795f35ec6 100644
--- a/Essentials/src/com/earth2me/essentials/utils/textreader/TextPager.java
+++ b/Essentials/src/net/ess3/utils/textreader/TextPager.java
@@ -1,11 +1,10 @@
-package com.earth2me.essentials.utils.textreader;
+package net.ess3.utils.textreader;
+
+import static net.ess3.I18n._;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.server.CommandSender;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import org.bukkit.command.CommandSender;
 
 
 public class TextPager