diff --git a/app/scripts/resources/classes/scripts.php b/app/scripts/resources/classes/scripts.php
index 2e976648c7..8be5626154 100644
--- a/app/scripts/resources/classes/scripts.php
+++ b/app/scripts/resources/classes/scripts.php
@@ -17,7 +17,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2017
+	Portions created by the Initial Developer are Copyright (C) 2008-2020
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -104,16 +104,16 @@ if (!class_exists('scripts')) {
 						$source_directory = '/usr/share/examples/fusionpbx/scripts';
 					}
 					else {
-						$source_directory = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/resources/install/scripts';
+						$source_directory = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/app/resources/scripts';
 					}
 					if (is_readable($source_directory)) {
 						//copy the main scripts
-						recursive_copy($source_directory,$destination_directory);
+						recursive_copy($source_directory, $destination_directory);
 						unset($source_directory);
 
 						//copy the app/*/resource/install/scripts
 						$app_scripts = glob($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'app/*/resource/install/scripts');
-						foreach ($app_scripts as $app_script){
+						foreach ($app_scripts as $app_script) {
 							recursive_copy($app_script, $destination_directory);
 						}
 						unset($app_scripts);
diff --git a/resources/install/scripts/app.lua b/app/scripts/resources/scripts/app.lua
similarity index 100%
rename from resources/install/scripts/app.lua
rename to app/scripts/resources/scripts/app.lua
diff --git a/resources/install/scripts/app/agent_status/index.lua b/app/scripts/resources/scripts/app/agent_status/index.lua
similarity index 100%
rename from resources/install/scripts/app/agent_status/index.lua
rename to app/scripts/resources/scripts/app/agent_status/index.lua
diff --git a/resources/install/scripts/app/avmd/index.lua b/app/scripts/resources/scripts/app/avmd/index.lua
similarity index 100%
rename from resources/install/scripts/app/avmd/index.lua
rename to app/scripts/resources/scripts/app/avmd/index.lua
diff --git a/resources/install/scripts/app/call_block/index.lua b/app/scripts/resources/scripts/app/call_block/index.lua
similarity index 100%
rename from resources/install/scripts/app/call_block/index.lua
rename to app/scripts/resources/scripts/app/call_block/index.lua
diff --git a/resources/install/scripts/app/conference_center/index.lua b/app/scripts/resources/scripts/app/conference_center/index.lua
similarity index 100%
rename from resources/install/scripts/app/conference_center/index.lua
rename to app/scripts/resources/scripts/app/conference_center/index.lua
diff --git a/resources/install/scripts/app/conference_center/resources/scripts/mute.lua b/app/scripts/resources/scripts/app/conference_center/resources/scripts/mute.lua
similarity index 100%
rename from resources/install/scripts/app/conference_center/resources/scripts/mute.lua
rename to app/scripts/resources/scripts/app/conference_center/resources/scripts/mute.lua
diff --git a/resources/install/scripts/app/conference_center/resources/scripts/start_recording.lua b/app/scripts/resources/scripts/app/conference_center/resources/scripts/start_recording.lua
similarity index 100%
rename from resources/install/scripts/app/conference_center/resources/scripts/start_recording.lua
rename to app/scripts/resources/scripts/app/conference_center/resources/scripts/start_recording.lua
diff --git a/resources/install/scripts/app/conference_center/resources/scripts/unmute.lua b/app/scripts/resources/scripts/app/conference_center/resources/scripts/unmute.lua
similarity index 100%
rename from resources/install/scripts/app/conference_center/resources/scripts/unmute.lua
rename to app/scripts/resources/scripts/app/conference_center/resources/scripts/unmute.lua
diff --git a/resources/install/scripts/app/conference_center/resources/templates/en/us/email_body.tpl b/app/scripts/resources/scripts/app/conference_center/resources/templates/en/us/email_body.tpl
similarity index 100%
rename from resources/install/scripts/app/conference_center/resources/templates/en/us/email_body.tpl
rename to app/scripts/resources/scripts/app/conference_center/resources/templates/en/us/email_body.tpl
diff --git a/resources/install/scripts/app/conference_center/resources/templates/en/us/email_subject.tpl b/app/scripts/resources/scripts/app/conference_center/resources/templates/en/us/email_subject.tpl
similarity index 100%
rename from resources/install/scripts/app/conference_center/resources/templates/en/us/email_subject.tpl
rename to app/scripts/resources/scripts/app/conference_center/resources/templates/en/us/email_subject.tpl
diff --git a/resources/install/scripts/app/dialplan/index.lua b/app/scripts/resources/scripts/app/dialplan/index.lua
similarity index 100%
rename from resources/install/scripts/app/dialplan/index.lua
rename to app/scripts/resources/scripts/app/dialplan/index.lua
diff --git a/resources/install/scripts/app/dialplan/resources/after/010_user_record.lua.noload b/app/scripts/resources/scripts/app/dialplan/resources/after/010_user_record.lua.noload
similarity index 100%
rename from resources/install/scripts/app/dialplan/resources/after/010_user_record.lua.noload
rename to app/scripts/resources/scripts/app/dialplan/resources/after/010_user_record.lua.noload
diff --git a/resources/install/scripts/app/dialplan/resources/before/010_user_exists.lua.noload b/app/scripts/resources/scripts/app/dialplan/resources/before/010_user_exists.lua.noload
similarity index 100%
rename from resources/install/scripts/app/dialplan/resources/before/010_user_exists.lua.noload
rename to app/scripts/resources/scripts/app/dialplan/resources/before/010_user_exists.lua.noload
diff --git a/resources/install/scripts/app/dialplan/resources/inbound/010_get_domain.lua.noload b/app/scripts/resources/scripts/app/dialplan/resources/inbound/010_get_domain.lua.noload
similarity index 100%
rename from resources/install/scripts/app/dialplan/resources/inbound/010_get_domain.lua.noload
rename to app/scripts/resources/scripts/app/dialplan/resources/inbound/010_get_domain.lua.noload
diff --git a/resources/install/scripts/app/emergency_notify/index.lua b/app/scripts/resources/scripts/app/emergency_notify/index.lua
similarity index 100%
rename from resources/install/scripts/app/emergency_notify/index.lua
rename to app/scripts/resources/scripts/app/emergency_notify/index.lua
diff --git a/resources/install/scripts/app/emergency_notify/resources/templates/en/us/email_body.tpl b/app/scripts/resources/scripts/app/emergency_notify/resources/templates/en/us/email_body.tpl
similarity index 100%
rename from resources/install/scripts/app/emergency_notify/resources/templates/en/us/email_body.tpl
rename to app/scripts/resources/scripts/app/emergency_notify/resources/templates/en/us/email_body.tpl
diff --git a/resources/install/scripts/app/emergency_notify/resources/templates/en/us/email_subject.tpl b/app/scripts/resources/scripts/app/emergency_notify/resources/templates/en/us/email_subject.tpl
similarity index 100%
rename from resources/install/scripts/app/emergency_notify/resources/templates/en/us/email_subject.tpl
rename to app/scripts/resources/scripts/app/emergency_notify/resources/templates/en/us/email_subject.tpl
diff --git a/resources/install/scripts/app/event_notify/index.lua b/app/scripts/resources/scripts/app/event_notify/index.lua
similarity index 100%
rename from resources/install/scripts/app/event_notify/index.lua
rename to app/scripts/resources/scripts/app/event_notify/index.lua
diff --git a/resources/install/scripts/app/failure_handler/index.lua b/app/scripts/resources/scripts/app/failure_handler/index.lua
similarity index 100%
rename from resources/install/scripts/app/failure_handler/index.lua
rename to app/scripts/resources/scripts/app/failure_handler/index.lua
diff --git a/resources/install/scripts/app/fax/app_languages.lua b/app/scripts/resources/scripts/app/fax/app_languages.lua
similarity index 100%
rename from resources/install/scripts/app/fax/app_languages.lua
rename to app/scripts/resources/scripts/app/fax/app_languages.lua
diff --git a/resources/install/scripts/app/fax/resources/scripts/fax_queue_monitor.lua b/app/scripts/resources/scripts/app/fax/resources/scripts/fax_queue_monitor.lua
similarity index 100%
rename from resources/install/scripts/app/fax/resources/scripts/fax_queue_monitor.lua
rename to app/scripts/resources/scripts/app/fax/resources/scripts/fax_queue_monitor.lua
diff --git a/resources/install/scripts/app/fax/resources/scripts/fax_queue_poll_once.lua b/app/scripts/resources/scripts/app/fax/resources/scripts/fax_queue_poll_once.lua
similarity index 100%
rename from resources/install/scripts/app/fax/resources/scripts/fax_queue_poll_once.lua
rename to app/scripts/resources/scripts/app/fax/resources/scripts/fax_queue_poll_once.lua
diff --git a/resources/install/scripts/app/fax/resources/scripts/hangup_rx.lua b/app/scripts/resources/scripts/app/fax/resources/scripts/hangup_rx.lua
similarity index 100%
rename from resources/install/scripts/app/fax/resources/scripts/hangup_rx.lua
rename to app/scripts/resources/scripts/app/fax/resources/scripts/hangup_rx.lua
diff --git a/resources/install/scripts/app/fax/resources/scripts/queue/exec.lua b/app/scripts/resources/scripts/app/fax/resources/scripts/queue/exec.lua
similarity index 100%
rename from resources/install/scripts/app/fax/resources/scripts/queue/exec.lua
rename to app/scripts/resources/scripts/app/fax/resources/scripts/queue/exec.lua
diff --git a/resources/install/scripts/app/fax/resources/scripts/queue/next.lua b/app/scripts/resources/scripts/app/fax/resources/scripts/queue/next.lua
similarity index 100%
rename from resources/install/scripts/app/fax/resources/scripts/queue/next.lua
rename to app/scripts/resources/scripts/app/fax/resources/scripts/queue/next.lua
diff --git a/resources/install/scripts/app/fax/resources/scripts/queue/retry.lua b/app/scripts/resources/scripts/app/fax/resources/scripts/queue/retry.lua
similarity index 100%
rename from resources/install/scripts/app/fax/resources/scripts/queue/retry.lua
rename to app/scripts/resources/scripts/app/fax/resources/scripts/queue/retry.lua
diff --git a/resources/install/scripts/app/fax/resources/scripts/queue/tasks.lua b/app/scripts/resources/scripts/app/fax/resources/scripts/queue/tasks.lua
similarity index 100%
rename from resources/install/scripts/app/fax/resources/scripts/queue/tasks.lua
rename to app/scripts/resources/scripts/app/fax/resources/scripts/queue/tasks.lua
diff --git a/resources/install/scripts/app/fax/resources/templates/en/us/outbound/fail/body.tpl b/app/scripts/resources/scripts/app/fax/resources/templates/en/us/outbound/fail/body.tpl
similarity index 100%
rename from resources/install/scripts/app/fax/resources/templates/en/us/outbound/fail/body.tpl
rename to app/scripts/resources/scripts/app/fax/resources/templates/en/us/outbound/fail/body.tpl
diff --git a/resources/install/scripts/app/fax/resources/templates/en/us/outbound/fail/subject.tpl b/app/scripts/resources/scripts/app/fax/resources/templates/en/us/outbound/fail/subject.tpl
similarity index 100%
rename from resources/install/scripts/app/fax/resources/templates/en/us/outbound/fail/subject.tpl
rename to app/scripts/resources/scripts/app/fax/resources/templates/en/us/outbound/fail/subject.tpl
diff --git a/resources/install/scripts/app/fax/resources/templates/en/us/outbound/success/body.tpl b/app/scripts/resources/scripts/app/fax/resources/templates/en/us/outbound/success/body.tpl
similarity index 100%
rename from resources/install/scripts/app/fax/resources/templates/en/us/outbound/success/body.tpl
rename to app/scripts/resources/scripts/app/fax/resources/templates/en/us/outbound/success/body.tpl
diff --git a/resources/install/scripts/app/fax/resources/templates/en/us/outbound/success/subject.tpl b/app/scripts/resources/scripts/app/fax/resources/templates/en/us/outbound/success/subject.tpl
similarity index 100%
rename from resources/install/scripts/app/fax/resources/templates/en/us/outbound/success/subject.tpl
rename to app/scripts/resources/scripts/app/fax/resources/templates/en/us/outbound/success/subject.tpl
diff --git a/resources/install/scripts/app/feature_event/index.lua b/app/scripts/resources/scripts/app/feature_event/index.lua
similarity index 100%
rename from resources/install/scripts/app/feature_event/index.lua
rename to app/scripts/resources/scripts/app/feature_event/index.lua
diff --git a/resources/install/scripts/app/feature_event/resources/functions/feature_event_notify.lua b/app/scripts/resources/scripts/app/feature_event/resources/functions/feature_event_notify.lua
similarity index 100%
rename from resources/install/scripts/app/feature_event/resources/functions/feature_event_notify.lua
rename to app/scripts/resources/scripts/app/feature_event/resources/functions/feature_event_notify.lua
diff --git a/resources/install/scripts/app/follow_me/index.lua b/app/scripts/resources/scripts/app/follow_me/index.lua
similarity index 100%
rename from resources/install/scripts/app/follow_me/index.lua
rename to app/scripts/resources/scripts/app/follow_me/index.lua
diff --git a/resources/install/scripts/app/hangup/index.lua b/app/scripts/resources/scripts/app/hangup/index.lua
similarity index 100%
rename from resources/install/scripts/app/hangup/index.lua
rename to app/scripts/resources/scripts/app/hangup/index.lua
diff --git a/resources/install/scripts/app/is_local/index.lua b/app/scripts/resources/scripts/app/is_local/index.lua
similarity index 100%
rename from resources/install/scripts/app/is_local/index.lua
rename to app/scripts/resources/scripts/app/is_local/index.lua
diff --git a/resources/install/scripts/app/messages/resources/events.lua b/app/scripts/resources/scripts/app/messages/resources/events.lua
similarity index 100%
rename from resources/install/scripts/app/messages/resources/events.lua
rename to app/scripts/resources/scripts/app/messages/resources/events.lua
diff --git a/resources/install/scripts/app/messages/resources/send.lua b/app/scripts/resources/scripts/app/messages/resources/send.lua
similarity index 100%
rename from resources/install/scripts/app/messages/resources/send.lua
rename to app/scripts/resources/scripts/app/messages/resources/send.lua
diff --git a/resources/install/scripts/app/missed_calls/resources/templates/en/us/email_body.tpl b/app/scripts/resources/scripts/app/missed_calls/resources/templates/en/us/email_body.tpl
similarity index 100%
rename from resources/install/scripts/app/missed_calls/resources/templates/en/us/email_body.tpl
rename to app/scripts/resources/scripts/app/missed_calls/resources/templates/en/us/email_body.tpl
diff --git a/resources/install/scripts/app/missed_calls/resources/templates/en/us/email_subject.tpl b/app/scripts/resources/scripts/app/missed_calls/resources/templates/en/us/email_subject.tpl
similarity index 100%
rename from resources/install/scripts/app/missed_calls/resources/templates/en/us/email_subject.tpl
rename to app/scripts/resources/scripts/app/missed_calls/resources/templates/en/us/email_subject.tpl
diff --git a/resources/install/scripts/app/provision/index.lua b/app/scripts/resources/scripts/app/provision/index.lua
similarity index 100%
rename from resources/install/scripts/app/provision/index.lua
rename to app/scripts/resources/scripts/app/provision/index.lua
diff --git a/resources/install/scripts/app/ring_groups/index.lua b/app/scripts/resources/scripts/app/ring_groups/index.lua
similarity index 100%
rename from resources/install/scripts/app/ring_groups/index.lua
rename to app/scripts/resources/scripts/app/ring_groups/index.lua
diff --git a/resources/install/scripts/app/ring_groups/resources/scripts/call_forward.lua b/app/scripts/resources/scripts/app/ring_groups/resources/scripts/call_forward.lua
similarity index 100%
rename from resources/install/scripts/app/ring_groups/resources/scripts/call_forward.lua
rename to app/scripts/resources/scripts/app/ring_groups/resources/scripts/call_forward.lua
diff --git a/resources/install/scripts/app/ring_groups/resources/scripts/confirm.lua b/app/scripts/resources/scripts/app/ring_groups/resources/scripts/confirm.lua
similarity index 100%
rename from resources/install/scripts/app/ring_groups/resources/scripts/confirm.lua
rename to app/scripts/resources/scripts/app/ring_groups/resources/scripts/confirm.lua
diff --git a/resources/install/scripts/app/ring_groups/resources/scripts/destination.lua b/app/scripts/resources/scripts/app/ring_groups/resources/scripts/destination.lua
similarity index 100%
rename from resources/install/scripts/app/ring_groups/resources/scripts/destination.lua
rename to app/scripts/resources/scripts/app/ring_groups/resources/scripts/destination.lua
diff --git a/resources/install/scripts/app/ring_groups/resources/scripts/monitor.lua b/app/scripts/resources/scripts/app/ring_groups/resources/scripts/monitor.lua
similarity index 100%
rename from resources/install/scripts/app/ring_groups/resources/scripts/monitor.lua
rename to app/scripts/resources/scripts/app/ring_groups/resources/scripts/monitor.lua
diff --git a/resources/install/scripts/app/ring_groups/resources/scripts/ring_member.lua b/app/scripts/resources/scripts/app/ring_groups/resources/scripts/ring_member.lua
similarity index 100%
rename from resources/install/scripts/app/ring_groups/resources/scripts/ring_member.lua
rename to app/scripts/resources/scripts/app/ring_groups/resources/scripts/ring_member.lua
diff --git a/resources/install/scripts/app/servers/resources/clear_cache.lua b/app/scripts/resources/scripts/app/servers/resources/clear_cache.lua
similarity index 100%
rename from resources/install/scripts/app/servers/resources/clear_cache.lua
rename to app/scripts/resources/scripts/app/servers/resources/clear_cache.lua
diff --git a/resources/install/scripts/app/servers/resources/file_cache.lua b/app/scripts/resources/scripts/app/servers/resources/file_cache.lua
similarity index 100%
rename from resources/install/scripts/app/servers/resources/file_cache.lua
rename to app/scripts/resources/scripts/app/servers/resources/file_cache.lua
diff --git a/resources/install/scripts/app/servers/resources/memcache.lua b/app/scripts/resources/scripts/app/servers/resources/memcache.lua
similarity index 100%
rename from resources/install/scripts/app/servers/resources/memcache.lua
rename to app/scripts/resources/scripts/app/servers/resources/memcache.lua
diff --git a/resources/install/scripts/app/speed_dial/index.lua b/app/scripts/resources/scripts/app/speed_dial/index.lua
similarity index 100%
rename from resources/install/scripts/app/speed_dial/index.lua
rename to app/scripts/resources/scripts/app/speed_dial/index.lua
diff --git a/resources/install/scripts/app/toll_allow/index.lua b/app/scripts/resources/scripts/app/toll_allow/index.lua
similarity index 100%
rename from resources/install/scripts/app/toll_allow/index.lua
rename to app/scripts/resources/scripts/app/toll_allow/index.lua
diff --git a/resources/install/scripts/app/voicemail/app_languages.lua b/app/scripts/resources/scripts/app/voicemail/app_languages.lua
similarity index 100%
rename from resources/install/scripts/app/voicemail/app_languages.lua
rename to app/scripts/resources/scripts/app/voicemail/app_languages.lua
diff --git a/resources/install/scripts/app/voicemail/index.lua b/app/scripts/resources/scripts/app/voicemail/index.lua
similarity index 100%
rename from resources/install/scripts/app/voicemail/index.lua
rename to app/scripts/resources/scripts/app/voicemail/index.lua
diff --git a/resources/install/scripts/app/voicemail/resources/functions/advanced.lua b/app/scripts/resources/scripts/app/voicemail/resources/functions/advanced.lua
similarity index 100%
rename from resources/install/scripts/app/voicemail/resources/functions/advanced.lua
rename to app/scripts/resources/scripts/app/voicemail/resources/functions/advanced.lua
diff --git a/resources/install/scripts/app/voicemail/resources/functions/change_password.lua b/app/scripts/resources/scripts/app/voicemail/resources/functions/change_password.lua
similarity index 100%
rename from resources/install/scripts/app/voicemail/resources/functions/change_password.lua
rename to app/scripts/resources/scripts/app/voicemail/resources/functions/change_password.lua
diff --git a/resources/install/scripts/app/voicemail/resources/functions/check_password.lua b/app/scripts/resources/scripts/app/voicemail/resources/functions/check_password.lua
similarity index 100%
rename from resources/install/scripts/app/voicemail/resources/functions/check_password.lua
rename to app/scripts/resources/scripts/app/voicemail/resources/functions/check_password.lua
diff --git a/resources/install/scripts/app/voicemail/resources/functions/choose_greeting.lua b/app/scripts/resources/scripts/app/voicemail/resources/functions/choose_greeting.lua
similarity index 100%
rename from resources/install/scripts/app/voicemail/resources/functions/choose_greeting.lua
rename to app/scripts/resources/scripts/app/voicemail/resources/functions/choose_greeting.lua
diff --git a/resources/install/scripts/app/voicemail/resources/functions/delete_recording.lua b/app/scripts/resources/scripts/app/voicemail/resources/functions/delete_recording.lua
similarity index 100%
rename from resources/install/scripts/app/voicemail/resources/functions/delete_recording.lua
rename to app/scripts/resources/scripts/app/voicemail/resources/functions/delete_recording.lua
diff --git a/resources/install/scripts/app/voicemail/resources/functions/forward_add_intro.lua b/app/scripts/resources/scripts/app/voicemail/resources/functions/forward_add_intro.lua
similarity index 100%
rename from resources/install/scripts/app/voicemail/resources/functions/forward_add_intro.lua
rename to app/scripts/resources/scripts/app/voicemail/resources/functions/forward_add_intro.lua
diff --git a/resources/install/scripts/app/voicemail/resources/functions/forward_to_extension.lua b/app/scripts/resources/scripts/app/voicemail/resources/functions/forward_to_extension.lua
similarity index 100%
rename from resources/install/scripts/app/voicemail/resources/functions/forward_to_extension.lua
rename to app/scripts/resources/scripts/app/voicemail/resources/functions/forward_to_extension.lua
diff --git a/resources/install/scripts/app/voicemail/resources/functions/get_voicemail_id.lua b/app/scripts/resources/scripts/app/voicemail/resources/functions/get_voicemail_id.lua
similarity index 100%
rename from resources/install/scripts/app/voicemail/resources/functions/get_voicemail_id.lua
rename to app/scripts/resources/scripts/app/voicemail/resources/functions/get_voicemail_id.lua
diff --git a/resources/install/scripts/app/voicemail/resources/functions/listen_to_recording.lua b/app/scripts/resources/scripts/app/voicemail/resources/functions/listen_to_recording.lua
similarity index 100%
rename from resources/install/scripts/app/voicemail/resources/functions/listen_to_recording.lua
rename to app/scripts/resources/scripts/app/voicemail/resources/functions/listen_to_recording.lua
diff --git a/resources/install/scripts/app/voicemail/resources/functions/macro.lua b/app/scripts/resources/scripts/app/voicemail/resources/functions/macro.lua
similarity index 100%
rename from resources/install/scripts/app/voicemail/resources/functions/macro.lua
rename to app/scripts/resources/scripts/app/voicemail/resources/functions/macro.lua
diff --git a/resources/install/scripts/app/voicemail/resources/functions/main_menu.lua b/app/scripts/resources/scripts/app/voicemail/resources/functions/main_menu.lua
similarity index 100%
rename from resources/install/scripts/app/voicemail/resources/functions/main_menu.lua
rename to app/scripts/resources/scripts/app/voicemail/resources/functions/main_menu.lua
diff --git a/resources/install/scripts/app/voicemail/resources/functions/menu_messages.lua b/app/scripts/resources/scripts/app/voicemail/resources/functions/menu_messages.lua
similarity index 100%
rename from resources/install/scripts/app/voicemail/resources/functions/menu_messages.lua
rename to app/scripts/resources/scripts/app/voicemail/resources/functions/menu_messages.lua
diff --git a/resources/install/scripts/app/voicemail/resources/functions/message_count.lua b/app/scripts/resources/scripts/app/voicemail/resources/functions/message_count.lua
similarity index 100%
rename from resources/install/scripts/app/voicemail/resources/functions/message_count.lua
rename to app/scripts/resources/scripts/app/voicemail/resources/functions/message_count.lua
diff --git a/resources/install/scripts/app/voicemail/resources/functions/message_saved.lua b/app/scripts/resources/scripts/app/voicemail/resources/functions/message_saved.lua
similarity index 100%
rename from resources/install/scripts/app/voicemail/resources/functions/message_saved.lua
rename to app/scripts/resources/scripts/app/voicemail/resources/functions/message_saved.lua
diff --git a/resources/install/scripts/app/voicemail/resources/functions/message_waiting.lua b/app/scripts/resources/scripts/app/voicemail/resources/functions/message_waiting.lua
similarity index 100%
rename from resources/install/scripts/app/voicemail/resources/functions/message_waiting.lua
rename to app/scripts/resources/scripts/app/voicemail/resources/functions/message_waiting.lua
diff --git a/resources/install/scripts/app/voicemail/resources/functions/mwi_notify.lua b/app/scripts/resources/scripts/app/voicemail/resources/functions/mwi_notify.lua
similarity index 100%
rename from resources/install/scripts/app/voicemail/resources/functions/mwi_notify.lua
rename to app/scripts/resources/scripts/app/voicemail/resources/functions/mwi_notify.lua
diff --git a/resources/install/scripts/app/voicemail/resources/functions/on_dtmf.lua b/app/scripts/resources/scripts/app/voicemail/resources/functions/on_dtmf.lua
similarity index 100%
rename from resources/install/scripts/app/voicemail/resources/functions/on_dtmf.lua
rename to app/scripts/resources/scripts/app/voicemail/resources/functions/on_dtmf.lua
diff --git a/resources/install/scripts/app/voicemail/resources/functions/play_greeting.lua b/app/scripts/resources/scripts/app/voicemail/resources/functions/play_greeting.lua
similarity index 100%
rename from resources/install/scripts/app/voicemail/resources/functions/play_greeting.lua
rename to app/scripts/resources/scripts/app/voicemail/resources/functions/play_greeting.lua
diff --git a/resources/install/scripts/app/voicemail/resources/functions/record_greeting.lua b/app/scripts/resources/scripts/app/voicemail/resources/functions/record_greeting.lua
similarity index 100%
rename from resources/install/scripts/app/voicemail/resources/functions/record_greeting.lua
rename to app/scripts/resources/scripts/app/voicemail/resources/functions/record_greeting.lua
diff --git a/resources/install/scripts/app/voicemail/resources/functions/record_menu.lua b/app/scripts/resources/scripts/app/voicemail/resources/functions/record_menu.lua
similarity index 100%
rename from resources/install/scripts/app/voicemail/resources/functions/record_menu.lua
rename to app/scripts/resources/scripts/app/voicemail/resources/functions/record_menu.lua
diff --git a/resources/install/scripts/app/voicemail/resources/functions/record_message.lua b/app/scripts/resources/scripts/app/voicemail/resources/functions/record_message.lua
similarity index 100%
rename from resources/install/scripts/app/voicemail/resources/functions/record_message.lua
rename to app/scripts/resources/scripts/app/voicemail/resources/functions/record_message.lua
diff --git a/resources/install/scripts/app/voicemail/resources/functions/record_name.lua b/app/scripts/resources/scripts/app/voicemail/resources/functions/record_name.lua
similarity index 100%
rename from resources/install/scripts/app/voicemail/resources/functions/record_name.lua
rename to app/scripts/resources/scripts/app/voicemail/resources/functions/record_name.lua
diff --git a/resources/install/scripts/app/voicemail/resources/functions/return_call.lua b/app/scripts/resources/scripts/app/voicemail/resources/functions/return_call.lua
similarity index 100%
rename from resources/install/scripts/app/voicemail/resources/functions/return_call.lua
rename to app/scripts/resources/scripts/app/voicemail/resources/functions/return_call.lua
diff --git a/resources/install/scripts/app/voicemail/resources/functions/send_email.lua b/app/scripts/resources/scripts/app/voicemail/resources/functions/send_email.lua
similarity index 100%
rename from resources/install/scripts/app/voicemail/resources/functions/send_email.lua
rename to app/scripts/resources/scripts/app/voicemail/resources/functions/send_email.lua
diff --git a/resources/install/scripts/app/voicemail/resources/functions/send_sms.lua b/app/scripts/resources/scripts/app/voicemail/resources/functions/send_sms.lua
similarity index 100%
rename from resources/install/scripts/app/voicemail/resources/functions/send_sms.lua
rename to app/scripts/resources/scripts/app/voicemail/resources/functions/send_sms.lua
diff --git a/resources/install/scripts/app/voicemail/resources/functions/tutorial.lua b/app/scripts/resources/scripts/app/voicemail/resources/functions/tutorial.lua
similarity index 100%
rename from resources/install/scripts/app/voicemail/resources/functions/tutorial.lua
rename to app/scripts/resources/scripts/app/voicemail/resources/functions/tutorial.lua
diff --git a/resources/install/scripts/app/voicemail/resources/scripts/mwi.lua b/app/scripts/resources/scripts/app/voicemail/resources/scripts/mwi.lua
similarity index 100%
rename from resources/install/scripts/app/voicemail/resources/scripts/mwi.lua
rename to app/scripts/resources/scripts/app/voicemail/resources/scripts/mwi.lua
diff --git a/resources/install/scripts/app/voicemail/resources/scripts/mwi_subscribe.lua b/app/scripts/resources/scripts/app/voicemail/resources/scripts/mwi_subscribe.lua
similarity index 100%
rename from resources/install/scripts/app/voicemail/resources/scripts/mwi_subscribe.lua
rename to app/scripts/resources/scripts/app/voicemail/resources/scripts/mwi_subscribe.lua
diff --git a/resources/install/scripts/app/voicemail/resources/templates/de/at/email_body.tpl b/app/scripts/resources/scripts/app/voicemail/resources/templates/de/at/email_body.tpl
similarity index 100%
rename from resources/install/scripts/app/voicemail/resources/templates/de/at/email_body.tpl
rename to app/scripts/resources/scripts/app/voicemail/resources/templates/de/at/email_body.tpl
diff --git a/resources/install/scripts/app/voicemail/resources/templates/de/at/email_subject.tpl b/app/scripts/resources/scripts/app/voicemail/resources/templates/de/at/email_subject.tpl
similarity index 100%
rename from resources/install/scripts/app/voicemail/resources/templates/de/at/email_subject.tpl
rename to app/scripts/resources/scripts/app/voicemail/resources/templates/de/at/email_subject.tpl
diff --git a/resources/install/scripts/app/voicemail/resources/templates/de/de/email_body.tpl b/app/scripts/resources/scripts/app/voicemail/resources/templates/de/de/email_body.tpl
similarity index 100%
rename from resources/install/scripts/app/voicemail/resources/templates/de/de/email_body.tpl
rename to app/scripts/resources/scripts/app/voicemail/resources/templates/de/de/email_body.tpl
diff --git a/resources/install/scripts/app/voicemail/resources/templates/de/de/email_subject.tpl b/app/scripts/resources/scripts/app/voicemail/resources/templates/de/de/email_subject.tpl
similarity index 100%
rename from resources/install/scripts/app/voicemail/resources/templates/de/de/email_subject.tpl
rename to app/scripts/resources/scripts/app/voicemail/resources/templates/de/de/email_subject.tpl
diff --git a/resources/install/scripts/app/voicemail/resources/templates/en/gb/email_body.tpl b/app/scripts/resources/scripts/app/voicemail/resources/templates/en/gb/email_body.tpl
similarity index 100%
rename from resources/install/scripts/app/voicemail/resources/templates/en/gb/email_body.tpl
rename to app/scripts/resources/scripts/app/voicemail/resources/templates/en/gb/email_body.tpl
diff --git a/resources/install/scripts/app/voicemail/resources/templates/en/gb/email_subject.tpl b/app/scripts/resources/scripts/app/voicemail/resources/templates/en/gb/email_subject.tpl
similarity index 100%
rename from resources/install/scripts/app/voicemail/resources/templates/en/gb/email_subject.tpl
rename to app/scripts/resources/scripts/app/voicemail/resources/templates/en/gb/email_subject.tpl
diff --git a/resources/install/scripts/app/voicemail/resources/templates/en/us/email_body.tpl b/app/scripts/resources/scripts/app/voicemail/resources/templates/en/us/email_body.tpl
similarity index 100%
rename from resources/install/scripts/app/voicemail/resources/templates/en/us/email_body.tpl
rename to app/scripts/resources/scripts/app/voicemail/resources/templates/en/us/email_body.tpl
diff --git a/resources/install/scripts/app/voicemail/resources/templates/en/us/email_body_transcription.tpl b/app/scripts/resources/scripts/app/voicemail/resources/templates/en/us/email_body_transcription.tpl
similarity index 100%
rename from resources/install/scripts/app/voicemail/resources/templates/en/us/email_body_transcription.tpl
rename to app/scripts/resources/scripts/app/voicemail/resources/templates/en/us/email_body_transcription.tpl
diff --git a/resources/install/scripts/app/voicemail/resources/templates/en/us/email_subject.tpl b/app/scripts/resources/scripts/app/voicemail/resources/templates/en/us/email_subject.tpl
similarity index 100%
rename from resources/install/scripts/app/voicemail/resources/templates/en/us/email_subject.tpl
rename to app/scripts/resources/scripts/app/voicemail/resources/templates/en/us/email_subject.tpl
diff --git a/resources/install/scripts/app/xml_handler/index.lua b/app/scripts/resources/scripts/app/xml_handler/index.lua
similarity index 100%
rename from resources/install/scripts/app/xml_handler/index.lua
rename to app/scripts/resources/scripts/app/xml_handler/index.lua
diff --git a/resources/install/scripts/app/xml_handler/resources/scripts/configuration/acl.conf.lua b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/acl.conf.lua
similarity index 100%
rename from resources/install/scripts/app/xml_handler/resources/scripts/configuration/acl.conf.lua
rename to app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/acl.conf.lua
diff --git a/resources/install/scripts/app/xml_handler/resources/scripts/configuration/callcenter.conf.lua b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/callcenter.conf.lua
similarity index 100%
rename from resources/install/scripts/app/xml_handler/resources/scripts/configuration/callcenter.conf.lua
rename to app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/callcenter.conf.lua
diff --git a/resources/install/scripts/app/xml_handler/resources/scripts/configuration/conference.conf.lua b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/conference.conf.lua
similarity index 100%
rename from resources/install/scripts/app/xml_handler/resources/scripts/configuration/conference.conf.lua
rename to app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/conference.conf.lua
diff --git a/resources/install/scripts/app/xml_handler/resources/scripts/configuration/ivr.conf.lua b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/ivr.conf.lua
similarity index 100%
rename from resources/install/scripts/app/xml_handler/resources/scripts/configuration/ivr.conf.lua
rename to app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/ivr.conf.lua
diff --git a/resources/install/scripts/app/xml_handler/resources/scripts/configuration/local_stream.conf.lua b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/local_stream.conf.lua
similarity index 100%
rename from resources/install/scripts/app/xml_handler/resources/scripts/configuration/local_stream.conf.lua
rename to app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/local_stream.conf.lua
diff --git a/resources/install/scripts/app/xml_handler/resources/scripts/configuration/sofia.conf.lua b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/sofia.conf.lua
similarity index 100%
rename from resources/install/scripts/app/xml_handler/resources/scripts/configuration/sofia.conf.lua
rename to app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/sofia.conf.lua
diff --git a/resources/install/scripts/app/xml_handler/resources/scripts/configuration/translate.conf.lua b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/translate.conf.lua
similarity index 100%
rename from resources/install/scripts/app/xml_handler/resources/scripts/configuration/translate.conf.lua
rename to app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/translate.conf.lua
diff --git a/resources/install/scripts/app/xml_handler/resources/scripts/dialplan/dialplan.lua b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/dialplan/dialplan.lua
similarity index 100%
rename from resources/install/scripts/app/xml_handler/resources/scripts/dialplan/dialplan.lua
rename to app/scripts/resources/scripts/app/xml_handler/resources/scripts/dialplan/dialplan.lua
diff --git a/resources/install/scripts/app/xml_handler/resources/scripts/directory/action/acl.lua b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/directory/action/acl.lua
similarity index 100%
rename from resources/install/scripts/app/xml_handler/resources/scripts/directory/action/acl.lua
rename to app/scripts/resources/scripts/app/xml_handler/resources/scripts/directory/action/acl.lua
diff --git a/resources/install/scripts/app/xml_handler/resources/scripts/directory/action/directory.lua b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/directory/action/directory.lua
similarity index 100%
rename from resources/install/scripts/app/xml_handler/resources/scripts/directory/action/directory.lua
rename to app/scripts/resources/scripts/app/xml_handler/resources/scripts/directory/action/directory.lua
diff --git a/resources/install/scripts/app/xml_handler/resources/scripts/directory/action/domains.lua b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/directory/action/domains.lua
similarity index 100%
rename from resources/install/scripts/app/xml_handler/resources/scripts/directory/action/domains.lua
rename to app/scripts/resources/scripts/app/xml_handler/resources/scripts/directory/action/domains.lua
diff --git a/resources/install/scripts/app/xml_handler/resources/scripts/directory/action/group_call.lua b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/directory/action/group_call.lua
similarity index 100%
rename from resources/install/scripts/app/xml_handler/resources/scripts/directory/action/group_call.lua
rename to app/scripts/resources/scripts/app/xml_handler/resources/scripts/directory/action/group_call.lua
diff --git a/resources/install/scripts/app/xml_handler/resources/scripts/directory/action/message-count.lua b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/directory/action/message-count.lua
similarity index 100%
rename from resources/install/scripts/app/xml_handler/resources/scripts/directory/action/message-count.lua
rename to app/scripts/resources/scripts/app/xml_handler/resources/scripts/directory/action/message-count.lua
diff --git a/resources/install/scripts/app/xml_handler/resources/scripts/directory/action/reverse-auth-lookup.lua b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/directory/action/reverse-auth-lookup.lua
similarity index 100%
rename from resources/install/scripts/app/xml_handler/resources/scripts/directory/action/reverse-auth-lookup.lua
rename to app/scripts/resources/scripts/app/xml_handler/resources/scripts/directory/action/reverse-auth-lookup.lua
diff --git a/resources/install/scripts/app/xml_handler/resources/scripts/directory/directory.lua b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/directory/directory.lua
similarity index 100%
rename from resources/install/scripts/app/xml_handler/resources/scripts/directory/directory.lua
rename to app/scripts/resources/scripts/app/xml_handler/resources/scripts/directory/directory.lua
diff --git a/resources/install/scripts/app/xml_handler/resources/scripts/languages/languages.lua b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/languages/languages.lua
similarity index 100%
rename from resources/install/scripts/app/xml_handler/resources/scripts/languages/languages.lua
rename to app/scripts/resources/scripts/app/xml_handler/resources/scripts/languages/languages.lua
diff --git a/resources/install/scripts/blf_subscribe.lua b/app/scripts/resources/scripts/blf_subscribe.lua
similarity index 100%
rename from resources/install/scripts/blf_subscribe.lua
rename to app/scripts/resources/scripts/blf_subscribe.lua
diff --git a/resources/install/scripts/call_flow.lua b/app/scripts/resources/scripts/call_flow.lua
similarity index 100%
rename from resources/install/scripts/call_flow.lua
rename to app/scripts/resources/scripts/call_flow.lua
diff --git a/resources/install/scripts/call_flow_monitor.lua b/app/scripts/resources/scripts/call_flow_monitor.lua
similarity index 100%
rename from resources/install/scripts/call_flow_monitor.lua
rename to app/scripts/resources/scripts/call_flow_monitor.lua
diff --git a/resources/install/scripts/call_flow_subscribe.lua b/app/scripts/resources/scripts/call_flow_subscribe.lua
similarity index 100%
rename from resources/install/scripts/call_flow_subscribe.lua
rename to app/scripts/resources/scripts/call_flow_subscribe.lua
diff --git a/resources/install/scripts/call_forward.lua b/app/scripts/resources/scripts/call_forward.lua
similarity index 100%
rename from resources/install/scripts/call_forward.lua
rename to app/scripts/resources/scripts/call_forward.lua
diff --git a/resources/install/scripts/cidlookup.lua b/app/scripts/resources/scripts/cidlookup.lua
similarity index 100%
rename from resources/install/scripts/cidlookup.lua
rename to app/scripts/resources/scripts/cidlookup.lua
diff --git a/resources/install/scripts/confirm.lua b/app/scripts/resources/scripts/confirm.lua
similarity index 100%
rename from resources/install/scripts/confirm.lua
rename to app/scripts/resources/scripts/confirm.lua
diff --git a/resources/install/scripts/destination_caller_id.lua b/app/scripts/resources/scripts/destination_caller_id.lua
similarity index 100%
rename from resources/install/scripts/destination_caller_id.lua
rename to app/scripts/resources/scripts/destination_caller_id.lua
diff --git a/resources/install/scripts/dial_string.lua b/app/scripts/resources/scripts/dial_string.lua
similarity index 100%
rename from resources/install/scripts/dial_string.lua
rename to app/scripts/resources/scripts/dial_string.lua
diff --git a/resources/install/scripts/directory.lua b/app/scripts/resources/scripts/directory.lua
similarity index 100%
rename from resources/install/scripts/directory.lua
rename to app/scripts/resources/scripts/directory.lua
diff --git a/resources/install/scripts/disa.callback.loopback.lua b/app/scripts/resources/scripts/disa.callback.loopback.lua
similarity index 100%
rename from resources/install/scripts/disa.callback.loopback.lua
rename to app/scripts/resources/scripts/disa.callback.loopback.lua
diff --git a/resources/install/scripts/disa.callback.lua b/app/scripts/resources/scripts/disa.callback.lua
similarity index 100%
rename from resources/install/scripts/disa.callback.lua
rename to app/scripts/resources/scripts/disa.callback.lua
diff --git a/resources/install/scripts/disa.lua b/app/scripts/resources/scripts/disa.lua
similarity index 100%
rename from resources/install/scripts/disa.lua
rename to app/scripts/resources/scripts/disa.lua
diff --git a/resources/install/scripts/disa.plus.lua b/app/scripts/resources/scripts/disa.plus.lua
similarity index 100%
rename from resources/install/scripts/disa.plus.lua
rename to app/scripts/resources/scripts/disa.plus.lua
diff --git a/resources/install/scripts/do_not_disturb.lua b/app/scripts/resources/scripts/do_not_disturb.lua
similarity index 100%
rename from resources/install/scripts/do_not_disturb.lua
rename to app/scripts/resources/scripts/do_not_disturb.lua
diff --git a/resources/install/scripts/eavesdrop.lua b/app/scripts/resources/scripts/eavesdrop.lua
similarity index 100%
rename from resources/install/scripts/eavesdrop.lua
rename to app/scripts/resources/scripts/eavesdrop.lua
diff --git a/resources/install/scripts/email.lua b/app/scripts/resources/scripts/email.lua
similarity index 100%
rename from resources/install/scripts/email.lua
rename to app/scripts/resources/scripts/email.lua
diff --git a/resources/install/scripts/extension_queue.lua b/app/scripts/resources/scripts/extension_queue.lua
similarity index 100%
rename from resources/install/scripts/extension_queue.lua
rename to app/scripts/resources/scripts/extension_queue.lua
diff --git a/resources/install/scripts/fax_retry.lua b/app/scripts/resources/scripts/fax_retry.lua
similarity index 100%
rename from resources/install/scripts/fax_retry.lua
rename to app/scripts/resources/scripts/fax_retry.lua
diff --git a/resources/install/scripts/fifo_member.lua b/app/scripts/resources/scripts/fifo_member.lua
similarity index 100%
rename from resources/install/scripts/fifo_member.lua
rename to app/scripts/resources/scripts/fifo_member.lua
diff --git a/resources/install/scripts/follow_me.lua b/app/scripts/resources/scripts/follow_me.lua
similarity index 100%
rename from resources/install/scripts/follow_me.lua
rename to app/scripts/resources/scripts/follow_me.lua
diff --git a/resources/install/scripts/ha_monitor.lua b/app/scripts/resources/scripts/ha_monitor.lua
similarity index 100%
rename from resources/install/scripts/ha_monitor.lua
rename to app/scripts/resources/scripts/ha_monitor.lua
diff --git a/resources/install/scripts/intercept.lua b/app/scripts/resources/scripts/intercept.lua
similarity index 100%
rename from resources/install/scripts/intercept.lua
rename to app/scripts/resources/scripts/intercept.lua
diff --git a/resources/install/scripts/intercept_group.lua b/app/scripts/resources/scripts/intercept_group.lua
similarity index 100%
rename from resources/install/scripts/intercept_group.lua
rename to app/scripts/resources/scripts/intercept_group.lua
diff --git a/resources/install/scripts/ivr_menu.lua b/app/scripts/resources/scripts/ivr_menu.lua
similarity index 100%
rename from resources/install/scripts/ivr_menu.lua
rename to app/scripts/resources/scripts/ivr_menu.lua
diff --git a/resources/install/scripts/mkdir.lua b/app/scripts/resources/scripts/mkdir.lua
similarity index 100%
rename from resources/install/scripts/mkdir.lua
rename to app/scripts/resources/scripts/mkdir.lua
diff --git a/resources/install/scripts/monitor.lua b/app/scripts/resources/scripts/monitor.lua
similarity index 100%
rename from resources/install/scripts/monitor.lua
rename to app/scripts/resources/scripts/monitor.lua
diff --git a/resources/install/scripts/page.lua b/app/scripts/resources/scripts/page.lua
similarity index 100%
rename from resources/install/scripts/page.lua
rename to app/scripts/resources/scripts/page.lua
diff --git a/resources/install/scripts/park.lua b/app/scripts/resources/scripts/park.lua
similarity index 100%
rename from resources/install/scripts/park.lua
rename to app/scripts/resources/scripts/park.lua
diff --git a/resources/install/scripts/park_monitor.lua b/app/scripts/resources/scripts/park_monitor.lua
similarity index 100%
rename from resources/install/scripts/park_monitor.lua
rename to app/scripts/resources/scripts/park_monitor.lua
diff --git a/resources/install/scripts/pin_number.lua b/app/scripts/resources/scripts/pin_number.lua
similarity index 100%
rename from resources/install/scripts/pin_number.lua
rename to app/scripts/resources/scripts/pin_number.lua
diff --git a/resources/install/scripts/recordings.lua b/app/scripts/resources/scripts/recordings.lua
similarity index 100%
rename from resources/install/scripts/recordings.lua
rename to app/scripts/resources/scripts/recordings.lua
diff --git a/resources/install/scripts/resources/functions/api.lua b/app/scripts/resources/scripts/resources/functions/api.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/api.lua
rename to app/scripts/resources/scripts/resources/functions/api.lua
diff --git a/resources/install/scripts/resources/functions/base64.lua b/app/scripts/resources/scripts/resources/functions/base64.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/base64.lua
rename to app/scripts/resources/scripts/resources/functions/base64.lua
diff --git a/resources/install/scripts/resources/functions/base64_alex.lua b/app/scripts/resources/scripts/resources/functions/base64_alex.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/base64_alex.lua
rename to app/scripts/resources/scripts/resources/functions/base64_alex.lua
diff --git a/resources/install/scripts/resources/functions/basename.lua b/app/scripts/resources/scripts/resources/functions/basename.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/basename.lua
rename to app/scripts/resources/scripts/resources/functions/basename.lua
diff --git a/resources/install/scripts/resources/functions/basic_event_service.lua b/app/scripts/resources/scripts/resources/functions/basic_event_service.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/basic_event_service.lua
rename to app/scripts/resources/scripts/resources/functions/basic_event_service.lua
diff --git a/resources/install/scripts/resources/functions/blf.lua b/app/scripts/resources/scripts/resources/functions/blf.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/blf.lua
rename to app/scripts/resources/scripts/resources/functions/blf.lua
diff --git a/resources/install/scripts/resources/functions/cache.lua b/app/scripts/resources/scripts/resources/functions/cache.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/cache.lua
rename to app/scripts/resources/scripts/resources/functions/cache.lua
diff --git a/resources/install/scripts/resources/functions/channel_utils.lua b/app/scripts/resources/scripts/resources/functions/channel_utils.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/channel_utils.lua
rename to app/scripts/resources/scripts/resources/functions/channel_utils.lua
diff --git a/resources/install/scripts/resources/functions/config.lua b/app/scripts/resources/scripts/resources/functions/config.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/config.lua
rename to app/scripts/resources/scripts/resources/functions/config.lua
diff --git a/resources/install/scripts/resources/functions/copy.lua b/app/scripts/resources/scripts/resources/functions/copy.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/copy.lua
rename to app/scripts/resources/scripts/resources/functions/copy.lua
diff --git a/resources/install/scripts/resources/functions/count.lua b/app/scripts/resources/scripts/resources/functions/count.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/count.lua
rename to app/scripts/resources/scripts/resources/functions/count.lua
diff --git a/resources/install/scripts/resources/functions/database.lua b/app/scripts/resources/scripts/resources/functions/database.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/database.lua
rename to app/scripts/resources/scripts/resources/functions/database.lua
diff --git a/resources/install/scripts/resources/functions/database/luasql.lua b/app/scripts/resources/scripts/resources/functions/database/luasql.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/database/luasql.lua
rename to app/scripts/resources/scripts/resources/functions/database/luasql.lua
diff --git a/resources/install/scripts/resources/functions/database/native.lua b/app/scripts/resources/scripts/resources/functions/database/native.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/database/native.lua
rename to app/scripts/resources/scripts/resources/functions/database/native.lua
diff --git a/resources/install/scripts/resources/functions/database/odbc.lua b/app/scripts/resources/scripts/resources/functions/database/odbc.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/database/odbc.lua
rename to app/scripts/resources/scripts/resources/functions/database/odbc.lua
diff --git a/resources/install/scripts/resources/functions/database/odbcpool.lua b/app/scripts/resources/scripts/resources/functions/database/odbcpool.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/database/odbcpool.lua
rename to app/scripts/resources/scripts/resources/functions/database/odbcpool.lua
diff --git a/resources/install/scripts/resources/functions/database_handle.lua b/app/scripts/resources/scripts/resources/functions/database_handle.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/database_handle.lua
rename to app/scripts/resources/scripts/resources/functions/database_handle.lua
diff --git a/resources/install/scripts/resources/functions/esl.lua b/app/scripts/resources/scripts/resources/functions/esl.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/esl.lua
rename to app/scripts/resources/scripts/resources/functions/esl.lua
diff --git a/resources/install/scripts/resources/functions/event_consumer.lua b/app/scripts/resources/scripts/resources/functions/event_consumer.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/event_consumer.lua
rename to app/scripts/resources/scripts/resources/functions/event_consumer.lua
diff --git a/resources/install/scripts/resources/functions/explode.lua b/app/scripts/resources/scripts/resources/functions/explode.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/explode.lua
rename to app/scripts/resources/scripts/resources/functions/explode.lua
diff --git a/resources/install/scripts/resources/functions/file.lua b/app/scripts/resources/scripts/resources/functions/file.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/file.lua
rename to app/scripts/resources/scripts/resources/functions/file.lua
diff --git a/resources/install/scripts/resources/functions/file_exists.lua b/app/scripts/resources/scripts/resources/functions/file_exists.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/file_exists.lua
rename to app/scripts/resources/scripts/resources/functions/file_exists.lua
diff --git a/resources/install/scripts/resources/functions/find_file.lua b/app/scripts/resources/scripts/resources/functions/find_file.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/find_file.lua
rename to app/scripts/resources/scripts/resources/functions/find_file.lua
diff --git a/resources/install/scripts/resources/functions/format_ringback.lua b/app/scripts/resources/scripts/resources/functions/format_ringback.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/format_ringback.lua
rename to app/scripts/resources/scripts/resources/functions/format_ringback.lua
diff --git a/resources/install/scripts/resources/functions/format_seconds.lua b/app/scripts/resources/scripts/resources/functions/format_seconds.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/format_seconds.lua
rename to app/scripts/resources/scripts/resources/functions/format_seconds.lua
diff --git a/resources/install/scripts/resources/functions/interval_timer.lua b/app/scripts/resources/scripts/resources/functions/interval_timer.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/interval_timer.lua
rename to app/scripts/resources/scripts/resources/functions/interval_timer.lua
diff --git a/resources/install/scripts/resources/functions/is_absolute_path.lua b/app/scripts/resources/scripts/resources/functions/is_absolute_path.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/is_absolute_path.lua
rename to app/scripts/resources/scripts/resources/functions/is_absolute_path.lua
diff --git a/resources/install/scripts/resources/functions/is_uuid.lua b/app/scripts/resources/scripts/resources/functions/is_uuid.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/is_uuid.lua
rename to app/scripts/resources/scripts/resources/functions/is_uuid.lua
diff --git a/resources/install/scripts/resources/functions/lazy_settings.lua b/app/scripts/resources/scripts/resources/functions/lazy_settings.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/lazy_settings.lua
rename to app/scripts/resources/scripts/resources/functions/lazy_settings.lua
diff --git a/resources/install/scripts/resources/functions/log.lua b/app/scripts/resources/scripts/resources/functions/log.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/log.lua
rename to app/scripts/resources/scripts/resources/functions/log.lua
diff --git a/resources/install/scripts/resources/functions/lunajson.lua b/app/scripts/resources/scripts/resources/functions/lunajson.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/lunajson.lua
rename to app/scripts/resources/scripts/resources/functions/lunajson.lua
diff --git a/resources/install/scripts/resources/functions/lunajson/_str_lib.lua b/app/scripts/resources/scripts/resources/functions/lunajson/_str_lib.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/lunajson/_str_lib.lua
rename to app/scripts/resources/scripts/resources/functions/lunajson/_str_lib.lua
diff --git a/resources/install/scripts/resources/functions/lunajson/_str_lib_lua53.lua b/app/scripts/resources/scripts/resources/functions/lunajson/_str_lib_lua53.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/lunajson/_str_lib_lua53.lua
rename to app/scripts/resources/scripts/resources/functions/lunajson/_str_lib_lua53.lua
diff --git a/resources/install/scripts/resources/functions/lunajson/decoder.lua b/app/scripts/resources/scripts/resources/functions/lunajson/decoder.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/lunajson/decoder.lua
rename to app/scripts/resources/scripts/resources/functions/lunajson/decoder.lua
diff --git a/resources/install/scripts/resources/functions/lunajson/encoder.lua b/app/scripts/resources/scripts/resources/functions/lunajson/encoder.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/lunajson/encoder.lua
rename to app/scripts/resources/scripts/resources/functions/lunajson/encoder.lua
diff --git a/resources/install/scripts/resources/functions/lunajson/sax.lua b/app/scripts/resources/scripts/resources/functions/lunajson/sax.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/lunajson/sax.lua
rename to app/scripts/resources/scripts/resources/functions/lunajson/sax.lua
diff --git a/resources/install/scripts/resources/functions/mkdir.lua b/app/scripts/resources/scripts/resources/functions/mkdir.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/mkdir.lua
rename to app/scripts/resources/scripts/resources/functions/mkdir.lua
diff --git a/resources/install/scripts/resources/functions/play_file.lua b/app/scripts/resources/scripts/resources/functions/play_file.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/play_file.lua
rename to app/scripts/resources/scripts/resources/functions/play_file.lua
diff --git a/resources/install/scripts/resources/functions/presence_in.lua b/app/scripts/resources/scripts/resources/functions/presence_in.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/presence_in.lua
rename to app/scripts/resources/scripts/resources/functions/presence_in.lua
diff --git a/resources/install/scripts/resources/functions/route_to_bridge.lua b/app/scripts/resources/scripts/resources/functions/route_to_bridge.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/route_to_bridge.lua
rename to app/scripts/resources/scripts/resources/functions/route_to_bridge.lua
diff --git a/resources/install/scripts/resources/functions/send_mail.lua b/app/scripts/resources/scripts/resources/functions/send_mail.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/send_mail.lua
rename to app/scripts/resources/scripts/resources/functions/send_mail.lua
diff --git a/resources/install/scripts/resources/functions/settings.lua b/app/scripts/resources/scripts/resources/functions/settings.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/settings.lua
rename to app/scripts/resources/scripts/resources/functions/settings.lua
diff --git a/resources/install/scripts/resources/functions/sleep.lua b/app/scripts/resources/scripts/resources/functions/sleep.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/sleep.lua
rename to app/scripts/resources/scripts/resources/functions/sleep.lua
diff --git a/resources/install/scripts/resources/functions/split.lua b/app/scripts/resources/scripts/resources/functions/split.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/split.lua
rename to app/scripts/resources/scripts/resources/functions/split.lua
diff --git a/resources/install/scripts/resources/functions/text.lua b/app/scripts/resources/scripts/resources/functions/text.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/text.lua
rename to app/scripts/resources/scripts/resources/functions/text.lua
diff --git a/resources/install/scripts/resources/functions/trim.lua b/app/scripts/resources/scripts/resources/functions/trim.lua
similarity index 100%
rename from resources/install/scripts/resources/functions/trim.lua
rename to app/scripts/resources/scripts/resources/functions/trim.lua
diff --git a/resources/install/scripts/resources/startup/odbc_pool.lua b/app/scripts/resources/scripts/resources/startup/odbc_pool.lua
similarity index 100%
rename from resources/install/scripts/resources/startup/odbc_pool.lua
rename to app/scripts/resources/scripts/resources/startup/odbc_pool.lua
diff --git a/resources/install/scripts/resources/tests/self_test.lua b/app/scripts/resources/scripts/resources/tests/self_test.lua
similarity index 100%
rename from resources/install/scripts/resources/tests/self_test.lua
rename to app/scripts/resources/scripts/resources/tests/self_test.lua
diff --git a/resources/install/scripts/roku.lua b/app/scripts/resources/scripts/roku.lua
similarity index 100%
rename from resources/install/scripts/roku.lua
rename to app/scripts/resources/scripts/roku.lua
diff --git a/resources/install/scripts/service b/app/scripts/resources/scripts/service
similarity index 100%
rename from resources/install/scripts/service
rename to app/scripts/resources/scripts/service
diff --git a/resources/install/scripts/streamfile.lua b/app/scripts/resources/scripts/streamfile.lua
similarity index 100%
rename from resources/install/scripts/streamfile.lua
rename to app/scripts/resources/scripts/streamfile.lua
diff --git a/resources/install/scripts/transfer2.lua b/app/scripts/resources/scripts/transfer2.lua
similarity index 100%
rename from resources/install/scripts/transfer2.lua
rename to app/scripts/resources/scripts/transfer2.lua
diff --git a/resources/install/scripts/wakeup.lua b/app/scripts/resources/scripts/wakeup.lua
similarity index 100%
rename from resources/install/scripts/wakeup.lua
rename to app/scripts/resources/scripts/wakeup.lua