diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java
index e38e867a5..46e79f684 100644
--- a/Essentials/src/com/earth2me/essentials/Essentials.java
+++ b/Essentials/src/com/earth2me/essentials/Essentials.java
@@ -25,7 +25,7 @@ import com.earth2me.essentials.backup.Backup;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.api.*;
 import com.earth2me.essentials.listener.*;
-import com.earth2me.essentials.register.payment.Methods;
+import com.earth2me.essentials.economy.register.Methods;
 import com.earth2me.essentials.ranks.RanksStorage;
 import com.earth2me.essentials.settings.SettingsHolder;
 import com.earth2me.essentials.settings.SpawnsHolder;
diff --git a/Essentials/src/com/earth2me/essentials/api/IEssentials.java b/Essentials/src/com/earth2me/essentials/api/IEssentials.java
index e7c323f5c..42c9a964d 100644
--- a/Essentials/src/com/earth2me/essentials/api/IEssentials.java
+++ b/Essentials/src/com/earth2me/essentials/api/IEssentials.java
@@ -1,7 +1,7 @@
 package com.earth2me.essentials.api;
 
 import com.earth2me.essentials.listener.TntExplodeListener;
-import com.earth2me.essentials.register.payment.Methods;
+import com.earth2me.essentials.economy.register.Methods;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
diff --git a/Essentials/src/com/earth2me/essentials/register/payment/Method.java b/Essentials/src/com/earth2me/essentials/economy/register/Method.java
similarity index 98%
rename from Essentials/src/com/earth2me/essentials/register/payment/Method.java
rename to Essentials/src/com/earth2me/essentials/economy/register/Method.java
index a942667e8..2b22bfd3f 100644
--- a/Essentials/src/com/earth2me/essentials/register/payment/Method.java
+++ b/Essentials/src/com/earth2me/essentials/economy/register/Method.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.register.payment;
+package com.earth2me.essentials.economy.register;
 
 import org.bukkit.plugin.Plugin;
 
diff --git a/Essentials/src/com/earth2me/essentials/register/payment/Methods.java b/Essentials/src/com/earth2me/essentials/economy/register/Methods.java
similarity index 89%
rename from Essentials/src/com/earth2me/essentials/register/payment/Methods.java
rename to Essentials/src/com/earth2me/essentials/economy/register/Methods.java
index f8729923e..eb3138473 100644
--- a/Essentials/src/com/earth2me/essentials/register/payment/Methods.java
+++ b/Essentials/src/com/earth2me/essentials/economy/register/Methods.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.register.payment;
+package com.earth2me.essentials.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.register.payment.methods.iCo6());
-		addMethod("iConomy", new com.earth2me.essentials.register.payment.methods.iCo5());
-		addMethod("iConomy", new com.earth2me.essentials.register.payment.methods.iCo4());
-		addMethod("BOSEconomy", new com.earth2me.essentials.register.payment.methods.BOSE6());
-		addMethod("BOSEconomy", new com.earth2me.essentials.register.payment.methods.BOSE7());
-		addMethod("Currency", new com.earth2me.essentials.register.payment.methods.MCUR());
+		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());
 		Dependencies.add("MultiCurrency");
