diff --git a/app/exec/app_config.php b/app/sql_query/app_config.php
similarity index 79%
rename from app/exec/app_config.php
rename to app/sql_query/app_config.php
index e64c5fcd3b..391fea2bd8 100644
--- a/app/exec/app_config.php
+++ b/app/sql_query/app_config.php
@@ -1,14 +1,14 @@
 <?php
 
 	//application details
-		$apps[$x]['name'] = "Exec";
+		$apps[$x]['name'] = "SQL";
 		$apps[$x]['uuid'] = "1dd98ca6-95f1-e728-7e8f-137fe18dc23c";
 		$apps[$x]['category'] = "System";
 		$apps[$x]['subcategory'] = "";
 		$apps[$x]['version'] = "1.0";
 		$apps[$x]['license'] = "Mozilla Public License 1.1";
 		$apps[$x]['url'] = "http://www.fusionpbx.com";
-		$apps[$x]['description']['en-us'] = "Provides a conventient way to execute system, PHP, switch and SQL commands.";
+		$apps[$x]['description']['en-us'] = "Provides a conventient way to SQL commands.";
 		$apps[$x]['description']['ar-eg'] = "";
 		$apps[$x]['description']['de-at'] = "Bietet eine praktische Möglichkeit system, PHP, Switch und SQL Befehle aus zu führen.";
 		$apps[$x]['description']['de-ch'] = "";
@@ -30,20 +30,11 @@
 
 	//permission details
 		$y=0;
-		$apps[$x]['permissions'][$y]['name'] = "exec_view";
+		$apps[$x]['permissions'][$y]['name'] = "sql_query_view";
 		$apps[$x]['permissions'][$y]['menu']['uuid'] = "06493580-9131-ce57-23cd-d42d69dd8526";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "exec_command";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "exec_php";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "exec_switch";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "exec_sql";
+		$apps[$x]['permissions'][$y]['name'] = "sql_query_command";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
 		//$apps[$x]['permissions'][$y]['name'] = "exec_sql_backup";
diff --git a/app/exec/app_languages.php b/app/sql_query/app_languages.php
similarity index 100%
rename from app/exec/app_languages.php
rename to app/sql_query/app_languages.php
diff --git a/app/exec/app_menu.php b/app/sql_query/app_menu.php
similarity index 91%
rename from app/exec/app_menu.php
rename to app/sql_query/app_menu.php
index 1e5b1ba7c6..49321a120b 100644
--- a/app/exec/app_menu.php
+++ b/app/sql_query/app_menu.php
@@ -1,7 +1,7 @@
 <?php
 
 	$y=0;
-	$apps[$x]['menu'][$y]['title']['en-us'] = "Command";
+	$apps[$x]['menu'][$y]['title']['en-us'] = "SQL Query";
 	$apps[$x]['menu'][$y]['title']['ar-eg'] = "";
 	$apps[$x]['menu'][$y]['title']['de-at'] = "Befehle";
 	$apps[$x]['menu'][$y]['title']['de-ch'] = "";
@@ -23,7 +23,7 @@
 	$apps[$x]['menu'][$y]['uuid'] = "06493580-9131-ce57-23cd-d42d69dd8526";
 	$apps[$x]['menu'][$y]['parent_uuid'] = "594d99c5-6128-9c88-ca35-4b33392cec0f";
 	$apps[$x]['menu'][$y]['category'] = "internal";
-	$apps[$x]['menu'][$y]['path'] = "/app/exec/exec.php";
+	$apps[$x]['menu'][$y]['path'] = "/app/sql_query/sql_query.php";
 	$apps[$x]['menu'][$y]['groups'][] = "superadmin";
 
 ?>
diff --git a/app/exec/resources/images/blank.gif b/app/sql_query/resources/images/blank.gif
similarity index 100%
rename from app/exec/resources/images/blank.gif
rename to app/sql_query/resources/images/blank.gif
diff --git a/app/exec/resources/images/icon_file.png b/app/sql_query/resources/images/icon_file.png
similarity index 100%
rename from app/exec/resources/images/icon_file.png
rename to app/sql_query/resources/images/icon_file.png
diff --git a/app/exec/resources/images/icon_folder.png b/app/sql_query/resources/images/icon_folder.png
similarity index 100%
rename from app/exec/resources/images/icon_folder.png
rename to app/sql_query/resources/images/icon_folder.png
diff --git a/app/exec/resources/images/icon_gear.png b/app/sql_query/resources/images/icon_gear.png
similarity index 100%
rename from app/exec/resources/images/icon_gear.png
rename to app/sql_query/resources/images/icon_gear.png
diff --git a/app/exec/resources/images/icon_goto.png b/app/sql_query/resources/images/icon_goto.png
similarity index 100%
rename from app/exec/resources/images/icon_goto.png
rename to app/sql_query/resources/images/icon_goto.png
diff --git a/app/exec/resources/images/icon_indenting.png b/app/sql_query/resources/images/icon_indenting.png
similarity index 100%
rename from app/exec/resources/images/icon_indenting.png
rename to app/sql_query/resources/images/icon_indenting.png
diff --git a/app/exec/resources/images/icon_invisibles.png b/app/sql_query/resources/images/icon_invisibles.png
similarity index 100%
rename from app/exec/resources/images/icon_invisibles.png
rename to app/sql_query/resources/images/icon_invisibles.png
diff --git a/app/exec/resources/images/icon_numbering.png b/app/sql_query/resources/images/icon_numbering.png
similarity index 100%
rename from app/exec/resources/images/icon_numbering.png
rename to app/sql_query/resources/images/icon_numbering.png
diff --git a/app/exec/resources/images/icon_replace.png b/app/sql_query/resources/images/icon_replace.png
similarity index 100%
rename from app/exec/resources/images/icon_replace.png
rename to app/sql_query/resources/images/icon_replace.png
diff --git a/app/exec/root.php b/app/sql_query/root.php
similarity index 100%
rename from app/exec/root.php
rename to app/sql_query/root.php
diff --git a/app/exec/sql_backup.php b/app/sql_query/sql_backup.php
similarity index 100%
rename from app/exec/sql_backup.php
rename to app/sql_query/sql_backup.php
diff --git a/app/exec/sql_db_conversion.php b/app/sql_query/sql_db_conversion.php
similarity index 100%
rename from app/exec/sql_db_conversion.php
rename to app/sql_query/sql_db_conversion.php
diff --git a/app/exec/exec.php b/app/sql_query/sql_query.php
similarity index 100%
rename from app/exec/exec.php
rename to app/sql_query/sql_query.php
diff --git a/app/exec/sql_query_db.php b/app/sql_query/sql_query_db.php
similarity index 100%
rename from app/exec/sql_query_db.php
rename to app/sql_query/sql_query_db.php
diff --git a/app/exec/sql_query_pdo.php b/app/sql_query/sql_query_pdo.php
similarity index 100%
rename from app/exec/sql_query_pdo.php
rename to app/sql_query/sql_query_pdo.php
diff --git a/app/exec/sql_query_result.php b/app/sql_query/sql_query_result.php
similarity index 100%
rename from app/exec/sql_query_result.php
rename to app/sql_query/sql_query_result.php