diff --git a/app/calls/app_config.php b/app/call_forward/app_config.php
similarity index 99%
rename from app/calls/app_config.php
rename to app/call_forward/app_config.php
index ec3f393e8e..58b24d9dcf 100644
--- a/app/calls/app_config.php
+++ b/app/call_forward/app_config.php
@@ -5,7 +5,7 @@
 		$apps[$x]['uuid'] = "19806921-e8ed-dcff-b325-dd3e5da4959d";
 		$apps[$x]['category'] = "Switch";;
 		$apps[$x]['subcategory'] = "";
-		$apps[$x]['version'] = "1.0";
+		$apps[$x]['version'] = "1.2";
 		$apps[$x]['license'] = "Mozilla Public License 1.1";
 		$apps[$x]['url'] = "http://www.fusionpbx.com";
 		$apps[$x]['description']['en-us'] = "Call Forward, Follow Me and Do Not Disturb.";
diff --git a/app/calls/app_defaults.php b/app/call_forward/app_defaults.php
similarity index 100%
rename from app/calls/app_defaults.php
rename to app/call_forward/app_defaults.php
diff --git a/app/calls/app_languages.php b/app/call_forward/app_languages.php
similarity index 100%
rename from app/calls/app_languages.php
rename to app/call_forward/app_languages.php
diff --git a/app/calls/app_menu.php b/app/call_forward/app_menu.php
similarity index 95%
rename from app/calls/app_menu.php
rename to app/call_forward/app_menu.php
index 5322964730..780840b238 100644
--- a/app/calls/app_menu.php
+++ b/app/call_forward/app_menu.php
@@ -25,7 +25,7 @@
 	$apps[$x]['menu'][$y]['uuid'] = "4e4df00b-aafb-45a8-82c1-cdabc921889c";
 	$apps[$x]['menu'][$y]['parent_uuid'] = "fd29e39c-c936-f5fc-8e2b-611681b266b5";
 	$apps[$x]['menu'][$y]['category'] = "internal";
-	$apps[$x]['menu'][$y]['path'] = "/app/calls/calls.php";
+	$apps[$x]['menu'][$y]['path'] = "/app/call_forward/call_forward.php";
 	$apps[$x]['menu'][$y]['groups'][] = "user";
 	$apps[$x]['menu'][$y]['groups'][] = "admin";
 	$apps[$x]['menu'][$y]['groups'][] = "superadmin";
diff --git a/app/calls/calls.php b/app/call_forward/call_forward.php
similarity index 100%
rename from app/calls/calls.php
rename to app/call_forward/call_forward.php
diff --git a/app/calls/call_edit.php b/app/call_forward/call_forward_edit.php
similarity index 100%
rename from app/calls/call_edit.php
rename to app/call_forward/call_forward_edit.php
diff --git a/app/calls/resources/classes/call_forward.php b/app/call_forward/resources/classes/call_forward.php
similarity index 100%
rename from app/calls/resources/classes/call_forward.php
rename to app/call_forward/resources/classes/call_forward.php
diff --git a/app/calls/resources/classes/do_not_disturb.php b/app/call_forward/resources/classes/do_not_disturb.php
similarity index 100%
rename from app/calls/resources/classes/do_not_disturb.php
rename to app/call_forward/resources/classes/do_not_disturb.php
diff --git a/app/calls/resources/classes/feature_event_notify.php b/app/call_forward/resources/classes/feature_event_notify.php
similarity index 100%
rename from app/calls/resources/classes/feature_event_notify.php
rename to app/call_forward/resources/classes/feature_event_notify.php
diff --git a/app/calls/resources/classes/follow_me.php b/app/call_forward/resources/classes/follow_me.php
similarity index 100%
rename from app/calls/resources/classes/follow_me.php
rename to app/call_forward/resources/classes/follow_me.php
diff --git a/app/calls/root.php b/app/call_forward/root.php
similarity index 100%
rename from app/calls/root.php
rename to app/call_forward/root.php