New directory structure. More powerful startup scripts

PocketMine · Mar 8, 2014 · cbc6446 · cbc6446
1 parent 8d75bff
commit cbc6446
Show file tree

Hide file tree

Showing 413 changed files with 325 additions and 150 deletions.
diff --git a/src/Achievement.php → src/PocketMine/Achievement.php b/src/Achievement.php → src/PocketMine/Achievement.php
diff --git a/src/BanAPI.php → src/PocketMine/BanAPI.php b/src/BanAPI.php → src/PocketMine/BanAPI.php
diff --git a/src/BlockAPI.php → src/PocketMine/BlockAPI.php b/src/BlockAPI.php → src/PocketMine/BlockAPI.php
diff --git a/src/ChatAPI.php → src/PocketMine/ChatAPI.php b/src/ChatAPI.php → src/PocketMine/ChatAPI.php
diff --git a/src/ConsoleAPI.php → src/PocketMine/ConsoleAPI.php b/src/ConsoleAPI.php → src/PocketMine/ConsoleAPI.php
diff --git a/src/Container.php → src/PocketMine/Container.php b/src/Container.php → src/PocketMine/Container.php
diff --git a/src/Deprecation.php → src/PocketMine/Deprecation.php b/src/Deprecation.php → src/PocketMine/Deprecation.php
diff --git a/src/LevelAPI.php → src/PocketMine/LevelAPI.php b/src/LevelAPI.php → src/PocketMine/LevelAPI.php
diff --git a/src/Player.php → src/PocketMine/Player.php b/src/Player.php → src/PocketMine/Player.php
diff --git a/src/PlayerAPI.php → src/PocketMine/PlayerAPI.php b/src/PlayerAPI.php → src/PocketMine/PlayerAPI.php
diff --git a/src/PluginAPI.php → src/PocketMine/PluginAPI.php b/src/PluginAPI.php → src/PocketMine/PluginAPI.php
diff --git a/PocketMine-MP.php → src/PocketMine/PocketMine.php b/PocketMine-MP.php → src/PocketMine/PocketMine.php
@@ -41,7 +41,7 @@ function console($message, $EOL = true, $log = true, $level = 1){
 			}else{
 				$path = "";
 			}
-			$fPath = \PocketMine\PATH . "src" . DIRECTORY_SEPARATOR . $path . $className . ".php";
+			$fPath = \PocketMine\PATH . "src" . DIRECTORY_SEPARATOR . "PocketMine" . DIRECTORY_SEPARATOR . $path . $className . ".php";
 			if(file_exists($fPath)){
 				require_once($fPath);
 			}
@@ -59,7 +59,7 @@ function console($message, $EOL = true, $log = true, $level = 1){
 		}
 	});
 
-	define("PocketMine\PATH", realpath(dirname(__FILE__)) . DIRECTORY_SEPARATOR);
+	define("PocketMine\PATH", \getcwd() . DIRECTORY_SEPARATOR);
 
 	//Startup code. Do not look at it, it can harm you. Most of them are hacks to fix date-related bugs, or basic functions used after this
 
