diff --git a/Essentials/src/com/earth2me/essentials/bukkit/EssentialsPlugin.java b/Essentials/src/com/earth2me/essentials/bukkit/EssentialsPlugin.java
new file mode 100644
index 000000000..f58f2e5b6
--- /dev/null
+++ b/Essentials/src/com/earth2me/essentials/bukkit/EssentialsPlugin.java
@@ -0,0 +1,7 @@
+package com.earth2me.essentials.bukkit;
+
+import org.bukkit.plugin.java.JavaPlugin;
+
+public class EssentialsPlugin extends JavaPlugin {
+	//TODO
+}
diff --git a/Essentials/src/com/earth2me/essentials/Mob.java b/Essentials/src/com/earth2me/essentials/bukkit/Mob.java
similarity index 98%
rename from Essentials/src/com/earth2me/essentials/Mob.java
rename to Essentials/src/com/earth2me/essentials/bukkit/Mob.java
index 38c11a81a..3d78b2a82 100644
--- a/Essentials/src/com/earth2me/essentials/Mob.java
+++ b/Essentials/src/com/earth2me/essentials/bukkit/Mob.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials;
+package com.earth2me.essentials.bukkit;
 
 import static com.earth2me.essentials.I18n._;
 import java.util.Collections;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkillall.java b/Essentials/src/com/earth2me/essentials/commands/Commandkillall.java
index e921aeab8..238dffb58 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandkillall.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandkillall.java
@@ -1,7 +1,7 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Mob;
+import com.earth2me.essentials.bukkit.Mob;
 import java.util.Collections;
 import java.util.Locale;
 import org.bukkit.Chunk;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkittycannon.java b/Essentials/src/com/earth2me/essentials/commands/Commandkittycannon.java
index 08c5912ae..67a3c9a8b 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandkittycannon.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandkittycannon.java
@@ -1,6 +1,6 @@
 package com.earth2me.essentials.commands;
 
-import com.earth2me.essentials.Mob;
+import com.earth2me.essentials.bukkit.Mob;
 import com.earth2me.essentials.api.IUser;
 import java.util.Random;
 import org.bukkit.Location;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandspawner.java b/Essentials/src/com/earth2me/essentials/commands/Commandspawner.java
index 1f263ba85..295a1b616 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandspawner.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandspawner.java
@@ -1,7 +1,7 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Mob;
+import com.earth2me.essentials.bukkit.Mob;
 import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.permissions.SpawnerPermissions;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java b/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java
index 84607c99b..717a578e2 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java
@@ -1,8 +1,8 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Mob;
-import com.earth2me.essentials.Mob.MobException;
+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;