diff --git a/includes/lib_switch.php b/includes/lib_switch.php
index 4989887c7f..7471fd2f08 100644
--- a/includes/lib_switch.php
+++ b/includes/lib_switch.php
@@ -1684,304 +1684,6 @@ function save_setting_xml() {
 	//unset($cmd);
 }
 
-function save_extension_xml() {
-	if (isset($_SESSION['switch']['extensions']['dir'])) {
-		//declare global variables
-			global $config, $db, $domain_uuid;
-
-		//get the context based from the domain_uuid
-			if (count($_SESSION['domains']) == 1) {
-				$user_context = "default";
-			}
-			else {
-				$user_context = $_SESSION['domains'][$domain_uuid]['domain_name'];
-			}
-
-		//delete all old extensions to prepare for new ones
-			$dialplan_list = glob($_SESSION['switch']['extensions']['dir']."/".$user_context."/v_*.xml");
-			foreach($dialplan_list as $name => $value) {
-				unlink($value);
-			}
-
-		//write the xml files
-			$sql = "select * from v_extensions ";
-			$sql .= "where domain_uuid = '$domain_uuid' ";
-			$sql .= "order by call_group asc ";
-			$prep_statement = $db->prepare(check_sql($sql));
-			$prep_statement->execute();
-			$i = 0;
-			$extension_xml_condensed = false;
-			while($row = $prep_statement->fetch(PDO::FETCH_ASSOC)) {
-				$call_group = $row['call_group'];
-				$call_group = str_replace(";", ",", $call_group);
-				$tmp_array = explode(",", $call_group);
-				foreach ($tmp_array as &$tmp_call_group) {
-					$tmp_call_group = trim($tmp_call_group);
-					if (strlen($tmp_call_group) > 0) {
-						if (strlen($call_group_array[$tmp_call_group]) == 0) {
-							$call_group_array[$tmp_call_group] = $row['extension'];
-						}
-						else {
-							$call_group_array[$tmp_call_group] = $call_group_array[$tmp_call_group].','.$row['extension'];
-						}
-					}
-					$i++;
-				}
-				$user_context = $row['user_context'];
-				$vm_password = $row['vm_password'];
-				$vm_password = str_replace("#", "", $vm_password); //preserves leading zeros
-
-				//echo "enabled: ".$row['enabled'];
-				if ($row['enabled'] != "false") {
-					$extension_uuid = $row['extension_uuid'];
-					//remove invalid characters from the file names
-					$extension = $row['extension'];
-					$extension = str_replace(" ", "_", $extension);
-					$extension = preg_replace("/[\*\:\\/\<\>\|\'\"\?]/", "", $extension);
-					$dial_string = $row['dial_string'];
-					if (strlen($dial_string) == 0) {
-						$dial_string = "{sip_invite_domain=\${domain_name},presence_id=\${dialed_user}@\${dialed_domain}}\${sofia_contact(\${dialed_user}@\${dialed_domain})}";
-					}
-
-					$xml .= "<include>\n";
-					$cidr = '';
-					if (strlen($row['cidr']) > 0) {
-						$cidr = " cidr=\"" . $row['cidr'] . "\"";
-					}
-					$number_alias = '';
-					if (strlen($row['number_alias']) > 0) {
-						$number_alias = " number-alias=\"".$row['number_alias']."\"";
-					}
-					$xml .= "  <user id=\"".$row['extension']."\"".$cidr."".$number_alias.">\n";
-					$xml .= "    <params>\n";
-					$xml .= "      <param name=\"password\" value=\"" . $row['password'] . "\"/>\n";
-					$xml .= "      <param name=\"vm-password\" value=\"" . $vm_password . "\"/>\n";
-					switch ($row['vm_enabled']) {
-					case "true":
-						$xml .= "      <param name=\"vm-enabled\" value=\"true\"/>\n";
-						break;
-					case "false":
-						$xml .= "      <param name=\"vm-enabled\" value=\"false\"/>\n";
-						break;
-					default:
-						$xml .= "      <param name=\"vm-enabled\" value=\"true\"/>\n";
-					}
-					if (strlen($row['vm_mailto']) > 0) {
-						$xml .= "      <param name=\"vm-email-all-messages\" value=\"true\"/>\n";
-
-						switch ($row['vm_attach_file']) {
-						case "true":
-								$xml .= "      <param name=\"vm-attach-file\" value=\"true\"/>\n";
-								break;
-						case "false":
-								$xml .= "      <param name=\"vm-attach-file\" value=\"false\"/>\n";
-								break;
-						default:
-								$xml .= "      <param name=\"vm-attach-file\" value=\"true\"/>\n";
-						}
-						switch ($row['vm_keep_local_after_email']) {
-						case "true":
-								$xml .= "      <param name=\"vm-keep-local-after-email\" value=\"true\"/>\n";
-								break;
-						case "false":
-								$xml .= "      <param name=\"vm-keep-local-after-email\" value=\"false\"/>\n";
-								break;
-						default:
-								$xml .= "      <param name=\"vm-keep-local-after-email\" value=\"true\"/>\n";
-						}
-						$xml .= "      <param name=\"vm-mailto\" value=\"" . $row['vm_mailto'] . "\"/>\n";
-					}
-					if (strlen($row['mwi_account']) > 0) {
-						$xml .= "      <param name=\"MWI-Account\" value=\"" . $row['mwi_account'] . "\"/>\n";
-					}
-					if (strlen($row['auth_acl']) > 0) {
-						$xml .= "      <param name=\"auth-acl\" value=\"" . $row['auth_acl'] . "\"/>\n";
-					}
-					if (strlen($row['directory_exten_visible']) > 0) {
-						$xml .= "      <param name=\"directory-exten-visible\" value=\"" . $row['directory_exten_visible'] . "\"/>\n";
-					}
-					$xml .= "      <param name=\"dial-string\" value=\"" . $dial_string . "\"/>\n";
-					$xml .= "    </params>\n";
-					$xml .= "    <variables>\n";
-					$xml .= "      <variable name=\"domain_uuid\" value=\"" . $_SESSION['domain_uuid'] . "\"/>\n";
-					$xml .= "      <variable name=\"extension_uuid\" value=\"" . $extension_uuid . "\"/>\n";
-					if (strlen($row['call_group']) > 0) {
-						$xml .= "      <variable name=\"call_group\" value=\"" . $row['call_group'] . "\"/>\n";
-					}
-					if (strlen($row['hold_music']) > 0) {
-						$xml .= "      <variable name=\"hold_music\" value=\"" . $row['hold_music'] . "\"/>\n";
-					}
-					$xml .= "      <variable name=\"toll_allow\" value=\"" . $row['toll_allow'] . "\"/>\n";
-					if (strlen($switch_account_code) > 0) {
-						$xml .= "      <variable name=\"accountcode\" value=\"" . $switch_account_code . "\"/>\n";
-					}
-					else {
-						$xml .= "      <variable name=\"accountcode\" value=\"" . $row['accountcode'] . "\"/>\n";
-					}
-					$xml .= "      <variable name=\"user_context\" value=\"" . $row['user_context'] . "\"/>\n";
-					if (strlen($row['effective_caller_id_name']) > 0) {
-						$xml .= "      <variable name=\"effective_caller_id_name\" value=\"" . $row['effective_caller_id_name'] . "\"/>\n";
-					}
-					if (strlen($row['effective_caller_id_number']) > 0) {
-						$xml .= "      <variable name=\"effective_caller_id_number\" value=\"" . $row['effective_caller_id_number'] . "\"/>\n";
-					}
-					if (strlen($row['outbound_caller_id_name']) > 0) {
-						$xml .= "      <variable name=\"outbound_caller_id_name\" value=\"" . $row['outbound_caller_id_name'] . "\"/>\n";
-					}
-					if (strlen($row['outbound_caller_id_number']) > 0) {
-						$xml .= "      <variable name=\"outbound_caller_id_number\" value=\"" . $row['outbound_caller_id_number'] . "\"/>\n";
-					}
-					if (strlen($row['emergency_caller_id_number']) > 0) {
-						$xml .= "      <variable name=\"emergency_caller_id_number\" value=\"" . $row['emergency_caller_id_number'] . "\"/>\n";
-					}
-					if (strlen($row['directory_full_name']) > 0) {
-						$xml .= "      <variable name=\"directory_full_name\" value=\"" . $row['directory_full_name'] . "\"/>\n";
-					}
-					if (strlen($row['directory_visible']) > 0) {
-						$xml .= "      <variable name=\"directory-visible\" value=\"" . $row['directory_visible'] . "\"/>\n";
-					}
-					if (strlen($row['limit_max']) > 0) {
-						$xml .= "      <variable name=\"limit_max\" value=\"" . $row['limit_max'] . "\"/>\n";
-					}
-					else {
-						$xml .= "      <variable name=\"limit_max\" value=\"5\"/>\n";
-					}
-					if (strlen($row['limit_destination']) > 0) {
-						$xml .= "      <variable name=\"limit_destination\" value=\"" . $row['limit_destination'] . "\"/>\n";
-					}
-					if (strlen($row['sip_force_contact']) > 0) {
-						$xml .= "      <variable name=\"sip-force-contact\" value=\"" . $row['sip_force_contact'] . "\"/>\n";
-					}
-					if (strlen($row['sip_force_expires']) > 0) {
-						$xml .= "      <variable name=\"sip-force-expires\" value=\"" . $row['sip_force_expires'] . "\"/>\n";
-					}
-					if (strlen($row['nibble_account']) > 0) {
-						$xml .= "      <variable name=\"nibble_account\" value=\"" . $row['nibble_account'] . "\"/>\n";
-					}
-					switch ($row['sip_bypass_media']) {
-						case "bypass-media":
-								$xml .= "      <variable name=\"bypass_media\" value=\"true\"/>\n";
-								break;
-						case "bypass-media-after-bridge":
-								$xml .= "      <variable name=\"bypass_media_after_bridge\" value=\"true\"/>\n";
-								break;
-						case "proxy-media":
-								$xml .= "      <variable name=\"proxy_media\" value=\"true\"/>\n";
-								break;
-					}
-
-					$xml .= "    </variables>\n";
-					$xml .= "  </user>\n";
-
-					if (!is_readable($_SESSION['switch']['extensions']['dir']."/".$row['user_context'])) {
-						mkdir($_SESSION['switch']['extensions']['dir']."/".$row['user_context'],0755,true);
-					}
-					if (strlen($extension) > 0) {
-						$fout = fopen($_SESSION['switch']['extensions']['dir']."/".$row['user_context']."/v_".$extension.".xml","w");
-					}
-					$xml .= "</include>\n";
-					fwrite($fout, $xml);
-					unset($xml);
-					fclose($fout);
-				}
-			}
-			unset ($prep_statement);
-
-		//prepare extension
-			$extension_dir_path = realpath($_SESSION['switch']['extensions']['dir']);
-			$user_context = str_replace(" ", "_", $user_context);
-			$user_context = preg_replace("/[\*\:\\/\<\>\|\'\"\?]/", "", $user_context);
-
-		//define the group members
-			$xml = "<!--\n";
-			$xml .= "	NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE\n";
-			$xml .= "\n";
-			$xml .= "	FreeSWITCH works off the concept of users and domains just like email.\n";
-			$xml .= "	You have users that are in domains for example 1000@domain.com.\n";
-			$xml .= "\n";
-			$xml .= "	When freeswitch gets a register packet it looks for the user in the directory\n";
-			$xml .= "	based on the from or to domain in the packet depending on how your sofia profile\n";
-			$xml .= "	is configured.  Out of the box the default domain will be the IP address of the\n";
-			$xml .= "	machine running FreeSWITCH.  This IP can be found by typing \"sofia status\" at the\n";
-			$xml .= "	CLI.  You will register your phones to the IP and not the hostname by default.\n";
-			$xml .= "	If you wish to register using the domain please open vars.xml in the root conf\n";
-			$xml .= "	directory and set the default domain to the hostname you desire.  Then you would\n";
-			$xml .= "	use the domain name in the client instead of the IP address to register\n";
-			$xml .= "	with FreeSWITCH.\n";
-			$xml .= "\n";
-			$xml .= "	NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE\n";
-			$xml .= "-->\n";
-			$xml .= "\n";
-			$xml .= "<include>\n";
-			$xml .= "	<!--the domain or ip (the right hand side of the @ in the addr-->\n";
-			if ($user_context == "default") {
-				$xml .= "	<domain name=\"\$\${domain}\">\n";
-			}
-			else {
-				$xml .= "	<domain name=\"".$user_context."\">\n";
-			}
-			$xml .= "		<params>\n";
-			//$xml .= "			<param name=\"dial-string\" value=\"{sip_invite_domain=\${domain_name},presence_id=\${dialed_user}@\${dialed_domain}}\${sofia_contact(\${dialed_user}@\${dialed_domain})}\"/>\n";
-			$xml .= "		</params>\n";
-			$xml .= "\n";
-			$xml .= "		<variables>\n";
-			$xml .= "			<variable name=\"record_stereo\" value=\"true\"/>\n";
-			$xml .= "			<variable name=\"default_gateway\" value=\"\$\${default_provider}\"/>\n";
-			$xml .= "			<variable name=\"default_areacode\" value=\"\$\${default_areacode}\"/>\n";
-			$xml .= "			<variable name=\"transfer_fallback_extension\" value=\"operator\"/>\n";
-			$xml .= "			<variable name=\"export_vars\" value=\"domain_name\"/>\n";
-			$xml .= "		</variables>\n";
-			$xml .= "\n";
-			$xml .= "		<groups>\n";
-			$xml .= "			<group name=\"".$user_context."\">\n";
-			$xml .= "			<users>\n";
-			$xml .= "				<X-PRE-PROCESS cmd=\"include\" data=\"".$user_context."/*.xml\"/>\n";
-			$xml .= "			</users>\n";
-			$xml .= "			</group>\n";
-			$xml .= "\n";
-			$previous_call_group = "";
-			foreach ($call_group_array as $key => $value) {
-				$call_group = trim($key);
-				$extension_list = trim($value);
-				if (strlen($call_group) > 0) {
-					if ($previous_call_group != $call_group) {
-						$xml .= "			<group name=\"$call_group\">\n";
-						$xml .= "				<users>\n";
-						$xml .= "					<!--\n";
-						$xml .= "					type=\"pointer\" is a pointer so you can have the\n";
-						$xml .= "					same user in multiple groups.  It basically means\n";
-						$xml .= "					to keep searching for the user in the directory.\n";
-						$xml .= "					-->\n";
-						$extension_array = explode(",", $extension_list);
-						foreach ($extension_array as &$tmp_extension) {
-							$xml .= "					<user id=\"$tmp_extension\" type=\"pointer\"/>\n";
-						}
-						$xml .= "				</users>\n";
-						$xml .= "			</group>\n";
-						$xml .= "\n";
-					}
-					$previous_call_group = $call_group;
-				}
-				unset($call_group);
-			}
-			$xml .= "		</groups>\n";
-			$xml .= "\n";
-			$xml .= "	</domain>\n";
-			$xml .= "</include>";
-
-		//write the xml file
-			if (is_readable($extension_dir_path) && strlen($extension_dir_path) > 0) {
-				$fout = fopen($extension_dir_path."/".$user_context.".xml","w");
-				fwrite($fout, $xml);
-				unset($xml);
-				fclose($fout);
-			}
-
-		//apply settings
-			$_SESSION["reload_xml"] = true;
-	}
-}
-
 function filename_safe($filename) {
 	// lower case
 		$filename = strtolower($filename);
@@ -3968,7 +3670,9 @@ if (!function_exists('save_switch_xml')) {
 			save_dialplan_xml();
 		}
 		if (is_readable($_SESSION['switch']['extensions']['dir'])) {
-			save_extension_xml();
+			require_once "app/extensions/resources/extension.php";
+			$extension = new extension;
+			$extension->xml();
 		}
 		if (is_readable($_SESSION['switch']['conf']['dir'])) {
 			save_setting_xml();