@@ -357,7 +357,7 @@ function log($message, $name, $EOL = true, $level = 2, $close = false){
 
 	ini_set("opcache.mmap_base", bin2hex(Utils\Utils::getRandomBytes(8, false))); //Fix OPCache address errors
 
-	require_once(\PocketMine\PATH . "src/utils/pthreads.php");
+	require_once(\PocketMine\PATH . "src/pthreads.php");
 
 	if(!file_exists(\PocketMine\DATA . "server.properties") and !isset($opts["no-wizard"])){
 		$installer = new Wizard\Installer();

diff --git a/src/Server.php → src/PocketMine/Server.php b/src/Server.php → src/PocketMine/Server.php
@@ -47,7 +47,7 @@ class Server{
 	private function load(){
 		$this->version = new VersionString();
 		if(defined("DEBUG") and DEBUG >= 0){
-			@cli_set_process_title("PocketMine-MP " . MAJOR_VERSION);
+			@cli_set_process_title("PocketMine-MP " . \PocketMine\VERSION);
 		}
 		console("[INFO] Starting Minecraft PE server on " . ($this->serverip === "0.0.0.0" ? "*" : $this->serverip) . ":" . $this->port);
 		define("BOOTUP_RANDOM", Utils::getRandomBytes(16));

diff --git a/src/ServerAPI.php → src/PocketMine/ServerAPI.php b/src/ServerAPI.php → src/PocketMine/ServerAPI.php
diff --git a/src/TimeAPI.php → src/PocketMine/TimeAPI.php b/src/TimeAPI.php → src/PocketMine/TimeAPI.php
diff --git a/src/block/Air.php → src/PocketMine/block/Air.php b/src/block/Air.php → src/PocketMine/block/Air.php
diff --git a/src/block/Bed.php → src/PocketMine/block/Bed.php b/src/block/Bed.php → src/PocketMine/block/Bed.php
diff --git a/src/block/Bedrock.php → src/PocketMine/block/Bedrock.php b/src/block/Bedrock.php → src/PocketMine/block/Bedrock.php
diff --git a/src/block/Beetroot.php → src/PocketMine/block/Beetroot.php b/src/block/Beetroot.php → src/PocketMine/block/Beetroot.php
diff --git a/src/block/BirchWoodStairs.php → src/PocketMine/block/BirchWoodStairs.php b/src/block/BirchWoodStairs.php → src/PocketMine/block/BirchWoodStairs.php
diff --git a/src/block/Block.php → src/PocketMine/block/Block.php b/src/block/Block.php → src/PocketMine/block/Block.php
diff --git a/src/block/Bookshelf.php → src/PocketMine/block/Bookshelf.php b/src/block/Bookshelf.php → src/PocketMine/block/Bookshelf.php
diff --git a/src/block/BrickStairs.php → src/PocketMine/block/BrickStairs.php b/src/block/BrickStairs.php → src/PocketMine/block/BrickStairs.php
diff --git a/src/block/Bricks.php → src/PocketMine/block/Bricks.php b/src/block/Bricks.php → src/PocketMine/block/Bricks.php
diff --git a/src/block/BrownMushroom.php → src/PocketMine/block/BrownMushroom.php b/src/block/BrownMushroom.php → src/PocketMine/block/BrownMushroom.php
diff --git a/src/block/BurningFurnace.php → src/PocketMine/block/BurningFurnace.php b/src/block/BurningFurnace.php → src/PocketMine/block/BurningFurnace.php
diff --git a/src/block/Cactus.php → src/PocketMine/block/Cactus.php b/src/block/Cactus.php → src/PocketMine/block/Cactus.php
diff --git a/src/block/Cake.php → src/PocketMine/block/Cake.php b/src/block/Cake.php → src/PocketMine/block/Cake.php
diff --git a/src/block/Carpet.php → src/PocketMine/block/Carpet.php b/src/block/Carpet.php → src/PocketMine/block/Carpet.php
diff --git a/src/block/Carrot.php → src/PocketMine/block/Carrot.php b/src/block/Carrot.php → src/PocketMine/block/Carrot.php
diff --git a/src/block/Chest.php → src/PocketMine/block/Chest.php b/src/block/Chest.php → src/PocketMine/block/Chest.php
diff --git a/src/block/Clay.php → src/PocketMine/block/Clay.php b/src/block/Clay.php → src/PocketMine/block/Clay.php
diff --git a/src/block/Coal.php → src/PocketMine/block/Coal.php b/src/block/Coal.php → src/PocketMine/block/Coal.php
diff --git a/src/block/CoalOre.php → src/PocketMine/block/CoalOre.php b/src/block/CoalOre.php → src/PocketMine/block/CoalOre.php
diff --git a/src/block/Cobblestone.php → src/PocketMine/block/Cobblestone.php b/src/block/Cobblestone.php → src/PocketMine/block/Cobblestone.php
diff --git a/src/block/CobblestoneStairs.php → src/PocketMine/block/CobblestoneStairs.php b/src/block/CobblestoneStairs.php → src/PocketMine/block/CobblestoneStairs.php
diff --git a/src/block/Cobweb.php → src/PocketMine/block/Cobweb.php b/src/block/Cobweb.php → src/PocketMine/block/Cobweb.php
diff --git a/src/block/CyanFlower.php → src/PocketMine/block/CyanFlower.php b/src/block/CyanFlower.php → src/PocketMine/block/CyanFlower.php
diff --git a/src/block/Dandelion.php → src/PocketMine/block/Dandelion.php b/src/block/Dandelion.php → src/PocketMine/block/Dandelion.php
diff --git a/src/block/DeadBush.php → src/PocketMine/block/DeadBush.php b/src/block/DeadBush.php → src/PocketMine/block/DeadBush.php
diff --git a/src/block/Diamond.php → src/PocketMine/block/Diamond.php b/src/block/Diamond.php → src/PocketMine/block/Diamond.php
diff --git a/src/block/DiamondOre.php → src/PocketMine/block/DiamondOre.php b/src/block/DiamondOre.php → src/PocketMine/block/DiamondOre.php
diff --git a/src/block/Dirt.php → src/PocketMine/block/Dirt.php b/src/block/Dirt.php → src/PocketMine/block/Dirt.php
diff --git a/src/block/Door.php → src/PocketMine/block/Door.php b/src/block/Door.php → src/PocketMine/block/Door.php
diff --git a/src/block/DoubleSlab.php → src/PocketMine/block/DoubleSlab.php b/src/block/DoubleSlab.php → src/PocketMine/block/DoubleSlab.php
diff --git a/src/block/DoubleWoodSlab.php → src/PocketMine/block/DoubleWoodSlab.php b/src/block/DoubleWoodSlab.php → src/PocketMine/block/DoubleWoodSlab.php
diff --git a/src/block/Fallable.php → src/PocketMine/block/Fallable.php b/src/block/Fallable.php → src/PocketMine/block/Fallable.php
diff --git a/src/block/Farmland.php → src/PocketMine/block/Farmland.php b/src/block/Farmland.php → src/PocketMine/block/Farmland.php
diff --git a/src/block/Fence.php → src/PocketMine/block/Fence.php b/src/block/Fence.php → src/PocketMine/block/Fence.php
diff --git a/src/block/FenceGate.php → src/PocketMine/block/FenceGate.php b/src/block/FenceGate.php → src/PocketMine/block/FenceGate.php
diff --git a/src/block/Fire.php → src/PocketMine/block/Fire.php b/src/block/Fire.php → src/PocketMine/block/Fire.php
diff --git a/src/block/Flowable.php → src/PocketMine/block/Flowable.php b/src/block/Flowable.php → src/PocketMine/block/Flowable.php
diff --git a/src/block/Furnace.php → src/PocketMine/block/Furnace.php b/src/block/Furnace.php → src/PocketMine/block/Furnace.php
diff --git a/src/block/Generic.php → src/PocketMine/block/Generic.php b/src/block/Generic.php → src/PocketMine/block/Generic.php
diff --git a/src/block/Glass.php → src/PocketMine/block/Glass.php b/src/block/Glass.php → src/PocketMine/block/Glass.php
diff --git a/src/block/GlassPane.php → src/PocketMine/block/GlassPane.php b/src/block/GlassPane.php → src/PocketMine/block/GlassPane.php
diff --git a/src/block/GlowingObsidian.php → src/PocketMine/block/GlowingObsidian.php b/src/block/GlowingObsidian.php → src/PocketMine/block/GlowingObsidian.php
diff --git a/src/block/GlowingRedstoneOre.php → src/PocketMine/block/GlowingRedstoneOre.php b/src/block/GlowingRedstoneOre.php → src/PocketMine/block/GlowingRedstoneOre.php
diff --git a/src/block/Glowstone.php → src/PocketMine/block/Glowstone.php b/src/block/Glowstone.php → src/PocketMine/block/Glowstone.php
diff --git a/src/block/Gold.php → src/PocketMine/block/Gold.php b/src/block/Gold.php → src/PocketMine/block/Gold.php
diff --git a/src/block/GoldOre.php → src/PocketMine/block/GoldOre.php b/src/block/GoldOre.php → src/PocketMine/block/GoldOre.php
diff --git a/src/block/Grass.php → src/PocketMine/block/Grass.php b/src/block/Grass.php → src/PocketMine/block/Grass.php
diff --git a/src/block/Gravel.php → src/PocketMine/block/Gravel.php b/src/block/Gravel.php → src/PocketMine/block/Gravel.php
diff --git a/src/block/HayBale.php → src/PocketMine/block/HayBale.php b/src/block/HayBale.php → src/PocketMine/block/HayBale.php
diff --git a/src/block/Ice.php → src/PocketMine/block/Ice.php b/src/block/Ice.php → src/PocketMine/block/Ice.php
diff --git a/src/block/Iron.php → src/PocketMine/block/Iron.php b/src/block/Iron.php → src/PocketMine/block/Iron.php
diff --git a/src/block/IronBars.php → src/PocketMine/block/IronBars.php b/src/block/IronBars.php → src/PocketMine/block/IronBars.php
diff --git a/src/block/IronDoor.php → src/PocketMine/block/IronDoor.php b/src/block/IronDoor.php → src/PocketMine/block/IronDoor.php
diff --git a/src/block/IronOre.php → src/PocketMine/block/IronOre.php b/src/block/IronOre.php → src/PocketMine/block/IronOre.php
diff --git a/src/block/JungleWoodStairs.php → src/PocketMine/block/JungleWoodStairs.php b/src/block/JungleWoodStairs.php → src/PocketMine/block/JungleWoodStairs.php
diff --git a/src/block/Ladder.php → src/PocketMine/block/Ladder.php b/src/block/Ladder.php → src/PocketMine/block/Ladder.php
diff --git a/src/block/Lapis.php → src/PocketMine/block/Lapis.php b/src/block/Lapis.php → src/PocketMine/block/Lapis.php
diff --git a/src/block/LapisOre.php → src/PocketMine/block/LapisOre.php b/src/block/LapisOre.php → src/PocketMine/block/LapisOre.php
diff --git a/src/block/Lava.php → src/PocketMine/block/Lava.php b/src/block/Lava.php → src/PocketMine/block/Lava.php
diff --git a/src/block/Leaves.php → src/PocketMine/block/Leaves.php b/src/block/Leaves.php → src/PocketMine/block/Leaves.php
diff --git a/src/block/Liquid.php → src/PocketMine/block/Liquid.php b/src/block/Liquid.php → src/PocketMine/block/Liquid.php
diff --git a/src/block/LitPumpkin.php → src/PocketMine/block/LitPumpkin.php b/src/block/LitPumpkin.php → src/PocketMine/block/LitPumpkin.php
diff --git a/src/block/Melon.php → src/PocketMine/block/Melon.php b/src/block/Melon.php → src/PocketMine/block/Melon.php
diff --git a/src/block/MelonStem.php → src/PocketMine/block/MelonStem.php b/src/block/MelonStem.php → src/PocketMine/block/MelonStem.php
diff --git a/src/block/MossStone.php → src/PocketMine/block/MossStone.php b/src/block/MossStone.php → src/PocketMine/block/MossStone.php
diff --git a/src/block/NetherBrick.php → src/PocketMine/block/NetherBrick.php b/src/block/NetherBrick.php → src/PocketMine/block/NetherBrick.php
diff --git a/src/block/NetherBrickStairs.php → src/PocketMine/block/NetherBrickStairs.php b/src/block/NetherBrickStairs.php → src/PocketMine/block/NetherBrickStairs.php
diff --git a/src/block/NetherReactor.php → src/PocketMine/block/NetherReactor.php b/src/block/NetherReactor.php → src/PocketMine/block/NetherReactor.php
diff --git a/src/block/Netherrack.php → src/PocketMine/block/Netherrack.php b/src/block/Netherrack.php → src/PocketMine/block/Netherrack.php
diff --git a/src/block/Obsidian.php → src/PocketMine/block/Obsidian.php b/src/block/Obsidian.php → src/PocketMine/block/Obsidian.php
diff --git a/src/block/Planks.php → src/PocketMine/block/Planks.php b/src/block/Planks.php → src/PocketMine/block/Planks.php
diff --git a/src/block/Potato.php → src/PocketMine/block/Potato.php b/src/block/Potato.php → src/PocketMine/block/Potato.php
diff --git a/src/block/Pumpkin.php → src/PocketMine/block/Pumpkin.php b/src/block/Pumpkin.php → src/PocketMine/block/Pumpkin.php
diff --git a/src/block/PumpkinStem.php → src/PocketMine/block/PumpkinStem.php b/src/block/PumpkinStem.php → src/PocketMine/block/PumpkinStem.php
diff --git a/src/block/Quartz.php → src/PocketMine/block/Quartz.php b/src/block/Quartz.php → src/PocketMine/block/Quartz.php
diff --git a/src/block/QuartzStairs.php → src/PocketMine/block/QuartzStairs.php b/src/block/QuartzStairs.php → src/PocketMine/block/QuartzStairs.php
diff --git a/src/block/RedMushroom.php → src/PocketMine/block/RedMushroom.php b/src/block/RedMushroom.php → src/PocketMine/block/RedMushroom.php
diff --git a/src/block/RedstoneOre.php → src/PocketMine/block/RedstoneOre.php b/src/block/RedstoneOre.php → src/PocketMine/block/RedstoneOre.php
diff --git a/src/block/Sand.php → src/PocketMine/block/Sand.php b/src/block/Sand.php → src/PocketMine/block/Sand.php
diff --git a/src/block/Sandstone.php → src/PocketMine/block/Sandstone.php b/src/block/Sandstone.php → src/PocketMine/block/Sandstone.php
diff --git a/src/block/SandstoneStairs.php → src/PocketMine/block/SandstoneStairs.php b/src/block/SandstoneStairs.php → src/PocketMine/block/SandstoneStairs.php
diff --git a/src/block/Sapling.php → src/PocketMine/block/Sapling.php b/src/block/Sapling.php → src/PocketMine/block/Sapling.php
diff --git a/src/block/SignPost.php → src/PocketMine/block/SignPost.php b/src/block/SignPost.php → src/PocketMine/block/SignPost.php
diff --git a/src/block/Slab.php → src/PocketMine/block/Slab.php b/src/block/Slab.php → src/PocketMine/block/Slab.php
diff --git a/src/block/Snow.php → src/PocketMine/block/Snow.php b/src/block/Snow.php → src/PocketMine/block/Snow.php
diff --git a/src/block/SnowLayer.php → src/PocketMine/block/SnowLayer.php b/src/block/SnowLayer.php → src/PocketMine/block/SnowLayer.php
diff --git a/src/block/Solid.php → src/PocketMine/block/Solid.php b/src/block/Solid.php → src/PocketMine/block/Solid.php
diff --git a/src/block/SoulSand.php → src/PocketMine/block/SoulSand.php b/src/block/SoulSand.php → src/PocketMine/block/SoulSand.php
diff --git a/src/block/Sponge.php → src/PocketMine/block/Sponge.php b/src/block/Sponge.php → src/PocketMine/block/Sponge.php
diff --git a/src/block/SpruceWoodStairs.php → src/PocketMine/block/SpruceWoodStairs.php b/src/block/SpruceWoodStairs.php → src/PocketMine/block/SpruceWoodStairs.php
diff --git a/src/block/Stair.php → src/PocketMine/block/Stair.php b/src/block/Stair.php → src/PocketMine/block/Stair.php
diff --git a/src/block/StillLava.php → src/PocketMine/block/StillLava.php b/src/block/StillLava.php → src/PocketMine/block/StillLava.php
diff --git a/src/block/StillWater.php → src/PocketMine/block/StillWater.php b/src/block/StillWater.php → src/PocketMine/block/StillWater.php
diff --git a/src/block/Stone.php → src/PocketMine/block/Stone.php b/src/block/Stone.php → src/PocketMine/block/Stone.php
diff --git a/src/block/StoneBrickStairs.php → src/PocketMine/block/StoneBrickStairs.php b/src/block/StoneBrickStairs.php → src/PocketMine/block/StoneBrickStairs.php
diff --git a/src/block/StoneBricks.php → src/PocketMine/block/StoneBricks.php b/src/block/StoneBricks.php → src/PocketMine/block/StoneBricks.php
diff --git a/src/block/StoneWall.php → src/PocketMine/block/StoneWall.php b/src/block/StoneWall.php → src/PocketMine/block/StoneWall.php
diff --git a/src/block/Stonecutter.php → src/PocketMine/block/Stonecutter.php b/src/block/Stonecutter.php → src/PocketMine/block/Stonecutter.php
diff --git a/src/block/Sugarcane.php → src/PocketMine/block/Sugarcane.php b/src/block/Sugarcane.php → src/PocketMine/block/Sugarcane.php
diff --git a/src/block/TNT.php → src/PocketMine/block/TNT.php b/src/block/TNT.php → src/PocketMine/block/TNT.php
diff --git a/src/block/TallGrass.php → src/PocketMine/block/TallGrass.php b/src/block/TallGrass.php → src/PocketMine/block/TallGrass.php
diff --git a/src/block/Torch.php → src/PocketMine/block/Torch.php b/src/block/Torch.php → src/PocketMine/block/Torch.php
diff --git a/src/block/Transparent.php → src/PocketMine/block/Transparent.php b/src/block/Transparent.php → src/PocketMine/block/Transparent.php
diff --git a/src/block/Trapdoor.php → src/PocketMine/block/Trapdoor.php b/src/block/Trapdoor.php → src/PocketMine/block/Trapdoor.php
diff --git a/src/block/WallSign.php → src/PocketMine/block/WallSign.php b/src/block/WallSign.php → src/PocketMine/block/WallSign.php
diff --git a/src/block/Water.php → src/PocketMine/block/Water.php b/src/block/Water.php → src/PocketMine/block/Water.php
diff --git a/src/block/Wheat.php → src/PocketMine/block/Wheat.php b/src/block/Wheat.php → src/PocketMine/block/Wheat.php
diff --git a/src/block/Wood.php → src/PocketMine/block/Wood.php b/src/block/Wood.php → src/PocketMine/block/Wood.php
diff --git a/src/block/WoodDoor.php → src/PocketMine/block/WoodDoor.php b/src/block/WoodDoor.php → src/PocketMine/block/WoodDoor.php
diff --git a/src/block/WoodSlab.php → src/PocketMine/block/WoodSlab.php b/src/block/WoodSlab.php → src/PocketMine/block/WoodSlab.php
diff --git a/src/block/WoodStairs.php → src/PocketMine/block/WoodStairs.php b/src/block/WoodStairs.php → src/PocketMine/block/WoodStairs.php
diff --git a/src/block/Wool.php → src/PocketMine/block/Wool.php b/src/block/Wool.php → src/PocketMine/block/Wool.php
diff --git a/src/block/Workbench.php → src/PocketMine/block/Workbench.php b/src/block/Workbench.php → src/PocketMine/block/Workbench.php
diff --git a/src/build/compile.sh → src/PocketMine/build/compile.sh b/src/build/compile.sh → src/PocketMine/build/compile.sh
diff --git a/src/build/installer.sh → src/PocketMine/build/installer.sh b/src/build/installer.sh → src/PocketMine/build/installer.sh
diff --git a/src/build/jenkins.sh → src/PocketMine/build/jenkins.sh b/src/build/jenkins.sh → src/PocketMine/build/jenkins.sh
diff --git a/src/constants/GeneralConstants.php → ...PocketMine/constants/GeneralConstants.php b/src/constants/GeneralConstants.php → ...PocketMine/constants/GeneralConstants.php
diff --git a/src/entity/Ageable.php → src/PocketMine/entity/Ageable.php b/src/entity/Ageable.php → src/PocketMine/entity/Ageable.php
diff --git a/src/entity/Animal.php → src/PocketMine/entity/Animal.php b/src/entity/Animal.php → src/PocketMine/entity/Animal.php
diff --git a/src/entity/Arrow.php → src/PocketMine/entity/Arrow.php b/src/entity/Arrow.php → src/PocketMine/entity/Arrow.php
diff --git a/src/entity/Attachable.php → src/PocketMine/entity/Attachable.php b/src/entity/Attachable.php → src/PocketMine/entity/Attachable.php
diff --git a/src/entity/Chicken.php → src/PocketMine/entity/Chicken.php b/src/entity/Chicken.php → src/PocketMine/entity/Chicken.php
diff --git a/src/entity/Colorable.php → src/PocketMine/entity/Colorable.php b/src/entity/Colorable.php → src/PocketMine/entity/Colorable.php
diff --git a/src/entity/Cow.php → src/PocketMine/entity/Cow.php b/src/entity/Cow.php → src/PocketMine/entity/Cow.php
diff --git a/src/entity/Creature.php → src/PocketMine/entity/Creature.php b/src/entity/Creature.php → src/PocketMine/entity/Creature.php
diff --git a/src/entity/Creeper.php → src/PocketMine/entity/Creeper.php b/src/entity/Creeper.php → src/PocketMine/entity/Creeper.php
diff --git a/src/entity/Damageable.php → src/PocketMine/entity/Damageable.php b/src/entity/Damageable.php → src/PocketMine/entity/Damageable.php
diff --git a/src/entity/DroppedItem.php → src/PocketMine/entity/DroppedItem.php b/src/entity/DroppedItem.php → src/PocketMine/entity/DroppedItem.php
diff --git a/src/entity/Egg.php → src/PocketMine/entity/Egg.php b/src/entity/Egg.php → src/PocketMine/entity/Egg.php
diff --git a/src/entity/EnderPearl.php → src/PocketMine/entity/EnderPearl.php b/src/entity/EnderPearl.php → src/PocketMine/entity/EnderPearl.php
diff --git a/src/entity/Enderman.php → src/PocketMine/entity/Enderman.php b/src/entity/Enderman.php → src/PocketMine/entity/Enderman.php
diff --git a/src/entity/Entity.php → src/PocketMine/entity/Entity.php b/src/entity/Entity.php → src/PocketMine/entity/Entity.php
diff --git a/src/entity/Explosive.php → src/PocketMine/entity/Explosive.php b/src/entity/Explosive.php → src/PocketMine/entity/Explosive.php
diff --git a/src/entity/FallingBlock.php → src/PocketMine/entity/FallingBlock.php b/src/entity/FallingBlock.php → src/PocketMine/entity/FallingBlock.php
diff --git a/src/entity/Hanging.php → src/PocketMine/entity/Hanging.php b/src/entity/Hanging.php → src/PocketMine/entity/Hanging.php
diff --git a/src/entity/Human.php → src/PocketMine/entity/Human.php b/src/entity/Human.php → src/PocketMine/entity/Human.php
diff --git a/src/entity/InventorySource.php → src/PocketMine/entity/InventorySource.php b/src/entity/InventorySource.php → src/PocketMine/entity/InventorySource.php
diff --git a/src/entity/Living.php → src/PocketMine/entity/Living.php b/src/entity/Living.php → src/PocketMine/entity/Living.php
diff --git a/src/entity/Minecart.php → src/PocketMine/entity/Minecart.php b/src/entity/Minecart.php → src/PocketMine/entity/Minecart.php
diff --git a/src/entity/Monster.php → src/PocketMine/entity/Monster.php b/src/entity/Monster.php → src/PocketMine/entity/Monster.php
diff --git a/src/entity/NPC.php → src/PocketMine/entity/NPC.php b/src/entity/NPC.php → src/PocketMine/entity/NPC.php
diff --git a/src/entity/Ocelot.php → src/PocketMine/entity/Ocelot.php b/src/entity/Ocelot.php → src/PocketMine/entity/Ocelot.php
diff --git a/src/entity/Painting.php → src/PocketMine/entity/Painting.php b/src/entity/Painting.php → src/PocketMine/entity/Painting.php
diff --git a/src/entity/Pig.php → src/PocketMine/entity/Pig.php b/src/entity/Pig.php → src/PocketMine/entity/Pig.php
diff --git a/src/entity/PigZombie.php → src/PocketMine/entity/PigZombie.php b/src/entity/PigZombie.php → src/PocketMine/entity/PigZombie.php
diff --git a/src/entity/Projectile.php → src/PocketMine/entity/Projectile.php b/src/entity/Projectile.php → src/PocketMine/entity/Projectile.php
diff --git a/src/entity/ProjectileSource.php → src/PocketMine/entity/ProjectileSource.php b/src/entity/ProjectileSource.php → src/PocketMine/entity/ProjectileSource.php
diff --git a/src/entity/RealHuman.php → src/PocketMine/entity/RealHuman.php b/src/entity/RealHuman.php → src/PocketMine/entity/RealHuman.php
diff --git a/src/entity/Rideable.php → src/PocketMine/entity/Rideable.php b/src/entity/Rideable.php → src/PocketMine/entity/Rideable.php
diff --git a/src/entity/Sheep.php → src/PocketMine/entity/Sheep.php b/src/entity/Sheep.php → src/PocketMine/entity/Sheep.php
diff --git a/src/entity/Silverfish.php → src/PocketMine/entity/Silverfish.php b/src/entity/Silverfish.php → src/PocketMine/entity/Silverfish.php
diff --git a/src/entity/Skeleton.php → src/PocketMine/entity/Skeleton.php b/src/entity/Skeleton.php → src/PocketMine/entity/Skeleton.php
diff --git a/src/entity/Slime.php → src/PocketMine/entity/Slime.php b/src/entity/Slime.php → src/PocketMine/entity/Slime.php
diff --git a/src/entity/Snowball.php → src/PocketMine/entity/Snowball.php b/src/entity/Snowball.php → src/PocketMine/entity/Snowball.php
diff --git a/src/entity/Spider.php → src/PocketMine/entity/Spider.php b/src/entity/Spider.php → src/PocketMine/entity/Spider.php
diff --git a/src/entity/TNTPrimed.php → src/PocketMine/entity/TNTPrimed.php b/src/entity/TNTPrimed.php → src/PocketMine/entity/TNTPrimed.php
diff --git a/src/entity/Tameable.php → src/PocketMine/entity/Tameable.php b/src/entity/Tameable.php → src/PocketMine/entity/Tameable.php
diff --git a/src/entity/Vehicle.php → src/PocketMine/entity/Vehicle.php b/src/entity/Vehicle.php → src/PocketMine/entity/Vehicle.php
diff --git a/src/entity/Villager.php → src/PocketMine/entity/Villager.php b/src/entity/Villager.php → src/PocketMine/entity/Villager.php
diff --git a/src/entity/Wolf.php → src/PocketMine/entity/Wolf.php b/src/entity/Wolf.php → src/PocketMine/entity/Wolf.php
diff --git a/src/entity/Zombie.php → src/PocketMine/entity/Zombie.php b/src/entity/Zombie.php → src/PocketMine/entity/Zombie.php
diff --git a/src/event/CancellableEvent.php → src/PocketMine/event/CancellableEvent.php b/src/event/CancellableEvent.php → src/PocketMine/event/CancellableEvent.php
diff --git a/src/event/Event.php → src/PocketMine/event/Event.php b/src/event/Event.php → src/PocketMine/event/Event.php
diff --git a/src/event/EventHandler.php → src/PocketMine/event/EventHandler.php b/src/event/EventHandler.php → src/PocketMine/event/EventHandler.php
diff --git a/src/event/EventPriority.php → src/PocketMine/event/EventPriority.php b/src/event/EventPriority.php → src/PocketMine/event/EventPriority.php
diff --git a/src/event/entity/EntityArmorChangeEvent.php → ...e/event/entity/EntityArmorChangeEvent.php b/src/event/entity/EntityArmorChangeEvent.php → ...e/event/entity/EntityArmorChangeEvent.php
diff --git a/src/event/entity/EntityEvent.php → src/PocketMine/event/entity/EntityEvent.php b/src/event/entity/EntityEvent.php → src/PocketMine/event/entity/EntityEvent.php
diff --git a/...ent/entity/EntityInventoryChangeEvent.php → ...ent/entity/EntityInventoryChangeEvent.php b/...ent/entity/EntityInventoryChangeEvent.php → ...ent/entity/EntityInventoryChangeEvent.php
diff --git a/src/event/entity/EntityLevelChangeEvent.php → ...e/event/entity/EntityLevelChangeEvent.php b/src/event/entity/EntityLevelChangeEvent.php → ...e/event/entity/EntityLevelChangeEvent.php
diff --git a/src/event/entity/EntityMotionEvent.php → ...etMine/event/entity/EntityMotionEvent.php b/src/event/entity/EntityMotionEvent.php → ...etMine/event/entity/EntityMotionEvent.php
diff --git a/src/event/entity/EntityMoveEvent.php → ...cketMine/event/entity/EntityMoveEvent.php b/src/event/entity/EntityMoveEvent.php → ...cketMine/event/entity/EntityMoveEvent.php
diff --git a/...ent/player/PlayerEquipmentChangeEvent.php → ...ent/player/PlayerEquipmentChangeEvent.php b/...ent/player/PlayerEquipmentChangeEvent.php → ...ent/player/PlayerEquipmentChangeEvent.php
diff --git a/src/event/player/PlayerEvent.php → src/PocketMine/event/player/PlayerEvent.php b/src/event/player/PlayerEvent.php → src/PocketMine/event/player/PlayerEvent.php
diff --git a/src/event/plugin/PluginEvent.php → src/PocketMine/event/plugin/PluginEvent.php b/src/event/plugin/PluginEvent.php → src/PocketMine/event/plugin/PluginEvent.php
diff --git a/src/event/server/DataPacketReceiveEvent.php → ...e/event/server/DataPacketReceiveEvent.php b/src/event/server/DataPacketReceiveEvent.php → ...e/event/server/DataPacketReceiveEvent.php
diff --git a/src/event/server/DataPacketSendEvent.php → ...Mine/event/server/DataPacketSendEvent.php b/src/event/server/DataPacketSendEvent.php → ...Mine/event/server/DataPacketSendEvent.php
diff --git a/src/event/server/PacketReceiveEvent.php → ...tMine/event/server/PacketReceiveEvent.php b/src/event/server/PacketReceiveEvent.php → ...tMine/event/server/PacketReceiveEvent.php
diff --git a/src/event/server/PacketSendEvent.php → ...cketMine/event/server/PacketSendEvent.php b/src/event/server/PacketSendEvent.php → ...cketMine/event/server/PacketSendEvent.php
diff --git a/src/event/server/ServerEvent.php → src/PocketMine/event/server/ServerEvent.php b/src/event/server/ServerEvent.php → src/PocketMine/event/server/ServerEvent.php
diff --git a/src/event/tile/TileEvent.php → src/PocketMine/event/tile/TileEvent.php b/src/event/tile/TileEvent.php → src/PocketMine/event/tile/TileEvent.php
diff --git a/src/event/tile/TileInventoryChangeEvent.php → ...e/event/tile/TileInventoryChangeEvent.php b/src/event/tile/TileInventoryChangeEvent.php → ...e/event/tile/TileInventoryChangeEvent.php
diff --git a/src/item/Apple.php → src/PocketMine/item/Apple.php b/src/item/Apple.php → src/PocketMine/item/Apple.php
diff --git a/src/item/Bed.php → src/PocketMine/item/Bed.php b/src/item/Bed.php → src/PocketMine/item/Bed.php
diff --git a/src/item/BeetrootSeeds.php → src/PocketMine/item/BeetrootSeeds.php b/src/item/BeetrootSeeds.php → src/PocketMine/item/BeetrootSeeds.php
diff --git a/src/item/BeetrootSoup.php → src/PocketMine/item/BeetrootSoup.php b/src/item/BeetrootSoup.php → src/PocketMine/item/BeetrootSoup.php
diff --git a/src/item/Block.php → src/PocketMine/item/Block.php b/src/item/Block.php → src/PocketMine/item/Block.php
diff --git a/src/item/Bowl.php → src/PocketMine/item/Bowl.php b/src/item/Bowl.php → src/PocketMine/item/Bowl.php
diff --git a/src/item/Brick.php → src/PocketMine/item/Brick.php b/src/item/Brick.php → src/PocketMine/item/Brick.php
diff --git a/src/item/Bucket.php → src/PocketMine/item/Bucket.php b/src/item/Bucket.php → src/PocketMine/item/Bucket.php
diff --git a/src/item/Cake.php → src/PocketMine/item/Cake.php b/src/item/Cake.php → src/PocketMine/item/Cake.php
diff --git a/src/item/Carrot.php → src/PocketMine/item/Carrot.php b/src/item/Carrot.php → src/PocketMine/item/Carrot.php
diff --git a/src/item/Coal.php → src/PocketMine/item/Coal.php b/src/item/Coal.php → src/PocketMine/item/Coal.php
diff --git a/src/item/Diamond.php → src/PocketMine/item/Diamond.php b/src/item/Diamond.php → src/PocketMine/item/Diamond.php
diff --git a/src/item/Feather.php → src/PocketMine/item/Feather.php b/src/item/Feather.php → src/PocketMine/item/Feather.php
diff --git a/src/item/FlintSteel.php → src/PocketMine/item/FlintSteel.php b/src/item/FlintSteel.php → src/PocketMine/item/FlintSteel.php
diff --git a/src/item/GoldIngot.php → src/PocketMine/item/GoldIngot.php b/src/item/GoldIngot.php → src/PocketMine/item/GoldIngot.php
diff --git a/src/item/IronAxe.php → src/PocketMine/item/IronAxe.php b/src/item/IronAxe.php → src/PocketMine/item/IronAxe.php
diff --git a/src/item/IronDoor.php → src/PocketMine/item/IronDoor.php b/src/item/IronDoor.php → src/PocketMine/item/IronDoor.php
diff --git a/src/item/IronHoe.php → src/PocketMine/item/IronHoe.php b/src/item/IronHoe.php → src/PocketMine/item/IronHoe.php
diff --git a/src/item/IronIngot.php → src/PocketMine/item/IronIngot.php b/src/item/IronIngot.php → src/PocketMine/item/IronIngot.php
diff --git a/src/item/IronPickaxe.php → src/PocketMine/item/IronPickaxe.php b/src/item/IronPickaxe.php → src/PocketMine/item/IronPickaxe.php
diff --git a/src/item/IronShovel.php → src/PocketMine/item/IronShovel.php b/src/item/IronShovel.php → src/PocketMine/item/IronShovel.php
diff --git a/src/item/Item.php → src/PocketMine/item/Item.php b/src/item/Item.php → src/PocketMine/item/Item.php
diff --git a/src/item/MelonSeeds.php → src/PocketMine/item/MelonSeeds.php b/src/item/MelonSeeds.php → src/PocketMine/item/MelonSeeds.php
diff --git a/src/item/MushroomStew.php → src/PocketMine/item/MushroomStew.php b/src/item/MushroomStew.php → src/PocketMine/item/MushroomStew.php
diff --git a/src/item/Painting.php → src/PocketMine/item/Painting.php b/src/item/Painting.php → src/PocketMine/item/Painting.php
diff --git a/src/item/Potato.php → src/PocketMine/item/Potato.php b/src/item/Potato.php → src/PocketMine/item/Potato.php
diff --git a/src/item/PumpkinSeeds.php → src/PocketMine/item/PumpkinSeeds.php b/src/item/PumpkinSeeds.php → src/PocketMine/item/PumpkinSeeds.php
diff --git a/src/item/Sign.php → src/PocketMine/item/Sign.php b/src/item/Sign.php → src/PocketMine/item/Sign.php
diff --git a/src/item/SpawnEgg.php → src/PocketMine/item/SpawnEgg.php b/src/item/SpawnEgg.php → src/PocketMine/item/SpawnEgg.php
diff --git a/src/item/Stick.php → src/PocketMine/item/Stick.php b/src/item/Stick.php → src/PocketMine/item/Stick.php
diff --git a/src/item/Sugarcane.php → src/PocketMine/item/Sugarcane.php b/src/item/Sugarcane.php → src/PocketMine/item/Sugarcane.php
diff --git a/src/item/WheatSeeds.php → src/PocketMine/item/WheatSeeds.php b/src/item/WheatSeeds.php → src/PocketMine/item/WheatSeeds.php
diff --git a/src/item/WoodenAxe.php → src/PocketMine/item/WoodenAxe.php b/src/item/WoodenAxe.php → src/PocketMine/item/WoodenAxe.php
diff --git a/src/item/WoodenDoor.php → src/PocketMine/item/WoodenDoor.php b/src/item/WoodenDoor.php → src/PocketMine/item/WoodenDoor.php
diff --git a/src/item/WoodenPickaxe.php → src/PocketMine/item/WoodenPickaxe.php b/src/item/WoodenPickaxe.php → src/PocketMine/item/WoodenPickaxe.php
diff --git a/src/item/WoodenShovel.php → src/PocketMine/item/WoodenShovel.php b/src/item/WoodenShovel.php → src/PocketMine/item/WoodenShovel.php
diff --git a/src/item/WoodenSword.php → src/PocketMine/item/WoodenSword.php b/src/item/WoodenSword.php → src/PocketMine/item/WoodenSword.php
diff --git a/src/lang/Installer/af_ZA.ini → src/PocketMine/lang/Installer/af_ZA.ini b/src/lang/Installer/af_ZA.ini → src/PocketMine/lang/Installer/af_ZA.ini
diff --git a/src/lang/Installer/ar_SA.ini → src/PocketMine/lang/Installer/ar_SA.ini b/src/lang/Installer/ar_SA.ini → src/PocketMine/lang/Installer/ar_SA.ini
diff --git a/src/lang/Installer/cs_CZ.ini → src/PocketMine/lang/Installer/cs_CZ.ini b/src/lang/Installer/cs_CZ.ini → src/PocketMine/lang/Installer/cs_CZ.ini
diff --git a/src/lang/Installer/de_DE.ini → src/PocketMine/lang/Installer/de_DE.ini b/src/lang/Installer/de_DE.ini → src/PocketMine/lang/Installer/de_DE.ini
diff --git a/src/lang/Installer/el_GR.ini → src/PocketMine/lang/Installer/el_GR.ini b/src/lang/Installer/el_GR.ini → src/PocketMine/lang/Installer/el_GR.ini
diff --git a/src/lang/Installer/en.ini → src/PocketMine/lang/Installer/en.ini b/src/lang/Installer/en.ini → src/PocketMine/lang/Installer/en.ini
diff --git a/src/lang/Installer/en_AU.ini → src/PocketMine/lang/Installer/en_AU.ini b/src/lang/Installer/en_AU.ini → src/PocketMine/lang/Installer/en_AU.ini
diff --git a/src/lang/Installer/en_CA.ini → src/PocketMine/lang/Installer/en_CA.ini b/src/lang/Installer/en_CA.ini → src/PocketMine/lang/Installer/en_CA.ini
diff --git a/src/lang/Installer/en_GB.ini → src/PocketMine/lang/Installer/en_GB.ini b/src/lang/Installer/en_GB.ini → src/PocketMine/lang/Installer/en_GB.ini
diff --git a/src/lang/Installer/en_PT.ini → src/PocketMine/lang/Installer/en_PT.ini b/src/lang/Installer/en_PT.ini → src/PocketMine/lang/Installer/en_PT.ini
diff --git a/src/lang/Installer/en_US.ini → src/PocketMine/lang/Installer/en_US.ini b/src/lang/Installer/en_US.ini → src/PocketMine/lang/Installer/en_US.ini
diff --git a/src/lang/Installer/es_AR.ini → src/PocketMine/lang/Installer/es_AR.ini b/src/lang/Installer/es_AR.ini → src/PocketMine/lang/Installer/es_AR.ini
diff --git a/src/lang/Installer/es_ES.ini → src/PocketMine/lang/Installer/es_ES.ini b/src/lang/Installer/es_ES.ini → src/PocketMine/lang/Installer/es_ES.ini
diff --git a/src/lang/Installer/es_MX.ini → src/PocketMine/lang/Installer/es_MX.ini b/src/lang/Installer/es_MX.ini → src/PocketMine/lang/Installer/es_MX.ini
diff --git a/src/lang/Installer/et_EE.ini → src/PocketMine/lang/Installer/et_EE.ini b/src/lang/Installer/et_EE.ini → src/PocketMine/lang/Installer/et_EE.ini
diff --git a/src/lang/Installer/fi_FI.ini → src/PocketMine/lang/Installer/fi_FI.ini b/src/lang/Installer/fi_FI.ini → src/PocketMine/lang/Installer/fi_FI.ini
diff --git a/src/lang/Installer/fr_FR.ini → src/PocketMine/lang/Installer/fr_FR.ini b/src/lang/Installer/fr_FR.ini → src/PocketMine/lang/Installer/fr_FR.ini
diff --git a/src/lang/Installer/ga_IE.ini → src/PocketMine/lang/Installer/ga_IE.ini b/src/lang/Installer/ga_IE.ini → src/PocketMine/lang/Installer/ga_IE.ini
diff --git a/src/lang/Installer/he_IL.ini → src/PocketMine/lang/Installer/he_IL.ini b/src/lang/Installer/he_IL.ini → src/PocketMine/lang/Installer/he_IL.ini
diff --git a/src/lang/Installer/id_ID.ini → src/PocketMine/lang/Installer/id_ID.ini b/src/lang/Installer/id_ID.ini → src/PocketMine/lang/Installer/id_ID.ini
diff --git a/src/lang/Installer/it_IT.ini → src/PocketMine/lang/Installer/it_IT.ini b/src/lang/Installer/it_IT.ini → src/PocketMine/lang/Installer/it_IT.ini
diff --git a/src/lang/Installer/ja_JP.ini → src/PocketMine/lang/Installer/ja_JP.ini b/src/lang/Installer/ja_JP.ini → src/PocketMine/lang/Installer/ja_JP.ini
diff --git a/src/lang/Installer/ko_KR.ini → src/PocketMine/lang/Installer/ko_KR.ini b/src/lang/Installer/ko_KR.ini → src/PocketMine/lang/Installer/ko_KR.ini
diff --git a/src/lang/Installer/lv_LV.ini → src/PocketMine/lang/Installer/lv_LV.ini b/src/lang/Installer/lv_LV.ini → src/PocketMine/lang/Installer/lv_LV.ini
diff --git a/src/lang/Installer/ms_MY.ini → src/PocketMine/lang/Installer/ms_MY.ini b/src/lang/Installer/ms_MY.ini → src/PocketMine/lang/Installer/ms_MY.ini
diff --git a/src/lang/Installer/mt_MT.ini → src/PocketMine/lang/Installer/mt_MT.ini b/src/lang/Installer/mt_MT.ini → src/PocketMine/lang/Installer/mt_MT.ini
diff --git a/src/lang/Installer/nl_NL.ini → src/PocketMine/lang/Installer/nl_NL.ini b/src/lang/Installer/nl_NL.ini → src/PocketMine/lang/Installer/nl_NL.ini
diff --git a/src/lang/Installer/no_NO.ini → src/PocketMine/lang/Installer/no_NO.ini b/src/lang/Installer/no_NO.ini → src/PocketMine/lang/Installer/no_NO.ini
diff --git a/src/lang/Installer/pl_PL.ini → src/PocketMine/lang/Installer/pl_PL.ini b/src/lang/Installer/pl_PL.ini → src/PocketMine/lang/Installer/pl_PL.ini
diff --git a/src/lang/Installer/pt_PT.ini → src/PocketMine/lang/Installer/pt_PT.ini b/src/lang/Installer/pt_PT.ini → src/PocketMine/lang/Installer/pt_PT.ini
diff --git a/src/lang/Installer/ru_RU.ini → src/PocketMine/lang/Installer/ru_RU.ini b/src/lang/Installer/ru_RU.ini → src/PocketMine/lang/Installer/ru_RU.ini
diff --git a/src/lang/Installer/sv_SE.ini → src/PocketMine/lang/Installer/sv_SE.ini b/src/lang/Installer/sv_SE.ini → src/PocketMine/lang/Installer/sv_SE.ini
diff --git a/src/lang/Installer/th_TH.ini → src/PocketMine/lang/Installer/th_TH.ini b/src/lang/Installer/th_TH.ini → src/PocketMine/lang/Installer/th_TH.ini
diff --git a/src/lang/Installer/tlh_AA.ini → src/PocketMine/lang/Installer/tlh_AA.ini b/src/lang/Installer/tlh_AA.ini → src/PocketMine/lang/Installer/tlh_AA.ini
diff --git a/src/lang/Installer/tr_TR.ini → src/PocketMine/lang/Installer/tr_TR.ini b/src/lang/Installer/tr_TR.ini → src/PocketMine/lang/Installer/tr_TR.ini
diff --git a/src/lang/Installer/uk_UA.ini → src/PocketMine/lang/Installer/uk_UA.ini b/src/lang/Installer/uk_UA.ini → src/PocketMine/lang/Installer/uk_UA.ini
diff --git a/src/lang/Installer/vi_VN.ini → src/PocketMine/lang/Installer/vi_VN.ini b/src/lang/Installer/vi_VN.ini → src/PocketMine/lang/Installer/vi_VN.ini
diff --git a/src/lang/Installer/zh_CN.ini → src/PocketMine/lang/Installer/zh_CN.ini b/src/lang/Installer/zh_CN.ini → src/PocketMine/lang/Installer/zh_CN.ini
diff --git a/src/lang/Installer/zu_ZA.ini → src/PocketMine/lang/Installer/zu_ZA.ini b/src/lang/Installer/zu_ZA.ini → src/PocketMine/lang/Installer/zu_ZA.ini
diff --git a/src/level/Explosion.php → src/PocketMine/level/Explosion.php b/src/level/Explosion.php → src/PocketMine/level/Explosion.php
diff --git a/src/level/Level.php → src/PocketMine/level/Level.php b/src/level/Level.php → src/PocketMine/level/Level.php
diff --git a/src/level/LevelImport.php → src/PocketMine/level/LevelImport.php b/src/level/LevelImport.php → src/PocketMine/level/LevelImport.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  *
  *  ____            _        _   __  __ _                  __  __ ____  
  * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
@@ -19,45 +19,52 @@
  *
 */
 
+namespace PocketMine\Level;
+
+use PocketMine\PMF\LevelFormat as LevelFormat;
+use PocketMine\Utils\Config as Config;
+use PocketMine;
+
 class LevelImport{
 	private $path;
+
 	public function __construct($path){
 		$this->path = $path;
 	}
-	
+
 	public function import(){
-		if(file_exists($this->path."tileEntities.dat")){ //OldPM
-			$level = unserialize(file_get_contents($this->path."level.dat"));
-			console("[INFO] Importing OldPM level \"".$level["LevelName"]."\" to PMF format");
-			$entities = new Config($this->path."entities.yml", CONFIG_YAML, unserialize(file_get_contents($this->path."entities.dat")));
+		if(file_exists($this->path . "tileEntities.dat")){ //OldPM
+			$level = unserialize(file_get_contents($this->path . "level.dat"));
+			console("[INFO] Importing OldPM level \"" . $level["LevelName"] . "\" to PMF format");
+			$entities = new Config($this->path . "entities.yml", Config::YAML, unserialize(file_get_contents($this->path . "entities.dat")));
 			$entities->save();
-			$tiles = new Config($this->path."tiles.yml", CONFIG_YAML, unserialize(file_get_contents($this->path."tileEntities.dat")));
+			$tiles = new Config($this->path . "tiles.yml", Config::YAML, unserialize(file_get_contents($this->path . "tileEntities.dat")));
 			$tiles->save();
-		}elseif(file_exists($this->path."chunks.dat") and file_exists($this->path."level.dat")){ //Pocket
+		} elseif(file_exists($this->path . "chunks.dat") and file_exists($this->path . "level.dat")){ //Pocket
 			$nbt = new NBT(NBT::LITTLE_ENDIAN);
-			$nbt->read(substr(file_get_contents($this->path."level.dat"), 8));
+			$nbt->read(substr(file_get_contents($this->path . "level.dat"), 8));
 			$level = $nbt->getData();
 			if($level->LevelName == ""){
-				$level->LevelName = "world".time();
+				$level->LevelName = "world" . time();
 			}
-			console("[INFO] Importing Pocket level \"".$level->LevelName."\" to PMF format");
+			console("[INFO] Importing Pocket level \"" . $level->LevelName . "\" to PMF format");
 			unset($level->Player);
-			$nbt->read(substr(file_get_contents($this->path."entities.dat"), 12));
+			$nbt->read(substr(file_get_contents($this->path . "entities.dat"), 12));
 			$entities = $nbt->getData();
 			if(!isset($entities->TileEntities)){
 				$entities->TileEntities = array();
 			}
 			$tiles = $entities->TileEntities;
 			$entities = $entities->Entities;
-			$entities = new Config($this->path."entities.yml", CONFIG_YAML, $entities);
+			$entities = new Config($this->path . "entities.yml", Config::YAML, $entities);
 			$entities->save();
-			$tiles = new Config($this->path."tiles.yml", CONFIG_YAML, $tiles);
+			$tiles = new Config($this->path . "tiles.yml", Config::YAML, $tiles);
 			$tiles->save();
-		}else{
+		} else{
 			return false;
 		}
-		
-		$pmf = new PMFLevel($this->path."level.pmf", array(
+
+		$pmf = new LevelFormat($this->path . "level.pmf", array(
 			"name" => $level->LevelName,
 			"seed" => $level->RandomSeed,
 			"time" => $level->Time,
@@ -70,7 +77,7 @@ public function import(){
 			"extra" => ""
 		));
 		$chunks = new PocketChunkParser();
-		$chunks->loadFile($this->path."chunks.dat");
+		$chunks->loadFile($this->path . "chunks.dat");
 		$chunks->loadMap();
 		for($Z = 0; $Z < 16; ++$Z){
 			for($X = 0; $X < 16; ++$X){
@@ -82,8 +89,10 @@ public function import(){
 					4 => "",
 					5 => "",
 					6 => "",
-					7 => ""					
+					7 => ""
 				);
+
+				$pmf->initCleanChunk($X, $Z);
 				for($z = 0; $z < 16; ++$z){
 					for($x = 0; $x < 16; ++$x){
 						$block = $chunks->getChunkColumn($X, $Z, $x, $z, 0);
@@ -101,18 +110,19 @@ public function import(){
 				$pmf->setPopulated($X, $Z);
 				$pmf->saveChunk($X, $Z);
 			}
-			console("[NOTICE] Importing level ".ceil(($Z + 1)/0.16)."%");
+			console("[NOTICE] Importing level " . ceil(($Z + 1) / 0.16) . "%");
 		}
 		$chunks->map = null;
 		$chunks = null;
-		@unlink($this->path."level.dat");
-		@unlink($this->path."level.dat_old");
-		@unlink($this->path."player.dat");
-		@unlink($this->path."entities.dat");
-		@unlink($this->path."chunks.dat");
-		@unlink($this->path."chunks.dat.gz");
-		@unlink($this->path."tiles.dat");
+		@unlink($this->path . "level.dat");
+		@unlink($this->path . "level.dat_old");
+		@unlink($this->path . "player.dat");
+		@unlink($this->path . "entities.dat");
+		@unlink($this->path . "chunks.dat");
+		@unlink($this->path . "chunks.dat.gz");
+		@unlink($this->path . "tiles.dat");
 		unset($chunks, $level, $entities, $tiles, $nbt);
+
 		return true;
 	}
 

diff --git a/src/level/PocketChunkParser.php → src/PocketMine/level/PocketChunkParser.php b/src/level/PocketChunkParser.php → src/PocketMine/level/PocketChunkParser.php
diff --git a/src/level/Position.php → src/PocketMine/level/Position.php b/src/level/Position.php → src/PocketMine/level/Position.php
diff --git a/src/level/WorldGenerator.php → src/PocketMine/level/WorldGenerator.php b/src/level/WorldGenerator.php → src/PocketMine/level/WorldGenerator.php
diff --git a/src/level/generator/Flat.php → src/PocketMine/level/generator/Flat.php b/src/level/generator/Flat.php → src/PocketMine/level/generator/Flat.php
diff --git a/src/level/generator/Generator.php → src/PocketMine/level/generator/Generator.php b/src/level/generator/Generator.php → src/PocketMine/level/generator/Generator.php
diff --git a/src/level/generator/Normal.php → src/PocketMine/level/generator/Normal.php b/src/level/generator/Normal.php → src/PocketMine/level/generator/Normal.php
diff --git a/src/level/generator/noise/Generator.php → ...tMine/level/generator/noise/Generator.php b/src/level/generator/noise/Generator.php → ...tMine/level/generator/noise/Generator.php
diff --git a/src/level/generator/noise/Perlin.php → ...cketMine/level/generator/noise/Perlin.php b/src/level/generator/noise/Perlin.php → ...cketMine/level/generator/noise/Perlin.php
diff --git a/src/level/generator/noise/Simplex.php → ...ketMine/level/generator/noise/Simplex.php b/src/level/generator/noise/Simplex.php → ...ketMine/level/generator/noise/Simplex.php
diff --git a/src/level/generator/object/BigTree.php → ...etMine/level/generator/object/BigTree.php b/src/level/generator/object/BigTree.php → ...etMine/level/generator/object/BigTree.php
diff --git a/src/level/generator/object/Object.php → ...ketMine/level/generator/object/Object.php b/src/level/generator/object/Object.php → ...ketMine/level/generator/object/Object.php
diff --git a/src/level/generator/object/Ore.php → ...PocketMine/level/generator/object/Ore.php b/src/level/generator/object/Ore.php → ...PocketMine/level/generator/object/Ore.php
diff --git a/src/level/generator/object/OreType.php → ...etMine/level/generator/object/OreType.php b/src/level/generator/object/OreType.php → ...etMine/level/generator/object/OreType.php
diff --git a/src/level/generator/object/PineTree.php → ...tMine/level/generator/object/PineTree.php b/src/level/generator/object/PineTree.php → ...tMine/level/generator/object/PineTree.php
diff --git a/src/level/generator/object/Pond.php → ...ocketMine/level/generator/object/Pond.php b/src/level/generator/object/Pond.php → ...ocketMine/level/generator/object/Pond.php
diff --git a/src/level/generator/object/SmallTree.php → ...Mine/level/generator/object/SmallTree.php b/src/level/generator/object/SmallTree.php → ...Mine/level/generator/object/SmallTree.php
diff --git a/src/level/generator/object/SpruceTree.php → ...ine/level/generator/object/SpruceTree.php b/src/level/generator/object/SpruceTree.php → ...ine/level/generator/object/SpruceTree.php
diff --git a/src/level/generator/object/TallGrass.php → ...Mine/level/generator/object/TallGrass.php b/src/level/generator/object/TallGrass.php → ...Mine/level/generator/object/TallGrass.php
diff --git a/src/level/generator/object/Tree.php → ...ocketMine/level/generator/object/Tree.php b/src/level/generator/object/Tree.php → ...ocketMine/level/generator/object/Tree.php
diff --git a/src/level/generator/populator/Mineshaft.php → ...e/level/generator/populator/Mineshaft.php b/src/level/generator/populator/Mineshaft.php → ...e/level/generator/populator/Mineshaft.php
diff --git a/src/level/generator/populator/Ore.php → ...ketMine/level/generator/populator/Ore.php b/src/level/generator/populator/Ore.php → ...ketMine/level/generator/populator/Ore.php
diff --git a/src/level/generator/populator/Pond.php → ...etMine/level/generator/populator/Pond.php b/src/level/generator/populator/Pond.php → ...etMine/level/generator/populator/Pond.php
diff --git a/src/level/generator/populator/Populator.php → ...e/level/generator/populator/Populator.php b/src/level/generator/populator/Populator.php → ...e/level/generator/populator/Populator.php
diff --git a/src/level/generator/populator/TallGrass.php → ...e/level/generator/populator/TallGrass.php b/src/level/generator/populator/TallGrass.php → ...e/level/generator/populator/TallGrass.php
diff --git a/src/level/generator/populator/Tree.php → ...etMine/level/generator/populator/Tree.php b/src/level/generator/populator/Tree.php → ...etMine/level/generator/populator/Tree.php