diff --git a/paper-api/src/main/java/org/bukkit/entity/Animals.java b/paper-api/src/main/java/org/bukkit/entity/Animals.java
new file mode 100644
index 0000000000..e4ae589fe0
--- /dev/null
+++ b/paper-api/src/main/java/org/bukkit/entity/Animals.java
@@ -0,0 +1,11 @@
+package org.bukkit.entity;
+
+/**
+ * Represents an Animal.
+ * 
+ * @author Cogito
+ *
+ */
+public interface Animals extends Creature{
+
+}
diff --git a/paper-api/src/main/java/org/bukkit/entity/Chicken.java b/paper-api/src/main/java/org/bukkit/entity/Chicken.java
new file mode 100644
index 0000000000..db7fb3ea0e
--- /dev/null
+++ b/paper-api/src/main/java/org/bukkit/entity/Chicken.java
@@ -0,0 +1,14 @@
+/**
+ * 
+ */
+package org.bukkit.entity;
+
+/**
+ * Represents a Chicken.
+ * 
+ * @author Cogito
+ *
+ */
+public interface Chicken extends Animals {
+
+}
diff --git a/paper-api/src/main/java/org/bukkit/entity/Cow.java b/paper-api/src/main/java/org/bukkit/entity/Cow.java
new file mode 100644
index 0000000000..67e34a913e
--- /dev/null
+++ b/paper-api/src/main/java/org/bukkit/entity/Cow.java
@@ -0,0 +1,14 @@
+/**
+ * 
+ */
+package org.bukkit.entity;
+
+/**
+ * Represents a Cow.
+ * 
+ * @author Cogito
+ *
+ */
+public interface Cow extends Animals {
+
+}
diff --git a/paper-api/src/main/java/org/bukkit/entity/Creature.java b/paper-api/src/main/java/org/bukkit/entity/Creature.java
new file mode 100644
index 0000000000..7acd7b1799
--- /dev/null
+++ b/paper-api/src/main/java/org/bukkit/entity/Creature.java
@@ -0,0 +1,10 @@
+package org.bukkit.entity;
+
+/**
+ * Represents a Creature. Any LivingEntity that is not human is a Creature.
+ * @author Cogito
+ *
+ */
+public interface Creature extends LivingEntity{
+
+}
diff --git a/paper-api/src/main/java/org/bukkit/entity/Creeper.java b/paper-api/src/main/java/org/bukkit/entity/Creeper.java
new file mode 100644
index 0000000000..a07e51571a
--- /dev/null
+++ b/paper-api/src/main/java/org/bukkit/entity/Creeper.java
@@ -0,0 +1,14 @@
+/**
+ * 
+ */
+package org.bukkit.entity;
+
+/**
+ * Represents a Creeper.
+ * 
+ * @author Cogito
+ *
+ */
+public interface Creeper extends Monster {
+
+}
diff --git a/paper-api/src/main/java/org/bukkit/entity/FallingSand.java b/paper-api/src/main/java/org/bukkit/entity/FallingSand.java
new file mode 100644
index 0000000000..0e498170f2
--- /dev/null
+++ b/paper-api/src/main/java/org/bukkit/entity/FallingSand.java
@@ -0,0 +1,14 @@
+/**
+ * 
+ */
+package org.bukkit.entity;
+
+/**
+ * Represents Falling Sand.
+ * 
+ * @author Cogito
+ *
+ */
+public interface FallingSand extends Entity {
+
+}
diff --git a/paper-api/src/main/java/org/bukkit/entity/Flying.java b/paper-api/src/main/java/org/bukkit/entity/Flying.java
new file mode 100644
index 0000000000..14099fa37c
--- /dev/null
+++ b/paper-api/src/main/java/org/bukkit/entity/Flying.java
@@ -0,0 +1,14 @@
+/**
+ * 
+ */
+package org.bukkit.entity;
+
+/**
+ * Represents a Flying Entity.
+ * 
+ * @author Cogito
+ *
+ */
+public interface Flying extends LivingEntity {
+
+}
diff --git a/paper-api/src/main/java/org/bukkit/entity/Ghast.java b/paper-api/src/main/java/org/bukkit/entity/Ghast.java
new file mode 100644
index 0000000000..a84c4786e8
--- /dev/null
+++ b/paper-api/src/main/java/org/bukkit/entity/Ghast.java
@@ -0,0 +1,14 @@
+/**
+ * 
+ */
+package org.bukkit.entity;
+
+/**
+ * Represents a Ghast.
+ * 
+ * @author Cogito
+ *
+ */
+public interface Ghast extends Flying {
+
+}
diff --git a/paper-api/src/main/java/org/bukkit/entity/Giant.java b/paper-api/src/main/java/org/bukkit/entity/Giant.java
new file mode 100644
index 0000000000..5a42baedaf
--- /dev/null
+++ b/paper-api/src/main/java/org/bukkit/entity/Giant.java
@@ -0,0 +1,14 @@
+/**
+ * 
+ */
+package org.bukkit.entity;
+
+/**
+ * Represents a Giant.
+ * 
+ * @author Cogito
+ *
+ */
+public interface Giant extends Monster {
+
+}
diff --git a/paper-api/src/main/java/org/bukkit/entity/Item.java b/paper-api/src/main/java/org/bukkit/entity/Item.java
new file mode 100644
index 0000000000..3a3c4ef4d1
--- /dev/null
+++ b/paper-api/src/main/java/org/bukkit/entity/Item.java
@@ -0,0 +1,14 @@
+/**
+ * 
+ */
+package org.bukkit.entity;
+
+/**
+ * Represents an Item.
+ * 
+ * @author Cogito
+ *
+ */
+public interface Item extends Entity {
+
+}
diff --git a/paper-api/src/main/java/org/bukkit/entity/Monster.java b/paper-api/src/main/java/org/bukkit/entity/Monster.java
new file mode 100644
index 0000000000..2f20e4d4f5
--- /dev/null
+++ b/paper-api/src/main/java/org/bukkit/entity/Monster.java
@@ -0,0 +1,14 @@
+/**
+ * 
+ */
+package org.bukkit.entity;
+
+/**
+ * Represents a Monster.
+ * 
+ * @author Cogito
+ *
+ */
+public interface Monster extends Creature {
+
+}
diff --git a/paper-api/src/main/java/org/bukkit/entity/Painting.java b/paper-api/src/main/java/org/bukkit/entity/Painting.java
new file mode 100644
index 0000000000..7dab8d12d5
--- /dev/null
+++ b/paper-api/src/main/java/org/bukkit/entity/Painting.java
@@ -0,0 +1,14 @@
+/**
+ * 
+ */
+package org.bukkit.entity;
+
+/**
+ * Represents a Painting.
+ * 
+ * @author Cogito
+ *
+ */
+public interface Painting extends Entity {
+
+}
diff --git a/paper-api/src/main/java/org/bukkit/entity/Pig.java b/paper-api/src/main/java/org/bukkit/entity/Pig.java
new file mode 100644
index 0000000000..cfe250b140
--- /dev/null
+++ b/paper-api/src/main/java/org/bukkit/entity/Pig.java
@@ -0,0 +1,14 @@
+/**
+ * 
+ */
+package org.bukkit.entity;
+
+/**
+ * Represents a Pig.
+ * 
+ * @author Cogito
+ *
+ */
+public interface Pig extends Animals {
+
+}
diff --git a/paper-api/src/main/java/org/bukkit/entity/PigZombie.java b/paper-api/src/main/java/org/bukkit/entity/PigZombie.java
new file mode 100644
index 0000000000..25670d278e
--- /dev/null
+++ b/paper-api/src/main/java/org/bukkit/entity/PigZombie.java
@@ -0,0 +1,14 @@
+/**
+ * 
+ */
+package org.bukkit.entity;
+
+/**
+ * Represents a Pig Zombie.
+ * 
+ * @author Cogito
+ *
+ */
+public interface PigZombie extends Zombie {
+
+}
diff --git a/paper-api/src/main/java/org/bukkit/entity/Sheep.java b/paper-api/src/main/java/org/bukkit/entity/Sheep.java
new file mode 100644
index 0000000000..33fe3ac3b5
--- /dev/null
+++ b/paper-api/src/main/java/org/bukkit/entity/Sheep.java
@@ -0,0 +1,14 @@
+/**
+ * 
+ */
+package org.bukkit.entity;
+
+/**
+ * Represents a Sheep.
+ * 
+ * @author Cogito
+ *
+ */
+public interface Sheep extends Animals {
+
+}
diff --git a/paper-api/src/main/java/org/bukkit/entity/Skeleton.java b/paper-api/src/main/java/org/bukkit/entity/Skeleton.java
new file mode 100644
index 0000000000..651cc90ae6
--- /dev/null
+++ b/paper-api/src/main/java/org/bukkit/entity/Skeleton.java
@@ -0,0 +1,14 @@
+/**
+ * 
+ */
+package org.bukkit.entity;
+
+/**
+ * Represents a Skeleton.
+ * 
+ * @author Cogito
+ *
+ */
+public interface Skeleton extends Monster {
+
+}
diff --git a/paper-api/src/main/java/org/bukkit/entity/Slime.java b/paper-api/src/main/java/org/bukkit/entity/Slime.java
new file mode 100644
index 0000000000..1ac9d8b497
--- /dev/null
+++ b/paper-api/src/main/java/org/bukkit/entity/Slime.java
@@ -0,0 +1,14 @@
+/**
+ * 
+ */
+package org.bukkit.entity;
+
+/**
+ * Represents a Slime.
+ * 
+ * @author Cogito
+ *
+ */
+public interface Slime extends LivingEntity {
+
+}
diff --git a/paper-api/src/main/java/org/bukkit/entity/Spider.java b/paper-api/src/main/java/org/bukkit/entity/Spider.java
new file mode 100644
index 0000000000..1e0edc04f3
--- /dev/null
+++ b/paper-api/src/main/java/org/bukkit/entity/Spider.java
@@ -0,0 +1,14 @@
+/**
+ * 
+ */
+package org.bukkit.entity;
+
+/**
+ * Represents a Spider.
+ * 
+ * @author Cogito
+ *
+ */
+public interface Spider extends Monster {
+
+}
diff --git a/paper-api/src/main/java/org/bukkit/entity/Squid.java b/paper-api/src/main/java/org/bukkit/entity/Squid.java
new file mode 100644
index 0000000000..58a6f391c9
--- /dev/null
+++ b/paper-api/src/main/java/org/bukkit/entity/Squid.java
@@ -0,0 +1,14 @@
+/**
+ * 
+ */
+package org.bukkit.entity;
+
+/**
+ * Represents a Squid.
+ * 
+ * @author Cogito
+ *
+ */
+public interface Squid extends WaterMob {
+
+}
diff --git a/paper-api/src/main/java/org/bukkit/entity/TNTPrimed.java b/paper-api/src/main/java/org/bukkit/entity/TNTPrimed.java
new file mode 100644
index 0000000000..3532fb1823
--- /dev/null
+++ b/paper-api/src/main/java/org/bukkit/entity/TNTPrimed.java
@@ -0,0 +1,14 @@
+/**
+ * 
+ */
+package org.bukkit.entity;
+
+/**
+ * Represents a Primed TNT.
+ * 
+ * @author Cogito
+ *
+ */
+public interface TNTPrimed extends Entity {
+
+}
diff --git a/paper-api/src/main/java/org/bukkit/entity/WaterMob.java b/paper-api/src/main/java/org/bukkit/entity/WaterMob.java
new file mode 100644
index 0000000000..8ab61165cc
--- /dev/null
+++ b/paper-api/src/main/java/org/bukkit/entity/WaterMob.java
@@ -0,0 +1,13 @@
+/**
+ * 
+ */
+package org.bukkit.entity;
+
+/**
+ * Represents a Water Mob
+ * @author Cogito
+ *
+ */
+public interface WaterMob extends Creature {
+
+}
diff --git a/paper-api/src/main/java/org/bukkit/entity/Zombie.java b/paper-api/src/main/java/org/bukkit/entity/Zombie.java
new file mode 100644
index 0000000000..18b9a283b0
--- /dev/null
+++ b/paper-api/src/main/java/org/bukkit/entity/Zombie.java
@@ -0,0 +1,11 @@
+package org.bukkit.entity;
+
+/**
+ * Represents a Zombie.
+ * 
+ * @author Cogito
+ *
+ */
+public interface Zombie extends Monster{
+
+}