diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php
index a9afc0546..53ae416f0 100644
--- a/src/pocketmine/Player.php
+++ b/src/pocketmine/Player.php
@@ -28,12 +28,12 @@ use pocketmine\block\Block;
 use pocketmine\block\BlockFactory;
 use pocketmine\command\Command;
 use pocketmine\command\CommandSender;
-use pocketmine\entity\Arrow;
 use pocketmine\entity\Effect;
 use pocketmine\entity\Entity;
 use pocketmine\entity\Human;
 use pocketmine\entity\Item as DroppedItem;
 use pocketmine\entity\Living;
+use pocketmine\entity\projectile\Arrow;
 use pocketmine\entity\Skin;
 use pocketmine\event\entity\EntityDamageByBlockEvent;
 use pocketmine\event\entity\EntityDamageByEntityEvent;
diff --git a/src/pocketmine/block/Fire.php b/src/pocketmine/block/Fire.php
index 9d92a3481..70d9ccfc3 100644
--- a/src/pocketmine/block/Fire.php
+++ b/src/pocketmine/block/Fire.php
@@ -23,8 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\entity\Arrow;
 use pocketmine\entity\Entity;
+use pocketmine\entity\projectile\Arrow;
 use pocketmine\event\entity\EntityCombustByBlockEvent;
 use pocketmine\event\entity\EntityDamageByBlockEvent;
 use pocketmine\event\entity\EntityDamageEvent;
diff --git a/src/pocketmine/entity/Entity.php b/src/pocketmine/entity/Entity.php
index 80cf39272..132945f21 100644
--- a/src/pocketmine/entity/Entity.php
+++ b/src/pocketmine/entity/Entity.php
@@ -29,6 +29,8 @@ namespace pocketmine\entity;
 use pocketmine\block\Block;
 use pocketmine\block\BlockFactory;
 use pocketmine\block\Water;
+use pocketmine\entity\projectile\Arrow;
+use pocketmine\entity\projectile\Snowball;
 use pocketmine\event\entity\EntityDamageEvent;
 use pocketmine\event\entity\EntityDespawnEvent;
 use pocketmine\event\entity\EntityLevelChangeEvent;
diff --git a/src/pocketmine/entity/Human.php b/src/pocketmine/entity/Human.php
index 46f1e9106..01d36a3d8 100644
--- a/src/pocketmine/entity/Human.php
+++ b/src/pocketmine/entity/Human.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\entity;
 
+use pocketmine\entity\projectile\ProjectileSource;
 use pocketmine\event\entity\EntityDamageEvent;
 use pocketmine\event\entity\EntityRegainHealthEvent;
 use pocketmine\event\player\PlayerExhaustEvent;
diff --git a/src/pocketmine/entity/Arrow.php b/src/pocketmine/entity/projectile/Arrow.php
similarity index 97%
rename from src/pocketmine/entity/Arrow.php
rename to src/pocketmine/entity/projectile/Arrow.php
index 73f519b7d..484e6a9e0 100644
--- a/src/pocketmine/entity/Arrow.php
+++ b/src/pocketmine/entity/projectile/Arrow.php
@@ -21,8 +21,9 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\entity;
+namespace pocketmine\entity\projectile;
 
+use pocketmine\entity\Entity;
 use pocketmine\level\Level;
 use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\network\mcpe\protocol\AddEntityPacket;
diff --git a/src/pocketmine/entity/Projectile.php b/src/pocketmine/entity/projectile/Projectile.php
similarity index 98%
rename from src/pocketmine/entity/Projectile.php
rename to src/pocketmine/entity/projectile/Projectile.php
index b8e8fb618..0d9946777 100644
--- a/src/pocketmine/entity/Projectile.php
+++ b/src/pocketmine/entity/projectile/Projectile.php
@@ -21,8 +21,10 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\entity;
+namespace pocketmine\entity\projectile;
 
