diff --git a/app/call_broadcast/call_broadcast.php b/app/call_broadcast/call_broadcast.php
index 102bbb70f3..1af9597b03 100644
--- a/app/call_broadcast/call_broadcast.php
+++ b/app/call_broadcast/call_broadcast.php
@@ -42,8 +42,8 @@ else {
 	}
 
 //add the includes
-	require_once "includes/header.php";
-	require_once "includes/paging.php";
+	require_once "resources/header.php";
+	require_once "resources/paging.php";
 
 //get the http get variables and set them to php variables
 	$order_by = $_GET["order_by"];
@@ -155,5 +155,5 @@ else {
 	echo "</div>";
 	echo "<br><br>";
 
-require_once "includes/footer.php";
+require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/call_broadcast/call_broadcast_delete.php b/app/call_broadcast/call_broadcast_delete.php
index a163000698..f2aec142e4 100644
--- a/app/call_broadcast/call_broadcast_delete.php
+++ b/app/call_broadcast/call_broadcast_delete.php
@@ -56,12 +56,12 @@ else {
 	}
 
 //redirect the user
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=call_broadcast.php\">\n";
 	echo "<div align='center'>\n";
 	echo "".$text['confirm-delete']."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>
\ No newline at end of file
diff --git a/app/call_broadcast/call_broadcast_edit.php b/app/call_broadcast/call_broadcast_edit.php
index b3f264e1f1..7f8e37a83c 100644
--- a/app/call_broadcast/call_broadcast_edit.php
+++ b/app/call_broadcast/call_broadcast_edit.php
@@ -82,7 +82,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		//if (strlen($broadcast_phone_numbers) == 0) { $msg .= "Please provide: Phone Number List<br>\n"; }
 		//if (strlen($broadcast_destination_data) == 0) { $msg .= "Please provide: Destination<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -90,7 +90,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -141,12 +141,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$db->exec(check_sql($sql));
 			unset($sql);
 
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=call_broadcast.php\">\n";
 			echo "<div align='center'>\n";
 			echo "".$text['confirm-add']."\n";
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		} //if ($action == "add")
 
@@ -177,12 +177,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$db->exec(check_sql($sql));
 			unset($sql);
 
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=call_broadcast.php\">\n";
 			echo "<div align='center'>\n";
 			echo "".$text['confirm-update']."\n";
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		} //if ($action == "update")
 	} //if ($_POST["persistformvar"] != "true")
@@ -213,7 +213,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 //begin header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 
 //begin content
 	echo "<div align='center'>";
@@ -554,5 +554,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</table>";
 	echo "</div>";
 
-require_once "includes/footer.php";
+require_once "resources/footer.php";
 ?>
diff --git a/app/call_broadcast/call_broadcast_send.php b/app/call_broadcast/call_broadcast_send.php
index 400018baa2..50dba90494 100644
--- a/app/call_broadcast/call_broadcast_send.php
+++ b/app/call_broadcast/call_broadcast_send.php
@@ -117,7 +117,7 @@ function cmd_async($cmd) {
 
 //get information over event socket
 	if (!$fp) {
-		require_once "includes/header.php";
+		require_once "resources/header.php";
 		$msg = "<div align='center'>Connection to Event Socket failed.<br /></div>"; 
 		echo "<div align='center'>\n";
 		echo "<table width='40%'>\n";
@@ -129,11 +129,11 @@ function cmd_async($cmd) {
 		echo "</tr>\n";
 		echo "</table>\n";
 		echo "</div>\n";
-		require_once "includes/footer.php";
+		require_once "resources/footer.php";
 	}
 	else {
 		//show the header
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 
 		//send the call broadcast
 			if (strlen($broadcast_phone_numbers) > 0) {
@@ -217,13 +217,13 @@ function cmd_async($cmd) {
 			}
 
 		//show the footer
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 	}
 
 /*
 //reserved for future use
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 
 	echo "<div align='center'>";
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='2'>\n";
@@ -371,7 +371,7 @@ require_once "includes/header.php";
 	echo "<br><br>";
 
 
-require_once "includes/footer.php";
+require_once "resources/footer.php";
 unset ($result_count);
 unset ($result);
 unset ($key);
diff --git a/app/call_center/call_center_agent_delete.php b/app/call_center/call_center_agent_delete.php
index d2d2fe1ba6..066b2e717b 100644
--- a/app/call_center/call_center_agent_delete.php
+++ b/app/call_center/call_center_agent_delete.php
@@ -77,12 +77,12 @@ if (count($_GET)>0) {
 	}
 
 //redirect the user
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=call_center_agents.php\">\n";
 	echo "<div align='center'>\n";
 	echo $text['message-delete']."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>
diff --git a/app/call_center/call_center_agent_edit.php b/app/call_center/call_center_agent_edit.php
index cd9986a902..1d6253c2de 100644
--- a/app/call_center/call_center_agent_edit.php
+++ b/app/call_center/call_center_agent_edit.php
@@ -86,7 +86,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		//if (strlen($agent_reject_delay_time) == 0) { $msg .= $text['message-required'].$text['label-reject_delay_time']."<br>\n"; }
 		//if (strlen($agent_busy_delay_time) == 0) { $msg .= $text['message-required'].$text['label-busy_delay_time']."<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -94,7 +94,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -231,12 +231,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				save_call_center_xml();
 
 			//redirect the user
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=call_center_agents.php\">\n";
 				echo "<div align='center'>\n";
 				echo $text['message-add']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 		} //if ($action == "add")
 
@@ -261,12 +261,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			//syncrhonize configuration
 			save_call_center_xml();
 
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=call_center_agents.php\">\n";
 			echo "<div align='center'>\n";
 			echo $text['message-update']."\n";
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		} //if ($action == "update")
 	} //if ($_POST["persistformvar"] != "true")
@@ -308,7 +308,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	if (strlen($agent_busy_delay_time) == 0) { $agent_busy_delay_time = "60"; }
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	if ($action == "add") {
 		$page["title"] = $text['title-call_center_agent_add'];
 	}
@@ -530,5 +530,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</div>";
 
 //footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
diff --git a/app/call_center/call_center_agent_status.php b/app/call_center/call_center_agent_status.php
index 31c2ddd5b7..82de45dd3f 100644
--- a/app/call_center/call_center_agent_status.php
+++ b/app/call_center/call_center_agent_status.php
@@ -40,10 +40,10 @@ else {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 $page["title"] = $text['title-call_center_agent_status'];
 
-require_once "includes/paging.php";
+require_once "resources/paging.php";
 
 //setup the event socket connection
 	$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
@@ -240,5 +240,5 @@ require_once "includes/paging.php";
 	echo "<br><br>";
 
 //show the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
diff --git a/app/call_center/call_center_agents.php b/app/call_center/call_center_agents.php
index bb1d89c946..7f495427bc 100644
--- a/app/call_center/call_center_agents.php
+++ b/app/call_center/call_center_agents.php
@@ -40,10 +40,10 @@ else {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 $page["title"] = $text['title-call_center_agents'];
 
-require_once "includes/paging.php";
+require_once "resources/paging.php";
 
 //get http values and set them to php variables
 	$order_by = $_GET["order_by"];
@@ -193,5 +193,5 @@ require_once "includes/paging.php";
 	echo "<br><br>";
 
 //show the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/call_center/call_center_queue_delete.php b/app/call_center/call_center_queue_delete.php
index bb233e929c..efa1da489f 100644
--- a/app/call_center/call_center_queue_delete.php
+++ b/app/call_center/call_center_queue_delete.php
@@ -93,12 +93,12 @@ if (strlen($id) > 0) {
 }
 
 //redirect the browser
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=call_center_queues.php\">\n";
 	echo "<div align='center'>\n";
 	echo $text['message-delete']."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>
\ No newline at end of file
diff --git a/app/call_center/call_center_queue_edit.php b/app/call_center/call_center_queue_edit.php
index ccaf61fffb..630a202886 100644
--- a/app/call_center/call_center_queue_edit.php
+++ b/app/call_center/call_center_queue_edit.php
@@ -107,7 +107,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		//if (strlen($queue_cid_prefix) == 0) { $msg .= $text['message-required'].$text['label-caller_id_name_prefix']."<br>\n"; }
 		//if (strlen($queue_description) == 0) { $msg .= $text['message-required'].$text['label-description']."<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -115,7 +115,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -184,12 +184,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				}
 
 			//redirect the user
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=call_center_queues.php\">\n";
 				echo "<div align='center'>\n";
 				echo $text['message-add']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 		} //if ($action == "add")
 
@@ -230,12 +230,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				}
 
 			//redirect the user
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=call_center_queues.php\">\n";
 				echo "<div align='center'>\n";
 				echo $text['message-update']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 		} //if ($action == "update")
 	} //if ($_POST["persistformvar"] != "true")
@@ -289,7 +289,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	if (strlen($queue_abandoned_resume_allowed) == 0) { $queue_abandoned_resume_allowed = "false"; }
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	if ($action == "add") {
 		$page["title"] = $text['title-call_center_queue_add'];
 	}
@@ -677,5 +677,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</table>";
 	echo "</div>";
 
-require_once "includes/footer.php";
+require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/call_center/call_center_queues.php b/app/call_center/call_center_queues.php
index f9d8b85b2f..2c2b60c401 100644
--- a/app/call_center/call_center_queues.php
+++ b/app/call_center/call_center_queues.php
@@ -40,10 +40,10 @@ else {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 $page["title"] = $text['title-call_center_queues'];
 
-require_once "includes/paging.php";
+require_once "resources/paging.php";
 
 //get http variables and set as php variables
 	$order_by = $_GET["order_by"];
@@ -197,5 +197,5 @@ require_once "includes/paging.php";
 	echo "<br><br>";
 
 //show the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
diff --git a/app/call_center/call_center_tier_delete.php b/app/call_center/call_center_tier_delete.php
index 2e4afee9bc..2bb15362b6 100644
--- a/app/call_center/call_center_tier_delete.php
+++ b/app/call_center/call_center_tier_delete.php
@@ -82,12 +82,12 @@ else {
 	}
 
 //redirect the user
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=call_center_tiers.php\">\n";
 	echo "<div align='center'>\n";
 	echo $text['message-delete']."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>
\ No newline at end of file
diff --git a/app/call_center/call_center_tier_edit.php b/app/call_center/call_center_tier_edit.php
index 64c420156a..90145921b9 100644
--- a/app/call_center/call_center_tier_edit.php
+++ b/app/call_center/call_center_tier_edit.php
@@ -71,7 +71,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		//if (strlen($tier_level) == 0) { $msg .= $text['message-required'].$text['label-tier_level']."<br>\n"; }
 		//if (strlen($tier_position) == 0) { $msg .= $text['message-required'].$text['label-tier_position']."<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -79,7 +79,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -137,12 +137,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			//syncrhonize configuration
 			save_call_center_xml();
 
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=call_center_tiers.php\">\n";
 			echo "<div align='center'>\n";
 			echo $text['message-add']."\n";
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		} //if ($action == "add")
 
@@ -160,12 +160,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			//syncrhonize configuration
 			save_call_center_xml();
 
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=call_center_tiers.php\">\n";
 			echo "<div align='center'>\n";
 			echo $text['message-update']."\n";
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		} //if ($action == "update")
 	} //if ($_POST["persistformvar"] != "true")
@@ -192,7 +192,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	if ($action == "add") {
 		$page["title"] = $text['title-call_center_tier_add'];
 	}
@@ -444,5 +444,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</table>";
 	echo "</div>";
 
-require_once "includes/footer.php";
+require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/call_center/call_center_tiers.php b/app/call_center/call_center_tiers.php
index d57a97710b..c419e750f7 100644
--- a/app/call_center/call_center_tiers.php
+++ b/app/call_center/call_center_tiers.php
@@ -40,10 +40,10 @@ else {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 $page["title"] = $text['title-call_center_tiers'];
 
-require_once "includes/paging.php";
+require_once "resources/paging.php";
 
 //get http variables and set as php variables
 	$order_by = $_GET["order_by"];
@@ -178,5 +178,5 @@ require_once "includes/paging.php";
 	echo "<br><br>";
 
 //show the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/call_center_active/call_center_active.php b/app/call_center_active/call_center_active.php
index 0dca86fc87..e0f00ecfe1 100644
--- a/app/call_center_active/call_center_active.php
+++ b/app/call_center_active/call_center_active.php
@@ -44,7 +44,7 @@ else {
 	$queue_name = $_GET[queue_name];
 
 //get the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	$page["title"] = $text['title-call_center_queue_activity'];
 
 ?><script type="text/javascript">
@@ -126,5 +126,5 @@ echo "	</tr>";
 echo "</table>";
 echo "</div>";
 
-require_once "includes/footer.php";
+require_once "resources/footer.php";
 ?>
diff --git a/app/call_center_active/call_center_queue.php b/app/call_center_active/call_center_queue.php
index 79edc3d659..e9cbcf96a3 100644
--- a/app/call_center_active/call_center_queue.php
+++ b/app/call_center_active/call_center_queue.php
@@ -40,10 +40,10 @@ else {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 $page["title"] = $text['title-active_call_center'];
 
-require_once "includes/paging.php";
+require_once "resources/paging.php";
 
 $order_by = $_GET["order_by"];
 $order = $_GET["order"];
@@ -179,6 +179,6 @@ $order = $_GET["order"];
 	echo "<br><br>";
 
 //show the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 
 ?>
diff --git a/app/call_flows/call_flow_delete.php b/app/call_flows/call_flow_delete.php
index a05a44a118..7cf32d7285 100644
--- a/app/call_flows/call_flow_delete.php
+++ b/app/call_flows/call_flow_delete.php
@@ -93,12 +93,12 @@ if (strlen($id)>0) {
 }
 
 //redirect the user
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=call_flows.php\">\n";
 	echo "<div align='center'>\n";
 	echo $text['message-delete']."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>
\ No newline at end of file
diff --git a/app/call_flows/call_flow_edit.php b/app/call_flows/call_flow_edit.php
index 936c4e20c3..6d7d8c09da 100644
--- a/app/call_flows/call_flow_edit.php
+++ b/app/call_flows/call_flow_edit.php
@@ -110,7 +110,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		//if (strlen($call_flow_anti_data) == 0) { $msg .= $text['message-required'].$text['label-alternate_destination']."<br>\n"; }
 		//if (strlen($call_flow_description) == 0) { $msg .= $text['message-required'].$text['label-description']."<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -118,7 +118,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -353,7 +353,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 					}
 
 				//redirect the browser
-					require_once "includes/header.php";
+					require_once "resources/header.php";
 					echo "<meta http-equiv=\"refresh\" content=\"2;url=call_flows.php\">\n";
 					echo "<div align='center'>\n";
 					if ($action == "add") {
@@ -363,7 +363,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 						echo $text['message-update']."\n";
 					}
 					echo "</div>\n";
-					require_once "includes/footer.php";
+					require_once "resources/footer.php";
 					return;
 			}
 		} //if ($_POST["persistformvar"] != "true")
@@ -425,7 +425,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	if ($action == "update") {
 		$page["title"] = $text['title-call_flow-edit'];
 	}
@@ -642,5 +642,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</div>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/call_flows/call_flows.php b/app/call_flows/call_flows.php
index 7f3fe812d6..c305f45b54 100644
--- a/app/call_flows/call_flows.php
+++ b/app/call_flows/call_flows.php
@@ -40,10 +40,10 @@ else {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 	$page["title"] = $text['title-call_flows'];
 
-require_once "includes/paging.php";
+require_once "resources/paging.php";
 
 //get variables used to control the order
 	$order_by = $_GET["order_by"];
@@ -190,5 +190,5 @@ require_once "includes/paging.php";
 	echo "<br /><br />";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/calls/call_edit.php b/app/calls/call_edit.php
index bedc372ed3..99831a7500 100644
--- a/app/calls/call_edit.php
+++ b/app/calls/call_edit.php
@@ -185,7 +185,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			//if (strlen($destination_timeout_7) == 0) { $msg .= "Please provide: sec<br>\n"; }
 			//if (strlen($hunt_group_call_prompt) == 0) { $msg .= "Please provide: call prompt<br>\n"; }
 			if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				require_once "resources/persist_form_var.php";
 				echo "<div align='center'>\n";
 				echo "<table><tr><td>\n";
@@ -193,7 +193,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				echo "</td></tr></table>\n";
 				persistformvar($_POST);
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 			}
 
@@ -348,18 +348,18 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		}
 
 	//redirect the user
-		require_once "includes/header.php";
+		require_once "resources/header.php";
 		echo "<meta http-equiv=\"refresh\" content=\"3;url=".PROJECT_PATH."/core/user_settings/user_dashboard.php\">\n";
 		echo "<div align='center'>\n";
 		echo "".$text['confirm-update']."<br />\n";
 		echo "</div>\n";
-		require_once "includes/footer.php";
+		require_once "resources/footer.php";
 		return;
 
 } //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 
 //pre-populate the form
 	$sql = "select * from v_follow_me ";
@@ -739,5 +739,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</table>";
 	echo "</div>";
 
-require_once "includes/footer.php";
+require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/calls/calls.php b/app/calls/calls.php
index 4827d4f09c..f4d4fb2bd7 100644
--- a/app/calls/calls.php
+++ b/app/calls/calls.php
@@ -48,8 +48,8 @@ else {
 	}
 
 //begin the content
-	require_once "includes/header.php";
-	require_once "includes/paging.php";
+	require_once "resources/header.php";
+	require_once "resources/paging.php";
 	echo "<div align='center'>";
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='2'>\n";
 	echo "<tr class='border'>\n";
@@ -194,7 +194,7 @@ else {
 	echo "<br>";
 
 	if ($is_included != "true") {
-		require_once "includes/footer.php";
+		require_once "resources/footer.php";
 	}
 
 ?>
\ No newline at end of file
diff --git a/app/calls_active/calls_active.php b/app/calls_active/calls_active.php
index 8657e2a2a2..d51ca04d98 100644
--- a/app/calls_active/calls_active.php
+++ b/app/calls_active/calls_active.php
@@ -43,7 +43,7 @@ else {
 $conference_name = trim($_REQUEST["c"]);
 $tmp_conference_name = str_replace("_", " ", $conference_name);
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 ?><script type="text/javascript">
 function loadXmlHttp(url, id) {
 	var f = this;
@@ -167,5 +167,5 @@ echo "}\n";
 echo "-->\n";
 echo "</script>\n";
 
-require_once "includes/footer.php";
+require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/calls_active/calls_active_extensions.php b/app/calls_active/calls_active_extensions.php
index 6545f8728a..addb4a797d 100644
--- a/app/calls_active/calls_active_extensions.php
+++ b/app/calls_active/calls_active_extensions.php
@@ -63,7 +63,7 @@ else {
 $conference_name = trim($_REQUEST["c"]);
 $tmp_conference_name = str_replace("_", " ", $conference_name);
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 ?><script type="text/javascript">
 <!--
 
@@ -340,5 +340,5 @@ echo "}\n";
 echo "-->\n";
 echo "</script>\n";
 
-require_once "includes/footer.php";
+require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/click_to_call/click_to_call.php b/app/click_to_call/click_to_call.php
index 369847d08c..f36803d54d 100644
--- a/app/click_to_call/click_to_call.php
+++ b/app/click_to_call/click_to_call.php
@@ -47,7 +47,7 @@ else {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 
 if (is_array($_REQUEST) && !empty($_REQUEST['src']) && !empty($_REQUEST['dest'])) {
 	//get the http variables and set them as variables
@@ -396,5 +396,5 @@ if (is_array($_REQUEST) && !empty($_REQUEST['src']) && !empty($_REQUEST['dest'])
 	echo "</form>";
 
 //show the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
diff --git a/app/conference_centers/conference_center_delete.php b/app/conference_centers/conference_center_delete.php
index df19039185..73d489f141 100644
--- a/app/conference_centers/conference_center_delete.php
+++ b/app/conference_centers/conference_center_delete.php
@@ -87,12 +87,12 @@ if (strlen($id)>0) {
 }
 
 //redirect the user
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=conference_centers.php\">\n";
 	echo "<div align='center'>\n";
 	echo "Delete Complete\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>
\ No newline at end of file
diff --git a/app/conference_centers/conference_center_edit.php b/app/conference_centers/conference_center_edit.php
index eb031a702e..b7a93a72b8 100644
--- a/app/conference_centers/conference_center_edit.php
+++ b/app/conference_centers/conference_center_edit.php
@@ -76,10 +76,10 @@ else {
 			$sql .= "and user_uuid = '".$user_uuid."' ";
 			$db->exec(check_sql($sql));
 		//redirect the browser
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=conference_center_edit.php?id=$conference_center_uuid\">\n";
 			echo "<div align='center'>Delete Complete</div>";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 	}
 
@@ -105,10 +105,10 @@ else {
 			$sql_insert .= ")";
 			$db->exec($sql_insert);
 		//redirect the browser
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=conference_center_edit.php?id=$conference_center_uuid\">\n";
 			echo "<div align='center'>Add Complete</div>";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 	}
 */
@@ -129,7 +129,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		//if (strlen($conference_center_description) == 0) { $msg .= "Please provide: Description<br>\n"; }
 		if (strlen($conference_center_enabled) == 0) { $msg .= "Please provide: Enabled<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -137,7 +137,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -202,12 +202,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 					save_dialplan_xml();
 
 				//redirect the browser
-					require_once "includes/header.php";
+					require_once "resources/header.php";
 					echo "<meta http-equiv=\"refresh\" content=\"2;url=conference_centers.php\">\n";
 					echo "<div align='center'>\n";
 					echo "Add Complete\n";
 					echo "</div>\n";
-					require_once "includes/footer.php";
+					require_once "resources/footer.php";
 					return;
 			} //if ($action == "add")
 
@@ -272,12 +272,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 					save_dialplan_xml();
 
 				//redirect the browser
-					require_once "includes/header.php";
+					require_once "resources/header.php";
 					echo "<meta http-equiv=\"refresh\" content=\"2;url=conference_centers.php\">\n";
 					echo "<div align='center'>\n";
 					echo "Update Complete\n";
 					echo "</div>\n";
-					require_once "includes/footer.php";
+					require_once "resources/footer.php";
 					return;
 			} //if ($action == "update")
 		} //if ($_POST["persistformvar"] != "true") 
@@ -310,7 +310,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	if (strlen($conference_center_pin_length) == 0) { $conference_center_pin_length = 9; }
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 
 //show the content
 	echo "<div align='center'>";
@@ -425,5 +425,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</div>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/conference_centers/conference_centers.php b/app/conference_centers/conference_centers.php
index 6e7484068c..8d383e460f 100644
--- a/app/conference_centers/conference_centers.php
+++ b/app/conference_centers/conference_centers.php
@@ -47,8 +47,8 @@ else {
 	}
 
 //additional includes
-	require_once "includes/header.php";
-	require_once "includes/paging.php";
+	require_once "resources/header.php";
+	require_once "resources/paging.php";
 
 //get variables used to control the order
 	$order_by = $_GET["order_by"];
@@ -210,5 +210,5 @@ else {
 	echo "<br /><br />";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/conference_centers/conference_room_delete.php b/app/conference_centers/conference_room_delete.php
index b534d05275..6078bcb174 100644
--- a/app/conference_centers/conference_room_delete.php
+++ b/app/conference_centers/conference_room_delete.php
@@ -88,12 +88,12 @@ if (strlen($id)>0) {
 }
 
 //redirect the user
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=conference_rooms.php\">\n";
 	echo "<div align='center'>\n";
 	echo "Delete Complete\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>
\ No newline at end of file
diff --git a/app/conference_centers/conference_room_edit.php b/app/conference_centers/conference_room_edit.php
index c44476c594..f1b2de5e8f 100644
--- a/app/conference_centers/conference_room_edit.php
+++ b/app/conference_centers/conference_room_edit.php
@@ -152,10 +152,10 @@ else {
 				unset($sql);
 		}
 		//redirect the browser
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=conference_room_edit.php?id=$conference_room_uuid\">\n";
 			echo "<div align='center'>Delete Complete</div>";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 	}
 
@@ -223,7 +223,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		//if (strlen($enabled) == 0) { $msg .= "Please provide: Enabled<br>\n"; }
 		//if (strlen($description) == 0) { $msg .= "Please provide: Description<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -231,7 +231,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			exit;
 		}
 