-		addMethod("Vault", new com.earth2me.essentials.register.payment.methods.VaultEco());
+		addMethod("Vault", new com.earth2me.essentials.economy.register.methods.VaultEco());
 	}
 
 	/**
diff --git a/Essentials/src/com/earth2me/essentials/register/payment/methods/BOSE6.java b/Essentials/src/com/earth2me/essentials/economy/register/methods/BOSE6.java
similarity index 98%
rename from Essentials/src/com/earth2me/essentials/register/payment/methods/BOSE6.java
rename to Essentials/src/com/earth2me/essentials/economy/register/methods/BOSE6.java
index c3b71d4e3..0fd7bb167 100644
--- a/Essentials/src/com/earth2me/essentials/register/payment/methods/BOSE6.java
+++ b/Essentials/src/com/earth2me/essentials/economy/register/methods/BOSE6.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.register.payment.methods;
+package com.earth2me.essentials.economy.register.methods;
 
-import com.earth2me.essentials.register.payment.Method;
+import com.earth2me.essentials.economy.register.Method;
 import cosine.boseconomy.BOSEconomy;
 import org.bukkit.plugin.Plugin;
 
diff --git a/Essentials/src/com/earth2me/essentials/register/payment/methods/BOSE7.java b/Essentials/src/com/earth2me/essentials/economy/register/methods/BOSE7.java
similarity index 98%
rename from Essentials/src/com/earth2me/essentials/register/payment/methods/BOSE7.java
rename to Essentials/src/com/earth2me/essentials/economy/register/methods/BOSE7.java
index d21ea6244..aa06589d3 100644
--- a/Essentials/src/com/earth2me/essentials/register/payment/methods/BOSE7.java
+++ b/Essentials/src/com/earth2me/essentials/economy/register/methods/BOSE7.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.register.payment.methods;
+package com.earth2me.essentials.economy.register.methods;
 
-import com.earth2me.essentials.register.payment.Method;
+import com.earth2me.essentials.economy.register.Method;
 import cosine.boseconomy.BOSEconomy;
 import org.bukkit.plugin.Plugin;
 
diff --git a/Essentials/src/com/earth2me/essentials/register/payment/methods/MCUR.java b/Essentials/src/com/earth2me/essentials/economy/register/methods/MCUR.java
similarity index 96%
rename from Essentials/src/com/earth2me/essentials/register/payment/methods/MCUR.java
rename to Essentials/src/com/earth2me/essentials/economy/register/methods/MCUR.java
index 87d633b5c..2c49c3233 100644
--- a/Essentials/src/com/earth2me/essentials/register/payment/methods/MCUR.java
+++ b/Essentials/src/com/earth2me/essentials/economy/register/methods/MCUR.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.register.payment.methods;
+package com.earth2me.essentials.economy.register.methods;
 
-import com.earth2me.essentials.register.payment.Method;
+import com.earth2me.essentials.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/register/payment/methods/VaultEco.java b/Essentials/src/com/earth2me/essentials/economy/register/methods/VaultEco.java
similarity index 98%
rename from Essentials/src/com/earth2me/essentials/register/payment/methods/VaultEco.java
rename to Essentials/src/com/earth2me/essentials/economy/register/methods/VaultEco.java
index eac0f6866..fe4c2f513 100644
--- a/Essentials/src/com/earth2me/essentials/register/payment/methods/VaultEco.java
+++ b/Essentials/src/com/earth2me/essentials/economy/register/methods/VaultEco.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.register.payment.methods;
+package com.earth2me.essentials.economy.register.methods;
 
-import com.earth2me.essentials.register.payment.Method;
+import com.earth2me.essentials.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/register/payment/methods/iCo4.java b/Essentials/src/com/earth2me/essentials/economy/register/methods/iCo4.java
similarity index 97%
rename from Essentials/src/com/earth2me/essentials/register/payment/methods/iCo4.java
rename to Essentials/src/com/earth2me/essentials/economy/register/methods/iCo4.java
index 52fb36e15..1d2aa111b 100644
--- a/Essentials/src/com/earth2me/essentials/register/payment/methods/iCo4.java
+++ b/Essentials/src/com/earth2me/essentials/economy/register/methods/iCo4.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.register.payment.methods;
+package com.earth2me.essentials.economy.register.methods;
 
-import com.earth2me.essentials.register.payment.Method;
+import com.earth2me.essentials.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/register/payment/methods/iCo5.java b/Essentials/src/com/earth2me/essentials/economy/register/methods/iCo5.java
similarity index 98%
rename from Essentials/src/com/earth2me/essentials/register/payment/methods/iCo5.java
rename to Essentials/src/com/earth2me/essentials/economy/register/methods/iCo5.java
index 3b2fb2f6d..2b1c02dfe 100644
--- a/Essentials/src/com/earth2me/essentials/register/payment/methods/iCo5.java
+++ b/Essentials/src/com/earth2me/essentials/economy/register/methods/iCo5.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.register.payment.methods;
+package com.earth2me.essentials.economy.register.methods;
 
-import com.earth2me.essentials.register.payment.Method;
+import com.earth2me.essentials.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/register/payment/methods/iCo6.java b/Essentials/src/com/earth2me/essentials/economy/register/methods/iCo6.java
similarity index 97%
rename from Essentials/src/com/earth2me/essentials/register/payment/methods/iCo6.java
rename to Essentials/src/com/earth2me/essentials/economy/register/methods/iCo6.java
index 1a2950847..d615a4888 100644
--- a/Essentials/src/com/earth2me/essentials/register/payment/methods/iCo6.java
+++ b/Essentials/src/com/earth2me/essentials/economy/register/methods/iCo6.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.register.payment.methods;
+package com.earth2me.essentials.economy.register.methods;
 
-import com.earth2me.essentials.register.payment.Method;
+import com.earth2me.essentials.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/EssentialsPluginListener.java b/Essentials/src/com/earth2me/essentials/listener/EssentialsPluginListener.java
index 6830dc9eb..edb839aa2 100644
--- a/Essentials/src/com/earth2me/essentials/listener/EssentialsPluginListener.java
+++ b/Essentials/src/com/earth2me/essentials/listener/EssentialsPluginListener.java
@@ -5,7 +5,7 @@ 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.register.payment.Methods;
+import com.earth2me.essentials.economy.register.Methods;
 import com.earth2me.essentials.settings.General;
 import com.earth2me.essentials.ranks.RanksStorage;
 import java.util.logging.Level;
diff --git a/Essentials/src/com/earth2me/essentials/user/User.java b/Essentials/src/com/earth2me/essentials/user/User.java
index 753497abf..770f1c071 100644
--- a/Essentials/src/com/earth2me/essentials/user/User.java
+++ b/Essentials/src/com/earth2me/essentials/user/User.java
@@ -8,7 +8,7 @@ import com.earth2me.essentials.utils.Util;
 import com.earth2me.essentials.api.*;
 import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
 import com.earth2me.essentials.permissions.Permissions;
-import com.earth2me.essentials.register.payment.Method;
+import com.earth2me.essentials.economy.register.Method;
 import com.earth2me.essentials.utils.DateUtil;
 import java.util.Calendar;
 import java.util.GregorianCalendar;