+use pocketmine\entity\Entity;
+use pocketmine\entity\Living;
 use pocketmine\event\entity\EntityCombustByEntityEvent;
 use pocketmine\event\entity\EntityDamageByChildEntityEvent;
 use pocketmine\event\entity\EntityDamageByEntityEvent;
diff --git a/src/pocketmine/entity/ProjectileSource.php b/src/pocketmine/entity/projectile/ProjectileSource.php
similarity index 95%
rename from src/pocketmine/entity/ProjectileSource.php
rename to src/pocketmine/entity/projectile/ProjectileSource.php
index 0f51aebc7..30c4ad9ae 100644
--- a/src/pocketmine/entity/ProjectileSource.php
+++ b/src/pocketmine/entity/projectile/ProjectileSource.php
@@ -21,7 +21,7 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\entity;
+namespace pocketmine\entity\projectile;
 
 
 interface ProjectileSource{
diff --git a/src/pocketmine/entity/Snowball.php b/src/pocketmine/entity/projectile/Snowball.php
similarity index 96%
rename from src/pocketmine/entity/Snowball.php
rename to src/pocketmine/entity/projectile/Snowball.php
index db45c4f97..fbadfad22 100644
--- a/src/pocketmine/entity/Snowball.php
+++ b/src/pocketmine/entity/projectile/Snowball.php
@@ -21,8 +21,9 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\entity;
+namespace pocketmine\entity\projectile;
 
+use pocketmine\entity\Entity;
 use pocketmine\level\Level;
 use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\network\mcpe\protocol\AddEntityPacket;
diff --git a/src/pocketmine/event/entity/EntityDespawnEvent.php b/src/pocketmine/event/entity/EntityDespawnEvent.php
index a4e9acea0..62c0b6ab2 100644
--- a/src/pocketmine/event/entity/EntityDespawnEvent.php
+++ b/src/pocketmine/event/entity/EntityDespawnEvent.php
@@ -27,7 +27,7 @@ use pocketmine\entity\Creature;
 use pocketmine\entity\Entity;
 use pocketmine\entity\Human;
 use pocketmine\entity\Item;
-use pocketmine\entity\Projectile;
+use pocketmine\entity\projectile\Projectile;
 use pocketmine\entity\Vehicle;
 
 /**
diff --git a/src/pocketmine/event/entity/EntityShootBowEvent.php b/src/pocketmine/event/entity/EntityShootBowEvent.php
index 06547a66b..b96cf045a 100644
--- a/src/pocketmine/event/entity/EntityShootBowEvent.php
+++ b/src/pocketmine/event/entity/EntityShootBowEvent.php
@@ -25,7 +25,7 @@ namespace pocketmine\event\entity;
 
 use pocketmine\entity\Entity;
 use pocketmine\entity\Living;
-use pocketmine\entity\Projectile;
+use pocketmine\entity\projectile\Projectile;
 use pocketmine\event\Cancellable;
 use pocketmine\item\Item;
 
diff --git a/src/pocketmine/event/entity/EntitySpawnEvent.php b/src/pocketmine/event/entity/EntitySpawnEvent.php
index 49411aee8..798daf8ec 100644
--- a/src/pocketmine/event/entity/EntitySpawnEvent.php
+++ b/src/pocketmine/event/entity/EntitySpawnEvent.php
@@ -27,7 +27,7 @@ use pocketmine\entity\Creature;
 use pocketmine\entity\Entity;
 use pocketmine\entity\Human;
 use pocketmine\entity\Item;
-use pocketmine\entity\Projectile;
+use pocketmine\entity\projectile\Projectile;
 use pocketmine\entity\Vehicle;
 use pocketmine\level\Position;
 
diff --git a/src/pocketmine/event/entity/ProjectileHitEvent.php b/src/pocketmine/event/entity/ProjectileHitEvent.php
index 5adcced4a..f7940adfd 100644
--- a/src/pocketmine/event/entity/ProjectileHitEvent.php
+++ b/src/pocketmine/event/entity/ProjectileHitEvent.php
@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\event\entity;
 
-use pocketmine\entity\Projectile;
+use pocketmine\entity\projectile\Projectile;
 
 class ProjectileHitEvent extends EntityEvent{
 	public static $handlerList = null;
diff --git a/src/pocketmine/event/entity/ProjectileLaunchEvent.php b/src/pocketmine/event/entity/ProjectileLaunchEvent.php
index 038e49f83..22c7ff34e 100644
--- a/src/pocketmine/event/entity/ProjectileLaunchEvent.php
+++ b/src/pocketmine/event/entity/ProjectileLaunchEvent.php
@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\event\entity;
 
-use pocketmine\entity\Projectile;
+use pocketmine\entity\projectile\Projectile;
 use pocketmine\event\Cancellable;
 
 class ProjectileLaunchEvent extends EntityEvent implements Cancellable{
diff --git a/src/pocketmine/event/inventory/InventoryPickupArrowEvent.php b/src/pocketmine/event/inventory/InventoryPickupArrowEvent.php
index bc80113c4..c36b57775 100644
--- a/src/pocketmine/event/inventory/InventoryPickupArrowEvent.php
+++ b/src/pocketmine/event/inventory/InventoryPickupArrowEvent.php
@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\event\inventory;
 
-use pocketmine\entity\Arrow;
+use pocketmine\entity\projectile\Arrow;
 use pocketmine\event\Cancellable;
 use pocketmine\inventory\Inventory;
 
diff --git a/src/pocketmine/item/Bow.php b/src/pocketmine/item/Bow.php
index b6c37c93e..5942ec887 100644
--- a/src/pocketmine/item/Bow.php
+++ b/src/pocketmine/item/Bow.php
@@ -24,7 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\item;
 
 use pocketmine\entity\Entity;
-use pocketmine\entity\Projectile;
+use pocketmine\entity\projectile\Projectile;
 use pocketmine\event\entity\EntityShootBowEvent;
 use pocketmine\event\entity\ProjectileLaunchEvent;
 use pocketmine\level\sound\LaunchSound;
diff --git a/src/pocketmine/item/ProjectileItem.php b/src/pocketmine/item/ProjectileItem.php
index c793b4174..63f896a1d 100644
--- a/src/pocketmine/item/ProjectileItem.php
+++ b/src/pocketmine/item/ProjectileItem.php
@@ -24,7 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\item;
 
 use pocketmine\entity\Entity;
-use pocketmine\entity\Projectile;
+use pocketmine\entity\projectile\Projectile;
 use pocketmine\event\entity\ProjectileLaunchEvent;
 use pocketmine\level\sound\LaunchSound;
 use pocketmine\math\Vector3;
diff --git a/src/pocketmine/lang/locale b/src/pocketmine/lang/locale
index 9d2680a85..21a589beb 160000
--- a/src/pocketmine/lang/locale
+++ b/src/pocketmine/lang/locale
@@ -1 +1 @@
-Subproject commit 9d2680a8580676cbfbe3328dd734ef840d566cd8
+Subproject commit 21a589bebf984ce16f6c18289ddf1ef94b1ba885
diff --git a/src/pocketmine/level/Level.php b/src/pocketmine/level/Level.php
index 448a20254..0a50230d1 100644
--- a/src/pocketmine/level/Level.php
+++ b/src/pocketmine/level/Level.php
@@ -28,10 +28,10 @@ namespace pocketmine\level;
 
 use pocketmine\block\Block;
 use pocketmine\block\BlockFactory;
-use pocketmine\entity\Arrow;
 use pocketmine\entity\Effect;
 use pocketmine\entity\Entity;
 use pocketmine\entity\Item as DroppedItem;
+use pocketmine\entity\projectile\Arrow;
 use pocketmine\event\block\BlockBreakEvent;
 use pocketmine\event\block\BlockPlaceEvent;
 use pocketmine\event\block\BlockUpdateEvent;