@@ -419,12 +419,12 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 				}
 
 			//redirect the user
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=conference_room_edit.php?id=$conference_room_uuid\">\n";
 				echo "<div align='center'>\n";
 				echo $text['confirm-update']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 
 		} //if ($_POST["persistformvar"] != "true")
@@ -487,7 +487,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	if (strlen($enabled) == 0) { $enabled = 'true'; }
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 
 //show the content
 	echo "<div align='center'>";
@@ -870,5 +870,5 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</div>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/conference_centers/conference_rooms.php b/app/conference_centers/conference_rooms.php
index 1afc416d8b..03ccddf034 100644
--- a/app/conference_centers/conference_rooms.php
+++ b/app/conference_centers/conference_rooms.php
@@ -41,8 +41,8 @@ else {
 	}
 
 //additional includes
-	require_once "includes/header.php";
-	require_once "includes/paging.php";
+	require_once "resources/header.php";
+	require_once "resources/paging.php";
 
 //get the meeting_uuid using the pin number
 	$search = check_str($_GET["search"]);
@@ -387,5 +387,5 @@ else {
 	echo "<br /><br />";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/conference_centers/conference_session_details.php b/app/conference_centers/conference_session_details.php
index fc567d6076..b81df4c4ee 100644
--- a/app/conference_centers/conference_session_details.php
+++ b/app/conference_centers/conference_session_details.php
@@ -40,8 +40,8 @@ else {
 	}
 
 //additional includes
-	require_once "includes/header.php";
-	require_once "includes/paging.php";
+	require_once "resources/header.php";
+	require_once "resources/paging.php";
 
 //set variables from the http values
 	$order_by = check_str($_GET["order_by"]);
@@ -241,5 +241,5 @@ else {
 	echo "<br /><br />";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/conference_centers/conference_sessions.php b/app/conference_centers/conference_sessions.php
index b91dd7187e..f0ffa1b141 100644
--- a/app/conference_centers/conference_sessions.php
+++ b/app/conference_centers/conference_sessions.php
@@ -40,8 +40,8 @@ else {
 	}
 
 //additional includes
-	require_once "includes/header.php";
-	require_once "includes/paging.php";
+	require_once "resources/header.php";
+	require_once "resources/paging.php";
 
 //set variables from the http values
 	$meeting_uuid = check_str($_GET["id"]);
@@ -209,5 +209,5 @@ else {
 	echo "<br /><br />";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/conferences/conference_delete.php b/app/conferences/conference_delete.php
index be899231bf..21a74708c3 100644
--- a/app/conferences/conference_delete.php
+++ b/app/conferences/conference_delete.php
@@ -94,12 +94,12 @@ if (strlen($id)>0) {
 }
 
 //redirect the user
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=conferences.php\">\n";
 	echo "<div align='center'>\n";
 	echo "".$text['confirm-delete']."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>
\ No newline at end of file
diff --git a/app/conferences/conference_edit.php b/app/conferences/conference_edit.php
index de66a3be93..ad3fb25102 100644
--- a/app/conferences/conference_edit.php
+++ b/app/conferences/conference_edit.php
@@ -78,10 +78,10 @@ else {
 			$sql .= "and user_uuid = '".$user_uuid."' ";
 			$db->exec(check_sql($sql));
 		//redirect the browser
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=conferences_edit.php?id=$conference_uuid\">\n";
 			echo "<div align='center'>".$text['confirm-delete']."</div>";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 	}
 
@@ -107,10 +107,10 @@ else {
 			$sql_insert .= ")";
 			$db->exec($sql_insert);
 		//redirect the browser
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=conferences_edit.php?id=$conference_uuid\">\n";
 			echo "<div align='center'>".$text['confirm-add']."</div>";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 	}
 
@@ -132,7 +132,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		//if (strlen($conference_description) == 0) { $msg .= "Please provide: Description<br>\n"; }
 		if (strlen($conference_enabled) == 0) { $msg .= "".$text['confirm-enabled']."<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -140,7 +140,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -287,12 +287,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				}
 
 			//redirect the browser
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=conferences.php\">\n";
 				echo "<div align='center'>\n";
 				echo "".$text['confirm-update']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 
 		} //if ($_POST["persistformvar"] != "true") 
@@ -326,7 +326,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	if (strlen($conference_enabled) == 0) { $conference_enabled = "true"; }
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 
 //show the content
 	echo "<div align='center'>";
@@ -542,5 +542,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</div>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
diff --git a/app/conferences/conferences.php b/app/conferences/conferences.php
index e622c505c4..7b912f1539 100644
--- a/app/conferences/conferences.php
+++ b/app/conferences/conferences.php
@@ -40,8 +40,8 @@ else {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];                
 	}
     
-require_once "includes/header.php";
-require_once "includes/paging.php";
+require_once "resources/header.php";
+require_once "resources/paging.php";
 
 //get variables used to control the order
 	$order_by = $_GET["order_by"];
@@ -205,5 +205,5 @@ require_once "includes/paging.php";
 	echo "<br /><br />";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
diff --git a/app/conferences_active/conference_interactive.php b/app/conferences_active/conference_interactive.php
index 539f75b8f7..17896f314d 100644
--- a/app/conferences_active/conference_interactive.php
+++ b/app/conferences_active/conference_interactive.php
@@ -47,7 +47,7 @@ else {
 	$conference_display_name = str_replace("_", " ", $conference_display_name);
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 
 ?><script type="text/javascript">
 function loadXmlHttp(url, id) {
@@ -132,5 +132,5 @@ echo "</table>";
 echo "</div>";
 
 //show the header
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/conferences_active/conferences_active.php b/app/conferences_active/conferences_active.php
index 43ab5f90f2..c7b4efe4df 100644
--- a/app/conferences_active/conferences_active.php
+++ b/app/conferences_active/conferences_active.php
@@ -42,7 +42,7 @@ else {
 	}
 
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 ?><script type="text/javascript">
 function loadXmlHttp(url, id) {
 	var f = this;
@@ -116,5 +116,5 @@ echo "	</tr>";
 echo "</table>";
 echo "</div>";
 
-require_once "includes/footer.php";
+require_once "resources/footer.php";
 ?>
diff --git a/app/contacts/contact_addresses.php b/app/contacts/contact_addresses.php
index 4041984444..46ef1b8c41 100644
--- a/app/contacts/contact_addresses.php
+++ b/app/contacts/contact_addresses.php
@@ -34,8 +34,8 @@ else {
 	exit;
 }
 
-//require_once "includes/header.php";
-require_once "includes/paging.php";
+//require_once "resources/header.php";
+require_once "resources/paging.php";
 
 //get variables used to control the order
 	$order_by = $_GET["order_by"];
diff --git a/app/contacts/contact_addresses_delete.php b/app/contacts/contact_addresses_delete.php
index 4d83869cde..c748a02430 100644
--- a/app/contacts/contact_addresses_delete.php
+++ b/app/contacts/contact_addresses_delete.php
@@ -56,12 +56,12 @@ if (strlen($id)>0) {
 	unset($sql);
 }
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 echo "<meta http-equiv=\"refresh\" content=\"2;url=contacts_edit.php?id=$contact_uuid\">\n";
 echo "<div align='center'>\n";
 echo $text['message-delete']."\n";
 echo "</div>\n";
-require_once "includes/footer.php";
+require_once "resources/footer.php";
 return;
 
 ?>
\ No newline at end of file
diff --git a/app/contacts/contact_addresses_edit.php b/app/contacts/contact_addresses_edit.php
index aeab89cdb6..a8e598b30b 100644
--- a/app/contacts/contact_addresses_edit.php
+++ b/app/contacts/contact_addresses_edit.php
@@ -86,7 +86,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		//if (strlen($address_latitude) == 0) { $msg .= $text['message-required'].$text['label-address_latitude']."<br>\n"; }
 		//if (strlen($address_longitude) == 0) { $msg .= $text['message-required'].$text['label-address_longitude']."<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -94,7 +94,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -139,12 +139,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$db->exec(check_sql($sql));
 			unset($sql);
 
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=contacts_edit.php?id=$contact_uuid\">\n";
 			echo "<div align='center'>\n";
 			echo $text['message-add']."\n";
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		} //if ($action == "add")
 
@@ -167,12 +167,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$db->exec(check_sql($sql));
 			unset($sql);
 
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=contacts_edit.php?id=$contact_uuid\">\n";
 			echo "<div align='center'>\n";
 			echo $text['message-update']."\n";
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		} //if ($action == "update")
 	} //if ($_POST["persistformvar"] != "true")
@@ -205,7 +205,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	if ($action == "update") {
 		$page["title"] = $text['title-contact_addresses-edit'];
 	}
@@ -404,5 +404,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</div>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/contacts/contact_import.php b/app/contacts/contact_import.php
index d668ade3df..f2b3b14dd5 100644
--- a/app/contacts/contact_import.php
+++ b/app/contacts/contact_import.php
@@ -298,7 +298,7 @@ else {
 			}
 
 		//show the header
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			echo "<div align='center'>\n";
 			echo "<table width='100%' border='0' cellpadding='6' cellspacing='0'>\n";
 			echo "<tr>\n";
@@ -341,14 +341,14 @@ else {
 			echo "</table>\n";
 
 		//include the footer
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 
 		//end the script
 			break;
 	}
 
 //include the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 
 //begin the content
 	echo "<div align='center'>";
@@ -426,7 +426,7 @@ else {
 	echo "</form>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 
 /*
 [Suffix]
diff --git a/app/contacts/contact_notes.php b/app/contacts/contact_notes.php
index 792ad4de0e..eb99733f5f 100644
--- a/app/contacts/contact_notes.php
+++ b/app/contacts/contact_notes.php
@@ -34,8 +34,8 @@ else {
 	exit;
 }
 
-//require_once "includes/header.php";
-require_once "includes/paging.php";
+//require_once "resources/header.php";
+require_once "resources/paging.php";
 
 //get variables used to control the order
 	$order_by = $_GET["order_by"];
diff --git a/app/contacts/contact_notes_delete.php b/app/contacts/contact_notes_delete.php
index 27f5771adb..2a6b5416bb 100644
--- a/app/contacts/contact_notes_delete.php
+++ b/app/contacts/contact_notes_delete.php
@@ -55,12 +55,12 @@ if (strlen($id)>0) {
 	unset($sql);
 }
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 echo "<meta http-equiv=\"refresh\" content=\"2;url=contacts_edit.php?id=$contact_uuid\">\n";
 echo "<div align='center'>\n";
 echo $text['message-delete']."\n";
 echo "</div>\n";
-require_once "includes/footer.php";
+require_once "resources/footer.php";
 return;
 
 ?>
\ No newline at end of file
diff --git a/app/contacts/contact_notes_edit.php b/app/contacts/contact_notes_edit.php
index e67e55c1a0..d5a3aaf792 100644
--- a/app/contacts/contact_notes_edit.php
+++ b/app/contacts/contact_notes_edit.php
@@ -73,7 +73,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		//if (strlen($last_mod_date) == 0) { $msg .= $text['message-required']."Last Modified Date<br>\n"; }
 		//if (strlen($last_mod_user) == 0) { $msg .= $text['message-required']."Last Modified By<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -81,7 +81,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -110,12 +110,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$db->exec(check_sql($sql));
 			unset($sql);
 
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=contacts_edit.php?id=$contact_uuid\">\n";
 			echo "<div align='center'>\n";
 			echo $text['message-add']."\n";
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		} //if ($action == "add")
 
@@ -130,12 +130,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$db->exec(check_sql($sql));
 			unset($sql);
 
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=contacts_edit.php?id=$contact_uuid\">\n";
 			echo "<div align='center'>\n";
 			echo $text['message-update']."\n";
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		} //if ($action == "update")
 	} //if ($_POST["persistformvar"] != "true")
@@ -161,7 +161,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	if ($action == "update") {
 		$page["title"] = $text['title-contact_notes-edit'];
 	}
@@ -217,5 +217,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</div>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/contacts/contact_phones.php b/app/contacts/contact_phones.php
index ee7cce70f9..cd75a80b6c 100644
--- a/app/contacts/contact_phones.php
+++ b/app/contacts/contact_phones.php
@@ -34,8 +34,8 @@ else {
 	exit;
 }
 
-//require_once "includes/header.php";
-require_once "includes/paging.php";
+//require_once "resources/header.php";
+require_once "resources/paging.php";
 
 //get variables used to control the order
 	$order_by = $_GET["order_by"];
diff --git a/app/contacts/contact_phones_delete.php b/app/contacts/contact_phones_delete.php
index b05872e892..36f440fc9a 100644
--- a/app/contacts/contact_phones_delete.php
+++ b/app/contacts/contact_phones_delete.php
@@ -55,13 +55,13 @@ if (strlen($id)>0) {
 	unset($sql);
 }
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 echo "<meta http-equiv=\"refresh\" content=\"2;url=contacts_edit.php?id=$contact_uuid\">\n";
 echo "<div align='center'>\n";
 echo $text['message-delete']."\n";
 echo "</div>\n";
 
-require_once "includes/footer.php";
+require_once "resources/footer.php";
 return;
 
 ?>
\ No newline at end of file
diff --git a/app/contacts/contact_phones_edit.php b/app/contacts/contact_phones_edit.php
index ebfcf222a4..eaa86f4bd7 100644
--- a/app/contacts/contact_phones_edit.php
+++ b/app/contacts/contact_phones_edit.php
@@ -75,7 +75,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		//if (strlen($phone_type) == 0) { $msg .= $text['message-required'].$text['label-phone_type']."<br>\n"; }
 		//if (strlen($phone_number) == 0) { $msg .= $text['message-required'].$text['label-phone_number']."<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -83,7 +83,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -114,12 +114,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$db->exec(check_sql($sql));
 			unset($sql);
 
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=contacts_edit.php?id=$contact_uuid\">\n";
 			echo "<div align='center'>\n";
 			echo $text['message-add']."\n";
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		} //if ($action == "add")
 
@@ -135,12 +135,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$db->exec(check_sql($sql));
 			unset($sql);
 
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=contacts_edit.php?id=$contact_uuid\">\n";
 			echo "<div align='center'>\n";
 			echo $text['message-update']."\n";
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		} //if ($action == "update")
 	} //if ($_POST["persistformvar"] != "true")
@@ -165,7 +165,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	if ($action == "update") {
 		$page["title"] = $text['title-contact_phones-edit'];
 	}
@@ -375,5 +375,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</div>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/contacts/contacts.php b/app/contacts/contacts.php
index 98e4712155..cfccd47dc5 100644
--- a/app/contacts/contacts.php
+++ b/app/contacts/contacts.php
@@ -40,10 +40,10 @@ else {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 $page["title"] = $text['title-contacts'];
 
-require_once "includes/paging.php";
+require_once "resources/paging.php";
 
 //get the search criteria
 	$search_all = check_str($_GET["search_all"]);
@@ -254,5 +254,5 @@ require_once "includes/paging.php";
 	echo "<br><br>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/contacts/contacts_delete.php b/app/contacts/contacts_delete.php
index e5986616e9..9e2286f11e 100644
--- a/app/contacts/contacts_delete.php
+++ b/app/contacts/contacts_delete.php
@@ -81,12 +81,12 @@ if (strlen($id)>0) {
 }
 
 //redirect the browser
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=contacts.php\">\n";
 	echo "<div align='center'>\n";
 	echo $text['message-delete']."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>
\ No newline at end of file
diff --git a/app/contacts/contacts_edit.php b/app/contacts/contacts_edit.php
index f0db71803a..200158f441 100644
--- a/app/contacts/contacts_edit.php
+++ b/app/contacts/contacts_edit.php
@@ -85,7 +85,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		//if (strlen($contact_time_zone) == 0) { $msg .= $text['message-required'].$text['label-contact_time_zone']."<br>\n"; }
 		//if (strlen($contact_note) == 0) { $msg .= $text['message-required'].$text['label-contact_note']."<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -93,7 +93,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -138,12 +138,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$db->exec(check_sql($sql));
 			unset($sql);
 
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=contacts.php\">\n";
 			echo "<div align='center'>\n";
 			echo $text['message-add']."\n";
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		} //if ($action == "add")
 
@@ -166,12 +166,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$db->exec(check_sql($sql));
 			unset($sql);
 
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=contacts.php\">\n";
 			echo "<div align='center'>\n";
 			echo $text['message-update']."\n";
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		} //if ($action == "update")
 	} //if ($_POST["persistformvar"] != "true")
@@ -205,7 +205,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	if ($action == "update") {
 		$page["title"] = $text['title-contact-edit'];
 	}
@@ -563,5 +563,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</div>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/content/index.php b/app/content/index.php
index c34770126d..0c858ca0da 100644
--- a/app/content/index.php
+++ b/app/content/index.php
@@ -39,12 +39,12 @@ else {
 require_once "config.php";
 session_start();
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 echo "<link rel=\"alternate\" type=\"application/rss+xml\" title=\"\" href=\"rss.php\" />\n";
 
 $_GET["c"] = "html";
 require_once "rss.php";
-require_once "includes/footer.php";
+require_once "resources/footer.php";
 
 return;
 ?>
diff --git a/app/content/rssadd.php b/app/content/rssadd.php
index 206584ce89..cc84368218 100644
--- a/app/content/rssadd.php
+++ b/app/content/rssadd.php
@@ -103,16 +103,16 @@ if (count($_POST)>0) {
 		$db->exec(check_sql($sql));
 		unset($sql);
 
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=rsslist.php\">\n";
 	echo "<div align='center'>";
 	echo $text['message-add'];
 	echo "</div>";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 }
 
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	if (is_dir($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/resources/tiny_mce')) {
 		if ($rss_optional_1 == "text/html") {
 			require_once "resources/wysiwyg.php";
@@ -350,5 +350,5 @@ if (count($_POST)>0) {
 	echo "</div>";
 
 
-require_once "includes/footer.php";
+require_once "resources/footer.php";
 ?>
diff --git a/app/content/rssdelete.php b/app/content/rssdelete.php
index a71e22d4c9..4ce66606d5 100644
--- a/app/content/rssdelete.php
+++ b/app/content/rssdelete.php
@@ -55,12 +55,12 @@ if (count($_GET)>0) {
 	$db->exec(check_sql($sql));
 	unset($sql);
 
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=rsslist.php?rss_uuid=$rss_uuid\">\n";
 	echo "<div align='center'>";
 	echo $text['message-delete-done'];
 	echo "</div>";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 }
 
diff --git a/app/content/rsslist.php b/app/content/rsslist.php
index e2142928e0..3a59e5314e 100644
--- a/app/content/rsslist.php
+++ b/app/content/rsslist.php
@@ -64,7 +64,7 @@ if (!function_exists('th_order_by')) {
 	}
 }
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 echo "<link rel=\"alternate\" type=\"application/rss+xml\" title=\"\" href=\"rss.php\" />\n";
 
 $order_by = $_GET["order_by"];
@@ -213,7 +213,7 @@ $order = $_GET["order"];
 	echo "</div>";
 
 	echo "<br><br>";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 
 	unset ($result_count);
 	unset ($result);
diff --git a/app/content/rssmovedown.php b/app/content/rssmovedown.php
index d02f83b751..c1f8f641d1 100644
--- a/app/content/rssmovedown.php
+++ b/app/content/rssmovedown.php
@@ -86,12 +86,12 @@ if (count($_GET)>0) {
 		$db->exec(check_sql($sql));
 		unset($sql);
 	}
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"1;url=rsslist.php?rss_uuid=$rss_uuid\">\n";
 	echo "<div align='center'>";
 	echo $text['message-item-down'];
 	echo "</div>";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 }
 
diff --git a/app/content/rssmoveup.php b/app/content/rssmoveup.php
index 5eee40fb66..a098c22771 100644
--- a/app/content/rssmoveup.php
+++ b/app/content/rssmoveup.php
@@ -70,12 +70,12 @@ if (count($_GET)>0) {
 		$db->exec(check_sql($sql));
 		unset($sql);
 	}
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"1;url=rsslist.php?rss_uuid=$rss_uuid\">\n";
 	echo "<div align='center'>";
 	echo $text['message-item-up'];
 	echo "</div>";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 }
 
diff --git a/app/content/rsssearch.php b/app/content/rsssearch.php
index 471550d16a..a7ce11f84f 100644
--- a/app/content/rsssearch.php
+++ b/app/content/rsssearch.php
@@ -60,7 +60,7 @@ if (count($_POST)>0) {
 	$rss_add_date = check_str($_POST["rss_add_date"]);
 	$rss_add_user = check_str($_POST["rss_add_user"]);
 
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 
 
 
@@ -187,7 +187,7 @@ if (count($_POST)>0) {
 	echo "</div>";
 
 	echo "<br><br>";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 
 	unset ($result_count);
 	unset ($result);
@@ -198,7 +198,7 @@ if (count($_POST)>0) {
 	}
 	else {
 
-		echo "\n";    require_once "includes/header.php";
+		echo "\n";    require_once "resources/header.php";
 	echo "<div align='center'>";
 	echo "<table border='0' cellpadding='0' cellspacing='2'>\n";
 
@@ -278,7 +278,7 @@ if (count($_POST)>0) {
 	echo "</div>";
 
 
-require_once "includes/footer.php";
+require_once "resources/footer.php";
 
 } //end if not post
 ?>
diff --git a/app/content/rsssubadd.php b/app/content/rsssubadd.php
index a2b2d828aa..e2854039b1 100644
--- a/app/content/rsssubadd.php
+++ b/app/content/rsssubadd.php
@@ -94,17 +94,17 @@ if (count($_POST)>0) {
 	$db->exec(check_sql($sql));
 	unset($sql);
 
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=rsssublist.php?rss_uuid=$rss_uuid\">\n";
 	echo "<div align='center'>";
 	echo $text['message-add'];
 	echo "</div>";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 }
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	require_once "resources/wysiwyg.php";
 
 //show the content
@@ -178,5 +178,5 @@ if (count($_POST)>0) {
 	echo "</div>";
 
 //show the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/content/rsssubcategoryadd.php b/app/content/rsssubcategoryadd.php
index ebd884097b..597f8f17cc 100644
--- a/app/content/rsssubcategoryadd.php
+++ b/app/content/rsssubcategoryadd.php
@@ -73,14 +73,14 @@ if (count($_POST)>0) {
 	$db->exec(check_sql($sql));
 	unset($sql);
 
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"5;url=rss_sub_categorylist.php\">\n";
 	echo $text['message-add'];
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 }
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 echo "<div align='center'>";
 echo "<table border='0' cellpadding='0' cellspacing='2'>\n";
 echo "<tr class='border'>\n";
@@ -120,5 +120,5 @@ echo "	</tr>";
 echo "</table>";
 echo "</div>";
 
-require_once "includes/footer.php";
+require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/content/rsssubcategorylist.php b/app/content/rsssubcategorylist.php
index dc8a2b248b..0575355038 100644
--- a/app/content/rsssubcategorylist.php
+++ b/app/content/rsssubcategorylist.php
@@ -42,7 +42,7 @@ else {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 
 $order_by = $_GET["order_by"];
 $order = $_GET["order"];    
@@ -199,7 +199,7 @@ echo "<input type='button' class='btn' name='' onclick=\"window.location='rss_su
 echo "</div>";
 
 echo "<br><br>";
-require_once "includes/footer.php";
+require_once "resources/footer.php";
 
 unset ($result_count);
 unset ($result);
diff --git a/app/content/rsssubcategoryupdate.php b/app/content/rsssubcategoryupdate.php
index da2130ba3f..4296fbc393 100644
--- a/app/content/rsssubcategoryupdate.php
+++ b/app/content/rsssubcategoryupdate.php
@@ -63,10 +63,10 @@ if (count($_POST)>0) {
 	//echo "Affected Rows: ".$count;
 
 	//edit: make sure the meta redirect url is correct 
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"5;url=rss_sub_categorylist.php\">\n";
 	echo $text['message-update'];
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 }
 else {
@@ -90,7 +90,7 @@ else {
 	}
 }
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 echo "<div align='center'>";
 echo "<table border='0' cellpadding='0' cellspacing='2'>\n";
 
@@ -137,5 +137,5 @@ echo "</table>";
 echo "</div>";
 
 
-  require_once "includes/footer.php";
+  require_once "resources/footer.php";
 ?>
diff --git a/app/content/rsssubdelete.php b/app/content/rsssubdelete.php
index acc49751c8..9b89b7807e 100644
--- a/app/content/rsssubdelete.php
+++ b/app/content/rsssubdelete.php
@@ -56,12 +56,12 @@ if (count($_GET)>0) {
 	$db->exec(check_sql($sql));
 	unset($sql);
 
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=rsssublist.php?rss_uuid=$rss_uuid\">\n";
 	echo "<div align='center'>";
 	echo $text['message-delete-done'];
 	echo "</div>";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 }
 
diff --git a/app/content/rsssublist.php b/app/content/rsssublist.php
index 88a422b917..ad75542e9f 100644
--- a/app/content/rsssublist.php
+++ b/app/content/rsssublist.php
@@ -46,7 +46,7 @@ $rss_uuid = $_GET["rss_uuid"];
 $order_by = $_GET["order_by"];
 $order = $_GET["order"];
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 
 
 	echo "<div align='center'>";
@@ -440,7 +440,7 @@ require_once "includes/header.php";
 	echo "</div>";
 
 	echo "<br><br>";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 
 	unset ($result_count);
 	unset ($result);
diff --git a/app/content/rsssubsearch.php b/app/content/rsssubsearch.php
index 1e95d1fa64..7f4f65165d 100644
--- a/app/content/rsssubsearch.php
+++ b/app/content/rsssubsearch.php
@@ -57,7 +57,7 @@ if (count($_POST)>0) {
 	$rss_sub_add_user = check_str($_POST["rss_sub_add_user"]);
 
 
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 
 	echo "<div align='center'>";
 	echo "<table border='0' cellpadding='0' cellspacing='2'>\n";
@@ -177,7 +177,7 @@ if (count($_POST)>0) {
 	echo "</div>";
 
 	echo "<br><br>";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 
 	unset ($result_count);
 	unset ($result);
@@ -188,7 +188,7 @@ if (count($_POST)>0) {
 	}
 	else {
 
-		echo "\n";    require_once "includes/header.php";
+		echo "\n";    require_once "resources/header.php";
 	echo "<div align='center'>";
 	echo "<table border='0' cellpadding='0' cellspacing='2'>\n";
 
@@ -260,7 +260,7 @@ if (count($_POST)>0) {
 	echo "</div>";
 
 
-require_once "includes/footer.php";
+require_once "resources/footer.php";
 
 } //end if not post
 ?>
diff --git a/app/content/rsssubupdate.php b/app/content/rsssubupdate.php
index 077f53e514..076b396c0d 100644
--- a/app/content/rsssubupdate.php
+++ b/app/content/rsssubupdate.php
@@ -66,7 +66,7 @@ if (count($_POST)>0 && $_POST["persistform"] == "0") {
 
 	if (strlen($msg) > 0) {
 		require_once "resources/persist_form.php";
-		require_once "includes/header.php";
+		require_once "resources/header.php";
 		echo "<div align='center' style='' >";
 		echo "<table>";
 		echo "<tr>";
@@ -81,7 +81,7 @@ if (count($_POST)>0 && $_POST["persistform"] == "0") {
 		echo "</table>";
 		echo "</div>";
 
-		require_once "includes/footer.php";
+		require_once "resources/footer.php";
 		return;
 	}
 
@@ -105,12 +105,12 @@ if (count($_POST)>0 && $_POST["persistform"] == "0") {
 	//echo "Affected Rows: ".$count;
 
 	//edit: make sure the meta redirect url is correct 
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=rsssublist.php?rss_uuid=$rss_uuid&rss_sub_uuid=$rss_sub_uuid\">\n";
 	echo "<div align='center'>";
 	echo $text['message-update'];
 	echo "</div>";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 }
 else {
@@ -141,7 +141,7 @@ else {
 }
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	require_once "resources/wysiwyg.php";
 
 //show the content
@@ -209,5 +209,5 @@ else {
 	echo "</div>";
 
 //show the footer
-  require_once "includes/footer.php";
+  require_once "resources/footer.php";
 ?>
diff --git a/app/content/rssupdate.php b/app/content/rssupdate.php
index 9a09596cf0..1e4901f7c9 100644
--- a/app/content/rssupdate.php
+++ b/app/content/rssupdate.php
@@ -91,12 +91,12 @@ if (count($_POST)>0) {
 	//exit;
 
 	//edit: make sure the meta redirect url is correct
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=rsslist.php\">\n";
 	echo "<div align='center'>";
 	echo $text['message-update'];
 	echo "</div>";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 }
 else {
@@ -140,7 +140,7 @@ else {
 	}
 }
 
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	if (is_dir($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/resources/tiny_mce')) {
 		if ($rss_optional_1 == "text/html") {
 			require_once "resources/wysiwyg.php";
@@ -395,5 +395,5 @@ else {
 	echo "</div>";
 
 
-  require_once "includes/footer.php";
+  require_once "resources/footer.php";
 ?>
diff --git a/app/destinations/destination_delete.php b/app/destinations/destination_delete.php
index a6aa89d7e4..588a0629e4 100644
--- a/app/destinations/destination_delete.php
+++ b/app/destinations/destination_delete.php
@@ -55,12 +55,12 @@ if (count($_GET)>0) {
 	}
 
 //redirect the browser
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=destinations.php\">\n";
 	echo "<div align='center'>\n";
 	echo $text['message-delete']."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>
\ No newline at end of file
diff --git a/app/destinations/destination_edit.php b/app/destinations/destination_edit.php
index 6574259579..2ccb0c0835 100644
--- a/app/destinations/destination_edit.php
+++ b/app/destinations/destination_edit.php
@@ -79,7 +79,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		//if (strlen($destination_enabled) == 0) { $msg .= "Please provide: Enabled<br>\n"; }
 		//if (strlen($destination_description) == 0) { $msg .= "Please provide: Description<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -87,7 +87,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -133,12 +133,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$db->exec(check_sql($sql));
 				unset($sql);
 
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=destinations.php\">\n";
 				echo "<div align='center'>\n";
 				echo $text['message-add']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 			} //if ($action == "add")
 
@@ -162,12 +162,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$db->exec(check_sql($sql));
 				unset($sql);
 
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=destinations.php\">\n";
 				echo "<div align='center'>\n";
 				echo $text['message-update']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 			} //if ($action == "update")
 		} //if ($_POST["persistformvar"] != "true")
@@ -202,7 +202,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	if (strlen($destination_context) == 0) { $destination_context = 'public'; }
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	if ($action == "update") {
 		$page["title"] = $text['title-destination-edit'];
 	}
@@ -376,5 +376,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</div>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/destinations/destinations.php b/app/destinations/destinations.php
index b7c4f37bad..79d3f5c254 100644
--- a/app/destinations/destinations.php
+++ b/app/destinations/destinations.php
@@ -40,10 +40,10 @@ else {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 $page["title"] = $text['title-destinations'];
 
-require_once "includes/paging.php";
+require_once "resources/paging.php";
 
 //get variables used to control the order
 	$order_by = $_GET["order_by"];
@@ -163,5 +163,5 @@ require_once "includes/paging.php";
 	echo "<br /><br />";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/devices/device_delete.php b/app/devices/device_delete.php
index 87b4b0f49b..13d670c288 100644
--- a/app/devices/device_delete.php
+++ b/app/devices/device_delete.php
@@ -58,12 +58,12 @@ else {
 	require_once "app/provision/provision_write.php";
 
 //redirect the user
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=devices.php\">\n";
 	echo "<div align='center'>\n";
 	echo $text['message-delete']."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>
\ No newline at end of file
diff --git a/app/devices/device_edit.php b/app/devices/device_edit.php
index 7a87186d3c..7fc3bab20e 100644
--- a/app/devices/device_edit.php
+++ b/app/devices/device_edit.php
@@ -131,7 +131,7 @@ require_once "resources/require.php";
 			//if (strlen($device_time_zone) == 0) { $msg .= "Please provide: Time Zone<br>\n"; }
 			//if (strlen($device_description) == 0) { $msg .= "Please provide: Description<br>\n"; }
 			if (strlen($msg) > 0) {
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				require_once "resources/persist_form_var.php";
 				echo "<div align='center'>\n";
 				echo "<table><tr><td>\n";
@@ -139,7 +139,7 @@ require_once "resources/require.php";
 				echo "</td></tr></table>\n";
 				persistformvar($_POST);
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 			}
 
@@ -242,12 +242,12 @@ require_once "resources/require.php";
 					require_once "app/provision/provision_write.php";
 
 				//redirect the user
-					require_once "includes/header.php";
+					require_once "resources/header.php";
 					echo "<meta http-equiv=\"refresh\" content=\"2;url=devices.php\">\n";
 					echo "<div align='center'>\n";
 					echo $text['message-add']."\n";
 					echo "</div>\n";
-					require_once "includes/footer.php";
+					require_once "resources/footer.php";
 					return;
 			} //if ($_POST["persistformvar"] != "true")
 	} //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
@@ -279,7 +279,7 @@ require_once "resources/require.php";
 	}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 
 //show the content
 	echo "<div align='center'>";
@@ -700,5 +700,5 @@ require_once "resources/require.php";
 	echo "</div>";
 
 //show the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/devices/device_line_delete.php b/app/devices/device_line_delete.php
index 136c329d59..d17757e2e2 100644
--- a/app/devices/device_line_delete.php
+++ b/app/devices/device_line_delete.php
@@ -56,12 +56,12 @@ if (strlen($id)>0) {
 }
 
 //redirect the user
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=device_edit.php?id=$device_uuid\">\n";
 	echo "<div align='center'>\n";
 	echo $text['message-delete']."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>
\ No newline at end of file
diff --git a/app/devices/device_line_edit.php b/app/devices/device_line_edit.php
index b3828a2e81..3c32508d48 100644
--- a/app/devices/device_line_edit.php
+++ b/app/devices/device_line_edit.php
@@ -80,7 +80,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		//if (strlen($auth_id) == 0) { $msg .= $text['message-required']." ".$text['label-auth_id']."<br>\n"; }
 		//if (strlen($password) == 0) { $msg .= $text['message-required']." ".$text['label-password']."<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -88,7 +88,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -144,7 +144,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				} //if ($action == "update")
 
 			//redirect the browser
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=device_edit.php?id=$device_uuid\">\n";
 				echo "<div align='center'>\n";
 				if ($action == "add") {
@@ -154,7 +154,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 					echo "	".$text['message-update']."\n";
 				}
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 		} //if ($_POST["persistformvar"] != "true") 
 } //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
@@ -181,7 +181,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 
 //show the content
 	echo "<div align='center'>";
@@ -311,5 +311,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</div>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/devices/devices.php b/app/devices/devices.php
index 63f4a98ed7..dce728dcaa 100644
--- a/app/devices/devices.php
+++ b/app/devices/devices.php
@@ -44,8 +44,8 @@ else {
 	$order = $_GET["order"];
 
 //additional includes
-	require_once "includes/header.php";
-	require_once "includes/paging.php";
+	require_once "resources/header.php";
+	require_once "resources/paging.php";
 
 //show the content
 	echo "<br />";
@@ -181,5 +181,5 @@ else {
 	echo "<br /><br />";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/dialplan/dialplan_add.php b/app/dialplan/dialplan_add.php
index 14037bdd97..f335446129 100644
--- a/app/dialplan/dialplan_add.php
+++ b/app/dialplan/dialplan_add.php
@@ -40,9 +40,9 @@ else {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 $page["title"] = $text['title-dialplan_add'];
-require_once "includes/paging.php";
+require_once "resources/paging.php";
 
 $order_by = $_GET["order_by"];
 $order = $_GET["order"];
@@ -89,7 +89,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		//if (strlen($dialplan_enabled) == 0) { $msg .= $text['message-required'].$text['label-enabled']."<br>\n"; }
 		//if (strlen($dialplan_description) == 0) { $msg .= $text['message-required'].$text['label-description']."<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -97,7 +97,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -256,12 +256,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		}
 
 	//redirect the browser
-		require_once "includes/header.php";
+		require_once "resources/header.php";
 		echo "<meta http-equiv=\"refresh\" content=\"2;url=".PROJECT_PATH."/app/dialplan/dialplans.php\">\n";
 		echo "<div align='center'>\n";
 		echo $text['message-update']."\n";
 		echo "</div>\n";
-		require_once "includes/footer.php";
+		require_once "resources/footer.php";
 		return;
 } //end if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
 
@@ -643,6 +643,6 @@ echo "</table>";
 echo "</div>";
 echo "<br><br>";
 
-require_once "includes/footer.php";
+require_once "resources/footer.php";
 
 ?>
\ No newline at end of file
diff --git a/app/dialplan/dialplan_advanced.php b/app/dialplan/dialplan_advanced.php
index feba2ea677..36dcafa697 100644
--- a/app/dialplan/dialplan_advanced.php
+++ b/app/dialplan/dialplan_advanced.php
@@ -40,7 +40,7 @@ else {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 $page["title"] = $text['title-default_dialplan'];
 
 if ($_GET['a'] == "default" && permission_exists('dialplan_advanced_edit')) {
@@ -162,5 +162,5 @@ function sf() { document.forms[0].savetopath.focus(); }
 </div>
 
 <?php
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/dialplan/dialplan_copy.php b/app/dialplan/dialplan_copy.php
index 8be522ff4c..7399993f2b 100644
--- a/app/dialplan/dialplan_copy.php
+++ b/app/dialplan/dialplan_copy.php
@@ -26,7 +26,7 @@
 include "root.php";
 require_once "resources/require.php";
 require_once "resources/check_auth.php";
-require_once "includes/paging.php";
+require_once "resources/paging.php";
 if (permission_exists('dialplan_add')
 	|| permission_exists('inbound_route_add')
 	|| permission_exists('outbound_route_add')
@@ -150,7 +150,7 @@ else {
 		}
 
 	//redirect the user
-		require_once "includes/header.php";
+		require_once "resources/header.php";
 		switch ($app_uuid) {
 			case "c03b422e-13a8-bd1b-e42b-b6b9b4d27ce4":
 				//inbound routes
@@ -171,7 +171,7 @@ else {
 		echo "<div align='center'>\n";
 		echo $text['message-copy']."\n";
 		echo "</div>\n";
-		require_once "includes/footer.php";
+		require_once "resources/footer.php";
 		return;
 
 ?>
\ No newline at end of file
diff --git a/app/dialplan/dialplan_delete.php b/app/dialplan/dialplan_delete.php
index 5ad9e1e936..732ae18733 100644
--- a/app/dialplan/dialplan_delete.php
+++ b/app/dialplan/dialplan_delete.php
@@ -94,7 +94,7 @@ if (strlen($dialplan_uuid)>0) {
 }
 
 //redirect the user
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	switch ($app_uuid) {
 		case "c03b422e-13a8-bd1b-e42b-b6b9b4d27ce4":
 			//inbound routes
@@ -115,6 +115,6 @@ if (strlen($dialplan_uuid)>0) {
 	echo "<div align='center'>\n";
 	echo $text['message-delete']."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 ?>
\ No newline at end of file
diff --git a/app/dialplan/dialplan_details_delete.php b/app/dialplan/dialplan_details_delete.php
index 5f2403deb6..cd285809bb 100644
--- a/app/dialplan/dialplan_details_delete.php
+++ b/app/dialplan/dialplan_details_delete.php
@@ -71,11 +71,11 @@ if (strlen($id)>0) {
 }
 
 //redirect the user
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=dialplan_edit.php?id=".$dialplan_uuid."\">\n";
 	echo "<div align='center'>\n";
 	echo $text['message-delete']."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 
 ?>
\ No newline at end of file
diff --git a/app/dialplan/dialplan_details_edit.php b/app/dialplan/dialplan_details_edit.php
index 0b78ae8d59..a27573cdfc 100644
--- a/app/dialplan/dialplan_details_edit.php
+++ b/app/dialplan/dialplan_details_edit.php
@@ -87,7 +87,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		//if (strlen($dialplan_detail_type) == 0) { $msg .= $text['message-required'].$text['label-type']."<br>\n"; }
 		//if (strlen($dialplan_detail_data) == 0) { $msg .= $text['message-required'].$text['label-data']."<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -95,7 +95,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -147,12 +147,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 					$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
 				}
 
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=dialplan_edit.php?id=".$dialplan_uuid."\">\n";
 				echo "<div align='center'>\n";
 				echo $text['message-add']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 			} //if ($action == "add")
 
@@ -186,12 +186,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 					$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
 				}
 
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=dialplan_edit.php?id=".$dialplan_uuid."\">\n";
 				echo "<div align='center'>\n";
 				echo $text['message-update']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 		   } //if ($action == "update")
 		} //if ($_POST["persistformvar"] != "true") {
@@ -221,7 +221,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	$page["title"] = $text['title-dialplan_detail'];
 
 //show the content
@@ -571,5 +571,5 @@ function Replaceivr_menu_option_param(obj){
 	echo "</div>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/dialplan/dialplan_edit.php b/app/dialplan/dialplan_edit.php
index f42ad7818c..6066790bd1 100644
--- a/app/dialplan/dialplan_edit.php
+++ b/app/dialplan/dialplan_edit.php
@@ -26,7 +26,7 @@
 include "root.php";
 require_once "resources/require.php";
 require_once "resources/check_auth.php";
-require_once "includes/paging.php";
+require_once "resources/paging.php";
 if (permission_exists('dialplan_add')
 	|| permission_exists('dialplan_edit')
 	|| permission_exists('inbound_route_add')
@@ -87,7 +87,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		if (strlen($dialplan_enabled) == 0) { $msg .= $text['message-required'].$text['label-enabled']."<br>\n"; }
 		//if (strlen($dialplan_description) == 0) { $msg .= $text['message-required'].$text['label-description']."<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -95,7 +95,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -142,7 +142,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 					save_dialplan_xml();
 
 				//redirect the user
-					require_once "includes/header.php";
+					require_once "resources/header.php";
 					switch ($app_uuid) {
 						case "c03b422e-13a8-bd1b-e42b-b6b9b4d27ce4":
 							//inbound routes
@@ -163,7 +163,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 					echo "<div align='center'>\n";
 					echo $text['message-add']."\n";
 					echo "</div>\n";
-					require_once "includes/footer.php";
+					require_once "resources/footer.php";
 					return;
 			} //if ($action == "add")
 
@@ -193,7 +193,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 					save_dialplan_xml();
 
 				//redirect the user
-					require_once "includes/header.php";
+					require_once "resources/header.php";
 					switch ($app_uuid) {
 						case "c03b422e-13a8-bd1b-e42b-b6b9b4d27ce4":
 							//inbound routes
@@ -214,7 +214,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 					echo "<div align='center'>\n";
 					echo $text['message-update']."\n";
 					echo "</div>\n";
-					require_once "includes/footer.php";
+					require_once "resources/footer.php";
 					return;
 			} //if ($action == "update")
 		} //if ($_POST["persistformvar"] != "true")
@@ -243,7 +243,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	$page["title"] = $text['title-dialplan_edit'];
 
 //show the content
@@ -594,5 +594,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	} //end if update
 
 //show the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/dialplan/dialplans.php b/app/dialplan/dialplans.php
index 16ca201e78..16206e4f34 100644
--- a/app/dialplan/dialplans.php
+++ b/app/dialplan/dialplans.php
@@ -47,7 +47,7 @@ else {
 	$app_uuid = $_GET["app_uuid"];
 
 //includes
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	if ($app_uuid == "c03b422e-13a8-bd1b-e42b-b6b9b4d27ce4") {
 		$page["title"] = $text['title-inbound_routes'];
 	}
@@ -61,7 +61,7 @@ else {
 		$page["title"] = $text['title-dialplan_manager'];
 	}
 
-	require_once "includes/paging.php";
+	require_once "resources/paging.php";
 
 //show the content
 	echo "<div align='center'>";
@@ -342,7 +342,7 @@ else {
 	echo "<br><br>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 
 //unset the variables
 	unset ($result_count);
diff --git a/app/dialplan_inbound/dialplan_inbound_add.php b/app/dialplan_inbound/dialplan_inbound_add.php
index 1c62fc047e..3b5761718a 100644
--- a/app/dialplan_inbound/dialplan_inbound_add.php
+++ b/app/dialplan_inbound/dialplan_inbound_add.php
@@ -40,10 +40,10 @@ foreach($text as $key => $value) {
 	$text[$key] = $value[$_SESSION['domain']['language']['code']];
 }
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 $page["title"] = $text['title-dialplan-inbound-add'];
 
-require_once "includes/paging.php";
+require_once "resources/paging.php";
 
 
 //get the http get values and set them as php variables
@@ -123,7 +123,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		//if (strlen($dialplan_enabled) == 0) { $msg .= "Please provide: Enabled True or False<br>\n"; }
 		//if (strlen($dialplan_description) == 0) { $msg .= "Please provide: Description<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -131,7 +131,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -586,12 +586,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		save_dialplan_xml();
 
 	//redirect the user
-		require_once "includes/header.php";
+		require_once "resources/header.php";
 		echo "<meta http-equiv=\"refresh\" content=\"2;url=".PROJECT_PATH."/app/dialplan/dialplans.php?app_uuid=c03b422e-13a8-bd1b-e42b-b6b9b4d27ce4\">\n";
 		echo "<div align='center'>\n";
 		echo "".$text['confirm-update-complete']."\n";
 		echo "</div>\n";
-		require_once "includes/footer.php";
+		require_once "resources/footer.php";
 		return;
 } //end if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
 
@@ -992,5 +992,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "<br><br>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/dialplan_outbound/dialplan_outbound_add.php b/app/dialplan_outbound/dialplan_outbound_add.php
index 78b31eb6d8..7b9f932d67 100644
--- a/app/dialplan_outbound/dialplan_outbound_add.php
+++ b/app/dialplan_outbound/dialplan_outbound_add.php
@@ -42,10 +42,10 @@ else {
 	}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	$page["title"] = $text['title-dialplan-outbound-add'];
 
-	require_once "includes/paging.php";
+	require_once "resources/paging.php";
 
 //get the http post values and set theme as php variables
 	if (count($_POST)>0) {
@@ -199,7 +199,7 @@ else {
 			//if (strlen($dialplan_enabled) == 0) { $msg .= "Please provide: Enabled True or False<br>\n"; }
 			//if (strlen($description) == 0) { $msg .= "Please provide: Description<br>\n"; }
 			if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				require_once "resources/persist_form_var.php";
 				echo "<div align='center'>\n";
 				echo "<table><tr><td>\n";
@@ -207,7 +207,7 @@ else {
 				echo "</td></tr></table>\n";
 				persistformvar($_POST);
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 			}
 
@@ -568,12 +568,12 @@ else {
 			save_dialplan_xml();
 
 		//redirect the user
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=".PROJECT_PATH."/app/dialplan/dialplans.php?app_uuid=8c914ec3-9fc0-8ab5-4cda-6c9288bdc9a3\">\n";
 			echo "<div align='center'>\n";
 			echo $text['message-update']."\n";
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 	} //end if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
 ?>
@@ -1001,5 +1001,5 @@ function type_onchange(dialplan_detail_type) {
 	echo "<br><br>";
 
 //show the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/edit/cliplist.php b/app/edit/cliplist.php
index ceb1a04ff3..6ff36ed6a6 100644
--- a/app/edit/cliplist.php
+++ b/app/edit/cliplist.php
@@ -228,7 +228,7 @@ echo "</table>\n";
 echo "</div>";
 
 echo "<br><br>";
-//require_once "includes/footer.php";
+//require_once "resources/footer.php";
 
 unset ($result_count);
 unset ($result);
diff --git a/app/exec/exec.php b/app/exec/exec.php
index a90af4db96..d9de3073f8 100644
--- a/app/exec/exec.php
+++ b/app/exec/exec.php
@@ -50,7 +50,7 @@ else {
 	}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 
 //edit area
 	echo "	<script language=\"javascript\" type=\"text/javascript\" src=\"".PROJECT_PATH."/resources/edit_area/edit_area_full.js\"></script>\n";
@@ -202,5 +202,5 @@ else {
 	echo "</div>";
 
 //show the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/extensions/extension_copy.php b/app/extensions/extension_copy.php
index b0eaadea3a..f9f58ad9a8 100644
--- a/app/extensions/extension_copy.php
+++ b/app/extensions/extension_copy.php
@@ -26,7 +26,7 @@
 include "root.php";
 require_once "resources/require.php";
 require_once "resources/check_auth.php";
-require_once "includes/paging.php";
+require_once "resources/paging.php";
 if (permission_exists('extension_add')) {
 	//access granted
 }
@@ -150,7 +150,7 @@ else {
 	}
 
 //redirect the user
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=extensions.php\">\n";
 	echo "<br />\n";
 	echo "<div align='center'>\n";
@@ -164,7 +164,7 @@ else {
 	echo "	</table>\n";
 	echo "	<br />\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>
\ No newline at end of file
diff --git a/app/extensions/extension_delete.php b/app/extensions/extension_delete.php
index ea9c694f1e..bb20bdb336 100644
--- a/app/extensions/extension_delete.php
+++ b/app/extensions/extension_delete.php
@@ -69,7 +69,7 @@ else {
 	}
 
 //redirect the user
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=extensions.php\">\n";
 	echo "<br />\n";
 	echo "<div align='center'>\n";
@@ -83,7 +83,7 @@ else {
 	echo "	</table>\n";
 	echo "	<br />\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>
\ No newline at end of file
diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php
index cdacb422e2..3931adacd2 100644
--- a/app/extensions/extension_edit.php
+++ b/app/extensions/extension_edit.php
@@ -108,10 +108,10 @@ else {
 			$sql .= "and user_uuid = '".$user_uuid."' ";
 			$db->exec(check_sql($sql));
 		//redirect the browser
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=extension_edit.php?id=$extension_uuid\">\n";
 			echo "<div align='center'>".$text['message-delete']."</div>";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 	}
 
@@ -127,10 +127,10 @@ else {
 			$sql .= "and device_extension_uuid = '".$device_extension_uuid."' ";
 			$db->exec(check_sql($sql));
 		//redirect the browser
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=extension_edit.php?id=$extension_uuid\">\n";
 			echo "<div align='center'>".$text['message-delete']."</div>";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 	}
 
@@ -156,10 +156,10 @@ else {
 			$sql_insert .= ")";
 			$db->exec($sql_insert);
 		//redirect the browser
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=extension_edit.php?id=$extension_uuid\">\n";
 			echo "<div align='center'>".$text['message-add']."</div>";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 	}
 
@@ -188,10 +188,10 @@ else {
 			$db->exec($sql_insert);
 
 		//redirect the browser
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=extension_edit.php?id=$extension_uuid\">\n";
 			echo "<div align='center'>".$text['message-add']."</div>";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 	}
 
@@ -232,7 +232,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		if (strlen($enabled) == 0) { $msg .= $text['message-required'].$text['label-enabled']."<br>\n"; }
 		//if (strlen($description) == 0) { $msg .= $text['message-required']."Description<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -240,7 +240,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -544,7 +544,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 					$row_style["1"] = "row_style1";
 
 				//show the action and redirect the user
-					require_once "includes/header.php";
+					require_once "resources/header.php";
 					echo "<br />\n";
 					echo "<div align='center'>\n";
 					if (count($generated_users) == 0) {
@@ -580,11 +580,11 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 							echo "	</table>";
 					}
 					echo "</div>\n";
-					require_once "includes/footer.php";
+					require_once "resources/footer.php";
 					return;
 			}
 			if ($action == "update") {
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=extensions.php\">\n";
 				echo "<br />\n";
 				echo "<div align='center'>\n";
@@ -603,7 +603,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				echo "	</table>\n";
 				echo "<br />\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 			}
 	} //if ($_POST["persistformvar"] != "true")
@@ -667,7 +667,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	if (strlen($call_timeout) == 0) { $call_timeout = '30'; }
 
 //begin the page content
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	if ($action == "update") {
 	$page["title"] = $text['title-extension-edit'];
 	}
@@ -1519,5 +1519,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</table>";
 	echo "</div>";
 
-require_once "includes/footer.php";
+require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/extensions/extensions.php b/app/extensions/extensions.php
index 5edfb83985..49f54cefd3 100644
--- a/app/extensions/extensions.php
+++ b/app/extensions/extensions.php
@@ -40,10 +40,10 @@ else {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 $page["title"] = $text['title-extensions'];
 
-require_once "includes/paging.php";
+require_once "resources/paging.php";
 
 //get the http values and set them as variables
 	if (isset($_GET["order_by"])) {
@@ -186,5 +186,5 @@ require_once "includes/paging.php";
 	echo "<br><br>";
 
 //show the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/fax/fax.php b/app/fax/fax.php
index 90d7c9ca1a..53e43650ef 100644
--- a/app/fax/fax.php
+++ b/app/fax/fax.php
@@ -33,8 +33,8 @@ else {
 	echo "access denied";
 	exit;
 }
-require_once "includes/header.php";
-require_once "includes/paging.php";
+require_once "resources/header.php";
+require_once "resources/paging.php";
 
 //add multi-lingual support
 	echo "<!--\n";
@@ -184,5 +184,5 @@ require_once "includes/paging.php";
 	echo "<br><br>";
 
 //show the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/fax/fax_copy.php b/app/fax/fax_copy.php
index 19c277d90d..077e4c7f20 100644
--- a/app/fax/fax_copy.php
+++ b/app/fax/fax_copy.php
@@ -26,7 +26,7 @@
 include "root.php";
 require_once "resources/require.php";
 require_once "resources/check_auth.php";
-require_once "includes/paging.php";
+require_once "resources/paging.php";
 if (permission_exists('fax_extension_add')) {
 	//access granted
 }
@@ -108,12 +108,12 @@ else {
 	unset($sql);
 
 //redirect the user
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=fax.php\">\n";
 	echo "<div align='center'>\n";
 	echo "".$text['confirm-copy']."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>
\ No newline at end of file
diff --git a/app/fax/fax_delete.php b/app/fax/fax_delete.php
index fd8b0613c0..9095a52638 100644
--- a/app/fax/fax_delete.php
+++ b/app/fax/fax_delete.php
@@ -96,12 +96,12 @@ else {
 	}
 
 //redirect the user
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=fax.php\">\n";
 	echo "<div align='center'>\n";
 	echo "".$text['confirm-delete']."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>
\ No newline at end of file
diff --git a/app/fax/fax_edit.php b/app/fax/fax_edit.php
index 6f06a31363..e9410a7f6d 100644
--- a/app/fax/fax_edit.php
+++ b/app/fax/fax_edit.php
@@ -133,10 +133,10 @@ else {
 			$db->exec(check_sql($sql));
 
 		//redirect the browser
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=fax_edit.php?id=$fax_uuid\">\n";
 			echo "<div align='center'>".$text['confirm-delete']."</div>";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 	}
 
@@ -163,10 +163,10 @@ else {
 			$db->exec($sql_insert);
 
 		//redirect the browser
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=fax_edit.php?id=$fax_uuid\">\n";
 			echo "<div align='center'>".$text['confirm-add']."</div>";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 	}
 
@@ -190,7 +190,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		//if (strlen($fax_forward_number) == 0) { $msg .= "Please provide: Forward Number<br>\n"; }
 		//if (strlen($fax_description) == 0) { $msg .= "Please provide: Description<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -198,7 +198,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -464,7 +464,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				}
 
 			//redirect the browser
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=fax.php\">\n";
 				echo "<div align='center'>\n";
 				if ($action == "update" && permission_exists('fax_extension_edit')) {
@@ -474,7 +474,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 					echo "".$text['confirm-add']."\n";
 				}
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 
 		} //if ($_POST["persistformvar"] != "true")
@@ -514,7 +514,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 
 //fax extension form
 	echo "<div align='center'>";
@@ -700,5 +700,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "<br />\n";
 
 //show the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
diff --git a/app/fax/fax_view.php b/app/fax/fax_view.php
index aabf2dc725..977057ed0a 100644
--- a/app/fax/fax_view.php
+++ b/app/fax/fax_view.php
@@ -367,7 +367,7 @@ else {
 
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 
 //fax extension form
 	echo "<div align='center'>";
@@ -729,5 +729,5 @@ else {
 	echo "</div>";
 
 //show the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
diff --git a/app/fifo/fifo.php b/app/fifo/fifo.php
index 8bed15545f..eb70d2fc2c 100644
--- a/app/fifo/fifo.php
+++ b/app/fifo/fifo.php
@@ -40,10 +40,10 @@ else {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 $page["title"] = $text['title-queues'];
 
-require_once "includes/paging.php";
+require_once "resources/paging.php";
 
 //get http values and set them as variables
 	$order_by = $_GET["order_by"];
@@ -199,7 +199,7 @@ require_once "includes/paging.php";
 	echo "<br><br>";
 
 //show the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	unset ($result_count);
 	unset ($result);
 	unset ($key);
diff --git a/app/fifo/fifo_add.php b/app/fifo/fifo_add.php
index 97bb658c7c..46c0de3908 100644
--- a/app/fifo/fifo_add.php
+++ b/app/fifo/fifo_add.php
@@ -40,10 +40,10 @@ else {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 $page["title"] = $text['title-queue_add'];
 
-require_once "includes/paging.php";
+require_once "resources/paging.php";
 
 //get http values and set them as variables
 	if (count($_POST)>0) {
@@ -68,7 +68,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		if (strlen($extension_name) == 0) { $msg .= $text['message-required'].$text['label-name']."<br>\n"; }
 		if (strlen($queue_extension_number) == 0) { $msg .= $text['message-required'].$text['label-extension']."<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -76,7 +76,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -257,12 +257,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		}
 
 	//redirect the user
-		require_once "includes/header.php";
+		require_once "resources/header.php";
 		echo "<meta http-equiv=\"refresh\" content=\"2;url=fifo.php\">\n";
 		echo "<div align='center'>\n";
 		echo $text['message-update']."\n";
 		echo "</div>\n";
-		require_once "includes/footer.php";
+		require_once "resources/footer.php";
 		return;
 
 } //end if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
@@ -428,5 +428,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "<br><br>";
 
 //show the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/fifo/fifo_delete.php b/app/fifo/fifo_delete.php
index 93389dd044..b415520d5d 100644
--- a/app/fifo/fifo_delete.php
+++ b/app/fifo/fifo_delete.php
@@ -83,12 +83,12 @@ if (strlen($id)>0) {
 }
 
 //redirect the user
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=fifo.php\">\n";
 	echo "<div align='center'>\n";
 	echo $text['message-delete']."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>
\ No newline at end of file
diff --git a/app/fifo/fifo_detail_delete.php b/app/fifo/fifo_detail_delete.php
index 10926a4e24..5d9ea552b4 100644
--- a/app/fifo/fifo_detail_delete.php
+++ b/app/fifo/fifo_detail_delete.php
@@ -66,14 +66,14 @@ if (strlen($id)>0) {
 }
 
 //redirect the user
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=fifo_edit.php?id=".$dialplan_uuid."\">\n";
 	echo "<div align='center'>\n";
 	echo $text['message-delete']."\n";
 	echo "</div>\n";
 
 //show the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>
\ No newline at end of file
diff --git a/app/fifo/fifo_detail_edit.php b/app/fifo/fifo_detail_edit.php
index 74a4c18b17..7e7adbe7e7 100644
--- a/app/fifo/fifo_detail_edit.php
+++ b/app/fifo/fifo_detail_edit.php
@@ -76,7 +76,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		if (strlen($dialplan_detail_tag) == 0) { $msg .= $text['message-required'].$text['label-tag']."<br>\n"; }
 		if (strlen($dialplan_detail_order) == 0) { $msg .= $text['message-required'].$text['label-order']."<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -84,7 +84,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -125,12 +125,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 					$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
 				}
 
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=fifo_edit.php?id=".$dialplan_uuid."\">\n";
 				echo "<div align='center'>\n";
 				echo $text['message-add']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 			} //if ($action == "add")
 
@@ -157,12 +157,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 					$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
 				}
 
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=fifo_edit.php?id=".$dialplan_uuid."\">\n";
 				echo "<div align='center'>\n";
 				echo $text['message-update']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 		   } //if ($action == "update")
 		} //if ($_POST["persistformvar"] != "true")
@@ -190,7 +190,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	if ($action == "add") {
 		$page["title"] = $text['title-queue_detail_add'];
 	}
@@ -475,5 +475,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</div>";
 
 //show the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/fifo/fifo_edit.php b/app/fifo/fifo_edit.php
index f0e1eb890c..5e556bd5af 100644
--- a/app/fifo/fifo_edit.php
+++ b/app/fifo/fifo_edit.php
@@ -26,7 +26,7 @@
 include "root.php";
 require_once "resources/require.php";
 require_once "resources/check_auth.php";
-require_once "includes/paging.php";
+require_once "resources/paging.php";
 if (permission_exists('fifo_add') || permission_exists('fifo_edit')) {
 	//access granted
 }
@@ -74,7 +74,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		if (strlen($dialplan_order) == 0) { $msg .= $text['message-required'].$text['label-order']."<br>\n"; }
 		if (strlen($dialplan_enabled) == 0) { $msg .= $text['message-required'].$text['label-enabled']."<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -82,7 +82,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -131,12 +131,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 					$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
 				}
 
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=fifo.php\">\n";
 				echo "<div align='center'>\n";
 				echo $text['message-add']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 			} //if ($action == "add")
 
@@ -164,12 +164,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 					$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
 				}
 
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=fifo.php\">\n";
 				echo "<div align='center'>\n";
 				echo $text['message-update']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 			} //if ($action == "update")
 		} //if ($_POST["persistformvar"] != "true")
@@ -198,7 +198,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	$page["title"] = $text['title-queue_edit'];
 
 //show the content
@@ -513,5 +513,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		} //end if update
 
 //show the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/fifo_list/fifo_interactive.php b/app/fifo_list/fifo_interactive.php
index c8f11a55fa..a3b41d50e2 100644
--- a/app/fifo_list/fifo_interactive.php
+++ b/app/fifo_list/fifo_interactive.php
@@ -57,7 +57,7 @@ else {
 	$tmp_fifo_name = $tmp_fifo_array[0];
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	$page["title"] = $text['title-queue'];
 
 ?>
@@ -146,5 +146,5 @@ echo "</table>";
 
 echo "</div>";
 
-require_once "includes/footer.php";
+require_once "resources/footer.php";
 ?>
diff --git a/app/fifo_list/fifo_list.php b/app/fifo_list/fifo_list.php
index 44c589eaca..0e5441b3be 100644
--- a/app/fifo_list/fifo_list.php
+++ b/app/fifo_list/fifo_list.php
@@ -40,7 +40,7 @@ else {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 $page["title"] = $text['title-active_queues'];
 
 ?><script type="text/javascript">
@@ -116,5 +116,5 @@ echo "	</tr>";
 echo "</table>";
 echo "</div>";
 
-require_once "includes/footer.php";
+require_once "resources/footer.php";
 ?>
diff --git a/app/gateways/gateway_copy.php b/app/gateways/gateway_copy.php
index 45e6f64d5f..0f0423a95c 100644
--- a/app/gateways/gateway_copy.php
+++ b/app/gateways/gateway_copy.php
@@ -26,7 +26,7 @@
 include "root.php";
 require_once "resources/require.php";
 require_once "resources/check_auth.php";
-require_once "includes/paging.php";
+require_once "resources/paging.php";
 if (permission_exists('gateway_add')) {
 	//access granted
 }
@@ -141,12 +141,12 @@ else {
 	save_gateway_xml();
 
 //redirect the user
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=gateways.php\">\n";
 	echo "<div align='center'>\n";
 	echo "Copy Complete\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>
\ No newline at end of file
diff --git a/app/gateways/gateway_delete.php b/app/gateways/gateway_delete.php
index 665fa8a391..5fe24593c8 100644
--- a/app/gateways/gateway_delete.php
+++ b/app/gateways/gateway_delete.php
@@ -123,12 +123,12 @@ if (strlen($_GET["id"])>0) {
 }
 
 //redirect the users
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=gateways.php\">\n";
 	echo "<div align='center'>\n";
 	echo $text['message-delete']."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>
\ No newline at end of file
diff --git a/app/gateways/gateway_edit.php b/app/gateways/gateway_edit.php
index bed35285fe..8acf99ae2e 100644
--- a/app/gateways/gateway_edit.php
+++ b/app/gateways/gateway_edit.php
@@ -115,7 +115,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		if (strlen($enabled) == 0) { $msg .= $text['message-required']." ".$text['label-enabled']."<br>\n"; }
 		//if (strlen($description) == 0) { $msg .= $text['message-required']." ".$text['label-description']."<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -123,7 +123,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -262,7 +262,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 
 	//redirect the user
 		if (isset($action)) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=gateways.php\">\n";
 			echo "<div align='center'>\n";
 			if ($action == "add") {
@@ -272,7 +272,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				echo "	".$text['message-update']."\n";
 			}
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 } //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
@@ -318,7 +318,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 
 //show the content
 	echo "<script type=\"text/javascript\" language=\"JavaScript\">\n";
@@ -802,5 +802,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</div>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/gateways/gateways.php b/app/gateways/gateways.php
index d4c67d24bc..f387a3a30d 100644
--- a/app/gateways/gateways.php
+++ b/app/gateways/gateways.php
@@ -41,8 +41,8 @@ else {
 	}
 
 //additional includes
-	require_once "includes/header.php";
-	require_once "includes/paging.php";
+	require_once "resources/header.php";
+	require_once "resources/paging.php";
 
 //get variables used to control the order
 	$order_by = check_str($_GET["order_by"]);
@@ -265,5 +265,5 @@ else {
 	echo "<br /><br />";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/hot_desking/extension_delete.php b/app/hot_desking/extension_delete.php
index 17377b1a32..20975989eb 100644
--- a/app/hot_desking/extension_delete.php
+++ b/app/hot_desking/extension_delete.php
@@ -78,7 +78,7 @@ if (count($_GET)>0) {
 	}
 
 //redirect the user
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=index.php\">\n";
 	echo "<br />\n";
 	echo "<div align='center'>\n";
@@ -92,7 +92,7 @@ if (count($_GET)>0) {
 	echo "	</table>\n";
 	echo "	<br />\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>
\ No newline at end of file
diff --git a/app/hot_desking/extension_edit.php b/app/hot_desking/extension_edit.php
index 91e60967c7..825d2e9fd2 100644
--- a/app/hot_desking/extension_edit.php
+++ b/app/hot_desking/extension_edit.php
@@ -76,7 +76,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		}
 		unset($prep_statement, $result);
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -84,7 +84,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -152,7 +152,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			}
 
 		//show the action and redirect the user
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=index.php\">\n";
 			echo "<br />\n";
 			echo "<div align='center'>\n";
@@ -171,7 +171,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "	</table>\n";
 			echo "<br />\n";
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 
 	} //if ($_POST["persistformvar"] != "true")
@@ -201,7 +201,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	if (strlen($limit_max) == 0) { $limit_max = '5'; }
 
 //begin the page content
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 
 	echo "<script type=\"text/javascript\" language=\"JavaScript\">\n";
 	echo "\n";
@@ -327,5 +327,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</table>";
 	echo "</div>";
 
-require_once "includes/footer.php";
+require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/hot_desking/index.php b/app/hot_desking/index.php
index ad0f09863e..f7345b7366 100644
--- a/app/hot_desking/index.php
+++ b/app/hot_desking/index.php
@@ -40,10 +40,10 @@ else {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 $page["title"] = $text['title-hot_desking'];
 
-require_once "includes/paging.php";
+require_once "resources/paging.php";
 
 //get the http values and set them as variables
 	if (isset($_GET["order_by"])) {
@@ -182,5 +182,5 @@ require_once "includes/paging.php";
 	echo "<br><br>";
 
 //show the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/hunt_groups/hunt_group_call_forward.php b/app/hunt_groups/hunt_group_call_forward.php
index b1d7b4ae54..fed00931ff 100644
--- a/app/hunt_groups/hunt_group_call_forward.php
+++ b/app/hunt_groups/hunt_group_call_forward.php
@@ -30,10 +30,10 @@ require_once "resources/check_auth.php";
 //check permissions
 if (permission_exists('hunt_group_call_forward')) {
 
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	$page["title"] = $text['title-hunt-group_call_forward'];
 
-	require_once "includes/paging.php";
+	require_once "resources/paging.php";
 
 
 	//add multi-lingual support
@@ -128,7 +128,7 @@ if (permission_exists('hunt_group_call_forward')) {
 	echo "</div>";
 
 	if ($is_included != "true") {
-		require_once "includes/footer.php";
+		require_once "resources/footer.php";
 	}
 }
 
diff --git a/app/hunt_groups/hunt_group_call_forward_edit.php b/app/hunt_groups/hunt_group_call_forward_edit.php
index 2a96742d7e..4fe4534f06 100644
--- a/app/hunt_groups/hunt_group_call_forward_edit.php
+++ b/app/hunt_groups/hunt_group_call_forward_edit.php
@@ -61,7 +61,7 @@ function destination_select($select_name, $select_value, $select_default) {
 }
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	$page["title"] = $text['title-hunt-group_call_forward'];
 
 //get the hunt_group_uuid
@@ -106,7 +106,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		//if (strlen($call_forward_number) == 0) { $msg .= $text['message-required'].$text['label-number']."<br>\n"; }
 		//if (strlen($hunt_group_call_prompt) == 0) { $msg .= $text['message-required'].$text['label-call_prompt']."<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -114,7 +114,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -347,12 +347,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		save_dialplan_xml();
 
 	//redirect the user
-		require_once "includes/header.php";
+		require_once "resources/header.php";
 		echo "<meta http-equiv=\"refresh\" content=\"3;url=".PROJECT_PATH."/app/hunt_group/hunt_group_call_forward.php\">\n";
 		echo "<div align='center'>\n";
 		echo $text['message-update']."<br />\n";
 		echo "</div>\n";
-		require_once "includes/footer.php";
+		require_once "resources/footer.php";
 		return;
 } //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
 
@@ -491,5 +491,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</div>";
 
 //show the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
diff --git a/app/hunt_groups/hunt_group_copy.php b/app/hunt_groups/hunt_group_copy.php
index 6ef3541b39..9d83f70e79 100644
--- a/app/hunt_groups/hunt_group_copy.php
+++ b/app/hunt_groups/hunt_group_copy.php
@@ -26,7 +26,7 @@
 include "root.php";
 require_once "resources/require.php";
 require_once "resources/check_auth.php";
-require_once "includes/paging.php";
+require_once "resources/paging.php";
 
 //check permissions
 	if (permission_exists('hunt_group_add')) {
@@ -173,12 +173,12 @@ require_once "includes/paging.php";
 		save_hunt_group_xml();
 
 	//redirect the user
-		require_once "includes/header.php";
+		require_once "resources/header.php";
 		echo "<meta http-equiv=\"refresh\" content=\"2;url=hunt_groups.php\">\n";
 		echo "<div align='center'>\n";
 		echo $text['message-copy']."\n";
 		echo "</div>\n";
-		require_once "includes/footer.php";
+		require_once "resources/footer.php";
 		return;
 
 ?>
\ No newline at end of file
diff --git a/app/hunt_groups/hunt_group_delete.php b/app/hunt_groups/hunt_group_delete.php
index 3611493059..ceebc2c20b 100644
--- a/app/hunt_groups/hunt_group_delete.php
+++ b/app/hunt_groups/hunt_group_delete.php
@@ -107,12 +107,12 @@ if (strlen($id)>0) {
 }
 
 //redirect the user
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=hunt_groups.php\">\n";
 	echo "<div align='center'>\n";
 	echo $text['message-delete']."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>
\ No newline at end of file
diff --git a/app/hunt_groups/hunt_group_destination_delete.php b/app/hunt_groups/hunt_group_destination_delete.php
index 212fdfbb16..aed3b5c76b 100644
--- a/app/hunt_groups/hunt_group_destination_delete.php
+++ b/app/hunt_groups/hunt_group_destination_delete.php
@@ -61,12 +61,12 @@ if (strlen($id)>0) {
 }
 
 //redirect the user
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=hunt_group_edit.php?id=".$hunt_group_uuid."\">\n";
 	echo "<div align='center'>\n";
 	echo $text['message-delete']."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>
\ No newline at end of file
diff --git a/app/hunt_groups/hunt_group_destination_edit.php b/app/hunt_groups/hunt_group_destination_edit.php
index d80e0be06c..fafe20331b 100644
--- a/app/hunt_groups/hunt_group_destination_edit.php
+++ b/app/hunt_groups/hunt_group_destination_edit.php
@@ -84,7 +84,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		//if (strlen($destination_enabled) == 0) { $msg .= $text['message-required'].$text['label-enabled']."<br>\n"; }
 		//if (strlen($destination_description) == 0) { $msg .= $text['message-required'].$text['label-description']."<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -92,7 +92,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -130,12 +130,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				//synchronize the xml config
 				save_hunt_group_xml();
 
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=hunt_group_edit.php?id=".$hunt_group_uuid."\">\n";
 				echo "<div align='center'>\n";
 				echo $text['message-add']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 			} //if ($action == "add")
 
@@ -156,12 +156,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				//synchronize the xml config
 				save_hunt_group_xml();
 
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=hunt_group_edit.php?id=".$hunt_group_uuid."\">\n";
 				echo "<div align='center'>\n";
 				echo $text['message-update']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 			} //if ($action == "update")
 		} //if ($_POST["persistformvar"] != "true")
@@ -190,7 +190,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	if ($action == "add") {
 		$page["title"] = $text['title-hunt_group_destination_add'];
 	}
@@ -372,5 +372,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</div>";
 
 //show the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/hunt_groups/hunt_group_edit.php b/app/hunt_groups/hunt_group_edit.php
index 7dfcb78db7..cc31674db4 100644
--- a/app/hunt_groups/hunt_group_edit.php
+++ b/app/hunt_groups/hunt_group_edit.php
@@ -26,7 +26,7 @@
 include "root.php";
 require_once "resources/require.php";
 require_once "resources/check_auth.php";
-require_once "includes/paging.php";
+require_once "resources/paging.php";
 
 //check permissions
 	if (permission_exists('hunt_group_add') || permission_exists('hunt_group_edit')) {
@@ -120,7 +120,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		//if (strlen($hunt_group_enabled) == 0) { $msg .= $text['message-required'].$text['label-enabled']."<br>\n"; }
 		//if (strlen($hunt_group_description) == 0) { $msg .= $text['message-required'].$text['label-description']."<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -128,7 +128,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -185,12 +185,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 					save_hunt_group_xml();
 
 				//redirect the user
-					require_once "includes/header.php";
+					require_once "resources/header.php";
 					echo "<meta http-equiv=\"refresh\" content=\"2;url=hunt_groups.php\">\n";
 					echo "<div align='center'>\n";
 					echo $text['message-add']."\n";
 					echo "</div>\n";
-					require_once "includes/footer.php";
+					require_once "resources/footer.php";
 					return;
 			} //if ($action == "add")
 
@@ -266,12 +266,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 					}
 
 				//rediret the user
-					require_once "includes/header.php";
+					require_once "resources/header.php";
 					echo "<meta http-equiv=\"refresh\" content=\"2;url=hunt_groups.php\">\n";
 					echo "<div align='center'>\n";
 					echo $text['message-update']."\n";
 					echo "</div>\n";
-					require_once "includes/footer.php";
+					require_once "resources/footer.php";
 					return;
 			} //if ($action == "update")
 		} //if ($_POST["persistformvar"] != "true")
@@ -308,7 +308,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	$page["title"] = $text['title-hunt_group'];
 
 
@@ -735,5 +735,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	} //end if update
 
 //show the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
diff --git a/app/hunt_groups/hunt_groups.php b/app/hunt_groups/hunt_groups.php
index f28206bd9b..322c1b9d44 100644
--- a/app/hunt_groups/hunt_groups.php
+++ b/app/hunt_groups/hunt_groups.php
@@ -42,10 +42,10 @@ require_once "resources/check_auth.php";
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 $page["title"] = $text['title-hunt_groups'];
 
-require_once "includes/paging.php";
+require_once "resources/paging.php";
 
 $order_by = $_GET["order_by"];
 $order = $_GET["order"];
@@ -186,7 +186,7 @@ echo "</table>";
 echo "</div>";
 echo "<br><br>";
 
-require_once "includes/footer.php";
+require_once "resources/footer.php";
 unset ($result_count);
 unset ($result);
 unset ($key);
diff --git a/app/ivr_menu/ivr_menu_copy.php b/app/ivr_menu/ivr_menu_copy.php
index c81b2c7c10..3f00c71a39 100644
--- a/app/ivr_menu/ivr_menu_copy.php
+++ b/app/ivr_menu/ivr_menu_copy.php
@@ -26,7 +26,7 @@
 include "root.php";
 require_once "resources/require.php";
 require_once "resources/check_auth.php";
-require_once "includes/paging.php";
+require_once "resources/paging.php";
 if (permission_exists('ivr_menu_edit')) {
 	//access granted
 }
@@ -176,12 +176,12 @@ else {
 	}
 
 //redirect the user
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=ivr_menus.php\">\n";
 	echo "<div align='center'>\n";
 	echo $text['message-copy']."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>
\ No newline at end of file
diff --git a/app/ivr_menu/ivr_menu_delete.php b/app/ivr_menu/ivr_menu_delete.php
index a522d30b29..b1b7d638f6 100644
--- a/app/ivr_menu/ivr_menu_delete.php
+++ b/app/ivr_menu/ivr_menu_delete.php
@@ -58,12 +58,12 @@ if (strlen($id)>0) {
 }
 
 //redirect the user
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=ivr_menus.php\">\n";
 	echo "<div align='center'>\n";
 	echo $text['message-delete']."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>
\ No newline at end of file
diff --git a/app/ivr_menu/ivr_menu_edit.php b/app/ivr_menu/ivr_menu_edit.php
index 77445801ca..ce78f20d83 100644
--- a/app/ivr_menu/ivr_menu_edit.php
+++ b/app/ivr_menu/ivr_menu_edit.php
@@ -163,7 +163,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		if (strlen($ivr_menu_enabled) == 0) { $msg .= $text['message-required'].$text['label-enabled']."<br>\n"; }
 		//if (strlen($ivr_menu_description) == 0) { $msg .= $text['message-required'].$text['label-description']."<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -171,7 +171,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -228,12 +228,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				}
 
 			//redirect the user
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=ivr_menus.php\">\n";
 				echo "<div align='center'>\n";
 				echo $text['message-update']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 		} //if ($_POST["persistformvar"] != "true")
 } //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
@@ -297,7 +297,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	if (!isset($ivr_menu_exit_action)) { $ivr_menu_exit_action = ''; }
 
 //content
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	$page["title"] = $text['title-ivr_menu'];
 
 	echo "<script type=\"text/javascript\" language=\"JavaScript\">\n";
@@ -862,5 +862,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</table>";
 	echo "</div>";
 
-require_once "includes/footer.php";
+require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/ivr_menu/ivr_menu_option_delete.php b/app/ivr_menu/ivr_menu_option_delete.php
index da498139ae..d2fa1f9007 100644
--- a/app/ivr_menu/ivr_menu_option_delete.php
+++ b/app/ivr_menu/ivr_menu_option_delete.php
@@ -58,12 +58,12 @@ else {
 	}
 
 //redirect the user
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=ivr_menu_edit.php?id=$ivr_menu_uuid\">\n";
 	echo "<div align='center'>\n";
 	echo $text['message-delete']."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>
\ No newline at end of file
diff --git a/app/ivr_menu/ivr_menu_option_edit.php b/app/ivr_menu/ivr_menu_option_edit.php
index 430bb898ca..b63d194026 100644
--- a/app/ivr_menu/ivr_menu_option_edit.php
+++ b/app/ivr_menu/ivr_menu_option_edit.php
@@ -88,7 +88,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		if (strlen($ivr_menu_option_order) == 0) { $msg .= $text['message-required'].$text['label-order']."<br>\n"; }
 		//if (strlen($ivr_menu_option_description) == 0) { $msg .= $text['message-required'].$text['label-description']."<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -96,7 +96,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -122,12 +122,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 					$ivr->add();
 
 				//redirect the user
-					require_once "includes/header.php";
+					require_once "resources/header.php";
 					echo "<meta http-equiv=\"refresh\" content=\"2;url=ivr_menu_edit.php?id=$ivr_menu_uuid\">\n";
 					echo "<div align='center'>\n";
 					echo "Add Complete\n";
 					echo "</div>\n";
-					require_once "includes/footer.php";
+					require_once "resources/footer.php";
 					return;
 			} //if ($action == "add")
 
@@ -137,12 +137,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 					$ivr->update();
 
 				//redirect the user
-					require_once "includes/header.php";
+					require_once "resources/header.php";
 					echo "<meta http-equiv=\"refresh\" content=\"2;url=ivr_menu_edit.php?id=$ivr_menu_uuid\">\n";
 					echo "<div align='center'>\n";
 					echo $text['message-add']."\n";
 					echo "</div>\n";
-					require_once "includes/footer.php";
+					require_once "resources/footer.php";
 					return;
 			} //if ($action == "update")
 		} //if ($_POST["persistformvar"] != "true")
@@ -182,7 +182,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 //send the content to the browser
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	if ($action == "add") {
 		$page["title"] = $text['title-option_add'];
 	}
@@ -363,5 +363,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</table>\n";
 	echo "</div>\n";
 
-require_once "includes/footer.php";
+require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/ivr_menu/ivr_menu_options.php b/app/ivr_menu/ivr_menu_options.php
index 2e56a1fa4d..67ee182268 100644
--- a/app/ivr_menu/ivr_menu_options.php
+++ b/app/ivr_menu/ivr_menu_options.php
@@ -35,7 +35,7 @@ else {
 }
 
 //additional includes
-	require_once "includes/paging.php";
+	require_once "resources/paging.php";
 
 //get the http values and set them as variables
 	if (isset($_GET["order_by"])) {
diff --git a/app/ivr_menu/ivr_menus.php b/app/ivr_menu/ivr_menus.php
index 81e2473fbf..c23553e26a 100644
--- a/app/ivr_menu/ivr_menus.php
+++ b/app/ivr_menu/ivr_menus.php
@@ -41,10 +41,10 @@ else {
 	}
 
 //additional includes
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	$page["title"] = $text['title-ivr_menus'];
 
-	require_once "includes/paging.php";
+	require_once "resources/paging.php";
 
 //get the http values and set them as variables
 	if (isset($_GET["order_by"])) {
@@ -174,5 +174,5 @@ else {
 	echo "<br><br>";
 
 //show the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
diff --git a/app/log_viewer/log_viewer.php b/app/log_viewer/log_viewer.php
index f99c1bd6bf..a715705e78 100644
--- a/app/log_viewer/log_viewer.php
+++ b/app/log_viewer/log_viewer.php
@@ -71,7 +71,7 @@ if (permission_exists('log_download')) {
 	}
 }
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 
 echo "<br />\n";
 echo "<div align='center'>\n";
@@ -286,6 +286,6 @@ if (permission_exists('log_view')) {
 echo "</table>\n";
 echo "</div>\n";
 
-require_once "includes/footer.php";
+require_once "resources/footer.php";
 
 ?>
diff --git a/app/modules/modules.php b/app/modules/modules.php
index 9eaad9511e..7c166e1e6e 100644
--- a/app/modules/modules.php
+++ b/app/modules/modules.php
@@ -40,10 +40,10 @@ else {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 $page["title"] = $text['title-modules'];
 
-require_once "includes/paging.php";
+require_once "resources/paging.php";
 
 $order_by = $_GET["order_by"];
 $order = $_GET["order"];
@@ -224,5 +224,5 @@ if (strlen($_GET["a"]) > 0) {
 	echo "<br><br>";
 
 //show the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/modules/modules_delete.php b/app/modules/modules_delete.php
index 402c80d2e0..21e664a2ee 100644
--- a/app/modules/modules_delete.php
+++ b/app/modules/modules_delete.php
@@ -52,12 +52,12 @@ if (strlen($id)>0) {
 	unset($sql);
 }
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 echo "<meta http-equiv=\"refresh\" content=\"2;url=modules.php\">\n";
 echo "<div align='center'>\n";
 echo $text['message-delete']."\n";
 echo "</div>\n";
-require_once "includes/footer.php";
+require_once "resources/footer.php";
 return;
 
 ?>
\ No newline at end of file
diff --git a/app/modules/modules_edit.php b/app/modules/modules_edit.php
index 35ec0ebd08..3994e8af68 100644
--- a/app/modules/modules_edit.php
+++ b/app/modules/modules_edit.php
@@ -74,7 +74,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		if (strlen($module_enabled) == 0) { $msg .= $text['message-required'].$text['label-enabled']."<br>\n"; }
 		if (strlen($module_default_enabled) == 0) { $msg .= $text['message-required'].$text['label-default_enabled']."<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -82,7 +82,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -115,12 +115,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 
 				save_module_xml();
 
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=modules.php\">\n";
 				echo "<div align='center'>\n";
 				echo $text['message-add']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 			} //if ($action == "add")
 
@@ -138,12 +138,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 
 				save_module_xml();
 
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=modules.php\">\n";
 				echo "<div align='center'>\n";
 				echo $text['message-update']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 			} //if ($action == "update")
 		} //if ($_POST["persistformvar"] != "true")
@@ -170,7 +170,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	if ($action == "add") {
 		$page["title"] = $text['title-module_add'];
 	}
@@ -311,5 +311,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</table>";
 	echo "</div>";
 
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/music_on_hold/music_on_hold.php b/app/music_on_hold/music_on_hold.php
index 2f5224e42f..68d17d8468 100644
--- a/app/music_on_hold/music_on_hold.php
+++ b/app/music_on_hold/music_on_hold.php
@@ -42,7 +42,7 @@ else {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
-require_once "includes/paging.php";
+require_once "resources/paging.php";
 
 $sampling_rate_dirs = Array(8000, 16000, 32000, 48000);
 $music_on_hold_dir = $_SESSION['switch']['sounds']['dir'].'/music';
@@ -222,7 +222,7 @@ if ($_GET['act'] == "del" && permission_exists('music_on_hold_delete')) {
 }
 
 //include the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 
 //show the title and description
 	echo "<script language='JavaScript' type='text/javascript' src='".PROJECT_PATH."/resources/javascript/reset_file_input.js'></script>\n";
@@ -445,6 +445,6 @@ if ($_GET['act'] == "del" && permission_exists('music_on_hold_delete')) {
 	}
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 
 ?>
\ No newline at end of file
diff --git a/app/recordings/recordings.php b/app/recordings/recordings.php
index 72fa30f030..dbd528c2cc 100644
--- a/app/recordings/recordings.php
+++ b/app/recordings/recordings.php
@@ -34,7 +34,7 @@ else {
 	echo "access denied";
 	exit;
 }
-require_once "includes/paging.php";
+require_once "resources/paging.php";
 
 //add multi-lingual support
 	require_once "app_languages.php";
@@ -142,7 +142,7 @@ require_once "includes/paging.php";
 	}
 
 //include the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 
 //begin the content
 	echo "<script>\n";
@@ -294,6 +294,6 @@ require_once "includes/paging.php";
 	echo "<br>\n";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 
 ?>
\ No newline at end of file
diff --git a/app/recordings/recordings_delete.php b/app/recordings/recordings_delete.php
index 2e6d5d33b3..77f676c72d 100644
--- a/app/recordings/recordings_delete.php
+++ b/app/recordings/recordings_delete.php
@@ -65,11 +65,11 @@ if (strlen($id)>0) {
 }
 
 //redirect the user
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=recordings.php\">\n";
 	echo "<div align='center'>\n";
 	echo "Delete Complete\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 ?>
\ No newline at end of file
diff --git a/app/recordings/recordings_edit.php b/app/recordings/recordings_edit.php
index 1223ab23aa..4840f5d28d 100644
--- a/app/recordings/recordings_edit.php
+++ b/app/recordings/recordings_edit.php
@@ -78,7 +78,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		//if (strlen($recording_uuid) == 0) { $msg .= "Please provide: recording_uuid<br>\n"; }
 		//if (strlen($recording_description) == 0) { $msg .= "Please provide: Description<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -86,7 +86,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -113,12 +113,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$db->exec(check_sql($sql));
 			unset($sql);
 
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=recordings.php\">\n";
 			echo "<div align='center'>\n";
 			echo $text['message-add']."\n";
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		} //if ($action == "add")
 
@@ -156,12 +156,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$db->exec(check_sql($sql));
 				unset($sql);
 
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=recordings.php\">\n";
 			echo "<div align='center'>\n";
 			echo $text['message-update']."\n";
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		} //if ($action == "update")
 	} //if ($_POST["persistformvar"] != "true")
@@ -188,7 +188,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 
 //show the content
 	echo "<div align='center'>";
@@ -272,5 +272,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</div>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/registrations/status_registrations.php b/app/registrations/status_registrations.php
index 279a28ade0..7b252ee7b9 100644
--- a/app/registrations/status_registrations.php
+++ b/app/registrations/status_registrations.php
@@ -123,7 +123,7 @@ require_once "resources/check_auth.php";
 			}
 
 		//show the header
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 
 		//show the registrations
 			echo "<table width='100%' border='0' cellspacing='0' cellpadding='5'>\n";
@@ -193,6 +193,6 @@ require_once "resources/check_auth.php";
 	echo "<br />\n";
 
 //get the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 
 ?>
\ No newline at end of file
diff --git a/app/ring_groups/ring_groups.php b/app/ring_groups/ring_groups.php
index 91a630331e..6c28657d44 100644
--- a/app/ring_groups/ring_groups.php
+++ b/app/ring_groups/ring_groups.php
@@ -41,8 +41,8 @@ else {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
-require_once "includes/header.php";
-require_once "includes/paging.php";
+require_once "resources/header.php";
+require_once "resources/paging.php";
 
 //get variables used to control the order
 	$order_by = $_GET["order_by"];
@@ -171,5 +171,5 @@ require_once "includes/paging.php";
 	echo "<br /><br />";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/ring_groups/ring_groups_delete.php b/app/ring_groups/ring_groups_delete.php
index dd46f1952b..37ba92d7fe 100644
--- a/app/ring_groups/ring_groups_delete.php
+++ b/app/ring_groups/ring_groups_delete.php
@@ -96,12 +96,12 @@ else {
 	}
 
 //redirect the user
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=ring_groups.php\">\n";
 	echo "<div align='center'>\n";
 	echo $text['message-delete-done']."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>
\ No newline at end of file
diff --git a/app/ring_groups/ring_groups_edit.php b/app/ring_groups/ring_groups_edit.php
index ffc1f62e5b..d6b11a3dd3 100644
--- a/app/ring_groups/ring_groups_edit.php
+++ b/app/ring_groups/ring_groups_edit.php
@@ -53,10 +53,10 @@ else {
 			$db->exec(check_sql($sql));
 			unset($sql);
 		//redirect the browser
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=ring_groups_edit.php?id=$ring_group_uuid\">\n";
 			echo "<div align='center'>Delete Complete</div>";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 	}
 
@@ -140,7 +140,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		if (strlen($ring_group_enabled) == 0) { $msg .= $text['message-enabled']."<br>\n"; }
 		//if (strlen($ring_group_description) == 0) { $msg .= "Please provide: Description<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -148,7 +148,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -322,7 +322,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 					}
 
 				//redirect the browser
-					require_once "includes/header.php";
+					require_once "resources/header.php";
 					echo "<meta http-equiv=\"refresh\" content=\"2;url=ring_groups_edit.php?id=$ring_group_uuid\">\n";
 					echo "<div align='center'>\n";
 					if ($action == "add") {
@@ -332,7 +332,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 						echo $text['message-update-complete']."\n";
 					}
 					echo "</div>\n";
-					require_once "includes/footer.php";
+					require_once "resources/footer.php";
 					exit;
 			}
 		} //if ($_POST["persistformvar"] != "true")
@@ -382,7 +382,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 
 //show the content
 	echo "<div align='center'>";
@@ -672,5 +672,5 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</div>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/schemas/schema_data_delete.php b/app/schemas/schema_data_delete.php
index 0c4564fc9f..8260f68ccd 100644
--- a/app/schemas/schema_data_delete.php
+++ b/app/schemas/schema_data_delete.php
@@ -51,7 +51,7 @@ if (count($_GET)>0) {
 		$schema_uuid = check_str($_GET["schema_uuid"]);
 
 	//show the results and redirect
-		require_once "includes/header.php";
+		require_once "resources/header.php";
 
 	//get the schema_parent_id from the child table
 		if (strlen($schema_parent_id) == 0) {
@@ -102,7 +102,7 @@ if (count($_GET)>0) {
 		echo "<div align='center'>\n";
 		echo $text['message-delete']."\n";
 		echo "</div>\n";
-		require_once "includes/footer.php";
+		require_once "resources/footer.php";
 		return;
 }
 
diff --git a/app/schemas/schema_data_edit.php b/app/schemas/schema_data_edit.php
index de29c8c4ac..fd764566a6 100644
--- a/app/schemas/schema_data_edit.php
+++ b/app/schemas/schema_data_edit.php
@@ -351,7 +351,7 @@ else {
 		}
 
 		//show the header
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 
 		//set the meta redirect
 			if (strlen($data_parent_row_uuid) == 0) {
@@ -366,12 +366,12 @@ else {
 			if ($action == "add") { echo $text['message-add']."\n"; }
 			if ($action == "update") { echo $text['message-update']."\n"; }
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 	}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	$page["title"] = $text['title-data'];
 
 //pre-populate the form
@@ -980,5 +980,5 @@ else {
 	echo "</table>\n";
 	echo "</div>\n";
 
-require_once "includes/footer.php";
+require_once "resources/footer.php";
 ?>
diff --git a/app/schemas/schema_data_view.php b/app/schemas/schema_data_view.php
index 524f996d2e..2a2de1c02c 100644
--- a/app/schemas/schema_data_view.php
+++ b/app/schemas/schema_data_view.php
@@ -58,7 +58,7 @@ if (strlen($_GET["id"]) > 0) {
 	$row_style["1"] = "row_style1";
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	$page["title"] = $text['title-data_view'];
 
 //get the information about the schema by using the id
@@ -271,7 +271,7 @@ if (strlen($_GET["id"]) > 0) {
 	echo "<br />";
 
 //prepare for paging the results
-	require_once "includes/paging.php";
+	require_once "resources/paging.php";
 	$rows_per_page = 100;
 	$param = "";
 	$page = $_GET['page'];
@@ -396,6 +396,6 @@ if (strlen($_GET["id"]) > 0) {
 
 //show the header
     echo "<br><br>";
-    require_once "includes/footer.php";
+    require_once "resources/footer.php";
 
 ?>
diff --git a/app/schemas/schema_delete.php b/app/schemas/schema_delete.php
index fedd34ba7b..81de980fdc 100644
--- a/app/schemas/schema_delete.php
+++ b/app/schemas/schema_delete.php
@@ -46,7 +46,7 @@ else {
 	}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 
 if (strlen($id) > 0) {
 	$sql = "delete from v_schemas ";
@@ -64,7 +64,7 @@ if (strlen($id) > 0) {
 	echo "</div>\n";
 
 //show the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>
diff --git a/app/schemas/schema_edit.php b/app/schemas/schema_edit.php
index 3c730a9f17..1892ff12d1 100644
--- a/app/schemas/schema_edit.php
+++ b/app/schemas/schema_edit.php
@@ -72,7 +72,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	//check for all required data
 		if (strlen($schema_name) == 0) { $msg .= $text['message-required'].$text['label-schema_name']."<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -80,7 +80,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -120,12 +120,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$db->exec(check_sql($sql));
 				unset($sql);
 
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=schemas.php\">\n";
 				echo "<div align='center'>\n";
 				echo $text['message-add']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 			} //if ($action == "add")
 
@@ -148,12 +148,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$db->exec(check_sql($sql));
 				unset($sql);
 
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=schemas.php\">\n";
 				echo "<div align='center'>\n";
 				echo $text['message-update']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 			} //if ($action == "update")
 		} //if ($_POST["persistformvar"] != "true")
@@ -182,7 +182,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	$page["title"] = $text['title-schema'];
 
 //show the content
@@ -357,5 +357,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</div>";
 
 //show the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/schemas/schema_field_delete.php b/app/schemas/schema_field_delete.php
index 9e1fc68864..c85d1f9db7 100644
--- a/app/schemas/schema_field_delete.php
+++ b/app/schemas/schema_field_delete.php
@@ -57,12 +57,12 @@ else {
 	}
 
 //redirect the user
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=schema_edit.php?id=$schema_uuid\">\n";
 	echo "<div align='center'>\n";
 	echo $text['message-delete']."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>
\ No newline at end of file
diff --git a/app/schemas/schema_field_edit.php b/app/schemas/schema_field_edit.php
index 555dd21ae4..e7fcb03ed7 100644
--- a/app/schemas/schema_field_edit.php
+++ b/app/schemas/schema_field_edit.php
@@ -86,7 +86,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		if (strlen($field_order) == 0) { $msg .= $text['message-required'].$text['label-field_order']."<br>\n"; }
 		if (strlen($field_order_tab) == 0) { $msg .= $text['message-required'].$text['label-field_tab_order']."<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -94,7 +94,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -139,12 +139,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$db->exec(check_sql($sql));
 			unset($sql);
 
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=schema_edit.php?id=$schema_uuid\">\n";
 			echo "<div align='center'>\n";
 			echo $text['message-add']."\n";
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		} //if ($action == "add")
 
@@ -167,12 +167,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$db->exec(check_sql($sql));
 			unset($sql);
 
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=schema_edit.php?id=$schema_uuid\">\n";
 			echo "<div align='center'>\n";
 			echo $text['message-update']."\n";
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		} //if ($action == "update")
 	} //if ($_POST["persistformvar"] != "true")
@@ -208,7 +208,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	$page["title"] = $text['title-field'];
 
 //begin the content
@@ -527,5 +527,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</div>";
 
 //show the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/schemas/schema_fields.php b/app/schemas/schema_fields.php
index b517cc192f..d43af76326 100644
--- a/app/schemas/schema_fields.php
+++ b/app/schemas/schema_fields.php
@@ -34,8 +34,8 @@ else {
 	exit;
 }
 
-require_once "includes/header.php";
-require_once "includes/paging.php";
+require_once "resources/header.php";
+require_once "resources/paging.php";
 
 $order_by = $_GET["order_by"];
 $order = $_GET["order"];
@@ -196,6 +196,6 @@ $order = $_GET["order"];
 	echo "<br><br>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 
 ?>
\ No newline at end of file
diff --git a/app/schemas/schema_import.php b/app/schemas/schema_import.php
index aeb737ba3f..b118679fa6 100644
--- a/app/schemas/schema_import.php
+++ b/app/schemas/schema_import.php
@@ -208,7 +208,7 @@ if (count($_POST)>0) {
 		if (count($_POST)>0) {
 
 			//show the header
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				$page["title"] = $text['title-import_results'];
 
 			echo "<div align='center'>\n";
@@ -297,13 +297,13 @@ if (count($_POST)>0) {
 			echo "</div>\n";
 
 			//show the footer
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				exit;
 		}
 
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	$page["title"] = $text['title-import'];
 
 //show the content
@@ -379,5 +379,5 @@ if (count($_POST)>0) {
 
 	echo "</form>";
 
-require_once "includes/footer.php";
+require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/schemas/schema_name_value_delete.php b/app/schemas/schema_name_value_delete.php
index da1071451d..4204b42b77 100644
--- a/app/schemas/schema_name_value_delete.php
+++ b/app/schemas/schema_name_value_delete.php
@@ -58,12 +58,12 @@ else {
 	}
 
 //redirect the user
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=schema_field_edit.php?schema_uuid=$schema_uuid&id=$schema_field_uuid\">\n";
 	echo "<div align='center'>\n";
 	echo $text['message-delete']."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>
\ No newline at end of file
diff --git a/app/schemas/schema_name_value_edit.php b/app/schemas/schema_name_value_edit.php
index 53c8a5b175..75fb35d40f 100644
--- a/app/schemas/schema_name_value_edit.php
+++ b/app/schemas/schema_name_value_edit.php
@@ -76,7 +76,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		if (strlen($data_types_name) == 0) { $msg .= $text['message-required'].$text['label-name_value_name']."<br>\n"; }
 		if (strlen($data_types_value) == 0) { $msg .= $text['message-required'].$text['label-name_value_value']."<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -84,7 +84,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -112,12 +112,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$db->exec(check_sql($sql));
 				unset($sql);
 
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=schema_field_edit.php?schema_uuid=$schema_uuid&id=$schema_field_uuid\">\n";
 				echo "<div align='center'>\n";
 				echo $text['message-add']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 			} //if ($action == "add")
 
@@ -132,12 +132,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$db->exec(check_sql($sql));
 				unset($sql);
 
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=schema_field_edit.php?schema_uuid=$schema_uuid&id=$schema_field_uuid\">\n";
 				echo "<div align='center'>\n";
 				echo $text['message-update']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 			} //if ($action == "update")
 		} //if ($_POST["persistformvar"] != "true")
@@ -165,7 +165,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	$page["title"] = $text['title-name_value'];
 
 //show the content
@@ -233,5 +233,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</table>";
 	echo "</div>";
 
-require_once "includes/footer.php";
+require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/schemas/schema_name_values.php b/app/schemas/schema_name_values.php
index a2398688d8..97037e44bc 100644
--- a/app/schemas/schema_name_values.php
+++ b/app/schemas/schema_name_values.php
@@ -33,8 +33,8 @@ else {
 	echo "access denied";
 	exit;
 }
-require_once "includes/header.php";
-require_once "includes/paging.php";
+require_once "resources/header.php";
+require_once "resources/paging.php";
 
 //get the http values
 	$order_by = $_GET["order_by"];
@@ -142,6 +142,6 @@ require_once "includes/paging.php";
 	echo "<br><br>";
 
 //show the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 
 ?>
\ No newline at end of file
diff --git a/app/schemas/schemas.php b/app/schemas/schemas.php
index d1b0edcd0d..2d9bd91db2 100644
--- a/app/schemas/schemas.php
+++ b/app/schemas/schemas.php
@@ -40,10 +40,10 @@ else {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 $page["title"] = $text['title-schemas'];
 
-require_once "includes/paging.php";
+require_once "resources/paging.php";
 
 //get the http get variables
 	$order_by = $_GET["order_by"];
@@ -172,6 +172,6 @@ require_once "includes/paging.php";
 	echo "<br><br>";
 
 //show the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 
 ?>
diff --git a/app/services/service_delete.php b/app/services/service_delete.php
index 452890d436..7a52ad9a7c 100644
--- a/app/services/service_delete.php
+++ b/app/services/service_delete.php
@@ -48,12 +48,12 @@ if (count($_GET)>0) {
 	}
 
 //redirect the user
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=services.php\">\n";
 	echo "<div align='center'>\n";
 	echo $text['message-delete']."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>
\ No newline at end of file
diff --git a/app/services/service_edit.php b/app/services/service_edit.php
index eeec71d498..44c14310e3 100644
--- a/app/services/service_edit.php
+++ b/app/services/service_edit.php
@@ -76,7 +76,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		//if (strlen($service_cmd_stop) == 0) { $msg .= "Please provide: Stop Command<br>\n"; }
 		//if (strlen($service_description) == 0) { $msg .= "Please provide: Description<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -84,7 +84,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -117,12 +117,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$db->exec(check_sql($sql));
 				unset($sql);
 
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=services.php\">\n";
 				echo "<div align='center'>\n";
 				echo "Add Complete\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 			} //if ($action == "add")
 
@@ -139,12 +139,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$db->exec(check_sql($sql));
 				unset($sql);
 
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=services.php\">\n";
 				echo "<div align='center'>\n";
 				echo "Update Complete\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 			} //if ($action == "update")
 		} //if ($_POST["persistformvar"] != "true")
@@ -172,7 +172,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 
 //begin the content
 	echo "<div align='center'>";
@@ -296,5 +296,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</div>";
 
 //show the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/services/services.php b/app/services/services.php
index fc608931fb..f80f3e0f85 100644
--- a/app/services/services.php
+++ b/app/services/services.php
@@ -33,8 +33,8 @@ else {
 	echo "access denied";
 	exit;
 }
-require_once "includes/header.php";
-require_once "includes/paging.php";
+require_once "resources/header.php";
+require_once "resources/paging.php";
 
 $order_by = $_GET["order_by"];
 $order = $_GET["order"];
@@ -67,12 +67,12 @@ if (strlen($_GET["a"]) > 0) {
 		shell_exec($service_cmd_start);
 	}
 
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"5;url=services.php\">\n";
 	echo "<div align='center'>\n";
 	echo $msg."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 }
 
@@ -214,6 +214,6 @@ if (strlen($_GET["a"]) > 0) {
 	echo "<br><br>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 
 ?>
\ No newline at end of file
diff --git a/app/settings/settings_edit.php b/app/settings/settings_edit.php
index 188188f003..a027c7d005 100644
--- a/app/settings/settings_edit.php
+++ b/app/settings/settings_edit.php
@@ -112,7 +112,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		//if (strlen($mod_shout_decoder) == 0) { $msg .= "Please provide: Mod Shout Decoder<br>\n"; }
 		//if (strlen($mod_shout_volume) == 0) { $msg .= "Please provide: Mod Shout Volume<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -120,7 +120,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 	
@@ -157,12 +157,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				//synchronize settings
 					save_setting_xml();
 
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=settings_edit.php\">\n";
 				echo "<div align='center'>\n";
 				echo "Add Complete\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 			} //if ($action == "add")
 
@@ -183,12 +183,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				//synchronize settings
 					save_setting_xml();
 
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=settings_edit.php\">\n";
 				echo "<div align='center'>\n";
 				echo "Update Complete\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 			} //if ($action == "update")
 		} //if ($_POST["persistformvar"] != "true")
@@ -219,7 +219,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 
 //show the content
 	echo "<div align='center'>";
@@ -469,5 +469,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</div>";
 
 //show the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/sip_profiles/sip_profile_copy.php b/app/sip_profiles/sip_profile_copy.php
index 61fc1039f7..802490fc8d 100644
--- a/app/sip_profiles/sip_profile_copy.php
+++ b/app/sip_profiles/sip_profile_copy.php
@@ -26,7 +26,7 @@
 include "root.php";
 require_once "resources/require.php";
 require_once "resources/check_auth.php";
-require_once "includes/paging.php";
+require_once "resources/paging.php";
 if (permission_exists('dialplan_add')
 	|| permission_exists('inbound_route_add')
 	|| permission_exists('outbound_route_add')
@@ -123,12 +123,12 @@ else {
 		$_SESSION["reload_xml"] = true;
 
 	//redirect the user
-		require_once "includes/header.php";
+		require_once "resources/header.php";
 		echo "<meta http-equiv=\"refresh\" content=\"2;url=".PROJECT_PATH."/app/sip_profiles/sip_profiles.php\">\n";
 		echo "<div align='center'>\n";
 		echo $text['message-copy']."\n";
 		echo "</div>\n";
-		require_once "includes/footer.php";
+		require_once "resources/footer.php";
 		return;
 
 ?>
\ No newline at end of file
diff --git a/app/sip_profiles/sip_profile_settings.php b/app/sip_profiles/sip_profile_settings.php
index d3f1086c9f..45c27c0d40 100644
--- a/app/sip_profiles/sip_profile_settings.php
+++ b/app/sip_profiles/sip_profile_settings.php
@@ -33,8 +33,8 @@ else {
 	echo "access denied";
 	exit;
 }
-require_once "includes/header.php";
-require_once "includes/paging.php";
+require_once "resources/header.php";
+require_once "resources/paging.php";
 
 //get variables used to control the order
 	$order_by = $_GET["order_by"];
@@ -154,5 +154,5 @@ require_once "includes/paging.php";
 	echo "<br /><br />";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/sip_profiles/sip_profile_settings_delete.php b/app/sip_profiles/sip_profile_settings_delete.php
index 5ea2b45e05..83dbec4917 100644
--- a/app/sip_profiles/sip_profile_settings_delete.php
+++ b/app/sip_profiles/sip_profile_settings_delete.php
@@ -61,12 +61,12 @@ if (strlen($id)>0) {
 }
 
 //redirect the browser
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=sip_profiles_edit.php?id=$sip_profile_uuid\">\n";
 	echo "<div align='center'>\n";
 	echo $text['message-delete']."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>
\ No newline at end of file
diff --git a/app/sip_profiles/sip_profile_settings_edit.php b/app/sip_profiles/sip_profile_settings_edit.php
index d14df242a6..d55b1f5270 100644
--- a/app/sip_profiles/sip_profile_settings_edit.php
+++ b/app/sip_profiles/sip_profile_settings_edit.php
@@ -74,7 +74,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		//if (strlen($sip_profile_setting_enabled) == 0) { $msg .= $text['message-required'].$text['label-setting_enabled']."<br>\n"; }
 		//if (strlen($sip_profile_setting_description) == 0) { $msg .= $text['message-required'].$text['label-setting_description']."<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -82,7 +82,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -118,12 +118,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 					$_SESSION["reload_xml"] = true;
 
 				//redirect the browser
-					require_once "includes/header.php";
+					require_once "resources/header.php";
 					echo "<meta http-equiv=\"refresh\" content=\"2;url=sip_profiles_edit.php?id=$sip_profile_uuid\">\n";
 					echo "<div align='center'>\n";
 					echo $text['message-add']."\n";
 					echo "</div>\n";
-					require_once "includes/footer.php";
+					require_once "resources/footer.php";
 					return;
 			} //if ($action == "add")
 
@@ -146,12 +146,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 					$_SESSION["reload_xml"] = true;
 
 				//redirect the browser
-					require_once "includes/header.php";
+					require_once "resources/header.php";
 					echo "<meta http-equiv=\"refresh\" content=\"2;url=sip_profiles_edit.php?id=$sip_profile_uuid\">\n";
 					echo "<div align='center'>\n";
 					echo $text['message-update']."\n";
 					echo "</div>\n";
-					require_once "includes/footer.php";
+					require_once "resources/footer.php";
 					return;
 			} //if ($action == "update")
 		} //if ($_POST["persistformvar"] != "true")
@@ -176,7 +176,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	$page["title"] = $text['title-setting'];
 
 //show the content
@@ -274,5 +274,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</div>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/sip_profiles/sip_profiles.php b/app/sip_profiles/sip_profiles.php
index ba831238e8..a8817b5e96 100644
--- a/app/sip_profiles/sip_profiles.php
+++ b/app/sip_profiles/sip_profiles.php
@@ -40,10 +40,10 @@ else {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 $page["title"] = $text['title-sip_profiles'];
 
-require_once "includes/paging.php";
+require_once "resources/paging.php";
 
 //get variables used to control the order
 	$order_by = $_GET["order_by"];
@@ -164,5 +164,5 @@ require_once "includes/paging.php";
 	echo "<br /><br />";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/sip_profiles/sip_profiles_delete.php b/app/sip_profiles/sip_profiles_delete.php
index 1b5beaaff7..e566e1e897 100644
--- a/app/sip_profiles/sip_profiles_delete.php
+++ b/app/sip_profiles/sip_profiles_delete.php
@@ -78,12 +78,12 @@ if (strlen($id)>0) {
 }
 
 //redirect the browser
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=sip_profiles.php\">\n";
 	echo "<div align='center'>\n";
 	echo $text['message-delete']."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>
\ No newline at end of file
diff --git a/app/sip_profiles/sip_profiles_edit.php b/app/sip_profiles/sip_profiles_edit.php
index b0e3c1f4a8..efde0f7691 100644
--- a/app/sip_profiles/sip_profiles_edit.php
+++ b/app/sip_profiles/sip_profiles_edit.php
@@ -66,7 +66,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		//if (strlen($sip_profile_name) == 0) { $msg .= $text['message-required'].$text['label-name']."<br>\n"; }
 		//if (strlen($sip_profile_description) == 0) { $msg .= $text['message-required'].$text['label-description']."<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -74,7 +74,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -116,12 +116,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				}
 
 			//redirect the browser
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=sip_profiles.php\">\n";
 				echo "<div align='center'>\n";
 				echo $text['message-update']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 		} //if ($_POST["persistformvar"] != "true")
 } //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
@@ -143,7 +143,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	$page["title"] = $text['title-sip_profile'];
 
 //show the content
@@ -211,5 +211,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</div>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/sip_status/sip_status.php b/app/sip_status/sip_status.php
index 6d8e270337..554f5a8ce3 100644
--- a/app/sip_status/sip_status.php
+++ b/app/sip_status/sip_status.php
@@ -71,7 +71,7 @@ if ($_GET['a'] == "download") {
 	exit;
 }
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 
 $msg = $_GET["savemsg"];
 $fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
@@ -260,6 +260,6 @@ if (strlen($msg) > 0) {
 	}
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 
 ?>
\ No newline at end of file
diff --git a/app/sql_query/sql_query.php b/app/sql_query/sql_query.php
index cbc82e9884..ba18012a67 100644
--- a/app/sql_query/sql_query.php
+++ b/app/sql_query/sql_query.php
@@ -41,7 +41,7 @@ else {
 	}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	$page["title"] = $text['title-sql_query'];
 
 //pdo voicemail database connection
@@ -175,5 +175,5 @@ else {
 
 //show the footer
 	include "resources/require.php";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/sql_query/sql_query_db.php b/app/sql_query/sql_query_db.php
index fec7c0cc98..f65fc7ddab 100644
--- a/app/sql_query/sql_query_db.php
+++ b/app/sql_query/sql_query_db.php
@@ -40,10 +40,10 @@ else {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 $page["title"] = $text['title-databases'];
 
-require_once "includes/paging.php";
+require_once "resources/paging.php";
 
 //get variables used to control the order
 	$order_by = $_GET["order_by"];
@@ -149,5 +149,5 @@ require_once "includes/paging.php";
 	echo "<br><br>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/system/system.php b/app/system/system.php
index 4c532ff241..e1a0852942 100644
--- a/app/system/system.php
+++ b/app/system/system.php
@@ -43,7 +43,7 @@ else {
 	foreach($text as $key => $value) {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
-require_once "includes/header.php";
+require_once "resources/header.php";
 
 echo "<br />";
 echo "<br />";
@@ -333,5 +333,5 @@ echo "<br />";
 	}
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
diff --git a/app/time_conditions/time_condition_add.php b/app/time_conditions/time_condition_add.php
index 05adb34314..b70e86e5b6 100644
--- a/app/time_conditions/time_condition_add.php
+++ b/app/time_conditions/time_condition_add.php
@@ -33,8 +33,8 @@ else {
 	echo "access denied";
 	exit;
 }
-require_once "includes/header.php";
-require_once "includes/paging.php";
+require_once "resources/header.php";
+require_once "resources/paging.php";
 
 //add multi-lingual support
 require_once "app_languages.php";
@@ -93,7 +93,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		//if (strlen($enabled) == 0) { $msg .= "Please provide: Enabled True or False<br>\n"; }
 		//if (strlen($dialplan_description) == 0) { $msg .= "Please provide: Description<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -101,7 +101,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -483,12 +483,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		}
 
 	//redirect the browser
-		require_once "includes/header.php";
+		require_once "resources/header.php";
 		echo "<meta http-equiv=\"refresh\" content=\"2;url=".PROJECT_PATH."/app/dialplan/dialplans.php?app_uuid=4b821450-926b-175a-af93-a03c441818b1\">\n";
 		echo "<div align='center'>\n";
 		echo "".$text['confirm-update-complete']."\n";
 		echo "</div>\n";
-		require_once "includes/footer.php";
+		require_once "resources/footer.php";
 		return;
 
 } //end if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
@@ -1085,6 +1085,6 @@ echo "</div>";
 echo "<br><br>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 
 ?>
\ No newline at end of file
diff --git a/app/traffic_graph/status_graph.php b/app/traffic_graph/status_graph.php
index 539f5a786f..ca19361e35 100644
--- a/app/traffic_graph/status_graph.php
+++ b/app/traffic_graph/status_graph.php
@@ -69,7 +69,7 @@ else {
 	$height = "330"; //275 //330 //396
 }
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 $page["title"] = $text['title-traffic_graph'];
 ?>
 <table width='100%'>
@@ -138,5 +138,5 @@ $page["title"] = $text['title-traffic_graph'];
 </div>
 
 <?php
-require_once "includes/footer.php";
+require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/vars/var_delete.php b/app/vars/var_delete.php
index e4e15d72e3..109950c14b 100644
--- a/app/vars/var_delete.php
+++ b/app/vars/var_delete.php
@@ -56,12 +56,12 @@ if (count($_GET)>0) {
 	}
 
 //redirect the user
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=vars.php\">\n";
 	echo "<div align='center'>\n";
 	echo $text['message-delete']."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>
\ No newline at end of file
diff --git a/app/vars/var_edit.php b/app/vars/var_edit.php
index 8033bfc641..5d7f3159bb 100644
--- a/app/vars/var_edit.php
+++ b/app/vars/var_edit.php
@@ -77,7 +77,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		if (strlen($var_enabled) == 0) { $msg .= $text['message-required'].$text['label-enabled']."<br>\n"; }
 		if (strlen($var_order) == 0) { $msg .= $text['message-required'].$text['label-order']."<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -85,7 +85,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -123,12 +123,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 					save_var_xml();
 
 				//redirect the user
-					require_once "includes/header.php";
+					require_once "resources/header.php";
 					echo "<meta http-equiv=\"refresh\" content=\"2;url=vars.php\">\n";
 					echo "<div align='center'>\n";
 					echo $text['message-add']."\n";
 					echo "</div>\n";
-					require_once "includes/footer.php";
+					require_once "resources/footer.php";
 					return;
 			} //if ($action == "add")
 
@@ -151,12 +151,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 					save_var_xml();
 
 				//redirect the user
-					require_once "includes/header.php";
+					require_once "resources/header.php";
 					echo "<meta http-equiv=\"refresh\" content=\"2;url=vars.php\">\n";
 					echo "<div align='center'>\n";
 					echo $text['message-update']."\n";
 					echo "</div>\n";
-					require_once "includes/footer.php";
+					require_once "resources/footer.php";
 					return;
 			} //if ($action == "update")
 	} //if ($_POST["persistformvar"] != "true")
@@ -183,7 +183,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 //include header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	if ($action == "add") {
 		$page["title"] = $text['title-variable_add'];
 	}
@@ -388,5 +388,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</div>";
 
 //include header
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
diff --git a/app/vars/vars.php b/app/vars/vars.php
index 54968d825a..61768d1671 100644
--- a/app/vars/vars.php
+++ b/app/vars/vars.php
@@ -41,7 +41,7 @@ else {
 	}
 
 //include the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	$page["title"] = $text['title-variables'];
 
 //set http values as php variables
@@ -185,6 +185,6 @@ else {
 	echo "<br><br>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 
 ?>
diff --git a/app/vars/vars_textarea.php b/app/vars/vars_textarea.php
index 5719a2cd0f..be6d8f23f7 100644
--- a/app/vars/vars_textarea.php
+++ b/app/vars/vars_textarea.php
@@ -41,7 +41,7 @@ else {
 	}
 
 //include the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	$page["title"] = $text['title-variables_advanced'];
 
 //restore the default vars.xml
@@ -164,5 +164,5 @@ if ($_GET['a'] == "default" && permission_exists('variables_edit')) {
 </div>
 
 <?php
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/voicemail_greetings/voicemail_greeting_delete.php b/app/voicemail_greetings/voicemail_greeting_delete.php
index 4cd9fa0773..6900f82343 100644
--- a/app/voicemail_greetings/voicemail_greeting_delete.php
+++ b/app/voicemail_greetings/voicemail_greeting_delete.php
@@ -77,11 +77,11 @@ if (strlen($id)>0) {
 }
 
 //redirect the user
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=voicemail_greetings.php?id=$voicemail_id\">\n";
 	echo "<div align='center'>\n";
 	echo "".$text['confirm-delete']."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 ?>
\ No newline at end of file
diff --git a/app/voicemail_greetings/voicemail_greeting_edit.php b/app/voicemail_greetings/voicemail_greeting_edit.php
index bfd09c0e6c..c13290a6a5 100644
--- a/app/voicemail_greetings/voicemail_greeting_edit.php
+++ b/app/voicemail_greetings/voicemail_greeting_edit.php
@@ -72,7 +72,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		if (strlen($greeting_name) == 0) { $msg .= "".$text['confirm-name']."<br>\n"; }
 		//if (strlen($greeting_description) == 0) { $msg .= "Please provide: Description<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -80,7 +80,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -105,12 +105,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$db->exec(check_sql($sql));
 			unset($sql);
 
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=voicemail_greetings.php?id=".$voicemail_id."\">\n";
 			echo "<div align='center'>\n";
 			echo "".$text['confirm-add']."\n";
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		} //if ($action == "add")
 
@@ -145,12 +145,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				unset($sql);
 
 			//redirect the user
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=voicemail_greetings.php?id=".$voicemail_id."\">\n";
 				echo "<div align='center'>\n";
 				echo "".$text['confirm-update']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 		} //if ($action == "update")
 	} //if ($_POST["persistformvar"] != "true")
@@ -174,7 +174,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 
 //show the content
 	echo "<div align='center'>";
@@ -236,5 +236,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</div>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/voicemail_greetings/voicemail_greetings.php b/app/voicemail_greetings/voicemail_greetings.php
index 9237de7833..45efb6ffbb 100644
--- a/app/voicemail_greetings/voicemail_greetings.php
+++ b/app/voicemail_greetings/voicemail_greetings.php
@@ -41,7 +41,7 @@ else {
 	}
 
 //additional includes
-	require_once "includes/paging.php";
+	require_once "resources/paging.php";
 
 //set the max php execution time
 	ini_set(max_execution_time,7200);
@@ -208,7 +208,7 @@ else {
 	unset($prep_statement, $result);
 
 //include the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 
 //show the message
 	if (strlen($save_msg) > 0) {
@@ -379,6 +379,6 @@ else {
 	echo "<br>\n";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 
 ?>
\ No newline at end of file
diff --git a/app/voicemails/voicemail_delete.php b/app/voicemails/voicemail_delete.php
index 99d4658a6c..10b510e7c7 100644
--- a/app/voicemails/voicemail_delete.php
+++ b/app/voicemails/voicemail_delete.php
@@ -56,12 +56,12 @@ if (strlen($id)>0) {
 }
 
 //redirect the user
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=voicemails.php\">\n";
 	echo "<div align='center'>\n";
 	echo $text['message-delete']."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>
\ No newline at end of file
diff --git a/app/voicemails/voicemail_edit.php b/app/voicemails/voicemail_edit.php
index d5ba3002be..b57bfc1e4b 100644
--- a/app/voicemails/voicemail_edit.php
+++ b/app/voicemails/voicemail_edit.php
@@ -85,7 +85,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		//if (strlen($voicemail_enabled) == 0) { $msg .= $text['message-required']." ".$text['label-voicemail_enabled']."<br>\n"; }
 		//if (strlen($voicemail_description) == 0) { $msg .= $text['message-required']." ".$text['label-voicemail_description']."<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -93,7 +93,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -133,12 +133,12 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 				$db->exec(check_sql($sql));
 				unset($sql);
 
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=voicemails.php\">\n";
 				echo "<div align='center'>\n";
 				echo "	".$text['message-add']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 			} //if ($action == "add")
 
@@ -162,7 +162,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 				$db->exec(check_sql($sql));
 				unset($sql);
 
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				if ($referer_path == "/app/voicemails/voicemail_messages.php") {
 					echo "<meta http-equiv=\"refresh\" content=\"2;url=voicemail_messages.php?".$referer_query."\">\n";
 				}
@@ -172,7 +172,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 				echo "<div align='center'>\n";
 				echo "	".$text['message-update']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 			} //if ($action == "update")
 		} //if ($_POST["persistformvar"] != "true") 
@@ -210,7 +210,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	if (strlen($voicemail_enabled) == 0) { $voicemail_enabled = "true"; }
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 
 //show the content
 	echo "<div align='center'>";
@@ -376,5 +376,5 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</div>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/voicemails/voicemail_message_delete.php b/app/voicemails/voicemail_message_delete.php
index 5c3e51374b..f5aea8e160 100644
--- a/app/voicemails/voicemail_message_delete.php
+++ b/app/voicemails/voicemail_message_delete.php
@@ -60,12 +60,12 @@ else {
 	}
 
 //redirect the user
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=voicemail_messages.php?id=$voicemail_uuid\">\n";
 	echo "<div align='center'>\n";
 	echo "Delete Complete\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>
\ No newline at end of file
diff --git a/app/voicemails/voicemail_message_edit.php b/app/voicemails/voicemail_message_edit.php
index 3bbfa9a2cf..b4926316d3 100644
--- a/app/voicemails/voicemail_message_edit.php
+++ b/app/voicemails/voicemail_message_edit.php
@@ -83,7 +83,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		//if (strlen($message_status) == 0) { $msg .= "Please provide: Status<br>\n"; }
 		//if (strlen($message_priority) == 0) { $msg .= "Please provide: Priority<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -91,7 +91,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -127,12 +127,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$db->exec(check_sql($sql));
 				unset($sql);
 
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=voicemail_edit.php?id=$voicemail_uuid\">\n";
 				echo "<div align='center'>\n";
 				echo "Add Complete\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 			} //if ($action == "add")
 
@@ -152,12 +152,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$db->exec(check_sql($sql));
 				unset($sql);
 
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=voicemail_edit.php?id=$voicemail_uuid\">\n";
 				echo "<div align='center'>\n";
 				echo "Update Complete\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 			} //if ($action == "update")
 		} //if ($_POST["persistformvar"] != "true") 
@@ -187,7 +187,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 
 //show the content
 	echo "<div align='center'>";
@@ -298,5 +298,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</div>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/voicemails/voicemail_message_play.php b/app/voicemails/voicemail_message_play.php
index 06b026ed94..0d4a26194c 100644
--- a/app/voicemails/voicemail_message_play.php
+++ b/app/voicemails/voicemail_message_play.php
@@ -59,7 +59,7 @@ else {
 
 //show the error message or show the content
 	if (strlen($msg) > 0) {
-		require_once "includes/header.php";
+		require_once "resources/header.php";
 		echo "<div align='center'>\n";
 		echo "	<table width='40%'>\n";
 		echo "		<tr>\n";
@@ -70,7 +70,7 @@ else {
 		echo "		</tr>\n";
 		echo "	</table>\n";
 		echo "</div>\n";
-		require_once "includes/footer.php";
+		require_once "resources/footer.php";
 		return;
 	}
 
diff --git a/app/voicemails/voicemail_messages.php b/app/voicemails/voicemail_messages.php
index bd4958c5e7..20cbaa5126 100644
--- a/app/voicemails/voicemail_messages.php
+++ b/app/voicemails/voicemail_messages.php
@@ -83,8 +83,8 @@ else {
 	$order = check_str($_GET["order"]);
 
 //additional includes
-	require_once "includes/header.php";
-	require_once "includes/paging.php";
+	require_once "resources/header.php";
+	require_once "resources/paging.php";
 
 //show the content
 	echo "<div align='center'>";
@@ -226,5 +226,5 @@ else {
 	echo "<br /><br />";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/voicemails/voicemails.php b/app/voicemails/voicemails.php
index 890f2da64e..a7f179fbe3 100644
--- a/app/voicemails/voicemails.php
+++ b/app/voicemails/voicemails.php
@@ -44,8 +44,8 @@ else {
 	$order = $_GET["order"];
 
 //additional includes
-	require_once "includes/header.php";
-	require_once "includes/paging.php";
+	require_once "resources/header.php";
+	require_once "resources/paging.php";
 
 //show the content
 	echo "<div align='center'>";
@@ -193,5 +193,5 @@ else {
 	echo "<br /><br />";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/xml_cdr/xml_cdr.php b/app/xml_cdr/xml_cdr.php
index f5627cac83..1a71d357d9 100644
--- a/app/xml_cdr/xml_cdr.php
+++ b/app/xml_cdr/xml_cdr.php
@@ -44,8 +44,8 @@ else {
 	require_once "v_xml_cdr_import.php";
 
 //additional includes
-	require_once "includes/header.php";
-	require_once "includes/paging.php";
+	require_once "resources/header.php";
+	require_once "resources/paging.php";
 
 
 //xml cdr include
@@ -454,5 +454,5 @@ else {
 	echo "<br><br>";
 
 //show the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
diff --git a/app/xml_cdr/xml_cdr_details.php b/app/xml_cdr/xml_cdr_details.php
index 9aca5af2c2..b36e73efba 100644
--- a/app/xml_cdr/xml_cdr_details.php
+++ b/app/xml_cdr/xml_cdr_details.php
@@ -75,7 +75,7 @@ else {
 	}
 
 //get the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 
 //page title and description
 	echo "<br>";
@@ -512,5 +512,5 @@ else {
 	//echo "</pre>\n";
 
 //get the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/xml_cdr/xml_cdr_inc.php b/app/xml_cdr/xml_cdr_inc.php
index 8741ee0236..082973b5ac 100644
--- a/app/xml_cdr/xml_cdr_inc.php
+++ b/app/xml_cdr/xml_cdr_inc.php
@@ -38,7 +38,7 @@ else {
 	require_once "v_xml_cdr_import.php";
 
 //additional includes
-	require_once "includes/paging.php";
+	require_once "resources/paging.php";
 
 //set 24hr or 12hr clock
 	define('TIME_24HR', 1);
diff --git a/app/xml_cdr/xml_cdr_search.php b/app/xml_cdr/xml_cdr_search.php
index 7259c5dffa..85b79030b1 100644
--- a/app/xml_cdr/xml_cdr_search.php
+++ b/app/xml_cdr/xml_cdr_search.php
@@ -56,7 +56,7 @@ if (count($_POST)>0) {
 }
 else {
 
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<div align='center'>";
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='2'>\n";
 	echo "<tr class='border'>\n";
@@ -150,7 +150,7 @@ else {
 	echo "</table>";
 	echo "</div>";
 
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 
 } //end if not post
 ?>
diff --git a/app/xml_cdr/xml_cdr_statistics.php b/app/xml_cdr/xml_cdr_statistics.php
index 803fd3ce30..3650eb709b 100644
--- a/app/xml_cdr/xml_cdr_statistics.php
+++ b/app/xml_cdr/xml_cdr_statistics.php
@@ -42,7 +42,7 @@ else {
 
 //additional includes
 	require_once "xml_cdr_statistics_inc.php";
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 
 //page title and description
 	echo "<div align='center'>";
@@ -221,5 +221,5 @@ else {
 	echo "</table>\n";
 
 //show the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/xmpp/profile_delete.php b/app/xmpp/profile_delete.php
index ca47a9183d..2e3a0a3179 100644
--- a/app/xmpp/profile_delete.php
+++ b/app/xmpp/profile_delete.php
@@ -42,7 +42,7 @@ else {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 
 $domain_name = $_SESSION['domains'][$domain_uuid]['domain_name'];
 
@@ -96,6 +96,6 @@ $action = "delete";
 include "update_complete.php";
 
 //show the footer
-require_once "includes/footer.php";
+require_once "resources/footer.php";
 
 ?>
diff --git a/app/xmpp/xmpp.php b/app/xmpp/xmpp.php
index 91b91a8da0..c4d88315b1 100644
--- a/app/xmpp/xmpp.php
+++ b/app/xmpp/xmpp.php
@@ -42,10 +42,10 @@ else {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 $page["title"] = $text['title-xmpp'];
 
-require_once "includes/paging.php";
+require_once "resources/paging.php";
 
 //connect to event socket
 $fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
@@ -96,6 +96,6 @@ unset ($prep_statement);
 include "profile_list.php";
 
 //include the footer
-require_once "includes/footer.php";
+require_once "resources/footer.php";
 
 ?>
\ No newline at end of file
diff --git a/app/xmpp/xmpp_profile_edit.php b/app/xmpp/xmpp_profile_edit.php
index 4544f3ffb6..faab0b54c6 100644
--- a/app/xmpp/xmpp_profile_edit.php
+++ b/app/xmpp/xmpp_profile_edit.php
@@ -52,7 +52,7 @@ if (isset($_REQUEST["id"])) {
 	$action = "add";
 }
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 if ($action == "update") {
 	$page["title"] = $text['title-xmpp-edit'];
 }
@@ -98,7 +98,7 @@ if ($action == "update") {
 if ((!isset($_REQUEST['submit'])) || ($_REQUEST['submit'] != $text['button-save'])) {
 	// If we arent saving a Profile Display the form.
 	include "profile_edit.php";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	exit;
 }
 
@@ -117,7 +117,7 @@ if (strlen($error) > 0) {
 	include "errors.php";
 	$profile = $request;
 	include "profile_edit.php";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	exit;
 }
 
@@ -242,6 +242,6 @@ if ($fp) {
 include "update_complete.php";
 
 //show the footer
-require_once "includes/footer.php";
+require_once "resources/footer.php";
 
 ?>
\ No newline at end of file
diff --git a/core/apps/apps.php b/core/apps/apps.php
index 56e7f6e171..55f601d6e3 100644
--- a/core/apps/apps.php
+++ b/core/apps/apps.php
@@ -40,10 +40,10 @@ else {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 $page["title"] = $text['title-apps'];
 
-require_once "includes/paging.php";
+require_once "resources/paging.php";
 
 //get variables used to control the order
 	$order_by = $_GET["order_by"];
@@ -125,5 +125,5 @@ require_once "includes/paging.php";
 	echo "<br /><br />";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/core/apps/apps_delete.php b/core/apps/apps_delete.php
index def9c6910c..cf922f0328 100644
--- a/core/apps/apps_delete.php
+++ b/core/apps/apps_delete.php
@@ -90,12 +90,12 @@ if (strlen($id)>0) {
 }
 
 //redirect the browser
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=apps.php\">\n";
 	echo "<div align='center'>\n";
 	echo $text['message-delete']."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>
\ No newline at end of file
diff --git a/core/apps/apps_edit.php b/core/apps/apps_edit.php
index c327d7d9b5..33ec6da7b7 100644
--- a/core/apps/apps_edit.php
+++ b/core/apps/apps_edit.php
@@ -64,7 +64,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	//check for all required data
 		//if (strlen($app_enabled) == 0) { $msg .= "Please provide: Enabled<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -72,7 +72,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -90,12 +90,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				//$db->exec(check_sql($sql));
 				unset($sql);
 
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=apps.php\">\n";
 				echo "<div align='center'>\n";
 				echo $text['message-add']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 			} //if ($action == "add")
 
@@ -106,19 +106,19 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				//$db->exec(check_sql($sql));
 				unset($sql);
 
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=apps.php\">\n";
 				echo "<div align='center'>\n";
 				echo $text['message-update']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 			} //if ($action == "update")
 		} //if ($_POST["persistformvar"] != "true")
 } //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	if ($action == "update") {
 		$page["title"] = $text['title-app-edit'];
 	}
@@ -229,5 +229,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</div>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/core/databases/database_delete.php b/core/databases/database_delete.php
index b719ff26a3..a6f3fdb7e4 100644
--- a/core/databases/database_delete.php
+++ b/core/databases/database_delete.php
@@ -53,12 +53,12 @@ if (strlen($id)>0) {
 	unset($sql);
 }
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 echo "<meta http-equiv=\"refresh\" content=\"2;url=databases.php\">\n";
 echo "<div align='center'>\n";
 echo $text['message-delete']."\n";
 echo "</div>\n";
-require_once "includes/footer.php";
+require_once "resources/footer.php";
 return;
 
 ?>
\ No newline at end of file
diff --git a/core/databases/database_edit.php b/core/databases/database_edit.php
index 69d526d9a6..103d357cd9 100644
--- a/core/databases/database_edit.php
+++ b/core/databases/database_edit.php
@@ -91,7 +91,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		//if (strlen($database_path) == 0) { $msg .= $text['message-required'].$text['label-path']."<br>\n"; }
 		//if (strlen($database_description) == 0) { $msg .= $text['message-required'].$text['label-description']."<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -99,7 +99,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -143,12 +143,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				require_once "app_defaults.php";
 
 			//redirect the browser
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=databases.php\">\n";
 				echo "<div align='center'>\n";
 				echo $text['message-add']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 		} //if ($action == "add")
 
@@ -173,12 +173,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				require_once "app_defaults.php";
 
 			//redirect the browser
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=databases.php\">\n";
 				echo "<div align='center'>\n";
 				echo $text['message-update']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 		} //if ($action == "update")
 	} //if ($_POST["persistformvar"] != "true")
@@ -208,7 +208,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	if ($action == "update") {
 		$page["title"] = $text['title-database-edit'];
 	}
@@ -414,5 +414,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</div>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/core/databases/databases.php b/core/databases/databases.php
index 692d84d13c..26485820da 100644
--- a/core/databases/databases.php
+++ b/core/databases/databases.php
@@ -40,10 +40,10 @@ else {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 $page["title"] = $text['title-databases'];
 
-require_once "includes/paging.php";
+require_once "resources/paging.php";
 
 //get variables used to control the order
 	$order_by = $_GET["order_by"];
@@ -169,5 +169,5 @@ require_once "includes/paging.php";
 	echo "<br><br>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/core/default_settings/default_setting_delete.php b/core/default_settings/default_setting_delete.php
index d3771c3708..8432aad57c 100644
--- a/core/default_settings/default_setting_delete.php
+++ b/core/default_settings/default_setting_delete.php
@@ -54,12 +54,12 @@ if (strlen($id)>0) {
 }
 
 //redirect the user
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=default_settings.php\">\n";
 	echo "<div align='center'>\n";
 	echo $text['message-delete']."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>
\ No newline at end of file
diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php
index 8d0447f780..1cc94f6a60 100644
--- a/core/default_settings/default_setting_edit.php
+++ b/core/default_settings/default_setting_edit.php
@@ -74,7 +74,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		//if (strlen($default_setting_enabled) == 0) { $msg .= $text['message-required'].$text['label-enabled']."<br>\n"; }
 		//if (strlen($default_setting_description) == 0) { $msg .= $text['message-required'].$text['label-description']."<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -82,7 +82,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -112,12 +112,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$db->exec(check_sql($sql));
 				unset($sql);
 
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=default_settings.php\">\n";
 				echo "<div align='center'>\n";
 				echo $text['message-add']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 			} //if ($action == "add")
 
@@ -133,12 +133,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$db->exec(check_sql($sql));
 				unset($sql);
 
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=default_settings.php\">\n";
 				echo "<div align='center'>\n";
 				echo $text['message-update']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 			} //if ($action == "update")
 		} //if ($_POST["persistformvar"] != "true")
@@ -165,7 +165,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	if ($action == "update") {
 		$page["title"] = $text['title-default_setting-edit'];
 	}
@@ -429,5 +429,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</div>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/core/default_settings/default_settings.php b/core/default_settings/default_settings.php
index 3d2c7e72e1..0be0170dbb 100644
--- a/core/default_settings/default_settings.php
+++ b/core/default_settings/default_settings.php
@@ -40,10 +40,10 @@ else {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 $page["title"] = $text['title-default_settings'];
 
-require_once "includes/paging.php";
+require_once "resources/paging.php";
 
 //get variables used to control the order
 	$order_by = $_GET["order_by"];
@@ -212,5 +212,5 @@ require_once "includes/paging.php";
 	echo "<br /><br />";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/core/domain_settings/domain_settings.php b/core/domain_settings/domain_settings.php
index bd6e4ea4e2..ae5a1d06bb 100644
--- a/core/domain_settings/domain_settings.php
+++ b/core/domain_settings/domain_settings.php
@@ -34,8 +34,8 @@ else {
 	exit;
 }
 
-require_once "includes/header.php";
-require_once "includes/paging.php";
+require_once "resources/header.php";
+require_once "resources/paging.php";
 
 //get variables used to control the order
 	$order_by = $_GET["order_by"];
@@ -205,5 +205,5 @@ require_once "includes/paging.php";
 	echo "<br /><br />";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/core/domain_settings/domain_settings_delete.php b/core/domain_settings/domain_settings_delete.php
index bb7ea2da96..2a0c011d18 100644
--- a/core/domain_settings/domain_settings_delete.php
+++ b/core/domain_settings/domain_settings_delete.php
@@ -56,12 +56,12 @@ if (strlen($id)>0) {
 }
 
 //redirect the user
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=domains_edit.php?id=$domain_uuid\">\n";
 	echo "<div align='center'>\n";
 	echo $text['message-delete']."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>
\ No newline at end of file
diff --git a/core/domain_settings/domain_settings_edit.php b/core/domain_settings/domain_settings_edit.php
index 95db3cd1b8..18904b8d18 100644
--- a/core/domain_settings/domain_settings_edit.php
+++ b/core/domain_settings/domain_settings_edit.php
@@ -78,7 +78,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		//if (strlen($domain_setting_enabled) == 0) { $msg .= $text['message-required'].$text['label-enabled']."<br>\n"; }
 		//if (strlen($domain_setting_description) == 0) { $msg .= $text['message-required'].$text['label-description']."<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -86,7 +86,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -118,12 +118,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$db->exec(check_sql($sql));
 				unset($sql);
 
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=domains_edit.php?id=$domain_uuid\">\n";
 				echo "<div align='center'>\n";
 				echo $text['message-add']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 			} //if ($action == "add")
 
@@ -140,12 +140,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$db->exec(check_sql($sql));
 				unset($sql);
 
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=domains_edit.php?id=$domain_uuid\">\n";
 				echo "<div align='center'>\n";
 				echo $text['message-update']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 			} //if ($action == "update")
 		} //if ($_POST["persistformvar"] != "true")
@@ -173,7 +173,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	if ($action == "update") {
 		$page["title"] = $text['title-domain_setting-edit'];
 	}
@@ -390,5 +390,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</div>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/core/domain_settings/domains.php b/core/domain_settings/domains.php
index 9c079e6d57..d8e4f75e99 100644
--- a/core/domain_settings/domains.php
+++ b/core/domain_settings/domains.php
@@ -84,10 +84,10 @@ else {
 	}
 
 //includes
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	$page["title"] = $text['title-domains'];
 
-	require_once "includes/paging.php";
+	require_once "resources/paging.php";
 
 //get variables used to control the order
 	$order_by = $_GET["order_by"];
@@ -219,5 +219,5 @@ else {
 	echo "<br /><br />";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/core/domain_settings/domains_delete.php b/core/domain_settings/domains_delete.php
index 2feaf9fc45..8d73fb78e2 100644
--- a/core/domain_settings/domains_delete.php
+++ b/core/domain_settings/domains_delete.php
@@ -190,12 +190,12 @@ if (strlen($id) > 0) {
 }
 
 //redirect the browser
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=domains.php\">\n";
 	echo "<div align='center'>\n";
 	echo $text['message-delete']."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>
\ No newline at end of file
diff --git a/core/domain_settings/domains_edit.php b/core/domain_settings/domains_edit.php
index e39d277e49..3293153b01 100644
--- a/core/domain_settings/domains_edit.php
+++ b/core/domain_settings/domains_edit.php
@@ -66,7 +66,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		//if (strlen($domain_name) == 0) { $msg .= $text['message-required'].$text['label-name']."<br>\n"; }
 		//if (strlen($domain_description) == 0) { $msg .= $text['message-required'].$text['label-description']."<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -74,7 +74,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -126,7 +126,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 			unset($_SESSION['switch']);
 
 		//redirect the browser
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=domains.php\">\n";
 			echo "<div align='center'>\n";
 			if ($action == "update") {
@@ -136,7 +136,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 				echo $text['message-add']."\n";
 			}
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		} //if ($_POST["persistformvar"] != "true")
 } //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
@@ -156,7 +156,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	if ($action == "update") {
 		$page["title"] = $text['title-domain-edit'];
 	}
@@ -244,5 +244,5 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</div>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/core/menu/menu.php b/core/menu/menu.php
index 0f3808b017..815978cec5 100644
--- a/core/menu/menu.php
+++ b/core/menu/menu.php
@@ -40,10 +40,10 @@ else {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 $page["title"] = $text['title-menus'];
 
-require_once "includes/paging.php";
+require_once "resources/paging.php";
 
 //get variables used to control the order
 	$order_by = $_GET["order_by"];
@@ -157,5 +157,5 @@ require_once "includes/paging.php";
 	echo "<br><br>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/core/menu/menu_delete.php b/core/menu/menu_delete.php
index b97fe6723d..edf1eb9fa3 100644
--- a/core/menu/menu_delete.php
+++ b/core/menu/menu_delete.php
@@ -78,12 +78,12 @@ if (strlen($id)>0) {
 }
 
 //redirect the user
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=menu.php\">\n";
 	echo "<div align='center'>\n";
 	echo $text['message-delete']."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>
\ No newline at end of file
diff --git a/core/menu/menu_edit.php b/core/menu/menu_edit.php
index 9832d07fb3..9be8f36e7e 100644
--- a/core/menu/menu_edit.php
+++ b/core/menu/menu_edit.php
@@ -69,7 +69,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		//if (strlen($menu_language) == 0) { $msg .= $text['message-required'].$text['label-language']."<br>\n"; }
 		//if (strlen($menu_description) == 0) { $msg .= $text['message-required'].$text['label-description']."<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
 			echo "<div align='center'>\n";
 			echo "<table><tr><td>\n";
@@ -77,7 +77,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "</td></tr></table>\n";
 			persistformvar($_POST);
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 		}
 
@@ -113,12 +113,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$menu->restore();
 
 			//redirect the user back to the main menu
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=menu.php\">\n";
 				echo "<div align='center'>\n";
 				echo $text['message-add']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 		} //if ($action == "add")
 
@@ -133,12 +133,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				unset($sql);
 
 			//redirect the user back to the main menu
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=menu.php\">\n";
 				echo "<div align='center'>\n";
 				echo $text['message-update']."\n";
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 		} //if ($action == "update")
 	} //if ($_POST["persistformvar"] != "true")
@@ -163,7 +163,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	if ($action == "update") {
 		$page["title"] = $text['title-menu-edit'];
 	}
@@ -258,5 +258,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	require_once "core/menu/menu_item_list.php";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/core/menu/menu_item_delete.php b/core/menu/menu_item_delete.php
index e7f0bda667..42c13fd4e4 100644
--- a/core/menu/menu_item_delete.php
+++ b/core/menu/menu_item_delete.php
@@ -56,12 +56,12 @@ if (count($_GET)>0) {
 		unset($sql);
 
 	//redirect the user
-		require_once "includes/header.php";
+		require_once "resources/header.php";
 		echo "<meta http-equiv=\"refresh\" content=\"2;url=menu_edit.php?id=$menu_uuid\">\n";
 		echo "<div align='center'>";
 		echo $text['message-delete'];
 		echo "</div>";
-		require_once "includes/footer.php";
+		require_once "resources/footer.php";
 		return;
 }
 
diff --git a/core/menu/menu_item_edit.php b/core/menu/menu_item_edit.php
index f6eb302b86..f74b79a0dd 100644
--- a/core/menu/menu_item_edit.php
+++ b/core/menu/menu_item_edit.php
@@ -54,12 +54,12 @@ else {
 			$sql .= "and group_name = '".$group_name."' ";
 			$db->exec(check_sql($sql));
 		//redirect the browser
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=menu_item_edit.php?id=$menu_uuid&menu_item_uuid=$menu_item_uuid&menu_uuid=$menu_uuid\">\n";
 			echo "<div align='center'>\n";
 			echo $text['message-delete']."\n";
 			echo "</div>\n";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 	}
 
@@ -107,7 +107,7 @@ else {
 			if (strlen($menu_item_category) == 0) { $msg .= $text['message-required'].$text['label-category']."<br>\n"; }
 			//if (strlen($menu_item_link) == 0) { $msg .= $text['message-required'].$text['label-link']."<br>\n"; }
 			if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 				require_once "resources/persist_form_var.php";
 				echo "<div align='center'>\n";
 				echo "<table><tr><td>\n";
@@ -115,7 +115,7 @@ else {
 				echo "</td></tr></table>\n";
 				persistformvar($_POST);
 				echo "</div>\n";
-				require_once "includes/footer.php";
+				require_once "resources/footer.php";
 				return;
 			}
 
@@ -221,7 +221,7 @@ else {
 				}
 
 			//redirect the user
-				require_once "includes/header.php";
+				require_once "resources/header.php";
 					echo "<meta http-equiv=\"refresh\" content=\"2;url=menu_edit.php?id=$menu_uuid\">\n";
 					echo "<div align='center'>\n";
 					if ($action == "add") {
@@ -231,7 +231,7 @@ else {
 						echo $text['message-update']."\n";
 					}
 					echo "</div>\n";
-					require_once "includes/footer.php";
+					require_once "resources/footer.php";
 					return;
 		} //if ($_POST["persistformvar"] != "true")
 	} //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
@@ -266,7 +266,7 @@ else {
 	}
 
 //include the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	if ($action == "update") {
 		$page["title"] = $text['title-menu_item-edit'];
 	}
@@ -459,5 +459,5 @@ else {
 	echo "</div>";
 
 //include the footer
-  require_once "includes/footer.php";
+  require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/core/menu/menu_item_list.php b/core/menu/menu_item_list.php
index a104a5a21d..d79f68fbcc 100644
--- a/core/menu/menu_item_list.php
+++ b/core/menu/menu_item_list.php
@@ -174,7 +174,7 @@ function build_db_child_menu_list ($db, $menu_item_level, $menu_item_uuid, $c) {
 	//end check for children
 }
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 $order_by = $_GET["order_by"];
 $order = $_GET["order"];
 
@@ -355,6 +355,6 @@ $order = $_GET["order"];
 	echo "</div>";
 
 	echo "<br><br>";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 
 ?>
\ No newline at end of file
diff --git a/core/menu/menu_item_move_down.php b/core/menu/menu_item_move_down.php
index 30be8d020b..e16dae2096 100644
--- a/core/menu/menu_item_move_down.php
+++ b/core/menu/menu_item_move_down.php
@@ -82,12 +82,12 @@ if (count($_GET)>0) {
 	}
 
 	//redirect the user
-		require_once "includes/header.php";
+		require_once "resources/header.php";
 		echo "<meta http-equiv=\"refresh\" content=\"1;url=menu_list.php?menu_item_id=$menu_item_id\">\n";
 		echo "<div align='center'>";
 		echo $text['message-moved_down'];
 		echo "</div>";
-		require_once "includes/footer.php";
+		require_once "resources/footer.php";
 		return;
 }
 
diff --git a/core/menu/menu_item_move_up.php b/core/menu/menu_item_move_up.php
index d4ea218da0..6f242dd706 100644
--- a/core/menu/menu_item_move_up.php
+++ b/core/menu/menu_item_move_up.php
@@ -69,12 +69,12 @@ if (count($_GET)>0) {
 	}
 
 	//redirect the user
-		require_once "includes/header.php";
+		require_once "resources/header.php";
 		echo "<meta http-equiv=\"refresh\" content=\"1;url=menu_list.php?menu_item_id=$menu_item_id\">\n";
 		echo "<div align='center'>";
 		echo $text['message-moved_up'];
 		echo "</div>";
-		require_once "includes/footer.php";
+		require_once "resources/footer.php";
 		return;
 }
 
diff --git a/core/menu/menu_restore_default.php b/core/menu/menu_restore_default.php
index c4b55e2bb7..178c1a9b59 100644
--- a/core/menu/menu_restore_default.php
+++ b/core/menu/menu_restore_default.php
@@ -60,12 +60,12 @@ else {
 	$_SESSION["template_content"] = '';
 
 //show a message to the user
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=".PROJECT_PATH."/core/menu/menu_edit.php?id=$menu_uuid\">\n";
 	echo "<div align='center'>\n";
 	echo $text['message-restore']."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>
\ No newline at end of file
diff --git a/core/upgrade/upgrade.php b/core/upgrade/upgrade.php
index de0322ce7d..d90c203ee9 100644
--- a/core/upgrade/upgrade.php
+++ b/core/upgrade/upgrade.php
@@ -67,7 +67,7 @@
 
 //include the header
 	if ($display_results) {
-		require_once "includes/header.php";
+		require_once "resources/header.php";
 	}
 
 if ($display_type == 'text') {
@@ -108,6 +108,6 @@ if ($display_type == 'text') {
 
 //include the footer
 	if ($display_results) {
-		require_once "includes/footer.php";
+		require_once "resources/footer.php";
 	}
 ?>
\ No newline at end of file
diff --git a/core/upgrade/upgrade_schema.php b/core/upgrade/upgrade_schema.php
index d3c17ad190..02a8f70423 100644
--- a/core/upgrade/upgrade_schema.php
+++ b/core/upgrade/upgrade_schema.php
@@ -58,7 +58,7 @@
 				$text[$key] = $value[$_SESSION['domain']['language']['code']];
 			}
 
-		require_once "includes/header.php";
+		require_once "resources/header.php";
 		$page["title"] = $text['title-upgrade_schema'];
 
 		$display_type = 'html'; //html, text
@@ -80,7 +80,7 @@
 if ($display_results && $display_type == "html") {
 	echo "<br />\n";
 	echo "<br />\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 }
 
 ?>
\ No newline at end of file
diff --git a/core/user_settings/user_dashboard.php b/core/user_settings/user_dashboard.php
index d5319cd662..8d3267d47c 100644
--- a/core/user_settings/user_dashboard.php
+++ b/core/user_settings/user_dashboard.php
@@ -30,7 +30,7 @@ if (!file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/includes/config.php"))
 }
 require_once "resources/require.php";
 require_once "resources/check_auth.php";
-require_once "includes/header.php";
+require_once "resources/header.php";
 
 //add multi-lingual support
 	echo "<!--\n";
@@ -100,5 +100,5 @@ require_once "includes/header.php";
 	}
 
 //show the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/core/user_settings/user_edit.php b/core/user_settings/user_edit.php
index 4fc260e8cd..29c29a6cba 100644
--- a/core/user_settings/user_edit.php
+++ b/core/user_settings/user_edit.php
@@ -92,7 +92,7 @@ if (count($_POST)>0 && $_POST["persistform"] != "1") {
 	//if (strlen($user_time_zone) == 0) { $msg .= "Please provide an time zone.<br>\n"; }
 
 	if (strlen($msg) > 0) {
-		require_once "includes/header.php";
+		require_once "resources/header.php";
 		echo "<div align='center'>";
 		echo "<table><tr><td>";
 		echo $msg;
@@ -101,7 +101,7 @@ if (count($_POST)>0 && $_POST["persistform"] != "1") {
 		require_once "resources/persist_form.php";
 		echo persistform($_POST);
 		echo "</div>";
-		require_once "includes/footer.php";
+		require_once "resources/footer.php";
 		return;
 	}
 
@@ -199,10 +199,10 @@ if (count($_POST)>0 && $_POST["persistform"] != "1") {
 		//$_SESSION["template_content"] = '';
 
 	//redirect the browser
-		require_once "includes/header.php";
+		require_once "resources/header.php";
 		echo "<meta http-equiv=\"refresh\" content=\"2;url=".PROJECT_PATH."/core/user_settings/user_edit.php\">\n";
 		echo "<div align='center'>".$text['confirm-update']."</div>";
-		require_once "includes/footer.php";
+		require_once "resources/footer.php";
 		return;
 }
 else {
@@ -225,7 +225,7 @@ else {
 }
 
 //include the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 
 //show the content
 	$table_width ='width="100%"';
@@ -416,6 +416,6 @@ else {
 	echo "</form>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 
 ?>
\ No newline at end of file
diff --git a/core/users/group_permissions.php b/core/users/group_permissions.php
index 4df8d583e2..9beb5db44d 100644
--- a/core/users/group_permissions.php
+++ b/core/users/group_permissions.php
@@ -40,10 +40,10 @@ else {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
-require_once "includes/header.php";
+require_once "resources/header.php";
 $page["title"] = $text['title-group_permissions'];
 
-require_once "includes/paging.php";
+require_once "resources/paging.php";
 
 //get the list of installed apps from the core and mod directories
 	$config_list = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/app_config.php");
@@ -279,6 +279,6 @@ require_once "includes/paging.php";
 	echo "<form>\n";
 
 //show the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 
 ?>
\ No newline at end of file
diff --git a/core/users/groupadd.php b/core/users/groupadd.php
index 5de6d2e2f6..c96a1478d6 100644
--- a/core/users/groupadd.php
+++ b/core/users/groupadd.php
@@ -71,17 +71,17 @@ if (strlen($group_name) > 0) {
 	}
 
 	//redirect the user
-		require_once "includes/header.php";
+		require_once "resources/header.php";
 		echo "<meta http-equiv=\"refresh\" content=\"2;url=groups.php\">\n";
 		echo "<div align='center'>\n";
 		echo $text['message-add']."\n";
 		echo "</div>\n";
-		require_once "includes/footer.php";
+		require_once "resources/footer.php";
 		return;
 }
 
 //include the header
-	include "includes/header.php";
+	include "resources/header.php";
 	$page["title"] = $text['title-group_add'];
 
 //show the content
@@ -137,6 +137,6 @@ if (strlen($group_name) > 0) {
 	echo "<br><br>";
 
 //include the footer
-	include "includes/footer.php";
+	include "resources/footer.php";
 
 ?>
diff --git a/core/users/groupmembers.php b/core/users/groupmembers.php
index 2862f18ebd..3a5cfdf0b5 100644
--- a/core/users/groupmembers.php
+++ b/core/users/groupmembers.php
@@ -63,7 +63,7 @@ else {
 	//$exampledatareturned = example("apples", 1);
 
 //include the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	$page["title"] = $text['title-group_members'];
 
 //show the content
@@ -164,5 +164,5 @@ else {
 	echo "<br><br>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/core/users/groups.php b/core/users/groups.php
index 7743869d5a..4b188e1c1a 100644
--- a/core/users/groups.php
+++ b/core/users/groups.php
@@ -43,7 +43,7 @@ else {
 	}
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	$page["title"] = $text['title-group_manager'];
 
 //show the content
@@ -139,6 +139,6 @@ else {
 	echo "</div>";
 
 //show the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 
 ?>
\ No newline at end of file
diff --git a/core/users/index.php b/core/users/index.php
index 3b6a5b822c..6acfcce31b 100644
--- a/core/users/index.php
+++ b/core/users/index.php
@@ -41,7 +41,7 @@ else {
 	}
 
 //include the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	$page["title"] = $text['title-user_manager'];
 
 //show the user list
@@ -59,6 +59,6 @@ else {
 	echo "</div>";
 
 //include the footer
-	include "includes/footer.php";
+	include "resources/footer.php";
 
 ?>
diff --git a/core/users/permissions_default.php b/core/users/permissions_default.php
index 1e6b955cb6..0621527181 100644
--- a/core/users/permissions_default.php
+++ b/core/users/permissions_default.php
@@ -47,12 +47,12 @@ else {
 	$permission->restore();
 
 //show a message to the user
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=groups.php\">\n";
 	echo "<div align='center'>\n";
 	echo $text['message-restore']."\n";
 	echo "</div>\n";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 
 ?>
\ No newline at end of file
diff --git a/core/users/signup.php b/core/users/signup.php
index e9b649ef24..f1c7d5bb8d 100644
--- a/core/users/signup.php
+++ b/core/users/signup.php
@@ -87,7 +87,7 @@ if (count($_POST)>0 && check_str($_POST["persistform"]) != "1") {
 	if (strlen($user_email) == 0) { $msgerror .= $text['message-required'].$text['label-email']."<br>\n"; }
 
 	if (strlen($msgerror) > 0) {
-		require_once "includes/header.php";
+		require_once "resources/header.php";
 		echo "<div align='center'>";
 		echo "<table><tr><td>";
 		echo $msgerror;
@@ -95,7 +95,7 @@ if (count($_POST)>0 && check_str($_POST["persistform"]) != "1") {
 		require_once "resources/persist_form.php";
 		echo persistform($_POST);
 		echo "</div>";
-		require_once "includes/footer.php";
+		require_once "resources/footer.php";
 		return;
 	}
 
@@ -182,15 +182,15 @@ if (count($_POST)>0 && check_str($_POST["persistform"]) != "1") {
 	$db->exec(check_sql($sql));
 	unset($sql);
 
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"3;url=index.php\">\n";
 	echo "<div align='center'>".$text['message-add']."</div>";
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 	return;
 }
 
 //show the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	$page["title"] = $text['title-user_add'];
 
 //show the content
@@ -259,5 +259,5 @@ if (count($_POST)>0 && check_str($_POST["persistform"]) != "1") {
 	echo "</div>";
 
 //show the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/core/users/userlist.php b/core/users/userlist.php
index 19ddd570f5..40b0983d6a 100644
--- a/core/users/userlist.php
+++ b/core/users/userlist.php
@@ -34,8 +34,8 @@ else {
 	exit;
 }
 
-//require_once "includes/header.php";
-	require_once "includes/paging.php";
+//require_once "resources/header.php";
+	require_once "resources/paging.php";
 
 $order_by = $_GET["order_by"];
 $order = $_GET["order"];
diff --git a/core/users/usersupdate.php b/core/users/usersupdate.php
index 3bd2e1717d..6b9df57a31 100644
--- a/core/users/usersupdate.php
+++ b/core/users/usersupdate.php
@@ -87,10 +87,10 @@ else {
 			$sql .= "and user_uuid = '$user_uuid' ";
 			$db->exec(check_sql($sql));
 		//redirect the user
-			require_once "includes/header.php";
+			require_once "resources/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=usersupdate.php?id=$user_uuid\">\n";
 			echo "<div align='center'>".$text['message-update']."</div>";
-			require_once "includes/footer.php";
+			require_once "resources/footer.php";
 			return;
 	}
 
@@ -133,7 +133,7 @@ if (count($_POST)>0 && $_POST["persistform"] != "1") {
 	if (strlen($user_enabled) == 0) { $msg_error .= $text['message-required'].$text['label-enabled']."<br>\n"; }
 
 	if ($msg_error) {
-		require_once "includes/header.php";
+		require_once "resources/header.php";
 		echo "<div align='center'>";
 		echo "<table><tr><td>";
 		echo $msg_error;
@@ -142,7 +142,7 @@ if (count($_POST)>0 && $_POST["persistform"] != "1") {
 		require_once "resources/persist_form.php";
 		echo persistform($_POST);
 		echo "</div>";
-		require_once "includes/footer.php";
+		require_once "resources/footer.php";
 		return;
 	}
 
@@ -280,7 +280,7 @@ if (count($_POST)>0 && $_POST["persistform"] != "1") {
 		//$_SESSION["template_content"] = '';
 
 	//redirect the browser
-		require_once "includes/header.php";
+		require_once "resources/header.php";
 		if (if_group("admin")) {
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=usersupdate.php?id=$user_uuid\">\n";
 		}
@@ -288,7 +288,7 @@ if (count($_POST)>0 && $_POST["persistform"] != "1") {
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=usersupdate.php?id=$user_uuid\">\n";
 		}
 		echo "<div align='center'>".$text['message-update']."</div>";
-		require_once "includes/footer.php";
+		require_once "resources/footer.php";
 		return;
 }
 else {
@@ -329,7 +329,7 @@ else {
 }
 
 //include the header
-	require_once "includes/header.php";
+	require_once "resources/header.php";
 	$page["title"] = $text['title-user_edit'];
 
 //show the content
@@ -644,6 +644,6 @@ else {
 	echo "</form>";
 
 //include the footer
-	require_once "includes/footer.php";
+	require_once "resources/footer.php";
 
 ?>
\ No newline at end of file
diff --git a/index.php b/index.php
index 874552bbbe..6c4370326b 100644
--- a/index.php
+++ b/index.php
@@ -47,8 +47,8 @@ include "root.php";
 	}
 	else {
 		require_once "resources/require.php";
-		require_once "includes/header.php";
+		require_once "resources/header.php";
 		echo "<br /><br />\n";
-		require_once "includes/footer.php";
+		require_once "resources/footer.php";
 	}
 ?>
diff --git a/resources/install.php b/resources/install.php
index fa84ec90aa..dccd0ebf08 100644
--- a/resources/install.php
+++ b/resources/install.php
@@ -1346,7 +1346,7 @@ if ($_POST["install_step"] == "3" && count($_POST) > 0 && strlen($_POST["persist
 	ob_start();
 
 //show the html form
-	if (!is_writable($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/includes/header.php")) {
+	if (!is_writable($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/resources/header.php")) {
 		$install_msg .= "<li>Write access to ".$_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/includes/ is required during the install.</li>\n";
 	}
 	if (!extension_loaded('PDO')) {
diff --git a/resources/login.php b/resources/login.php
index be76faf6d4..0dc35681a8 100644
--- a/resources/login.php
+++ b/resources/login.php
@@ -40,7 +40,7 @@
 	}
 
 //add the header
-	include "includes/header.php";
+	include "resources/header.php";
 
 //show the message
 	if (strlen($msg) > 0) {
@@ -141,6 +141,6 @@
 	echo "</div>";
 
 //add the footer
-	include "includes/footer.php";
+	include "resources/footer.php";
 
 ?>
\ No newline at end of file
diff --git a/resources/recaptchalib.php b/resources/recaptchalib.php
index 225a04a5dc..e919fac632 100644
--- a/resources/recaptchalib.php
+++ b/resources/recaptchalib.php
@@ -102,9 +102,9 @@ function _recaptcha_http_post($host, $path, $data, $port = 80) {
 function recaptcha_get_html ($pubkey, $error = null, $use_ssl = false)
 {
 	if ($pubkey == null || $pubkey == '') {
-		require_once "includes/header.php";
+		require_once "resources/header.php";
 		echo "To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>";
-		require_once "includes/footer.php";
+		require_once "resources/footer.php";
 		exit;
 	}