28 files changed, 12 insertions, 15 deletions

diff --git a/docs/platform_overview/index.rst b/docs/platform_overview/index.rst
deleted file mode 100644
index 81271a43..00000000
--- a/docs/platform_overview/index.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-.. This work is licensed under a Creative Commons Attribution 4.0 International License.
-.. http://creativecommons.org/licenses/by/4.0
-.. (c) Huawei Technologies Co.,Ltd and others.
-
-*******************************
-Bottlenecks - Platform Overview
-*******************************
-
-.. toctree::
-   :maxdepth: 2
-
-   ./introduction.rst
diff --git a/docs/release_notes/index.rst b/docs/release/index.rst
index 622671cd..17e78444 100644
--- a/docs/release_notes/index.rst
+++ b/docs/release/index.rst
@@ -1,3 +1,4 @@
+.. _bottlenecks-releasenotes:
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
 .. http://creativecommons.org/licenses/by/4.0
 .. (c) Huawei Technologies Co.,Ltd and others.
@@ -7,7 +8,6 @@ Bottlenecks - Release Notes
 ***************************
 
 .. toctree::
-   :maxdepth: 2
+   :glob:
 
-   ./release_notes.rst
-   ./requirements_notes.rst
+   release-notes/*
diff --git a/docs/release_notes/release_notes.rst b/docs/release/release-notes/release_notes.rst
index 76b5c1cf..76b5c1cf 100644
--- a/docs/release_notes/release_notes.rst
+++ b/docs/release/release-notes/release_notes.rst
diff --git a/docs/release_notes/requirements_notes.rst b/docs/release/release-notes/requirements_notes.rst
index 2660bb01..2660bb01 100644
--- a/docs/release_notes/requirements_notes.rst
+++ b/docs/release/release-notes/requirements_notes.rst
diff --git a/docs/testing_guide/dashboard_guide.rst b/docs/testing/developer/dashboard_guide.rst
index 5679e508..5679e508 100644
--- a/docs/testing_guide/dashboard_guide.rst
+++ b/docs/testing/developer/dashboard_guide.rst
diff --git a/docs/testing_guide/index.rst b/docs/testing/developer/index.rst
index 20cc00eb..20cc00eb 100644
--- a/docs/testing_guide/index.rst
+++ b/docs/testing/developer/index.rst
diff --git a/docs/testing_guide/overview.rst b/docs/testing/developer/overview.rst
index 8bc1b7c1..8bc1b7c1 100644
--- a/docs/testing_guide/overview.rst
+++ b/docs/testing/developer/overview.rst
diff --git a/docs/testing_guide/posca_guide.rst b/docs/testing/developer/posca_guide.rst
index dbc7568c..dbc7568c 100644
--- a/docs/testing_guide/posca_guide.rst
+++ b/docs/testing/developer/posca_guide.rst
diff --git a/docs/testing_guide/rubbos_guide.rst b/docs/testing/developer/rubbos_guide.rst
index 4d92d2e2..4d92d2e2 100644
--- a/docs/testing_guide/rubbos_guide.rst
+++ b/docs/testing/developer/rubbos_guide.rst
diff --git a/docs/testing_guide/vstf_guide.rst b/docs/testing/developer/vstf_guide.rst
index e1ad5f2b..e1ad5f2b 100644
--- a/docs/testing_guide/vstf_guide.rst
+++ b/docs/testing/developer/vstf_guide.rst
diff --git a/docs/platform_overview/introduction.rst b/docs/testing/index.rst
index cb85e61d..70d3983b 100644
--- a/docs/platform_overview/introduction.rst
+++ b/docs/testing/index.rst
@@ -23,6 +23,13 @@ This project forms a staging framework to find bottlenecks and to do analysis of
 The *Bottlenecks* framework is deployed in several  OPNFV community labs. It is
 installer, infrastructure and application independent.
 
+.. toctree::
+   :glob:
+
+   developer/index.rst
+   user/index.rst
+   *
+
 .. _Pharos: https://wiki.opnfv.org/pharos
 
 .. seealso:: Pharos_ for information on OPNFV community labs.
@@ -35,3 +42,5 @@ Contact Bottlenecks
 Feedback `Contact us`_
 
 .. _Contact us: opnfv-users@lists.opnfv.org
+
+
diff --git a/docs/user_guide/index.rst b/docs/testing/user/index.rst
index 8afd57ab..8afd57ab 100644
--- a/docs/user_guide/index.rst
+++ b/docs/testing/user/index.rst
diff --git a/docs/user_guide/posca/posca_stress_ping.rst b/docs/testing/user/posca/posca_stress_ping.rst
index 846b4686..846b4686 100644
--- a/docs/user_guide/posca/posca_stress_ping.rst
+++ b/docs/testing/user/posca/posca_stress_ping.rst
diff --git a/docs/user_guide/posca/posca_stress_traffic.rst b/docs/testing/user/posca/posca_stress_traffic.rst
index a995996e..a995996e 100644
--- a/docs/user_guide/posca/posca_stress_traffic.rst
+++ b/docs/testing/user/posca/posca_stress_traffic.rst
diff --git a/docs/user_guide/rubbos/rubbos_basic.rst b/docs/testing/user/rubbos/rubbos_basic.rst
index ffef6c48..ffef6c48 100644
--- a/docs/user_guide/rubbos/rubbos_basic.rst
+++ b/docs/testing/user/rubbos/rubbos_basic.rst
diff --git a/docs/user_guide/rubbos/rubbos_heavy_tc1101.rst b/docs/testing/user/rubbos/rubbos_heavy_tc1101.rst
index 08251c7b..08251c7b 100644
--- a/docs/user_guide/rubbos/rubbos_heavy_tc1101.rst
+++ b/docs/testing/user/rubbos/rubbos_heavy_tc1101.rst
diff --git a/docs/user_guide/rubbos/rubbos_tc1101.rst b/docs/testing/user/rubbos/rubbos_tc1101.rst
index 2a261313..2a261313 100644
--- a/docs/user_guide/rubbos/rubbos_tc1101.rst
+++ b/docs/testing/user/rubbos/rubbos_tc1101.rst
diff --git a/docs/user_guide/rubbos/rubbos_tc1201.rst b/docs/testing/user/rubbos/rubbos_tc1201.rst
index 9b6a5f99..9b6a5f99 100644
--- a/docs/user_guide/rubbos/rubbos_tc1201.rst
+++ b/docs/testing/user/rubbos/rubbos_tc1201.rst
diff --git a/docs/user_guide/rubbos/rubbos_tc1301.rst b/docs/testing/user/rubbos/rubbos_tc1301.rst
index db4e0b63..db4e0b63 100644
--- a/docs/user_guide/rubbos/rubbos_tc1301.rst
+++ b/docs/testing/user/rubbos/rubbos_tc1301.rst
diff --git a/docs/user_guide/rubbos/rubbos_tc1401.rst b/docs/testing/user/rubbos/rubbos_tc1401.rst
index f195d237..f195d237 100644
--- a/docs/user_guide/rubbos/rubbos_tc1401.rst
+++ b/docs/testing/user/rubbos/rubbos_tc1401.rst
diff --git a/docs/user_guide/vstf/vstf_Ti1.rst b/docs/testing/user/vstf/vstf_Ti1.rst
index ce1690b4..ce1690b4 100644
--- a/docs/user_guide/vstf/vstf_Ti1.rst
+++ b/docs/testing/user/vstf/vstf_Ti1.rst
diff --git a/docs/user_guide/vstf/vstf_Ti2.rst b/docs/testing/user/vstf/vstf_Ti2.rst
index 58cb40f7..58cb40f7 100644
--- a/docs/user_guide/vstf/vstf_Ti2.rst
+++ b/docs/testing/user/vstf/vstf_Ti2.rst
diff --git a/docs/user_guide/vstf/vstf_Ti3.rst b/docs/testing/user/vstf/vstf_Ti3.rst
index 3bb9dfce..3bb9dfce 100644
--- a/docs/user_guide/vstf/vstf_Ti3.rst
+++ b/docs/testing/user/vstf/vstf_Ti3.rst
diff --git a/docs/user_guide/vstf/vstf_Tn1.rst b/docs/testing/user/vstf/vstf_Tn1.rst
index 5c591a9b..5c591a9b 100644
--- a/docs/user_guide/vstf/vstf_Tn1.rst
+++ b/docs/testing/user/vstf/vstf_Tn1.rst
diff --git a/docs/user_guide/vstf/vstf_Tn2.rst b/docs/testing/user/vstf/vstf_Tn2.rst
index 4b6d0c45..4b6d0c45 100644
--- a/docs/user_guide/vstf/vstf_Tn2.rst
+++ b/docs/testing/user/vstf/vstf_Tn2.rst
diff --git a/docs/user_guide/vstf/vstf_Tu1.rst b/docs/testing/user/vstf/vstf_Tu1.rst
index cf27bb25..cf27bb25 100644
--- a/docs/user_guide/vstf/vstf_Tu1.rst
+++ b/docs/testing/user/vstf/vstf_Tu1.rst
diff --git a/docs/user_guide/vstf/vstf_Tu2.rst b/docs/testing/user/vstf/vstf_Tu2.rst
index 2ae84467..2ae84467 100644
--- a/docs/user_guide/vstf/vstf_Tu2.rst
+++ b/docs/testing/user/vstf/vstf_Tu2.rst
diff --git a/docs/user_guide/vstf/vstf_Tu3.rst b/docs/testing/user/vstf/vstf_Tu3.rst
index 4e090f17..4e090f17 100644
--- a/docs/user_guide/vstf/vstf_Tu3.rst
+++ b/docs/testing/user/vstf/vstf_Tu3.rst