diff --git a/src/pocketmine/Server.php b/src/pocketmine/Server.php
index f8c673eee0..5e9e96d9d1 100644
--- a/src/pocketmine/Server.php
+++ b/src/pocketmine/Server.php
@@ -33,13 +33,13 @@ use pocketmine\command\CommandSender;
 use pocketmine\command\ConsoleCommandSender;
 use pocketmine\command\PluginIdentifiableCommand;
 use pocketmine\command\SimpleCommandMap;
+use pocketmine\crafting\CraftingManager;
 use pocketmine\entity\EntityFactory;
 use pocketmine\event\HandlerListManager;
 use pocketmine\event\player\PlayerDataSaveEvent;
 use pocketmine\event\server\CommandEvent;
 use pocketmine\event\server\DataPacketBroadcastEvent;
 use pocketmine\event\server\QueryRegenerateEvent;
-use pocketmine\inventory\CraftingManager;
 use pocketmine\inventory\CreativeInventory;
 use pocketmine\item\enchantment\Enchantment;
 use pocketmine\item\ItemFactory;
diff --git a/src/pocketmine/block/CraftingTable.php b/src/pocketmine/block/CraftingTable.php
index 2a9aec8b43..453483a1b0 100644
--- a/src/pocketmine/block/CraftingTable.php
+++ b/src/pocketmine/block/CraftingTable.php
@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\inventory\CraftingGrid;
+use pocketmine\crafting\CraftingGrid;
 use pocketmine\item\Item;
 use pocketmine\math\Vector3;
 use pocketmine\player\Player;
diff --git a/src/pocketmine/block/tile/Furnace.php b/src/pocketmine/block/tile/Furnace.php
index a5c64d4e10..1189cc0454 100644
--- a/src/pocketmine/block/tile/Furnace.php
+++ b/src/pocketmine/block/tile/Furnace.php
@@ -24,11 +24,11 @@ declare(strict_types=1);
 namespace pocketmine\block\tile;
 
 use pocketmine\block\Furnace as BlockFurnace;
+use pocketmine\crafting\FurnaceRecipe;
 use pocketmine\event\inventory\FurnaceBurnEvent;
 use pocketmine\event\inventory\FurnaceSmeltEvent;
 use pocketmine\inventory\CallbackInventoryChangeListener;
 use pocketmine\inventory\FurnaceInventory;
-use pocketmine\inventory\FurnaceRecipe;
 use pocketmine\inventory\Inventory;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
diff --git a/src/pocketmine/inventory/CraftingGrid.php b/src/pocketmine/crafting/CraftingGrid.php
similarity index 97%
rename from src/pocketmine/inventory/CraftingGrid.php
rename to src/pocketmine/crafting/CraftingGrid.php
index ea8663dd9a..8812866bfa 100644
--- a/src/pocketmine/inventory/CraftingGrid.php
+++ b/src/pocketmine/crafting/CraftingGrid.php
@@ -21,8 +21,9 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\inventory;
+namespace pocketmine\crafting;
 
+use pocketmine\inventory\BaseInventory;
 use pocketmine\item\Item;
 use pocketmine\player\Player;
 use function max;
diff --git a/src/pocketmine/inventory/CraftingManager.php b/src/pocketmine/crafting/CraftingManager.php
similarity index 99%
rename from src/pocketmine/inventory/CraftingManager.php
rename to src/pocketmine/crafting/CraftingManager.php
index b643b80699..1196f6aa39 100644
--- a/src/pocketmine/inventory/CraftingManager.php
+++ b/src/pocketmine/crafting/CraftingManager.php
@@ -21,7 +21,7 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\inventory;
+namespace pocketmine\crafting;
 
 use pocketmine\item\Item;
 use pocketmine\network\mcpe\compression\CompressBatchPromise;
diff --git a/src/pocketmine/inventory/CraftingRecipe.php b/src/pocketmine/crafting/CraftingRecipe.php
similarity index 97%
rename from src/pocketmine/inventory/CraftingRecipe.php
rename to src/pocketmine/crafting/CraftingRecipe.php
index 1ea9d71e74..5a64c43090 100644
--- a/src/pocketmine/inventory/CraftingRecipe.php
+++ b/src/pocketmine/crafting/CraftingRecipe.php
@@ -21,7 +21,7 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\inventory;
+namespace pocketmine\crafting;
 
 use pocketmine\item\Item;
 
