diff --git a/phpBB/includes/crypto/driver/base.php b/phpBB/phpbb/crypto/driver/base.php
similarity index 100%
rename from phpBB/includes/crypto/driver/base.php
rename to phpBB/phpbb/crypto/driver/base.php
diff --git a/phpBB/includes/crypto/driver/bcrypt.php b/phpBB/phpbb/crypto/driver/bcrypt.php
similarity index 100%
rename from phpBB/includes/crypto/driver/bcrypt.php
rename to phpBB/phpbb/crypto/driver/bcrypt.php
diff --git a/phpBB/includes/crypto/driver/bcrypt_2y.php b/phpBB/phpbb/crypto/driver/bcrypt_2y.php
similarity index 100%
rename from phpBB/includes/crypto/driver/bcrypt_2y.php
rename to phpBB/phpbb/crypto/driver/bcrypt_2y.php
diff --git a/phpBB/includes/crypto/driver/helper.php b/phpBB/phpbb/crypto/driver/helper.php
similarity index 100%
rename from phpBB/includes/crypto/driver/helper.php
rename to phpBB/phpbb/crypto/driver/helper.php
diff --git a/phpBB/includes/crypto/driver/interface.php b/phpBB/phpbb/crypto/driver/interface.php
similarity index 100%
rename from phpBB/includes/crypto/driver/interface.php
rename to phpBB/phpbb/crypto/driver/interface.php
diff --git a/phpBB/includes/crypto/driver/phpass.php b/phpBB/phpbb/crypto/driver/phpass.php
similarity index 100%
rename from phpBB/includes/crypto/driver/phpass.php
rename to phpBB/phpbb/crypto/driver/phpass.php
diff --git a/phpBB/includes/crypto/driver/salted_md5.php b/phpBB/phpbb/crypto/driver/salted_md5.php
similarity index 100%
rename from phpBB/includes/crypto/driver/salted_md5.php
rename to phpBB/phpbb/crypto/driver/salted_md5.php
diff --git a/phpBB/includes/crypto/helper.php b/phpBB/phpbb/crypto/helper.php
similarity index 100%
rename from phpBB/includes/crypto/helper.php
rename to phpBB/phpbb/crypto/helper.php
diff --git a/phpBB/includes/crypto/manager.php b/phpBB/phpbb/crypto/manager.php
similarity index 100%
rename from phpBB/includes/crypto/manager.php
rename to phpBB/phpbb/crypto/manager.php
diff --git a/tests/crypto/manager_test.php b/tests/crypto/manager_test.php
index 2b6e1b311e..ba13c9c8ad 100644
--- a/tests/crypto/manager_test.php
+++ b/tests/crypto/manager_test.php
@@ -8,11 +8,11 @@
 */
 
 require_once dirname(__FILE__) . '/../mock/container_builder.php';
-require_once dirname(__FILE__) . '/../../phpBB/includes/crypto/driver/bcrypt.php';
-require_once dirname(__FILE__) . '/../../phpBB/includes/crypto/driver/bcrypt_2y.php';
-require_once dirname(__FILE__) . '/../../phpBB/includes/crypto/driver/salted_md5.php';
-require_once dirname(__FILE__) . '/../../phpBB/includes/crypto/driver/phpass.php';
-require_once dirname(__FILE__) . '/../../phpBB/includes/crypto/driver/helper.php';
+require_once dirname(__FILE__) . '/../../phpBB/phpbb/crypto/driver/bcrypt.php';
+require_once dirname(__FILE__) . '/../../phpBB/phpbb/crypto/driver/bcrypt_2y.php';
+require_once dirname(__FILE__) . '/../../phpBB/phpbb/crypto/driver/salted_md5.php';
+require_once dirname(__FILE__) . '/../../phpBB/phpbb/crypto/driver/phpass.php';
+require_once dirname(__FILE__) . '/../../phpBB/phpbb/crypto/driver/helper.php';
 
 class phpbb_crypto_manager_test extends PHPUnit_Framework_TestCase
 {