diff --git a/crm/optimize.rst b/crm/optimize.rst
index e76f760d1..293abb556 100644
--- a/crm/optimize.rst
+++ b/crm/optimize.rst
@@ -6,7 +6,5 @@ Optimize your Day-to-Day work
    :titlesonly:
 
    optimize/google_calendar_credentials
-   optimize/onsip
-   optimize/setup
    optimize/partner_autocomplete
    optimize/gamification
diff --git a/general.rst b/general.rst
index cef4ab723..84b0d1e1b 100644
--- a/general.rst
+++ b/general.rst
@@ -14,5 +14,6 @@ General
    general/auth
    general/tags
    general/payment_acquirers
+   general/voip
    general/in_app_purchase
    general/developer_mode
diff --git a/general/voip.rst b/general/voip.rst
new file mode 100644
index 000000000..0f1a224db
--- /dev/null
+++ b/general/voip.rst
@@ -0,0 +1,10 @@
+===================================
+VoIP (Voice over Internet Protocol)
+===================================
+
+.. toctree::
+   :titlesonly:
+
+   voip/asterisk
+   voip/onsip
+   voip/asterisk
\ No newline at end of file
diff --git a/crm/optimize/setup.rst b/general/voip/asterisk.rst
similarity index 100%
rename from crm/optimize/setup.rst
rename to general/voip/asterisk.rst
diff --git a/crm/optimize/media/onsip01.png b/general/voip/media/onsip01.png
similarity index 100%
rename from crm/optimize/media/onsip01.png
rename to general/voip/media/onsip01.png
diff --git a/crm/optimize/media/onsip02.png b/general/voip/media/onsip02.png
similarity index 100%
rename from crm/optimize/media/onsip02.png
rename to general/voip/media/onsip02.png
diff --git a/crm/optimize/media/onsip03.png b/general/voip/media/onsip03.png
similarity index 100%
rename from crm/optimize/media/onsip03.png
rename to general/voip/media/onsip03.png
diff --git a/crm/optimize/media/onsip04.png b/general/voip/media/onsip04.png
similarity index 100%
rename from crm/optimize/media/onsip04.png
rename to general/voip/media/onsip04.png
diff --git a/crm/optimize/media/onsip05.png b/general/voip/media/onsip05.png
similarity index 100%
rename from crm/optimize/media/onsip05.png
rename to general/voip/media/onsip05.png
diff --git a/crm/optimize/media/onsip06.png b/general/voip/media/onsip06.png
similarity index 100%
rename from crm/optimize/media/onsip06.png
rename to general/voip/media/onsip06.png
diff --git a/crm/optimize/media/voip_config01.png b/general/voip/media/voip_config01.png
similarity index 100%
rename from crm/optimize/media/voip_config01.png
rename to general/voip/media/voip_config01.png
diff --git a/crm/optimize/media/voip_config02.png b/general/voip/media/voip_config02.png
similarity index 100%
rename from crm/optimize/media/voip_config02.png
rename to general/voip/media/voip_config02.png
diff --git a/crm/optimize/onsip.rst b/general/voip/onsip.rst
similarity index 100%
rename from crm/optimize/onsip.rst
rename to general/voip/onsip.rst
diff --git a/redirects.txt b/redirects.txt
index 94e7f05da..db29e8b9c 100644
--- a/redirects.txt
+++ b/redirects.txt
@@ -172,3 +172,6 @@ discuss/email_servers.rst discuss/advanced/email_servers.rst               # (#6
 discuss/plan_activities.rst discuss/overview/plan_activities.rst           # (#655)
 discuss/team_communication.rst discuss/overview/team_communication.rst     # (#655)
 discuss/overview.rst discuss/overview/get_started.rst                      # (#655)
+
+crm/optimize/onsip.rst general/voip/onsip.rst                                                       # crm/optimize/* --> general/voip/*
+crm/optimize/setup.rst general/voip/asterisk.rst                                                    # crm/optimize/setup --> general/voip/asterisk