diff --git a/.gitmodules b/.gitmodules
index cf20af141..21adfef04 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -8,5 +8,5 @@
 	path = tests/plugins/PocketMine-DevTools
 	url = https://github.com/pmmp/PocketMine-DevTools.git
 [submodule "src/pocketmine/resources/vanilla"]
-	path = src/pocketmine/resources/vanilla
+	path = resources/vanilla
 	url = https://github.com/pmmp/BedrockData.git
diff --git a/src/pocketmine/resources/pocketmine.yml b/resources/pocketmine.yml
similarity index 100%
rename from src/pocketmine/resources/pocketmine.yml
rename to resources/pocketmine.yml
diff --git a/src/pocketmine/resources/resource_packs.yml b/resources/resource_packs.yml
similarity index 100%
rename from src/pocketmine/resources/resource_packs.yml
rename to resources/resource_packs.yml
diff --git a/src/pocketmine/resources/runtimeid_table.json b/resources/runtimeid_table.json
similarity index 100%
rename from src/pocketmine/resources/runtimeid_table.json
rename to resources/runtimeid_table.json
diff --git a/src/pocketmine/resources/vanilla b/resources/vanilla
similarity index 100%
rename from src/pocketmine/resources/vanilla
rename to resources/vanilla
diff --git a/src/pocketmine/PocketMine.php b/src/pocketmine/PocketMine.php
index a865e32bc..9023c2e19 100644
--- a/src/pocketmine/PocketMine.php
+++ b/src/pocketmine/PocketMine.php
@@ -181,7 +181,7 @@ namespace pocketmine {
 	ini_set("memory_limit", '-1');
 	define('pocketmine\START_TIME', microtime(true));
 
-	define('pocketmine\RESOURCE_PATH', \pocketmine\PATH . 'src' . DIRECTORY_SEPARATOR . 'pocketmine' . DIRECTORY_SEPARATOR . 'resources' . DIRECTORY_SEPARATOR);
+	define('pocketmine\RESOURCE_PATH', \pocketmine\PATH . 'resources' . DIRECTORY_SEPARATOR);
 
 	$opts = getopt("", ["data:", "plugins:", "no-wizard"]);
 
diff --git a/tests/plugins/PocketMine-DevTools b/tests/plugins/PocketMine-DevTools
index 3318ac4c0..cc6a5b5aa 160000
--- a/tests/plugins/PocketMine-DevTools
+++ b/tests/plugins/PocketMine-DevTools
@@ -1 +1 @@
-Subproject commit 3318ac4c0e6c0ea1bc7eb2d0f4e66a038ae581a9
+Subproject commit cc6a5b5aa79fddb0a03715a503bae6f78add721c
diff --git a/tests/travis.sh b/tests/travis.sh
index d975014a1..6cfeac161 100755
--- a/tests/travis.sh
+++ b/tests/travis.sh
@@ -36,7 +36,7 @@ cd tests/plugins/PocketMine-DevTools
 "$PHP_BINARY" -dphar.readonly=0 ./src/DevTools/ConsoleScript.php --make ./ --relative ./ --out ../../../DevTools.phar
 cd ../../..
 
-"$PHP_BINARY" -dphar.readonly=0 DevTools.phar --make src,vendor --relative ./ --entry src/pocketmine/PocketMine.php --out PocketMine-MP.phar
+"$PHP_BINARY" -dphar.readonly=0 DevTools.phar --make src,vendor,resources --relative ./ --entry src/pocketmine/PocketMine.php --out PocketMine-MP.phar
 if [ -f PocketMine-MP.phar ]; then
 	echo Server phar created successfully.
 else