8 files changed, 20 insertions, 23 deletions
diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandsetxmpp.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandsetxmpp.java
index 4fe9283df..bc4ef0b6c 100644
--- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandsetxmpp.java
+++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandsetxmpp.java
@@ -1,8 +1,8 @@
 package com.earth2me.essentials.xmpp;
 
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.commands.EssentialsCommand;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
+import net.ess3.api.IUser;
+import net.ess3.commands.EssentialsCommand;
+import net.ess3.commands.NotEnoughArgumentsException;
 
 
 public class Commandsetxmpp extends EssentialsCommand
diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandxmpp.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandxmpp.java
index c11e212e7..0a5b41218 100644
--- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandxmpp.java
+++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandxmpp.java
@@ -1,10 +1,8 @@
 package com.earth2me.essentials.xmpp;
 
-import com.earth2me.essentials.Console;
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.commands.EssentialsCommand;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import org.bukkit.command.CommandSender;
+import net.ess3.Console;
+import net.ess3.commands.EssentialsCommand;
+import net.ess3.commands.NotEnoughArgumentsException;
 import org.bukkit.entity.Player;
 
 
diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandxmppspy.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandxmppspy.java
index 13d152306..392e20d5c 100644
--- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandxmppspy.java
+++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandxmppspy.java
@@ -1,10 +1,9 @@
 package com.earth2me.essentials.xmpp;
 
-import com.earth2me.essentials.api.server.CommandSender;
-import com.earth2me.essentials.commands.EssentialsCommand;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
+import net.ess3.commands.EssentialsCommand;
+import net.ess3.commands.NotEnoughArgumentsException;
 import java.util.List;
-import org.bukkit.command.CommandSender;
+
 import org.bukkit.entity.Player;
 
 
diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java
index fea8dd2e2..e4727d8a5 100644
--- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java
+++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java
@@ -1,10 +1,10 @@
 package com.earth2me.essentials.xmpp;
 
-import com.earth2me.essentials.commands.EssentialsCommandHandler;
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.ICommandHandler;
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.IUser;
+import net.ess3.commands.EssentialsCommandHandler;
+import static net.ess3.I18n._;
+import net.ess3.api.ICommandHandler;
+import net.ess3.api.IEssentials;
+import net.ess3.api.IUser;
 import java.util.List;
 import java.util.Locale;
 import java.util.logging.Level;
diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPPPlayerListener.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPPPlayerListener.java
index b6daf8114..2d454deb1 100644
--- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPPPlayerListener.java
+++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPPPlayerListener.java
@@ -1,7 +1,7 @@
 package com.earth2me.essentials.xmpp;
 
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IEssentials;
+import net.ess3.api.IUser;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/IEssentialsXMPP.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/IEssentialsXMPP.java
index 83851d055..df329156d 100644
--- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/IEssentialsXMPP.java
+++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/IEssentialsXMPP.java
@@ -1,6 +1,6 @@
 package com.earth2me.essentials.xmpp;
 
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IUser;
 import java.util.List;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/UserManager.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/UserManager.java
index 0f17e8660..44ad39d2d 100644
--- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/UserManager.java
+++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/UserManager.java
@@ -1,6 +1,6 @@
 package com.earth2me.essentials.xmpp;
 
-import com.earth2me.essentials.api.IReload;
+import net.ess3.api.IReload;
 import java.io.File;
 import java.io.IOException;
 import java.util.*;
diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java
index 64dd5aff2..d4fb64756 100644
--- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java
+++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java
@@ -1,7 +1,7 @@
 package com.earth2me.essentials.xmpp;
 
-import com.earth2me.essentials.api.IReload;
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IReload;
+import net.ess3.api.IUser;
 import java.io.File;
 import java.util.*;
 import java.util.logging.Handler;