diff --git a/src/pocketmine/entity/Entity.php b/src/pocketmine/entity/Entity.php
index 9517a9689..6da71d6e3 100644
--- a/src/pocketmine/entity/Entity.php
+++ b/src/pocketmine/entity/Entity.php
@@ -30,9 +30,11 @@ use pocketmine\block\Block;
 use pocketmine\block\BlockFactory;
 use pocketmine\block\Water;
 use pocketmine\entity\object\ExperienceOrb;
+use pocketmine\entity\object\FallingBlock;
 use pocketmine\entity\object\ItemEntity;
 use pocketmine\entity\object\Painting;
 use pocketmine\entity\object\PaintingMotive;
+use pocketmine\entity\object\PrimedTNT;
 use pocketmine\entity\projectile\Arrow;
 use pocketmine\entity\projectile\Egg;
 use pocketmine\entity\projectile\EnderPearl;
@@ -237,7 +239,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		Entity::registerEntity(EnderPearl::class, false, ['ThrownEnderpearl', 'minecraft:ender_pearl']);
 		Entity::registerEntity(ExperienceBottle::class, false, ['ThrownExpBottle', 'minecraft:xp_bottle']);
 		Entity::registerEntity(ExperienceOrb::class, false, ['XPOrb', 'minecraft:xp_orb']);
-		Entity::registerEntity(FallingSand::class, false, ['FallingSand', 'minecraft:falling_block']);
+		Entity::registerEntity(FallingBlock::class, false, ['FallingSand', 'minecraft:falling_block']);
 		Entity::registerEntity(ItemEntity::class, false, ['Item', 'minecraft:item']);
 		Entity::registerEntity(Painting::class, false, ['Painting', 'minecraft:painting']);
 		Entity::registerEntity(PrimedTNT::class, false, ['PrimedTnt', 'PrimedTNT', 'minecraft:tnt']);
diff --git a/src/pocketmine/entity/FallingSand.php b/src/pocketmine/entity/object/FallingBlock.php
similarity index 97%
rename from src/pocketmine/entity/FallingSand.php
rename to src/pocketmine/entity/object/FallingBlock.php
index cf4e65d9a..982c63ab5 100644
--- a/src/pocketmine/entity/FallingSand.php
+++ b/src/pocketmine/entity/object/FallingBlock.php
@@ -21,11 +21,12 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\entity;
+namespace pocketmine\entity\object;
 
 use pocketmine\block\Block;
 use pocketmine\block\BlockFactory;
 use pocketmine\block\Fallable;
+use pocketmine\entity\Entity;
 use pocketmine\event\entity\EntityBlockChangeEvent;
 use pocketmine\event\entity\EntityDamageEvent;
 use pocketmine\item\ItemFactory;
@@ -33,7 +34,7 @@ use pocketmine\level\Position;
 use pocketmine\nbt\tag\ByteTag;
 use pocketmine\nbt\tag\IntTag;
 
-class FallingSand extends Entity{
+class FallingBlock extends Entity{
 	public const NETWORK_ID = self::FALLING_BLOCK;
 
 	public $width = 0.98;
diff --git a/src/pocketmine/entity/PrimedTNT.php b/src/pocketmine/entity/object/PrimedTNT.php
similarity index 96%
rename from src/pocketmine/entity/PrimedTNT.php
rename to src/pocketmine/entity/object/PrimedTNT.php
index a8b1e67de..e1a12b7db 100644
--- a/src/pocketmine/entity/PrimedTNT.php
+++ b/src/pocketmine/entity/object/PrimedTNT.php
@@ -21,8 +21,10 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\entity;
+namespace pocketmine\entity\object;
 
+use pocketmine\entity\Entity;
+use pocketmine\entity\Explosive;
 use pocketmine\event\entity\EntityDamageEvent;
 use pocketmine\event\entity\ExplosionPrimeEvent;
 use pocketmine\level\Explosion;