summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Essentials/src/com/earth2me/essentials/Essentials.java1
-rw-r--r--Essentials/src/com/earth2me/essentials/Teleport.java1
-rw-r--r--Essentials/src/com/earth2me/essentials/api/ITeleport.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandback.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandhome.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandjump.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandkit.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandpay.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandrepair.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandsell.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandspawn.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandspawner.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandtop.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandtp.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandtphere.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandtppos.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandwarp.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandworld.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/economy/Trade.java (renamed from Essentials/src/com/earth2me/essentials/Trade.java)2
-rw-r--r--EssentialsChat/src/com/earth2me/essentials/chat/ChatStore.java2
-rw-r--r--EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java2
-rw-r--r--EssentialsSigns/src/com/earth2me/essentials/signs/EssentialsSign.java2
-rw-r--r--EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java2
-rw-r--r--EssentialsSigns/src/com/earth2me/essentials/signs/SignEnchant.java2
-rw-r--r--EssentialsSigns/src/com/earth2me/essentials/signs/SignFree.java2
-rw-r--r--EssentialsSigns/src/com/earth2me/essentials/signs/SignGameMode.java2
-rw-r--r--EssentialsSigns/src/com/earth2me/essentials/signs/SignHeal.java2
-rw-r--r--EssentialsSigns/src/com/earth2me/essentials/signs/SignKit.java2
-rw-r--r--EssentialsSigns/src/com/earth2me/essentials/signs/SignProtection.java2
-rw-r--r--EssentialsSigns/src/com/earth2me/essentials/signs/SignSell.java2
-rw-r--r--EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java2
-rw-r--r--EssentialsSigns/src/com/earth2me/essentials/signs/SignTime.java2
-rw-r--r--EssentialsSigns/src/com/earth2me/essentials/signs/SignTrade.java2
-rw-r--r--EssentialsSigns/src/com/earth2me/essentials/signs/SignWarp.java2
-rw-r--r--EssentialsSigns/src/com/earth2me/essentials/signs/SignWeather.java2
37 files changed, 37 insertions, 35 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java
index 46e79f684..ccea1ba15 100644
--- a/Essentials/src/com/earth2me/essentials/Essentials.java
+++ b/Essentials/src/com/earth2me/essentials/Essentials.java
@@ -17,6 +17,7 @@
*/
package com.earth2me.essentials;
+import com.earth2me.essentials.economy.Trade;
import com.earth2me.essentials.commands.EssentialsCommandHandler;
import com.earth2me.essentials.utils.ExecuteTimer;
import com.earth2me.essentials.economy.WorthHolder;
diff --git a/Essentials/src/com/earth2me/essentials/Teleport.java b/Essentials/src/com/earth2me/essentials/Teleport.java
index 0966395fc..0ae38725b 100644
--- a/Essentials/src/com/earth2me/essentials/Teleport.java
+++ b/Essentials/src/com/earth2me/essentials/Teleport.java
@@ -1,5 +1,6 @@
package com.earth2me.essentials;
+import com.earth2me.essentials.economy.Trade;
import com.earth2me.essentials.utils.Util;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.api.IEssentials;
diff --git a/Essentials/src/com/earth2me/essentials/api/ITeleport.java b/Essentials/src/com/earth2me/essentials/api/ITeleport.java
index 42dce4caa..3a5f25f78 100644
--- a/Essentials/src/com/earth2me/essentials/api/ITeleport.java
+++ b/Essentials/src/com/earth2me/essentials/api/ITeleport.java
@@ -1,6 +1,6 @@
package com.earth2me.essentials.api;
-import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.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/commands/Commandback.java b/Essentials/src/com/earth2me/essentials/commands/Commandback.java
index 8b335f63f..a23b5409c 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandback.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandback.java
@@ -1,7 +1,7 @@
package com.earth2me.essentials.commands;
import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.economy.Trade;
import com.earth2me.essentials.api.IUser;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandhome.java b/Essentials/src/com/earth2me/essentials/commands/Commandhome.java
index 6505fe2df..f2403b92a 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandhome.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandhome.java
@@ -1,7 +1,7 @@
package com.earth2me.essentials.commands;
import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.economy.Trade;
import com.earth2me.essentials.utils.Util;
import com.earth2me.essentials.api.IUser;
import com.earth2me.essentials.permissions.Permissions;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandjump.java b/Essentials/src/com/earth2me/essentials/commands/Commandjump.java
index d9523e2a9..8a1fa91d4 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandjump.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandjump.java
@@ -1,7 +1,7 @@
package com.earth2me.essentials.commands;
import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.economy.Trade;
import com.earth2me.essentials.api.IUser;
import com.earth2me.essentials.utils.LocationUtil;
import org.bukkit.Location;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkit.java b/Essentials/src/com/earth2me/essentials/commands/Commandkit.java
index 7675201e8..1bd9e770d 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandkit.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandkit.java
@@ -1,7 +1,7 @@
package com.earth2me.essentials.commands;
import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.economy.Trade;
import com.earth2me.essentials.utils.Util;
import com.earth2me.essentials.api.IUser;
import com.earth2me.essentials.permissions.KitPermissions;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandpay.java b/Essentials/src/com/earth2me/essentials/commands/Commandpay.java
index 837360f18..f79f0150b 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandpay.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandpay.java
@@ -1,7 +1,7 @@
package com.earth2me.essentials.commands;
import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.economy.Trade;
import com.earth2me.essentials.api.IUser;
import org.bukkit.entity.Player;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java b/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java
index c803c659e..4503e2416 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java
@@ -2,7 +2,7 @@ package com.earth2me.essentials.commands;
import com.earth2me.essentials.api.ChargeException;
import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.economy.Trade;
import com.earth2me.essentials.utils.Util;
import com.earth2me.essentials.api.IUser;
import com.earth2me.essentials.permissions.Permissions;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsell.java b/Essentials/src/com/earth2me/essentials/commands/Commandsell.java
index 0102ef76b..0b56843cd 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandsell.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandsell.java
@@ -1,7 +1,7 @@
package com.earth2me.essentials.commands;
import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.economy.Trade;
import com.earth2me.essentials.utils.Util;
import com.earth2me.essentials.api.IUser;
import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandspawn.java b/Essentials/src/com/earth2me/essentials/commands/Commandspawn.java
index b0f242ce2..0edcf870c 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandspawn.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandspawn.java
@@ -1,7 +1,7 @@
package com.earth2me.essentials.commands;
import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.economy.Trade;
import com.earth2me.essentials.api.IUser;
import com.earth2me.essentials.permissions.Permissions;
import com.earth2me.essentials.settings.SpawnsHolder;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandspawner.java b/Essentials/src/com/earth2me/essentials/commands/Commandspawner.java
index 295a1b616..1a3b52e1f 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandspawner.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandspawner.java
@@ -2,7 +2,7 @@ package com.earth2me.essentials.commands;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.bukkit.Mob;
-import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.economy.Trade;
import com.earth2me.essentials.api.IUser;
import com.earth2me.essentials.permissions.SpawnerPermissions;
import com.earth2me.essentials.utils.LocationUtil;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtop.java b/Essentials/src/com/earth2me/essentials/commands/Commandtop.java
index 01fa24c1d..1e9926ecd 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtop.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandtop.java
@@ -1,7 +1,7 @@
package com.earth2me.essentials.commands;
import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.economy.Trade;
import com.earth2me.essentials.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/com/earth2me/essentials/commands/Commandtp.java
index a9713246a..0fbc4a056 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtp.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandtp.java
@@ -2,7 +2,7 @@ package com.earth2me.essentials.commands;
import com.earth2me.essentials.Console;
import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.economy.Trade;
import com.earth2me.essentials.api.IUser;
import com.earth2me.essentials.permissions.Permissions;
import lombok.Cleanup;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java b/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java
index 4afe2e211..2953b9c93 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java
@@ -1,7 +1,7 @@
package com.earth2me.essentials.commands;
import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.economy.Trade;
import com.earth2me.essentials.api.ISettings;
import com.earth2me.essentials.api.IUser;
import com.earth2me.essentials.permissions.Permissions;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtphere.java b/Essentials/src/com/earth2me/essentials/commands/Commandtphere.java
index b2cb09ca2..ee137fb38 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtphere.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandtphere.java
@@ -1,7 +1,7 @@
package com.earth2me.essentials.commands;
import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.economy.Trade;
import com.earth2me.essentials.api.IUser;
import lombok.Cleanup;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtppos.java b/Essentials/src/com/earth2me/essentials/commands/Commandtppos.java
index c2fd75707..79d803cd1 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtppos.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandtppos.java
@@ -1,7 +1,7 @@
package com.earth2me.essentials.commands;
import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.economy.Trade;
import com.earth2me.essentials.api.IUser;
import org.bukkit.Location;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandwarp.java b/Essentials/src/com/earth2me/essentials/commands/Commandwarp.java
index bc3036718..d6c3eae72 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandwarp.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandwarp.java
@@ -1,7 +1,7 @@
package com.earth2me.essentials.commands;
import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.economy.Trade;
import com.earth2me.essentials.utils.Util;
import com.earth2me.essentials.api.IUser;
import com.earth2me.essentials.api.IWarps;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandworld.java b/Essentials/src/com/earth2me/essentials/commands/Commandworld.java
index f95b3b43a..9e2c1b08d 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandworld.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandworld.java
@@ -1,7 +1,7 @@
package com.earth2me.essentials.commands;
import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.economy.Trade;
import com.earth2me.essentials.api.IUser;
import com.earth2me.essentials.permissions.WorldPermissions;
import java.util.List;
diff --git a/Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java b/Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java
index 7c931333f..e3b25177a 100644
--- a/Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java
+++ b/Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java
@@ -1,7 +1,7 @@
package com.earth2me.essentials.commands;
import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.economy.Trade;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.api.IEssentialsModule;
import com.earth2me.essentials.api.IUser;
diff --git a/Essentials/src/com/earth2me/essentials/Trade.java b/Essentials/src/com/earth2me/essentials/economy/Trade.java
index 4a04087a2..f2b11ee51 100644
--- a/Essentials/src/com/earth2me/essentials/Trade.java
+++ b/Essentials/src/com/earth2me/essentials/economy/Trade.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials;
+package com.earth2me.essentials.economy;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.api.ChargeException;
diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/ChatStore.java b/EssentialsChat/src/com/earth2me/essentials/chat/ChatStore.java
index f2e36e094..887ac8337 100644
--- a/EssentialsChat/src/com/earth2me/essentials/chat/ChatStore.java
+++ b/EssentialsChat/src/com/earth2me/essentials/chat/ChatStore.java
@@ -1,6 +1,6 @@
package com.earth2me.essentials.chat;
-import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.economy.Trade;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.api.IUser;
diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java
index 62098f111..8037234fd 100644
--- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java
+++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java
@@ -2,7 +2,7 @@ package com.earth2me.essentials.chat;
import com.earth2me.essentials.api.ChargeException;
import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.economy.Trade;
import com.earth2me.essentials.utils.Util;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.api.IRanks;
diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/EssentialsSign.java b/EssentialsSigns/src/com/earth2me/essentials/signs/EssentialsSign.java
index 4a5bd8a1f..54266b3b9 100644
--- a/EssentialsSigns/src/com/earth2me/essentials/signs/EssentialsSign.java
+++ b/EssentialsSigns/src/com/earth2me/essentials/signs/EssentialsSign.java
@@ -2,7 +2,7 @@ package com.earth2me.essentials.signs;
import com.earth2me.essentials.api.ChargeException;
import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.economy.Trade;
import com.earth2me.essentials.utils.Util;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.api.IUser;
diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java
index 90deed418..1f5951a16 100644
--- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java
+++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java
@@ -1,7 +1,7 @@
package com.earth2me.essentials.signs;
import com.earth2me.essentials.api.ChargeException;
-import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.economy.Trade;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.api.IUser;
diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignEnchant.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignEnchant.java
index e2ca49f1b..66f379d85 100644
--- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignEnchant.java
+++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignEnchant.java
@@ -3,7 +3,7 @@ package com.earth2me.essentials.signs;
import com.earth2me.essentials.api.ChargeException;
import com.earth2me.essentials.Enchantments;
import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.economy.Trade;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.api.IUser;
import java.util.Locale;
diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignFree.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignFree.java
index 96ae2fdce..1452d4570 100644
--- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignFree.java
+++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignFree.java
@@ -1,7 +1,7 @@
package com.earth2me.essentials.signs;
import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.economy.Trade;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.api.IUser;
import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignGameMode.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignGameMode.java
index a61b378c1..74fc33509 100644
--- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignGameMode.java
+++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignGameMode.java
@@ -2,7 +2,7 @@ package com.earth2me.essentials.signs;
import com.earth2me.essentials.api.ChargeException;
import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.economy.Trade;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.api.IUser;
import java.util.Locale;
diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignHeal.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignHeal.java
index 8d4896a78..920ff04e0 100644
--- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignHeal.java
+++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignHeal.java
@@ -2,7 +2,7 @@ package com.earth2me.essentials.signs;
import com.earth2me.essentials.api.ChargeException;
import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.economy.Trade;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.api.IUser;
diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignKit.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignKit.java
index e54e837bd..f6471123f 100644
--- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignKit.java
+++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignKit.java
@@ -1,7 +1,7 @@
package com.earth2me.essentials.signs;
import com.earth2me.essentials.api.ChargeException;
-import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.economy.Trade;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.api.IUser;
import com.earth2me.essentials.permissions.KitPermissions;
diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignProtection.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignProtection.java
index 74f40b924..ca4f6b869 100644
--- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignProtection.java
+++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignProtection.java
@@ -2,7 +2,7 @@ package com.earth2me.essentials.signs;
import com.earth2me.essentials.api.ChargeException;
import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.economy.Trade;
import com.earth2me.essentials.utils.Util;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.api.IUser;
diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignSell.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignSell.java
index 6efe0ea2a..1ec8da077 100644
--- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignSell.java
+++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignSell.java
@@ -1,7 +1,7 @@
package com.earth2me.essentials.signs;
import com.earth2me.essentials.api.ChargeException;
-import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.economy.Trade;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.api.IUser;
diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java
index 8a96fe25f..577cc7a6b 100644
--- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java
+++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java
@@ -1,7 +1,7 @@
package com.earth2me.essentials.signs;
import com.earth2me.essentials.api.ChargeException;
-import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.economy.Trade;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.api.IUser;
import com.earth2me.essentials.commands.Commandspawnmob;
diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignTime.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignTime.java
index 76bfb1105..3479b70b0 100644
--- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignTime.java
+++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignTime.java
@@ -2,7 +2,7 @@ package com.earth2me.essentials.signs;
import com.earth2me.essentials.api.ChargeException;
import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.economy.Trade;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.api.IUser;
diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignTrade.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignTrade.java
index 2cca465ce..7622493b7 100644
--- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignTrade.java
+++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignTrade.java
@@ -2,7 +2,7 @@ package com.earth2me.essentials.signs;
import com.earth2me.essentials.api.ChargeException;
import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.economy.Trade;
import com.earth2me.essentials.utils.Util;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.api.IUser;
diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignWarp.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignWarp.java
index 281618ce6..ba724b733 100644
--- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignWarp.java
+++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignWarp.java
@@ -1,7 +1,7 @@
package com.earth2me.essentials.signs;
import com.earth2me.essentials.api.ChargeException;
-import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.economy.Trade;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.api.IUser;
import com.earth2me.essentials.permissions.WarpPermissions;
diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignWeather.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignWeather.java
index bac05a825..17f7014fb 100644
--- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignWeather.java
+++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignWeather.java
@@ -2,7 +2,7 @@ package com.earth2me.essentials.signs;
import com.earth2me.essentials.api.ChargeException;
import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.economy.Trade;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.api.IUser;