diff --git a/src/pocketmine/inventory/FurnaceRecipe.php b/src/pocketmine/crafting/FurnaceRecipe.php
similarity index 97%
rename from src/pocketmine/inventory/FurnaceRecipe.php
rename to src/pocketmine/crafting/FurnaceRecipe.php
index 038c885a1a..2fa65a4771 100644
--- a/src/pocketmine/inventory/FurnaceRecipe.php
+++ b/src/pocketmine/crafting/FurnaceRecipe.php
@@ -21,7 +21,7 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\inventory;
+namespace pocketmine\crafting;
 
 use pocketmine\item\Item;
 
diff --git a/src/pocketmine/inventory/MultiRecipe.php b/src/pocketmine/crafting/MultiRecipe.php
similarity index 98%
rename from src/pocketmine/inventory/MultiRecipe.php
rename to src/pocketmine/crafting/MultiRecipe.php
index d9e6674648..a44edad1e9 100644
--- a/src/pocketmine/inventory/MultiRecipe.php
+++ b/src/pocketmine/crafting/MultiRecipe.php
@@ -21,7 +21,7 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\inventory;
+namespace pocketmine\crafting;
 
 use pocketmine\utils\UUID;
 
diff --git a/src/pocketmine/inventory/ShapedRecipe.php b/src/pocketmine/crafting/ShapedRecipe.php
similarity index 99%
rename from src/pocketmine/inventory/ShapedRecipe.php
rename to src/pocketmine/crafting/ShapedRecipe.php
index 16e46d569b..6f48b3cfe1 100644
--- a/src/pocketmine/inventory/ShapedRecipe.php
+++ b/src/pocketmine/crafting/ShapedRecipe.php
@@ -21,7 +21,7 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\inventory;
+namespace pocketmine\crafting;
 
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
diff --git a/src/pocketmine/inventory/ShapelessRecipe.php b/src/pocketmine/crafting/ShapelessRecipe.php
similarity index 99%
rename from src/pocketmine/inventory/ShapelessRecipe.php
rename to src/pocketmine/crafting/ShapelessRecipe.php
index 29e5b3182b..9cecfdf1fe 100644
--- a/src/pocketmine/inventory/ShapelessRecipe.php
+++ b/src/pocketmine/crafting/ShapelessRecipe.php
@@ -21,7 +21,7 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\inventory;
+namespace pocketmine\crafting;
 
 use pocketmine\item\Item;
 use function array_map;
diff --git a/src/pocketmine/event/inventory/CraftItemEvent.php b/src/pocketmine/event/inventory/CraftItemEvent.php
index 71ff4a1cb5..126e14a900 100644
--- a/src/pocketmine/event/inventory/CraftItemEvent.php
+++ b/src/pocketmine/event/inventory/CraftItemEvent.php
@@ -23,10 +23,10 @@ declare(strict_types=1);
 
 namespace pocketmine\event\inventory;
 
+use pocketmine\crafting\CraftingRecipe;
 use pocketmine\event\Cancellable;
 use pocketmine\event\CancellableTrait;
 use pocketmine\event\Event;
-use pocketmine\inventory\CraftingRecipe;
 use pocketmine\inventory\transaction\CraftingTransaction;
 use pocketmine\item\Item;
 use pocketmine\player\Player;
