diff --git a/PocketMine-MP.php b/PocketMine-MP.php
index 78ca2a2ee..6a7603af8 100644
--- a/PocketMine-MP.php
+++ b/PocketMine-MP.php
@@ -36,7 +36,7 @@ const PHP_VERSION = "5.5";
 		}else{
 			$path = "";
 		}
-		$fPath = PATH . "src" . DIRECTORY_SEPARATOR . $path . $className . ".php";
+		$fPath = \PocketMine\PATH . "src" . DIRECTORY_SEPARATOR . $path . $className . ".php";
 		if(file_exists($fPath)){
 			require_once($fPath);
 		}
@@ -47,7 +47,7 @@ const PHP_VERSION = "5.5";
 		}else{
 			$path = "";
 		}
-		$fPath = PATH . "plugins". DIRECTORY_SEPARATOR . $parent . DIRECTORY_SEPARATOR . "src" . DIRECTORY_SEPARATOR . $path . $className . ".php";
+		$fPath = \PocketMine\PATH . "plugins". DIRECTORY_SEPARATOR . $parent . DIRECTORY_SEPARATOR . "src" . DIRECTORY_SEPARATOR . $path . $className . ".php";
 		if(file_exists($fPath)){
 			require_once($fPath);
 		}
@@ -274,7 +274,7 @@ function log($message, $name, $EOL = true, $level = 2, $close = false){
 			$fpointers = array();
 		}
 		if(!isset($fpointers[$name]) or $fpointers[$name] === false){
-			$fpointers[$name] = @fopen(DATA."/".$name.".log", "ab");
+			$fpointers[$name] = @fopen(\PocketMine\DATA."/".$name.".log", "ab");
 		}
 		@fwrite($fpointers[$name], $message);
 		if($close === true){
@@ -344,17 +344,17 @@ if($errors > 0){
 }
 
 $gitsha1 = false;
-if(file_exists(PATH . ".git/refs/heads/master")){ //Found Git information!
-	define("PocketMine\GIT_COMMIT", strtolower(trim(file_get_contents(PATH .".git/refs/heads/master"))));
+if(file_exists(\PocketMine\PATH . ".git/refs/heads/master")){ //Found Git information!
+	define("PocketMine\GIT_COMMIT", strtolower(trim(file_get_contents(\PocketMine\PATH .".git/refs/heads/master"))));
 }else{ //Unknown :(
 	define("PocketMine\GIT_COMMIT", str_repeat("00", 20));
 }
 
 ini_set("opcache.mmap_base", bin2hex(Utils\Utils::getRandomBytes(8, false))); //Fix OPCache address errors
 
-require_once(PATH . "src/utils/pthreads.php");
+require_once(\PocketMine\PATH . "src/utils/pthreads.php");
 
-if(!file_exists(DATA . "server.properties") and !isset($opts["no-wizard"])){
+if(!file_exists(\PocketMine\DATA . "server.properties") and !isset($opts["no-wizard"])){
 	$installer = new Wizard\Installer();
 }
 
diff --git a/src/BanAPI.php b/src/BanAPI.php
index a609543de..4c92213ac 100644
--- a/src/BanAPI.php
+++ b/src/BanAPI.php
@@ -40,10 +40,10 @@ class BanAPI{
 	}
 	
 	public function init(){
-		$this->whitelist = new Utils\Config(DATA."white-list.txt", Utils\Config::ENUM);//Open whitelist list file
-		$this->bannedIPs = new Utils\Config(DATA."banned-ips.txt", Utils\Config::ENUM);//Open Banned IPs list file
-		$this->banned = new Utils\Config(DATA."banned.txt", Utils\Config::ENUM);//Open Banned Usernames list file
-		$this->ops = new Utils\Config(DATA."ops.txt", Utils\Config::ENUM);//Open list of OPs
+		$this->whitelist = new Utils\Config(\PocketMine\DATA."white-list.txt", Utils\Config::ENUM);//Open whitelist list file
+		$this->bannedIPs = new Utils\Config(\PocketMine\DATA."banned-ips.txt", Utils\Config::ENUM);//Open Banned IPs list file
+		$this->banned = new Utils\Config(\PocketMine\DATA."banned.txt", Utils\Config::ENUM);//Open Banned Usernames list file
+		$this->ops = new Utils\Config(\PocketMine\DATA."ops.txt", Utils\Config::ENUM);//Open list of OPs
 		$this->server->api->console->register("banip", "<add|remove|list|reload> [IP|player]", array($this, "commandHandler"));
 		$this->server->api->console->register("ban", "<add|remove|list|reload> [username]", array($this, "commandHandler"));
 		$this->server->api->console->register("kick", "<player> [reason ...]", array($this, "commandHandler"));
@@ -213,7 +213,7 @@ class BanAPI{
 						$output .= "Player \"$user\" added to white-list\n";
 						break;
 					case "reload":
-						$this->whitelist = new Utils\Config(DATA."white-list.txt", Utils\Config::ENUM);
+						$this->whitelist = new Utils\Config(\PocketMine\DATA."white-list.txt", Utils\Config::ENUM);
 						break;
 					case "list":
 						$output .= "White-list: ".implode(", ", $this->whitelist->getAll(true))."\n";
@@ -258,7 +258,7 @@ class BanAPI{
 						$output .= "IP \"$ip\" added to ban list\n";
 						break;
 					case "reload":
-						$this->bannedIPs = new Utils\Config(DATA."banned-ips.txt", Utils\Config::ENUM);
+						$this->bannedIPs = new Utils\Config(\PocketMine\DATA."banned-ips.txt", Utils\Config::ENUM);
 						break;
 					case "list":
 						$output .= "IP ban list: ".implode(", ", $this->bannedIPs->getAll(true))."\n";
@@ -296,7 +296,7 @@ class BanAPI{
 						$output .= "Player \"$user\" added to ban list\n";
 						break;
 					case "reload":
-						$this->banned = new Utils\Config(DATA."banned.txt", Utils\Config::ENUM);
+						$this->banned = new Utils\Config(\PocketMine\DATA."banned.txt", Utils\Config::ENUM);
 						break;
 					case "list":
 						$output .= "Ban list: ".implode(", ", $this->banned->getAll(true))."\n";
diff --git a/src/LevelAPI.php b/src/LevelAPI.php
index 6aca94846..25ce46b65 100644
--- a/src/LevelAPI.php
+++ b/src/LevelAPI.php
@@ -109,7 +109,7 @@ class LevelAPI{
 		if($name === ""){
 			return false;
 		}
-		$path = DATA."worlds/".$name."/";
+		$path = \PocketMine\DATA."worlds/".$name."/";
 		if($this->get($name) === false and !file_exists($path."level.pmf")){
 			$level = new Level\LevelImport($path);
 			if($level->import() === false){
@@ -142,7 +142,7 @@ class LevelAPI{
 			console("[NOTICE] Level \"".$name."\" not found");
 			return false;
 		}
-		$path = DATA."worlds/".$name."/";
+		$path = \PocketMine\DATA."worlds/".$name."/";
 		console("[INFO] Preparing level \"".$name."\"");
 		$level = new PMF\LevelFormat($path."level.pmf");
 		if(!$level->isLoaded){
diff --git a/src/Player.php b/src/Player.php
index 79188d1c3..4b947f9e9 100644
--- a/src/Player.php
+++ b/src/Player.php
@@ -112,7 +112,7 @@ class Player extends Entity\RealHuman{
 	public static function getOffline($name){
 		$server = ServerAPI::request();
 		$iname = strtolower($name);
-		if(!file_exists(DATA."players/".$iname.".dat")){
+		if(!file_exists(\PocketMine\DATA."players/".$iname.".dat")){
 			$nbt = new NBT\Tag\Compound(false, array(
 				"Pos" => new NBT\Tag\Enum("Pos", array(
 					0 => new NBT\Tag\Double(0, $server->spawn->x),
@@ -149,8 +149,8 @@ class Player extends Entity\RealHuman{
 			$nbt->Inventory->setTagType(NBT\TAG_Compound);
 			$nbt->Motion->setTagType(NBT\TAG_Double);
 			$nbt->Rotation->setTagType(NBT\TAG_Float);
-			if(file_exists(DATA."players/".$iname.".yml")){
-				$data = new Utils\Config(DATA."players/".$iname.".yml", Utils\Config::YAML, array());
+			if(file_exists(\PocketMine\DATA."players/".$iname.".yml")){
+				$data = new Utils\Config(\PocketMine\DATA."players/".$iname.".yml", Utils\Config::YAML, array());
 				$nbt->playerGameType = (int) $data->get("gamemode");
 				$nbt->Level = $data->get("position")["level"];
 				$nbt->Pos[0] = $data->get("position")["x"];
@@ -197,7 +197,7 @@ class Player extends Entity\RealHuman{
 				foreach($data->get("achievements") as $achievement => $status){
 					$nbt->Achievements[$achievement] = new NBT\Tag\Byte($achievement, $status == true ? 1:0);
 				}
-				unlink(DATA."players/".$iname.".yml");
+				unlink(\PocketMine\DATA."players/".$iname.".yml");
 			}else{
 				console("[NOTICE] Player data not found for \"".$iname."\", creating new profile");
 				Player::saveOffline($name, $nbt);
@@ -205,7 +205,7 @@ class Player extends Entity\RealHuman{
 			
 		}else{
 			$nbt = new NBT(NBT\BIG_ENDIAN);
-			$nbt->read(file_get_contents(DATA."players/".$iname.".dat"));
+			$nbt->read(file_get_contents(\PocketMine\DATA."players/".$iname.".dat"));
 			$nbt = $nbt->getData();
 		}
 
@@ -218,7 +218,7 @@ class Player extends Entity\RealHuman{
 		ServerAPI::request()->handle("player.offline.save", $nbtTag);
 		$nbt = new NBT(NBT\BIG_ENDIAN);
 		$nbt->setData($nbtTag);
-		file_put_contents(DATA."players/".strtolower($name).".dat", $nbt->write());
+		file_put_contents(\PocketMine\DATA."players/".strtolower($name).".dat", $nbt->write());
 	}
 	
 	public static function broadcastPacket(array $players, Network\Protocol\DataPacket $packet){
diff --git a/src/PluginAPI.php b/src/PluginAPI.php
index 7e4b2cc8e..7b801a71f 100644
--- a/src/PluginAPI.php
+++ b/src/PluginAPI.php
@@ -169,7 +169,7 @@ class PluginAPI extends \stdClass{
 	}
 	
 	public function pluginsPath(){
-		$path = join(DIRECTORY_SEPARATOR, array(DATA."plugins", ""));
+		$path = join(DIRECTORY_SEPARATOR, array(\PocketMine\DATA."plugins", ""));
 		@mkdir($path);
 		return $path;
 	}
diff --git a/src/ServerAPI.php b/src/ServerAPI.php
index ea4ee7458..c15fce5a1 100644
--- a/src/ServerAPI.php
+++ b/src/ServerAPI.php
@@ -92,9 +92,9 @@ class ServerAPI{
 	}
 	
 	public function load(){
-		@mkdir(DATA."players/", 0755);
-		@mkdir(DATA."worlds/", 0755);
-		@mkdir(DATA."plugins/", 0755);
+		@mkdir(\PocketMine\DATA."players/", 0755);
+		@mkdir(\PocketMine\DATA."worlds/", 0755);
+		@mkdir(\PocketMine\DATA."plugins/", 0755);
 		
 		//Init all the events
 		foreach(get_declared_classes() as $class){
@@ -107,7 +107,7 @@ class ServerAPI{
 		console("[INFO] Starting Minecraft PE server version ".Utils\TextFormat::AQUA.MINECRAFT_VERSION);
 		
 		console("[INFO] Loading properties...");
-		$this->config = new Utils\Config(DATA . "server.properties", Utils\Config::PROPERTIES, array(
+		$this->config = new Utils\Config(\PocketMine\DATA . "server.properties", Utils\Config::PROPERTIES, array(
 			"server-name" => "Minecraft: PE Server",
 			"description" => "Server made using PocketMine-MP",
 			"motd" => "Welcome @player to this server!",
diff --git a/src/entity/notimplemented/Arrow.php b/src/entity/notimplemented/Arrow.php
deleted file mode 100644
index e48f3ee81..000000000
--- a/src/entity/notimplemented/Arrow.php
+++ /dev/null
@@ -1,27 +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/
- * 
- *
-*/
-
-namespace PocketMine\Entity;
-use PocketMine;
-
-class Arrow extends Projectile{
-
-}
\ No newline at end of file
diff --git a/src/entity/notimplemented/Chicken.php b/src/entity/notimplemented/Chicken.php
deleted file mode 100644
index 6fe3b7da4..000000000
--- a/src/entity/notimplemented/Chicken.php
+++ /dev/null
@@ -1,27 +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/
- * 
- *
-*/
-
-namespace PocketMine\Entity;
-use PocketMine;
-
-class Chicken extends Animal{
-
-}
\ No newline at end of file
diff --git a/src/entity/notimplemented/Cow.php b/src/entity/notimplemented/Cow.php
deleted file mode 100644
index c680ca880..000000000
--- a/src/entity/notimplemented/Cow.php
+++ /dev/null
@@ -1,27 +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/
- * 
- *
-*/
-
-namespace PocketMine\Entity;
-use PocketMine;
-
-class Cow extends Animal{
-
-}
\ No newline at end of file
diff --git a/src/entity/notimplemented/Creeper.php b/src/entity/notimplemented/Creeper.php
deleted file mode 100644
index 07a57960b..000000000
--- a/src/entity/notimplemented/Creeper.php
+++ /dev/null
@@ -1,27 +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/
- * 
- *
-*/
-
-namespace PocketMine\Entity;
-use PocketMine;
-
-class Creeper extends Monster implements Explosive{
-
-}
\ No newline at end of file
diff --git a/src/entity/notimplemented/DroppedItem.php b/src/entity/notimplemented/DroppedItem.php
deleted file mode 100644
index ddbc5a6f2..000000000
--- a/src/entity/notimplemented/DroppedItem.php
+++ /dev/null
@@ -1,24 +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/
- * 
- *
-*/
-
-class DroppedItem extends Entity{
-
-}
\ No newline at end of file
diff --git a/src/entity/notimplemented/Egg.php b/src/entity/notimplemented/Egg.php
deleted file mode 100644
index bd8c8663f..000000000
--- a/src/entity/notimplemented/Egg.php
+++ /dev/null
@@ -1,27 +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/
- * 
- *
-*/
-
-namespace PocketMine\Entity;
-use PocketMine;
-
-class Egg extends Projectile{
-
-}
\ No newline at end of file
diff --git a/src/entity/notimplemented/EnderPearl.php b/src/entity/notimplemented/EnderPearl.php
deleted file mode 100644
index ab767c1a8..000000000
--- a/src/entity/notimplemented/EnderPearl.php
+++ /dev/null
@@ -1,27 +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/
- * 
- *
-*/
-
-namespace PocketMine\Entity;
-use PocketMine;
-
-class EnderPearl extends Projectile{
-
-}
\ No newline at end of file
diff --git a/src/entity/notimplemented/Enderman.php b/src/entity/notimplemented/Enderman.php
deleted file mode 100644
index 14a1bf68b..000000000
--- a/src/entity/notimplemented/Enderman.php
+++ /dev/null
@@ -1,27 +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/
- * 
- *
-*/
-
-namespace PocketMine\Entity;
-use PocketMine;
-
-class Enderman extends Monster implements InventorySource{
-
-}
\ No newline at end of file
diff --git a/src/entity/notimplemented/FallingBlock.php b/src/entity/notimplemented/FallingBlock.php
deleted file mode 100644
index dd7814045..000000000
--- a/src/entity/notimplemented/FallingBlock.php
+++ /dev/null
@@ -1,27 +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/
- * 
- *
-*/
-
-namespace PocketMine\Entity;
-use PocketMine;
-
-class FallingBlock extends Entity{
-
-}
\ No newline at end of file
diff --git a/src/entity/notimplemented/Minecart.php b/src/entity/notimplemented/Minecart.php
deleted file mode 100644
index b9dede759..000000000
--- a/src/entity/notimplemented/Minecart.php
+++ /dev/null
@@ -1,27 +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/
- * 
- *
-*/
-
-namespace PocketMine\Entity;
-use PocketMine;
-
-class Minecart extends Vehicle{
-
-}
\ No newline at end of file
diff --git a/src/entity/notimplemented/Ocelot.php b/src/entity/notimplemented/Ocelot.php
deleted file mode 100644
index 733d431ec..000000000
--- a/src/entity/notimplemented/Ocelot.php
+++ /dev/null
@@ -1,27 +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/
- * 
- *
-*/
-
-namespace PocketMine\Entity;
-use PocketMine;
-
-class Ocelot extends Animal implements Tameable{
-
-}
\ No newline at end of file
diff --git a/src/entity/notimplemented/Painting.php b/src/entity/notimplemented/Painting.php
deleted file mode 100644
index a99d02f38..000000000
--- a/src/entity/notimplemented/Painting.php
+++ /dev/null
@@ -1,27 +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/
- * 
- *
-*/
-
-namespace PocketMine\Entity;
-use PocketMine;
-
-class Painting extends Hanging{
-
-}
\ No newline at end of file
diff --git a/src/entity/notimplemented/Pig.php b/src/entity/notimplemented/Pig.php
deleted file mode 100644
index 5f28a96dd..000000000
--- a/src/entity/notimplemented/Pig.php
+++ /dev/null
@@ -1,27 +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/
- * 
- *
-*/
-
-namespace PocketMine\Entity;
-use PocketMine;
-
-class Pig extends Animal implements Rideable{
-
-}
\ No newline at end of file
diff --git a/src/entity/notimplemented/PigZombie.php b/src/entity/notimplemented/PigZombie.php
deleted file mode 100644
index ee23e47d8..000000000
--- a/src/entity/notimplemented/PigZombie.php
+++ /dev/null
@@ -1,27 +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/
- * 
- *
-*/
-
-namespace PocketMine\Entity;
-use PocketMine;
-
-class PigZombie extends Zombie{
-
-}
\ No newline at end of file
diff --git a/src/entity/notimplemented/Sheep.php b/src/entity/notimplemented/Sheep.php
deleted file mode 100644
index e69b03463..000000000
--- a/src/entity/notimplemented/Sheep.php
+++ /dev/null
@@ -1,27 +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/
- * 
- *
-*/
-
-namespace PocketMine\Entity;
-use PocketMine;
-
-class Sheep extends Animal implements Colorable{
-
-}
\ No newline at end of file
diff --git a/src/entity/notimplemented/Silverfish.php b/src/entity/notimplemented/Silverfish.php
deleted file mode 100644
index 503c2d079..000000000
--- a/src/entity/notimplemented/Silverfish.php
+++ /dev/null
@@ -1,27 +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/
- * 
- *
-*/
-
-namespace PocketMine\Entity;
-use PocketMine;
-
-class Silverfish extends Monster{
-
-}
\ No newline at end of file
diff --git a/src/entity/notimplemented/Skeleton.php b/src/entity/notimplemented/Skeleton.php
deleted file mode 100644
index 2283e2970..000000000
--- a/src/entity/notimplemented/Skeleton.php
+++ /dev/null
@@ -1,27 +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/
- * 
- *
-*/
-
-namespace PocketMine\Entity;
-use PocketMine;
-
-class Skeleton extends Monster implements ProjectileSource{
-
-}
\ No newline at end of file
diff --git a/src/entity/notimplemented/Slime.php b/src/entity/notimplemented/Slime.php
deleted file mode 100644
index cf20f54c8..000000000
--- a/src/entity/notimplemented/Slime.php
+++ /dev/null
@@ -1,27 +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/
- * 
- *
-*/
-
-namespace PocketMine\Entity;
-use PocketMine;
-
-class Slime extends Living{
-
-}
\ No newline at end of file
diff --git a/src/entity/notimplemented/Snowball.php b/src/entity/notimplemented/Snowball.php
deleted file mode 100644
index 851939363..000000000
--- a/src/entity/notimplemented/Snowball.php
+++ /dev/null
@@ -1,27 +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/
- * 
- *
-*/
-
-namespace PocketMine\Entity;
-use PocketMine;
-
-class Snowball extends Projectile{
-
-}
\ No newline at end of file
diff --git a/src/entity/notimplemented/Spider.php b/src/entity/notimplemented/Spider.php
deleted file mode 100644
index c68283ed5..000000000
--- a/src/entity/notimplemented/Spider.php
+++ /dev/null
@@ -1,27 +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/
- * 
- *
-*/
-
-namespace PocketMine\Entity;
-use PocketMine;
-
-class Spider extends Monster{
-
-}
\ No newline at end of file
diff --git a/src/entity/notimplemented/TNTPrimed.php b/src/entity/notimplemented/TNTPrimed.php
deleted file mode 100644
index d7f57722d..000000000
--- a/src/entity/notimplemented/TNTPrimed.php
+++ /dev/null
@@ -1,27 +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/
- * 
- *
-*/
-
-namespace PocketMine\Entity;
-use PocketMine;
-
-class TNTPrimed extends Entity implements Explosive{
-
-}
\ No newline at end of file
diff --git a/src/entity/notimplemented/Wolf.php b/src/entity/notimplemented/Wolf.php
deleted file mode 100644
index 215d206bb..000000000
--- a/src/entity/notimplemented/Wolf.php
+++ /dev/null
@@ -1,27 +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/
- * 
- *
-*/
-
-namespace PocketMine\Entity;
-use PocketMine;
-
-class Wolf extends Animal implements Tameable{
-
-}
\ No newline at end of file
diff --git a/src/entity/notimplemented/Zombie.php b/src/entity/notimplemented/Zombie.php
deleted file mode 100644
index 52c867689..000000000
--- a/src/entity/notimplemented/Zombie.php
+++ /dev/null
@@ -1,27 +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/
- * 
- *
-*/
-
-namespace PocketMine\Entity;
-use PocketMine;
-
-class Zombie extends Monster{
-
-}
\ No newline at end of file
diff --git a/src/level/WorldGenerator.php b/src/level/WorldGenerator.php
index c2d0809fe..0f8da5587 100644
--- a/src/level/WorldGenerator.php
+++ b/src/level/WorldGenerator.php
@@ -28,7 +28,7 @@ class WorldGenerator{
 		$this->seed = $seed !== false ? (int) $seed:Utils\Utils::readInt(Utils\Utils::getRandomBytes(4, false));
 		$this->random = new Utils\Random($this->seed);
 		$this->height = (int) $height;
-		$this->path = DATA."worlds/".$name."/";
+		$this->path = \PocketMine\DATA."worlds/".$name."/";
 		$this->generator = $generator;
 		$level = new PMF\LevelFormat($this->path."level.pmf", array(
 			"name" => $name,
diff --git a/src/pmf/Level.php b/src/pmf/LevelFormat.php
similarity index 100%
rename from src/pmf/Level.php
rename to src/pmf/LevelFormat.php
diff --git a/src/tests/ServerSuiteTest.php b/src/tests/ServerSuiteTest.php
index f6ad4dc15..97a94316a 100644
--- a/src/tests/ServerSuiteTest.php
+++ b/src/tests/ServerSuiteTest.php
@@ -16,8 +16,8 @@ exit(0);//TODO
 		if(!class_exists("Server", false)){
 			define("NO_THREADS", true);
 			require_once(dirname(__FILE__)."/../dependencies.php");
-			require_once(PATH."/src/functions.php");
-			require_once(PATH."/src/dependencies.php");
+			require_once(\PocketMine\PATH."/src/functions.php");
+			require_once(\PocketMine\PATH."/src/dependencies.php");
 			console(Utils\TextFormat::GREEN . "[TEST] Starting tests");
 			testCase("dummy", dummy(), null);
 			$t = new ServerSuiteTest;
diff --git a/src/wizard/Installer.php b/src/wizard/Installer.php
index 2492121dc..1c157a4d7 100644
--- a/src/wizard/Installer.php
+++ b/src/wizard/Installer.php
@@ -84,7 +84,7 @@ LICENSE;
 		}
 		
 		private function generateBaseConfig(){
-			$config = new Utils\Config(DATA . "server.properties", Utils\Config::PROPERTIES);
+			$config = new Utils\Config(\PocketMine\DATA . "server.properties", Utils\Config::PROPERTIES);
 			echo "[?] ".$this->lang->name_your_server." (".self::DEFAULT_NAME."): ";
 			$config->set("server-name", $this->getInput(self::DEFAULT_NAME));
 			echo "[*] ".$this->lang->port_warning."\n";
@@ -124,13 +124,13 @@ LICENSE;
 			if($op === ""){
 				echo "[!] ".$this->lang->op_warning."\n";
 			}else{
-				$ops = new Utils\Config(DATA."ops.txt", Utils\Config::ENUM);
+				$ops = new Utils\Config(\PocketMine\DATA."ops.txt", Utils\Config::ENUM);
 				$ops->set($op, true);
 				$ops->save();
 			}
 			echo "[*] ".$this->lang->whitelist_info."\n";
 			echo "[?] ".$this->lang->whitelist_enable." (y/N): ";
-			$config = new Utils\Config(DATA . "server.properties", Utils\Config::PROPERTIES);
+			$config = new Utils\Config(\PocketMine\DATA . "server.properties", Utils\Config::PROPERTIES);
 			if(strtolower($this->getInput("n")) === "y"){
 				echo "[!] ".$this->lang->whitelist_warning."\n";
 				$config->set("white-list", true);
@@ -141,7 +141,7 @@ LICENSE;
 		}
 		
 		private function networkFunctions(){
-			$config = new Utils\Config(DATA . "server.properties", Utils\Config::PROPERTIES);
+			$config = new Utils\Config(\PocketMine\DATA . "server.properties", Utils\Config::PROPERTIES);
 			echo "[!] ".$this->lang->query_warning1."\n";
 			echo "[!] ".$this->lang->query_warning2."\n";
 			echo "[?] ".$this->lang->query_disable." (y/N): ";
diff --git a/src/wizard/InstallerLang.php b/src/wizard/InstallerLang.php
index 689391d98..2dc5f7f66 100644
--- a/src/wizard/InstallerLang.php
+++ b/src/wizard/InstallerLang.php
@@ -46,11 +46,11 @@ use PocketMine;
 		private $lang;
 		private $langfile;
 		public function __construct($lang = ""){
-			if(file_exists(PATH."src/lang/Installer/".$lang.".ini")){
+			if(file_exists(\PocketMine\PATH."src/lang/Installer/".$lang.".ini")){
 				$this->lang = $lang;
-				$this->langfile = PATH."src/lang/Installer/".$lang.".ini";
+				$this->langfile = \PocketMine\PATH."src/lang/Installer/".$lang.".ini";
 			}else{
-				$l = glob(PATH."src/lang/Installer/".$lang."_*.ini");
+				$l = glob(\PocketMine\PATH."src/lang/Installer/".$lang."_*.ini");
 				if(count($l) > 0){
 					$files = array();
 					foreach($l as $file){
@@ -61,14 +61,14 @@ use PocketMine;
 					$l = key($files);
 					$l = substr($l, strrpos($l, "/") + 1, -4);
 					$this->lang = isset(self::$languages[$l]) ? $l:$lang;
-					$this->langfile = PATH."src/lang/Installer/".$l.".ini";
+					$this->langfile = \PocketMine\PATH."src/lang/Installer/".$l.".ini";
 				}else{
 					$this->lang = "en";
-					$this->langfile = PATH."src/lang/Installer/en.ini";
+					$this->langfile = \PocketMine\PATH."src/lang/Installer/en.ini";
 				}
 			}
 			
-			$this->loadLang(PATH."src/lang/Installer/en.ini", "en");
+			$this->loadLang(\PocketMine\PATH."src/lang/Installer/en.ini", "en");
 			if($this->lang !== "en"){
 				$this->loadLang($this->langfile, $this->lang);
 			}