diff --git a/app/sql_query/sql_db_conversion.php b/app/sql_query/sql_db_conversion.php
index bf4255daeb..54d3583754 100644
--- a/app/sql_query/sql_db_conversion.php
+++ b/app/sql_query/sql_db_conversion.php
@@ -26,7 +26,7 @@
 include "root.php";
 require_once "resources/require.php";
 require_once "resources/check_auth.php";
-require_once "includes/lib_schema.php";
+require_once "resources/schema.php";
 
 if (if_group("superadmin")) {
 	//access granted
diff --git a/core/upgrade/upgrade_schema.php b/core/upgrade/upgrade_schema.php
index 02a8f70423..24822f0ccd 100644
--- a/core/upgrade/upgrade_schema.php
+++ b/core/upgrade/upgrade_schema.php
@@ -70,7 +70,7 @@
 	}
 
 //load the default database into memory and compare it with the active database
-	require_once "includes/lib_schema.php";
+	require_once "resources/schema.php";
 	db_upgrade_schema ($db, $db_type, $db_name, $display_results);
 	unset($apps);
 
diff --git a/resources/install.php b/resources/install.php
index 51c9f44092..d21d21476c 100644
--- a/resources/install.php
+++ b/resources/install.php
@@ -1370,7 +1370,7 @@ if ($_POST["install_step"] == "3" && count($_POST) > 0 && strlen($_POST["persist
 	echo "<div align='center'>\n";
 	$msg = '';
 	//make sure the includes directory is writable so the config.php file can be written.
-		if (!is_writable($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/includes/lib_pdo.php")) {
+		if (!is_writable($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/resources/pdo.php")) {
 			$msg .= "<b>Write access to ".$_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."</b><br />";
 			$msg .= "and its sub-directories are required during the install.<br /><br />\n";
 		}
diff --git a/resources/require.php b/resources/require.php
index 22f32da7dd..676ea5303f 100644
--- a/resources/require.php
+++ b/resources/require.php
@@ -30,11 +30,14 @@ if (file_exists("/etc/fusionpbx/config.php")) {
 elseif (file_exists("/usr/local/etc/fusionpbx/config.php")) {
 	include "/usr/local/etc/fusionpbx/config.php";
 }
-else {
+elseif (file_exists("includes/config.php")) {
 	include "includes/config.php";
 }
-require_once "includes/lib_php.php";
-require "includes/lib_pdo.php";
+else {
+	include "resources/config.php";
+}
+require_once "resources/php.php";
+require "resources/pdo.php";
 require_once "resources/functions.php";
-require_once "includes/lib_switch.php";
+require_once "resources/switch.php";
 ?>
\ No newline at end of file