diff --git a/doc/source/index.rst b/doc/source/index.rst
index 37c1b14..f76ed49 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -19,9 +19,9 @@ Contents
:maxdepth: 2
introduction.rst
- methodologies/index.rst
- test_plans/index.rst
+ methodologies/index
labs/index.rst
+ test_plans/index
test_results/index
.. raw:: pdf
diff --git a/doc/source/test_plans/controlplane_density/plan.rst b/doc/source/test_plans/controlplane_density/plan.rst
index e3fcadd..8dd265f 100644
--- a/doc/source/test_plans/controlplane_density/plan.rst
+++ b/doc/source/test_plans/controlplane_density/plan.rst
@@ -1,7 +1,7 @@
.. _controlplane_density:
=======================================
-OpenStack Control Plane Density testing
+OpenStack control plane density testing
=======================================
:status: **ready**
diff --git a/doc/source/test_plans/hardware_features/hardware_offloads/test_plan.rst b/doc/source/test_plans/hardware_features/hardware_offloads/plan.rst
similarity index 100%
rename from doc/source/test_plans/hardware_features/hardware_offloads/test_plan.rst
rename to doc/source/test_plans/hardware_features/hardware_offloads/plan.rst
diff --git a/doc/source/test_plans/hardware_features/index.rst b/doc/source/test_plans/hardware_features/index.rst
index 22cd646..054e035 100644
--- a/doc/source/test_plans/hardware_features/index.rst
+++ b/doc/source/test_plans/hardware_features/index.rst
@@ -9,4 +9,4 @@ Hardware features test plans
.. toctree::
:maxdepth: 3
- hardware_offloads/test_plan
\ No newline at end of file
+ hardware_offloads/plan
\ No newline at end of file
diff --git a/doc/source/test_plans/index.rst b/doc/source/test_plans/index.rst
index 9f065b6..c3b6984 100644
--- a/doc/source/test_plans/index.rst
+++ b/doc/source/test_plans/index.rst
@@ -2,25 +2,12 @@
PageBreak oneColumn
-=======================
+==========
Test Plans
-=======================
+==========
.. toctree::
- :maxdepth: 2
+ :glob:
- mq/plan
- mq_ha/plan
- db/plan
- provisioning/plan
- tenant_networking/plan
- container_repositories/plan
- keystone/plan
- container_cluster_systems/plan
- neutron_features/l3_ha/test_plan
- hardware_features/index
- openstack_load/plan
- 1000_nodes/plan
- reliability/plan
- control_plane/plan
- controlplane_density/plan
+ */plan
+ */index
diff --git a/doc/source/test_plans/neutron_features/index.rst b/doc/source/test_plans/neutron_features/index.rst
new file mode 100644
index 0000000..905d2e4
--- /dev/null
+++ b/doc/source/test_plans/neutron_features/index.rst
@@ -0,0 +1,12 @@
+.. raw:: pdf
+
+ PageBreak oneColumn
+
+===========================
+Neutron features test plans
+===========================
+
+.. toctree::
+ :maxdepth: 3
+
+ l3_ha/plan
\ No newline at end of file
diff --git a/doc/source/test_plans/neutron_features/l3_ha/test_plan.rst b/doc/source/test_plans/neutron_features/l3_ha/plan.rst
similarity index 100%
rename from doc/source/test_plans/neutron_features/l3_ha/test_plan.rst
rename to doc/source/test_plans/neutron_features/l3_ha/plan.rst
diff --git a/doc/source/test_plans/tenant_networking/plan.rst b/doc/source/test_plans/tenant_networking/plan.rst
index eb327c3..e1dc49c 100644
--- a/doc/source/test_plans/tenant_networking/plan.rst
+++ b/doc/source/test_plans/tenant_networking/plan.rst
@@ -1,8 +1,8 @@
.. _openstack_tenant_networking_test_plan:
-=====================================
-OpenStack Tenant Networking Test Plan
-=====================================
+=======================================
+OpenStack tenant networking performance
+=======================================
:status: **draft**
:version: 1.0
diff --git a/doc/source/test_results/1000_nodes/index.rst b/doc/source/test_results/1000_nodes/index.rst
index 0f4b468..acce9eb 100644
--- a/doc/source/test_results/1000_nodes/index.rst
+++ b/doc/source/test_results/1000_nodes/index.rst
@@ -1,5 +1,5 @@
-Testing on scale of 1000 compute hosts.
-=======================================
+1000 Compute nodes resource scalability testing
+===============================================
Environment setup
-----------------
diff --git a/doc/source/test_results/container_platforms/index.rst b/doc/source/test_results/container_cluster_systems/index.rst
similarity index 51%
rename from doc/source/test_results/container_platforms/index.rst
rename to doc/source/test_results/container_cluster_systems/index.rst
index 3b965df..bfd9c99 100644
--- a/doc/source/test_results/container_platforms/index.rst
+++ b/doc/source/test_results/container_cluster_systems/index.rst
@@ -1,5 +1,5 @@
-Container platforms test results
-********************************
+Container cluster systems performance
+*************************************
.. toctree::
:numbered:
diff --git a/doc/source/test_results/container_platforms/mesos-marathon/Network_Scheme.png b/doc/source/test_results/container_cluster_systems/mesos-marathon/Network_Scheme.png
similarity index 100%
rename from doc/source/test_results/container_platforms/mesos-marathon/Network_Scheme.png
rename to doc/source/test_results/container_cluster_systems/mesos-marathon/Network_Scheme.png
diff --git a/doc/source/test_results/container_platforms/mesos-marathon/create-1.png b/doc/source/test_results/container_cluster_systems/mesos-marathon/create-1.png
similarity index 100%
rename from doc/source/test_results/container_platforms/mesos-marathon/create-1.png
rename to doc/source/test_results/container_cluster_systems/mesos-marathon/create-1.png
diff --git a/doc/source/test_results/container_platforms/mesos-marathon/create-16.png b/doc/source/test_results/container_cluster_systems/mesos-marathon/create-16.png
similarity index 100%
rename from doc/source/test_results/container_platforms/mesos-marathon/create-16.png
rename to doc/source/test_results/container_cluster_systems/mesos-marathon/create-16.png
diff --git a/doc/source/test_results/container_platforms/mesos-marathon/create-2.png b/doc/source/test_results/container_cluster_systems/mesos-marathon/create-2.png
similarity index 100%
rename from doc/source/test_results/container_platforms/mesos-marathon/create-2.png
rename to doc/source/test_results/container_cluster_systems/mesos-marathon/create-2.png
diff --git a/doc/source/test_results/container_platforms/mesos-marathon/create-4.png b/doc/source/test_results/container_cluster_systems/mesos-marathon/create-4.png
similarity index 100%
rename from doc/source/test_results/container_platforms/mesos-marathon/create-4.png
rename to doc/source/test_results/container_cluster_systems/mesos-marathon/create-4.png
diff --git a/doc/source/test_results/container_platforms/mesos-marathon/create-8.png b/doc/source/test_results/container_cluster_systems/mesos-marathon/create-8.png
similarity index 100%
rename from doc/source/test_results/container_platforms/mesos-marathon/create-8.png
rename to doc/source/test_results/container_cluster_systems/mesos-marathon/create-8.png
diff --git a/doc/source/test_results/container_platforms/mesos-marathon/delete-1.png b/doc/source/test_results/container_cluster_systems/mesos-marathon/delete-1.png
similarity index 100%
rename from doc/source/test_results/container_platforms/mesos-marathon/delete-1.png
rename to doc/source/test_results/container_cluster_systems/mesos-marathon/delete-1.png
diff --git a/doc/source/test_results/container_platforms/mesos-marathon/delete-16.png b/doc/source/test_results/container_cluster_systems/mesos-marathon/delete-16.png
similarity index 100%
rename from doc/source/test_results/container_platforms/mesos-marathon/delete-16.png
rename to doc/source/test_results/container_cluster_systems/mesos-marathon/delete-16.png
diff --git a/doc/source/test_results/container_platforms/mesos-marathon/delete-2.png b/doc/source/test_results/container_cluster_systems/mesos-marathon/delete-2.png
similarity index 100%
rename from doc/source/test_results/container_platforms/mesos-marathon/delete-2.png
rename to doc/source/test_results/container_cluster_systems/mesos-marathon/delete-2.png
diff --git a/doc/source/test_results/container_platforms/mesos-marathon/delete-4.png b/doc/source/test_results/container_cluster_systems/mesos-marathon/delete-4.png
similarity index 100%
rename from doc/source/test_results/container_platforms/mesos-marathon/delete-4.png
rename to doc/source/test_results/container_cluster_systems/mesos-marathon/delete-4.png
diff --git a/doc/source/test_results/container_platforms/mesos-marathon/delete-8.png b/doc/source/test_results/container_cluster_systems/mesos-marathon/delete-8.png
similarity index 100%
rename from doc/source/test_results/container_platforms/mesos-marathon/delete-8.png
rename to doc/source/test_results/container_cluster_systems/mesos-marathon/delete-8.png
diff --git a/doc/source/test_results/container_platforms/mesos-marathon/mesos-marathon.rst b/doc/source/test_results/container_cluster_systems/mesos-marathon/mesos-marathon.rst
similarity index 100%
rename from doc/source/test_results/container_platforms/mesos-marathon/mesos-marathon.rst
rename to doc/source/test_results/container_cluster_systems/mesos-marathon/mesos-marathon.rst
diff --git a/doc/source/test_results/container_platforms/mesos-marathon/restart-16.png b/doc/source/test_results/container_cluster_systems/mesos-marathon/restart-16.png
similarity index 100%
rename from doc/source/test_results/container_platforms/mesos-marathon/restart-16.png
rename to doc/source/test_results/container_cluster_systems/mesos-marathon/restart-16.png
diff --git a/doc/source/test_results/container_platforms/mesos-marathon/restart-2.png b/doc/source/test_results/container_cluster_systems/mesos-marathon/restart-2.png
similarity index 100%
rename from doc/source/test_results/container_platforms/mesos-marathon/restart-2.png
rename to doc/source/test_results/container_cluster_systems/mesos-marathon/restart-2.png
diff --git a/doc/source/test_results/container_platforms/mesos-marathon/restart-4.png b/doc/source/test_results/container_cluster_systems/mesos-marathon/restart-4.png
similarity index 100%
rename from doc/source/test_results/container_platforms/mesos-marathon/restart-4.png
rename to doc/source/test_results/container_cluster_systems/mesos-marathon/restart-4.png
diff --git a/doc/source/test_results/container_platforms/mesos-marathon/restart-8.png b/doc/source/test_results/container_cluster_systems/mesos-marathon/restart-8.png
similarity index 100%
rename from doc/source/test_results/container_platforms/mesos-marathon/restart-8.png
rename to doc/source/test_results/container_cluster_systems/mesos-marathon/restart-8.png
diff --git a/doc/source/test_results/container_platforms/mesos-marathon/results-marathon-health-check.rst b/doc/source/test_results/container_cluster_systems/mesos-marathon/results-marathon-health-check.rst
similarity index 100%
rename from doc/source/test_results/container_platforms/mesos-marathon/results-marathon-health-check.rst
rename to doc/source/test_results/container_cluster_systems/mesos-marathon/results-marathon-health-check.rst
diff --git a/doc/source/test_results/container_platforms/mesos-marathon/results-mesos-marathon.rst b/doc/source/test_results/container_cluster_systems/mesos-marathon/results-mesos-marathon.rst
similarity index 100%
rename from doc/source/test_results/container_platforms/mesos-marathon/results-mesos-marathon.rst
rename to doc/source/test_results/container_cluster_systems/mesos-marathon/results-mesos-marathon.rst
diff --git a/doc/source/test_results/container_platforms/mesos-marathon/update_cpu-1.png b/doc/source/test_results/container_cluster_systems/mesos-marathon/update_cpu-1.png
similarity index 100%
rename from doc/source/test_results/container_platforms/mesos-marathon/update_cpu-1.png
rename to doc/source/test_results/container_cluster_systems/mesos-marathon/update_cpu-1.png
diff --git a/doc/source/test_results/container_platforms/mesos-marathon/update_cpu-16.png b/doc/source/test_results/container_cluster_systems/mesos-marathon/update_cpu-16.png
similarity index 100%
rename from doc/source/test_results/container_platforms/mesos-marathon/update_cpu-16.png
rename to doc/source/test_results/container_cluster_systems/mesos-marathon/update_cpu-16.png
diff --git a/doc/source/test_results/container_platforms/mesos-marathon/update_cpu-2.png b/doc/source/test_results/container_cluster_systems/mesos-marathon/update_cpu-2.png
similarity index 100%
rename from doc/source/test_results/container_platforms/mesos-marathon/update_cpu-2.png
rename to doc/source/test_results/container_cluster_systems/mesos-marathon/update_cpu-2.png
diff --git a/doc/source/test_results/container_platforms/mesos-marathon/update_cpu-4.png b/doc/source/test_results/container_cluster_systems/mesos-marathon/update_cpu-4.png
similarity index 100%
rename from doc/source/test_results/container_platforms/mesos-marathon/update_cpu-4.png
rename to doc/source/test_results/container_cluster_systems/mesos-marathon/update_cpu-4.png
diff --git a/doc/source/test_results/container_platforms/mesos-marathon/update_cpu-8.png b/doc/source/test_results/container_cluster_systems/mesos-marathon/update_cpu-8.png
similarity index 100%
rename from doc/source/test_results/container_platforms/mesos-marathon/update_cpu-8.png
rename to doc/source/test_results/container_cluster_systems/mesos-marathon/update_cpu-8.png
diff --git a/doc/source/test_results/container_platforms/mesos-marathon/update_disk-1.png b/doc/source/test_results/container_cluster_systems/mesos-marathon/update_disk-1.png
similarity index 100%
rename from doc/source/test_results/container_platforms/mesos-marathon/update_disk-1.png
rename to doc/source/test_results/container_cluster_systems/mesos-marathon/update_disk-1.png
diff --git a/doc/source/test_results/container_platforms/mesos-marathon/update_disk-16.png b/doc/source/test_results/container_cluster_systems/mesos-marathon/update_disk-16.png
similarity index 100%
rename from doc/source/test_results/container_platforms/mesos-marathon/update_disk-16.png
rename to doc/source/test_results/container_cluster_systems/mesos-marathon/update_disk-16.png
diff --git a/doc/source/test_results/container_platforms/mesos-marathon/update_disk-2.png b/doc/source/test_results/container_cluster_systems/mesos-marathon/update_disk-2.png
similarity index 100%
rename from doc/source/test_results/container_platforms/mesos-marathon/update_disk-2.png
rename to doc/source/test_results/container_cluster_systems/mesos-marathon/update_disk-2.png
diff --git a/doc/source/test_results/container_platforms/mesos-marathon/update_disk-4.png b/doc/source/test_results/container_cluster_systems/mesos-marathon/update_disk-4.png
similarity index 100%
rename from doc/source/test_results/container_platforms/mesos-marathon/update_disk-4.png
rename to doc/source/test_results/container_cluster_systems/mesos-marathon/update_disk-4.png
diff --git a/doc/source/test_results/container_platforms/mesos-marathon/update_disk-8.png b/doc/source/test_results/container_cluster_systems/mesos-marathon/update_disk-8.png
similarity index 100%
rename from doc/source/test_results/container_platforms/mesos-marathon/update_disk-8.png
rename to doc/source/test_results/container_cluster_systems/mesos-marathon/update_disk-8.png
diff --git a/doc/source/test_results/container_platforms/mesos-marathon/update_instances-1.png b/doc/source/test_results/container_cluster_systems/mesos-marathon/update_instances-1.png
similarity index 100%
rename from doc/source/test_results/container_platforms/mesos-marathon/update_instances-1.png
rename to doc/source/test_results/container_cluster_systems/mesos-marathon/update_instances-1.png
diff --git a/doc/source/test_results/container_platforms/mesos-marathon/update_instances-16.png b/doc/source/test_results/container_cluster_systems/mesos-marathon/update_instances-16.png
similarity index 100%
rename from doc/source/test_results/container_platforms/mesos-marathon/update_instances-16.png
rename to doc/source/test_results/container_cluster_systems/mesos-marathon/update_instances-16.png
diff --git a/doc/source/test_results/container_platforms/mesos-marathon/update_instances-2.png b/doc/source/test_results/container_cluster_systems/mesos-marathon/update_instances-2.png
similarity index 100%
rename from doc/source/test_results/container_platforms/mesos-marathon/update_instances-2.png
rename to doc/source/test_results/container_cluster_systems/mesos-marathon/update_instances-2.png
diff --git a/doc/source/test_results/container_platforms/mesos-marathon/update_instances-4.png b/doc/source/test_results/container_cluster_systems/mesos-marathon/update_instances-4.png
similarity index 100%
rename from doc/source/test_results/container_platforms/mesos-marathon/update_instances-4.png
rename to doc/source/test_results/container_cluster_systems/mesos-marathon/update_instances-4.png
diff --git a/doc/source/test_results/container_platforms/mesos-marathon/update_instances-8.png b/doc/source/test_results/container_cluster_systems/mesos-marathon/update_instances-8.png
similarity index 100%
rename from doc/source/test_results/container_platforms/mesos-marathon/update_instances-8.png
rename to doc/source/test_results/container_cluster_systems/mesos-marathon/update_instances-8.png
diff --git a/doc/source/test_results/container_platforms/mesos-marathon/update_mem-1.png b/doc/source/test_results/container_cluster_systems/mesos-marathon/update_mem-1.png
similarity index 100%
rename from doc/source/test_results/container_platforms/mesos-marathon/update_mem-1.png
rename to doc/source/test_results/container_cluster_systems/mesos-marathon/update_mem-1.png
diff --git a/doc/source/test_results/container_platforms/mesos-marathon/update_mem-16.png b/doc/source/test_results/container_cluster_systems/mesos-marathon/update_mem-16.png
similarity index 100%
rename from doc/source/test_results/container_platforms/mesos-marathon/update_mem-16.png
rename to doc/source/test_results/container_cluster_systems/mesos-marathon/update_mem-16.png
diff --git a/doc/source/test_results/container_platforms/mesos-marathon/update_mem-2.png b/doc/source/test_results/container_cluster_systems/mesos-marathon/update_mem-2.png
similarity index 100%
rename from doc/source/test_results/container_platforms/mesos-marathon/update_mem-2.png
rename to doc/source/test_results/container_cluster_systems/mesos-marathon/update_mem-2.png
diff --git a/doc/source/test_results/container_platforms/mesos-marathon/update_mem-4.png b/doc/source/test_results/container_cluster_systems/mesos-marathon/update_mem-4.png
similarity index 100%
rename from doc/source/test_results/container_platforms/mesos-marathon/update_mem-4.png
rename to doc/source/test_results/container_cluster_systems/mesos-marathon/update_mem-4.png
diff --git a/doc/source/test_results/container_platforms/mesos-marathon/update_mem-8.png b/doc/source/test_results/container_cluster_systems/mesos-marathon/update_mem-8.png
similarity index 100%
rename from doc/source/test_results/container_platforms/mesos-marathon/update_mem-8.png
rename to doc/source/test_results/container_cluster_systems/mesos-marathon/update_mem-8.png
diff --git a/doc/source/test_results/container_repositories/index.rst b/doc/source/test_results/container_repositories/index.rst
index ffbf616..a7cf310 100644
--- a/doc/source/test_results/container_repositories/index.rst
+++ b/doc/source/test_results/container_repositories/index.rst
@@ -1,5 +1,5 @@
-Container repositories test results
-***********************************
+Container repositories performance
+**********************************
.. toctree::
:numbered:
diff --git a/doc/source/test_results/control_plane/main.rst b/doc/source/test_results/control_plane/index.rst
similarity index 100%
rename from doc/source/test_results/control_plane/main.rst
rename to doc/source/test_results/control_plane/index.rst
diff --git a/doc/source/test_results/index.rst b/doc/source/test_results/index.rst
index fe40044..c17c8db 100644
--- a/doc/source/test_results/index.rst
+++ b/doc/source/test_results/index.rst
@@ -7,21 +7,6 @@ Test Results
============
.. toctree::
- :maxdepth: 2
+ :glob:
- mq/index
- mq_ha/index
- container_repositories/index
- db/index
- tenant_networking/index
- keystone/index
- container_platforms/index
- neutron_features/index
- hardware_features/index
- provisioning/index
- openstack_load/index
- 1000_nodes/index
- reliability/index
- control_plane/main
- controlplane_density/index
- monitoring/index
+ */index
diff --git a/doc/source/test_results/tenant_networking/index.rst b/doc/source/test_results/tenant_networking/index.rst
index 1f28e7c..52f4fdd 100644
--- a/doc/source/test_results/tenant_networking/index.rst
+++ b/doc/source/test_results/tenant_networking/index.rst
@@ -3,7 +3,7 @@
PageBreak oneColumn
===========================
-OpenStack Tenant Networking
+OpenStack tenant networking
===========================
.. toctree::