diff --git a/include/Config.php b/include/Core/Config.php
similarity index 99%
rename from include/Config.php
rename to include/Core/Config.php
index e08a7de74..bbae746b4 100644
--- a/include/Config.php
+++ b/include/Core/Config.php
@@ -1,7 +1,7 @@
 <?php
-
+namespace Friendica\Core;
 /**
- * @file include/Config.php
+ * @file include/Core/Config.php
  * 
  *  @brief Contains the class with methods for system configuration
  */
diff --git a/include/PConfig.php b/include/Core/PConfig.php
similarity index 99%
rename from include/PConfig.php
rename to include/Core/PConfig.php
index 5ee4ec692..9ca608e76 100644
--- a/include/PConfig.php
+++ b/include/Core/PConfig.php
@@ -1,7 +1,7 @@
 <?php
-
+namespace Friendica\Core;
 /**
- * @file include/PConfig.php
+ * @file include/Core/PConfig.php
  * @brief contains the class with methods for the management
  * of the user configuration
  */
diff --git a/include/config.php b/include/config.php
index 8f36dbdc8..c96651cdc 100644
--- a/include/config.php
+++ b/include/config.php
@@ -1,8 +1,4 @@
 <?php
-
-require_once("include/PConfig.php");
-require_once("include/Config.php");
-
 /**
  * @file include/config.php
  * 
@@ -16,6 +12,9 @@ require_once("include/Config.php");
  * configurations need to be fixed as of 10/08/2011.
  */
 
+use \Friendica\Core\Config;
+use \Friendica\Core\PConfig;
+
 /**
  * @brief (Deprecated) Loads all configuration values of family into a cached storage.
  *