diff --git a/source/index-openstack.rst b/source/index-openstack.rst
new file mode 100644
index 00000000..5bdaa6e7
--- /dev/null
+++ b/source/index-openstack.rst
@@ -0,0 +1,21 @@
+OpenStack* implementation
+#########################
+
+.. toctree::
+   :maxdepth: 1
+
+   openstack_use_cases
+   openstack_bundle_and_service_summary
+   openstack_sys_req_and_pw_summary
+   openstack_installing_bundles
+   openstack_supporting-database
+   openstack_supporting-messaging
+   openstack_identity
+   openstack_identity-openrc
+   openstack_image
+   openstack_compute
+   openstack_block_storage
+   openstack_dashboard
+   openstack_networking
+   openstack_orchestration
+   openstack_telemetry
\ No newline at end of file
diff --git a/source/index.rst b/source/index.rst
index 3164348e..97b2a3ba 100644
--- a/source/index.rst
+++ b/source/index.rst
@@ -4,79 +4,54 @@
    contain the root `toctree` directive.
 
 Clear Linux* Project for Intel® Architecture--Documentation
-===========================================================
+############################################################
+
+
+Getting started
+================
 
 .. toctree::
    :maxdepth: 2
 
-
-Getting started
-###############
-
-.. toctree::
-   :maxdepth: 1
-
-   gs_getting_started
-   gs_supported_hardware
-   gs_creating_bootable_usb
-   gs_installing_clr_as_host
-   gs_running_clr_virtual
-   gs-clear-containers-gettting-started
+   index_gs.rst
 
 
 Software update
-###############
+===============
 
 .. toctree::
-   :maxdepth: 1
+   :maxdepth: 2
 
-   swupdate_about_sw_update
-   swupdate_how_to_run_the_updater
+   index_sw_update.rst
 
 
 Bundles
-#######
+=======
 
 .. toctree::
-   :maxdepth: 1
+   :maxdepth: 2
 
-   bundles_overview
-   bundles_in_clr
-   table_view_bundles
+   index_bundles.rst
 
 
 OpenStack* implementation
-#############################
+=========================
 
 .. toctree::
-   :maxdepth: 1
+   :maxdepth: 2
 
-   openstack_use_cases
-   openstack_bundle_and_service_summary
-   openstack_sys_req_and_pw_summary
-   openstack_installing_bundles
-   openstack_supporting-database
-   openstack_supporting-messaging
-   openstack_identity
-   openstack_identity-openrc
-   openstack_image
-   openstack_compute
-   openstack_block_storage
-   openstack_dashboard
-   openstack_networking
-   openstack_orchestration
-   openstack_telemetry
+   index-openstack.rst
 
 
 Indices and tables
-==================
+##################
 
 * :ref:`genindex`
 * :ref:`modindex`
 * :ref:`search`
 
 License and Disclaimers
-=======================
+#######################
 .. toctree::   
 
 .. include:: documentation_license.rst
diff --git a/source/index_bundles.rst b/source/index_bundles.rst
new file mode 100644
index 00000000..c0fa757f
--- /dev/null
+++ b/source/index_bundles.rst
@@ -0,0 +1,9 @@
+Bundles
+#######
+
+.. toctree::
+   :maxdepth: 2
+
+   bundles_overview
+   bundles_in_clr
+   table_view_bundles
\ No newline at end of file
diff --git a/source/index_gs.rst b/source/index_gs.rst
new file mode 100644
index 00000000..cecd2e27
--- /dev/null
+++ b/source/index_gs.rst
@@ -0,0 +1,12 @@
+Getting started
+###############
+
+.. toctree::
+   :maxdepth: 2
+
+   gs_getting_started
+   gs_supported_hardware
+   gs_creating_bootable_usb
+   gs_installing_clr_as_host
+   gs_running_clr_virtual
+   gs-clear-containers-gettting-started
\ No newline at end of file
diff --git a/source/index_sw_update.rst b/source/index_sw_update.rst
new file mode 100644
index 00000000..0d4ca479
--- /dev/null
+++ b/source/index_sw_update.rst
@@ -0,0 +1,8 @@
+Software update
+###############
+
+.. toctree::
+   :maxdepth: 2
+
+   swupdate_about_sw_update
+   swupdate_how_to_run_the_updater
\ No newline at end of file