diff --git a/src/no/runsafe/framework/api/entity/IWitherBoss.java b/src/no/runsafe/framework/api/entity/IWitherBoss.java
deleted file mode 100644
index afed0284..00000000
--- a/src/no/runsafe/framework/api/entity/IWitherBoss.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package no.runsafe.framework.api.entity;
-
-public interface IWitherBoss extends ILivingEntity
-{
-}
diff --git a/src/no/runsafe/framework/api/entity/monsters/IWitherBoss.java b/src/no/runsafe/framework/api/entity/monsters/IWitherBoss.java
new file mode 100644
index 00000000..a91359b8
--- /dev/null
+++ b/src/no/runsafe/framework/api/entity/monsters/IWitherBoss.java
@@ -0,0 +1,5 @@
+package no.runsafe.framework.api.entity.monsters;
+
+public interface IWitherBoss extends IMonster
+{
+}
diff --git a/src/no/runsafe/framework/internal/wrapper/ObjectWrapper.java b/src/no/runsafe/framework/internal/wrapper/ObjectWrapper.java
index 5c765b0c..9bc3114a 100644
--- a/src/no/runsafe/framework/internal/wrapper/ObjectWrapper.java
+++ b/src/no/runsafe/framework/internal/wrapper/ObjectWrapper.java
@@ -479,9 +479,6 @@ public static RunsafeLivingEntity convert(org.bukkit.entity.LivingEntity toWrap)
 		if (toWrap instanceof EnderDragon)
 			return new RunsafeEnderDragon((EnderDragon) toWrap);
 
-		if (toWrap instanceof Wither)
-			return new RunsafeWitherBoss((Wither) toWrap);
-
 		return new RunsafeLivingEntity(toWrap);
 	}
 
@@ -530,6 +527,9 @@ public static RunsafeMonster convert(org.bukkit.entity.Monster toWrap)
 		if (toWrap instanceof Silverfish)
 			return new RunsafeSilverfish((Silverfish) toWrap);
 
+		if (toWrap instanceof Wither)
+			return new RunsafeWitherBoss((Wither) toWrap);
+
 		return new RunsafeMonster(toWrap);
 	}
 
diff --git a/src/no/runsafe/framework/minecraft/entity/RunsafeWitherBoss.java b/src/no/runsafe/framework/minecraft/entity/RunsafeWitherBoss.java
deleted file mode 100644
index 57e82cff..00000000
--- a/src/no/runsafe/framework/minecraft/entity/RunsafeWitherBoss.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package no.runsafe.framework.minecraft.entity;
-
-import no.runsafe.framework.api.entity.IWitherBoss;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Wither;
-
-public class RunsafeWitherBoss extends RunsafeLivingEntity implements IWitherBoss
-{
-	public RunsafeWitherBoss(Wither toWrap)
-	{
-		super(toWrap);
-		wither = toWrap;
-	}
-
-	Wither wither;
-}
diff --git a/src/no/runsafe/framework/minecraft/entity/monsters/RunsafeWitherBoss.java b/src/no/runsafe/framework/minecraft/entity/monsters/RunsafeWitherBoss.java
new file mode 100644
index 00000000..a8481f32
--- /dev/null
+++ b/src/no/runsafe/framework/minecraft/entity/monsters/RunsafeWitherBoss.java
@@ -0,0 +1,15 @@
+package no.runsafe.framework.minecraft.entity.monsters;
+
+import no.runsafe.framework.api.entity.monsters.IWitherBoss;
+import org.bukkit.entity.Wither;
+
+public class RunsafeWitherBoss extends RunsafeMonster implements IWitherBoss
+{
+	public RunsafeWitherBoss(Wither toWrap)
+	{
+		super(toWrap);
+		wither = toWrap;
+	}
+
+	Wither wither;
+}