diff --git a/src/pocketmine/entity/Animal.php b/src/pocketmine/entity/Animal.php
index d651057e8..3d5b26384 100644
--- a/src/pocketmine/entity/Animal.php
+++ b/src/pocketmine/entity/Animal.php
@@ -26,7 +26,7 @@ namespace pocketmine\entity;
 
 use pocketmine\network\mcpe\protocol\types\EntityMetadataFlags;
 
-abstract class Animal extends Creature implements Ageable{
+abstract class Animal extends Living implements Ageable{
 
 	public function isBaby() : bool{
 		return $this->getGenericFlag(EntityMetadataFlags::BABY);
diff --git a/src/pocketmine/entity/Creature.php b/src/pocketmine/entity/Creature.php
deleted file mode 100644
index fbbd7dbf4..000000000
--- a/src/pocketmine/entity/Creature.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- *
- *
-*/
-
-declare(strict_types=1);
-
-namespace pocketmine\entity;
-
-
-abstract class Creature extends Living{
-
-}
diff --git a/src/pocketmine/entity/Damageable.php b/src/pocketmine/entity/Damageable.php
deleted file mode 100644
index 613010b77..000000000
--- a/src/pocketmine/entity/Damageable.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- *
- *
-*/
-
-declare(strict_types=1);
-
-namespace pocketmine\entity;
-
-
-interface Damageable{
-
-}
diff --git a/src/pocketmine/entity/Human.php b/src/pocketmine/entity/Human.php
index 33339e7e1..128b4ccda 100644
--- a/src/pocketmine/entity/Human.php
+++ b/src/pocketmine/entity/Human.php
@@ -72,7 +72,7 @@ use function strlen;
 use const INT32_MAX;
 use const INT32_MIN;
 
-class Human extends Creature implements ProjectileSource, InventoryHolder{
+class Human extends Living implements ProjectileSource, InventoryHolder{
 
 	/** @var PlayerInventory */
 	protected $inventory;
diff --git a/src/pocketmine/entity/Living.php b/src/pocketmine/entity/Living.php
index dd034f704..2225f54ba 100644
--- a/src/pocketmine/entity/Living.php
+++ b/src/pocketmine/entity/Living.php
@@ -67,7 +67,7 @@ use function mt_rand;
 use function sqrt;
 use const M_PI;
 
-abstract class Living extends Entity implements Damageable{
+abstract class Living extends Entity{
 
 	protected $gravity = 0.08;
 	protected $drag = 0.02;
diff --git a/src/pocketmine/entity/Monster.php b/src/pocketmine/entity/Monster.php
deleted file mode 100644
index d2b0091b2..000000000
--- a/src/pocketmine/entity/Monster.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- *
- *
-*/
-
-declare(strict_types=1);
-
-namespace pocketmine\entity;
-
-
-abstract class Monster extends Creature{
-
-}
diff --git a/src/pocketmine/entity/NPC.php b/src/pocketmine/entity/NPC.php
deleted file mode 100644
index 01f715a0e..000000000
--- a/src/pocketmine/entity/NPC.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- *
- *
-*/
-
-declare(strict_types=1);
-
-namespace pocketmine\entity;
-
-
-interface NPC{
-
-}
diff --git a/src/pocketmine/entity/Rideable.php b/src/pocketmine/entity/Rideable.php
deleted file mode 100644
index 8d72a14cf..000000000
--- a/src/pocketmine/entity/Rideable.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- *
- *
-*/
-
-declare(strict_types=1);
-
-namespace pocketmine\entity;
-
-
-interface Rideable{
-
-}
diff --git a/src/pocketmine/entity/Vehicle.php b/src/pocketmine/entity/Vehicle.php
deleted file mode 100644
index 21fdbe44f..000000000
--- a/src/pocketmine/entity/Vehicle.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- *
- *
-*/
-
-declare(strict_types=1);
-
-namespace pocketmine\entity;
-
-
-abstract class Vehicle extends Entity implements Rideable{
-
-}
diff --git a/src/pocketmine/entity/Villager.php b/src/pocketmine/entity/Villager.php
index 836c817f5..85906b14d 100644
--- a/src/pocketmine/entity/Villager.php
+++ b/src/pocketmine/entity/Villager.php
@@ -27,7 +27,7 @@ use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\network\mcpe\protocol\types\EntityMetadataFlags;
 use pocketmine\network\mcpe\protocol\types\EntityMetadataProperties;
 
-class Villager extends Creature implements NPC, Ageable{
+class Villager extends Living implements Ageable{
 	public const PROFESSION_FARMER = 0;
 	public const PROFESSION_LIBRARIAN = 1;
 	public const PROFESSION_PRIEST = 2;
diff --git a/src/pocketmine/entity/WaterAnimal.php b/src/pocketmine/entity/WaterAnimal.php
index 56c846465..fc724462e 100644
--- a/src/pocketmine/entity/WaterAnimal.php
+++ b/src/pocketmine/entity/WaterAnimal.php
@@ -26,7 +26,7 @@ namespace pocketmine\entity;
 use pocketmine\event\entity\EntityDamageEvent;
 use pocketmine\network\mcpe\protocol\types\EntityMetadataFlags;
 
-abstract class WaterAnimal extends Creature implements Ageable{
+abstract class WaterAnimal extends Living implements Ageable{
 
 	public function isBaby() : bool{
 		return $this->getGenericFlag(EntityMetadataFlags::BABY);
diff --git a/src/pocketmine/entity/Zombie.php b/src/pocketmine/entity/Zombie.php
index 464892a34..1a0078d3f 100644
--- a/src/pocketmine/entity/Zombie.php
+++ b/src/pocketmine/entity/Zombie.php
@@ -27,7 +27,7 @@ use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
 use function mt_rand;
 
-class Zombie extends Monster{
+class Zombie extends Living{
 	public const NETWORK_ID = self::ZOMBIE;
 
 	public $width = 0.6;