@@ -36,7 +36,7 @@ class CraftItemEvent extends Event implements Cancellable{
 
 	/** @var CraftingTransaction */
 	private $transaction;
-	/** @var CraftingRecipe */
+	/** @var \pocketmine\crafting\CraftingRecipe */
 	private $recipe;
 	/** @var int */
 	private $repetitions;
@@ -46,13 +46,13 @@ class CraftItemEvent extends Event implements Cancellable{
 	private $outputs;
 
 	/**
-	 * @param CraftingTransaction $transaction
-	 * @param CraftingRecipe      $recipe
-	 * @param int                 $repetitions
-	 * @param Item[]              $inputs
-	 * @param Item[]              $outputs
+	 * @param CraftingTransaction                 $transaction
+	 * @param \pocketmine\crafting\CraftingRecipe $recipe
+	 * @param int                                 $repetitions
+	 * @param Item[]                              $inputs
+	 * @param Item[]                              $outputs
 	 */
-	public function __construct(CraftingTransaction $transaction, CraftingRecipe $recipe, int $repetitions, array $inputs, array $outputs){
+	public function __construct(CraftingTransaction $transaction, \pocketmine\crafting\CraftingRecipe $recipe, int $repetitions, array $inputs, array $outputs){
 		$this->transaction = $transaction;
 		$this->recipe = $recipe;
 		$this->repetitions = $repetitions;
@@ -72,9 +72,9 @@ class CraftItemEvent extends Event implements Cancellable{
 	/**
 	 * Returns the recipe crafted.
 	 *
-	 * @return CraftingRecipe
+	 * @return \pocketmine\crafting\CraftingRecipe
 	 */
-	public function getRecipe() : CraftingRecipe{
+	public function getRecipe() : \pocketmine\crafting\CraftingRecipe{
 		return $this->recipe;
 	}
 
diff --git a/src/pocketmine/inventory/transaction/CraftingTransaction.php b/src/pocketmine/inventory/transaction/CraftingTransaction.php
index c414d23608..ab9545f9a8 100644
--- a/src/pocketmine/inventory/transaction/CraftingTransaction.php
+++ b/src/pocketmine/inventory/transaction/CraftingTransaction.php
@@ -23,8 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine\inventory\transaction;
 
+use pocketmine\crafting\CraftingRecipe;
 use pocketmine\event\inventory\CraftItemEvent;
-use pocketmine\inventory\CraftingRecipe;
 use pocketmine\item\Item;
 use pocketmine\network\mcpe\protocol\ContainerClosePacket;
 use pocketmine\network\mcpe\protocol\types\ContainerIds;
diff --git a/src/pocketmine/network/mcpe/protocol/CraftingDataPacket.php b/src/pocketmine/network/mcpe/protocol/CraftingDataPacket.php
index c001f28a7b..eab5be2696 100644
--- a/src/pocketmine/network/mcpe/protocol/CraftingDataPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/CraftingDataPacket.php
@@ -26,9 +26,9 @@ namespace pocketmine\network\mcpe\protocol;
 #include <rules/DataPacket.h>
 
 
-use pocketmine\inventory\FurnaceRecipe;
-use pocketmine\inventory\ShapedRecipe;
-use pocketmine\inventory\ShapelessRecipe;
+use pocketmine\crafting\FurnaceRecipe;
+use pocketmine\crafting\ShapedRecipe;
+use pocketmine\crafting\ShapelessRecipe;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
 use pocketmine\network\BadPacketException;
diff --git a/src/pocketmine/player/Player.php b/src/pocketmine/player/Player.php
index 34316e2dd5..39f992670a 100644
--- a/src/pocketmine/player/Player.php
+++ b/src/pocketmine/player/Player.php
@@ -28,6 +28,7 @@ use pocketmine\block\BlockFactory;
 use pocketmine\block\BlockLegacyIds;
 use pocketmine\block\UnknownBlock;
 use pocketmine\command\CommandSender;
+use pocketmine\crafting\CraftingGrid;
 use pocketmine\entity\effect\Effect;
 use pocketmine\entity\effect\EffectInstance;
 use pocketmine\entity\Entity;
@@ -67,7 +68,6 @@ use pocketmine\event\player\PlayerToggleSprintEvent;
 use pocketmine\event\player\PlayerTransferEvent;
 use pocketmine\form\Form;
 use pocketmine\form\FormValidationException;
-use pocketmine\inventory\CraftingGrid;
 use pocketmine\inventory\Inventory;
 use pocketmine\inventory\PlayerCursorInventory;
 use pocketmine\item\Consumable;
@@ -183,7 +183,7 @@ class Player extends Human implements CommandSender, ChunkLoader, ChunkListener,
 	protected $permanentWindows = [];
 	/** @var PlayerCursorInventory */
 	protected $cursorInventory;
-	/** @var CraftingGrid */
+	/** @var \pocketmine\crafting\CraftingGrid */
 	protected $craftingGrid = null;
 
 	/** @var int */