48 files changed, 50 insertions, 34 deletions
diff --git a/docs/development/devtools/devtools.rst b/docs/development/devtools/devtools.rst
index c84fb746..c626966f 100644
--- a/docs/development/devtools/devtools.rst
+++ b/docs/development/devtools/devtools.rst
@@ -11,7 +11,10 @@ Policy Platform Development Tools
     :depth: 3
 
 
-This article explains how to build the ONAP Policy Framework for development purposes and how to run stability/performance tests for a variety of components. To start, the developer should consult the latest ONAP Wiki to familiarize themselves with developer best practices and how-tos to setup their environment, see `https://wiki.onap.org/display/DW/Developer+Best+Practices`.
+This article explains how to build the ONAP Policy Framework for development purposes and how to run stability/
+performance tests for a variety of components. To start, the developer should consult the latest ONAP Wiki to
+familiarize themselves with developer best practices and how-tos to setup their environment,
+see `https://wiki.onap.org/display/DW/Developer+Best+Practices`.
 
 This article assumes that:
 
@@ -19,16 +22,22 @@ This article assumes that:
 * You are using a directory called *git* off your home directory *(~/git)* for your git repositories
 * Your local maven repository is in the location *~/.m2/repository*
 * You have copied the settings.xml from oparent to *~/.m2/* directory
-* You have added settings to access the ONAP Nexus to your M2 configuration, see `Maven Settings Example <https://wiki.onap.org/display/DW/Setting+Up+Your+Development+Environment>`_ (bottom of the linked page)
+* You have added settings to access the ONAP Nexus to your M2 configuration,
+  see `Maven Settings Example <https://wiki.onap.org/display/DW/Setting+Up+Your+Development+Environment>`_
+  (bottom of the linked page)
 
-The procedure documented in this article has been verified to work on a MacBook laptop running macOS Mojave Version 10.14.6 and an Ubuntu 18.06 VM.
+The procedure documented in this article has been verified to work on a MacBook laptop running macOS Mojave Version
+10.14.6 and an Ubuntu 18.06 VM.
 
 Cloning All The Policy Repositories
 ***********************************
 
-Run a script such as the script below to clone the required modules from the `ONAP git repository <https://gerrit.onap.org/r/admin/repos/q/filter:policy>`_. This script clones all the ONAP Policy Framework repositories.
+Run a script such as the script below to clone the required modules from the
+`ONAP git repository <https://gerrit.onap.org/r/admin/repos/q/filter:policy>`_.
+This script clones all the ONAP Policy Framework repositories.
 
-ONAP Policy Framework has dependencies to the ONAP Parent *oparent* module, the ONAP ECOMP SDK *ecompsdkos* module, and the A&AI Schema module.
+ONAP Policy Framework has dependencies to the ONAP Parent *oparent* module, the ONAP ECOMP SDK *ecompsdkos* module,
+and the A&AI Schema module.
 
 
 .. code-block:: bash
@@ -167,7 +176,8 @@ Building ONAP Policy Framework Components
         rm -fr ~/.m2/repository/org/onap
 
 
-**Step 2:**  A pom such as the one below can be used to build the ONAP Policy Framework modules. Create the *pom.xml* file in the directory *~/git/onap/policy*.
+**Step 2:**  A pom such as the one below can be used to build the ONAP Policy Framework modules. Create the *pom.xml*
+file in the directory *~/git/onap/policy*.
 
 .. code-block:: xml
    :caption: Typical pom.xml to build the ONAP Policy Framework
@@ -203,8 +213,9 @@ Building ONAP Policy Framework Components
 
 **Policy Architecture/API Transition**
 
-In Dublin, a new Policy Architecture was introduced. The legacy architecture runs in parallel with the new architecture. It will be deprecated after Frankfurt release.
-If the developer is only interested in working with the new architecture components, the engine sub-module can be ommitted.
+In Dublin, a new Policy Architecture was introduced. The legacy architecture runs in parallel with the new
+architecture. It will be deprecated after Frankfurt release. If the developer is only interested in working with the
+new architecture components, the engine sub-module can be ommitted.
 
 
 **Step 3:** You can now build the Policy framework.
@@ -247,15 +258,17 @@ Another example on how to run the MariaDb is using the docker compose file used
 Running the API component standalone
 ++++++++++++++++++++++++++++++++++++
 
-Assuming you have successfully built the codebase using the instructions above. The only requirement for the API component to run is a
-running MariaDb database instance. The easiest way to do this is to run the docker image, please see the mariadb documentation for the latest
-information on doing so. Once the mariadb is up and running, a configuration file must be provided to the api in order for it to know how to
-connect to the mariadb. You can locate the default configuration file in the packaging of the api component:
+Assuming you have successfully built the codebase using the instructions above. The only requirement for the API
+component to run is a running MariaDb database instance. The easiest way to do this is to run the docker image, please
+see the mariadb documentation for the latest information on doing so. Once the mariadb is up and running, a
+configuration file must be provided to the api in order for it to know how to connect to the mariadb. You can locate
+the default configuration file in the packaging of the api component:
 
 `Default Policy API Configuration <https://gerrit.onap.org/r/gitweb?p=policy/api.git;a=blob;f=packages/policy-api-tarball/src/main/resources/etc/apiParameters.yaml;h=2c19199a8a889cb0ab203334182662fe15e1635e;hb=refs/heads/master>`_
 
-You will want to change the fields pertaining to "host", "port" and "databaseUrl" to your local environment settings and start the
-policy-api springboot application either using your IDE of choice or using the run goal from Spring Boot Maven plugin: *mvn spring-boot:run*.
+You will want to change the fields pertaining to "host", "port" and "databaseUrl" to your local environment settings
+and start the policy-api springboot application either using your IDE of choice or using the run goal from Spring Boot
+Maven plugin: *mvn spring-boot:run*.
 
 Running the API component using Docker Compose
 ++++++++++++++++++++++++++++++++++++++++++++++
@@ -267,17 +280,19 @@ An example of running the api using a docker compose script is located in the Po
 Running the PAP component standalone
 ++++++++++++++++++++++++++++++++++++
 
-Once you have successfully built the PAP codebase, a running MariaDb database and DMaaP instance will also be required to start up the application.
-For MariaDb instance, the easiest way is to run the docker image, please see the mariadb documentation for the latest
-information on doing so. For DMaaP, the easiest way during development is to run the DMaaP simulator which is explained in the below sections.
-Once the mariadb and DMaaP are running, a configuration file must be provided to the PAP component in order for it to know how to
-connect to the mariadb and DMaaP along with other relevant configuration details. You can locate the default configuration file in the packaging of the PAP component:
+Once you have successfully built the PAP codebase, a running MariaDb database and DMaaP instance will also be required
+to start up the application. For MariaDb instance, the easiest way is to run the docker image, please see the mariadb
+documentation for the latest information on doing so. For DMaaP, the easiest way during development is to run the DMaaP
+simulator which is explained in the below sections. Once the mariadb and DMaaP are running, a configuration file must
+be provided to the PAP component in order for it to know how to connect to the mariadb and DMaaP along with other
+relevant configuration details. You can locate the default configuration file in the packaging of the PAP component:
 
 `Default PAP Configuration <https://gerrit.onap.org/r/gitweb?p=policy/pap.git;a=blob;f=packages/policy-pap-tarball/src/main/resources/etc/papParameters.yaml;h=06dd45f4946fd0a11ed8ef859f8fc5bcf409a3f0;hb=HEAD>`_
 
 Update the fields related to MariaDB, DMaaP and the RestServer for the application as per your local environment settings.
 Then to start the application, just run the Spring Boot application using IDE or command line.
 
+
 Running the Smoke Tests
 ***********************
 
@@ -308,16 +323,17 @@ The following links contain instructions on how to run the S3P Stability and Per
 familiar with the Policy Framework components and test any local changes.
 
 .. toctree::
-   :maxdepth: 1
+   :maxdepth: 2
+
+   testing/s3p/run-s3p.rst
+   testing/s3p/api-s3p.rst
+   testing/s3p/pap-s3p.rst
+   testing/s3p/apex-s3p.rst
+   testing/s3p/drools-s3p.rst
+   testing/s3p/xacml-s3p.rst
+   testing/s3p/distribution-s3p.rst
+   testing/s3p/clamp-s3p.rst
 
-   run-s3p.rst
-   api-s3p.rst
-   pap-s3p.rst
-   apex-s3p.rst
-   drools-s3p.rst
-   xacml-s3p.rst
-   distribution-s3p.rst
-   clamp-s3p.rst
 
 Running the Pairwise Tests
 **************************
@@ -380,7 +396,7 @@ To test these images, CSITs will be run.
 
 3. Clone policy/docker repo.
 
-4. Modify docker/csit/docker-compose-all.yml to use the tagged OpenSuse image.
+4. Modify docker/csit/docker-compose.yml to use the tagged OpenSuse image.
 
     Replace:
 
diff --git a/docs/development/devtools/apex-s3p-results/apex_metrics_after_72h.txt b/docs/development/devtools/testing/s3p/apex-s3p-results/apex_metrics_after_72h.txt
index 56f13907..56f13907 100644
--- a/docs/development/devtools/apex-s3p-results/apex_metrics_after_72h.txt
+++ b/docs/development/devtools/testing/s3p/apex-s3p-results/apex_metrics_after_72h.txt
diff --git a/docs/development/devtools/apex-s3p-results/apex_metrics_before_72h.txt b/docs/development/devtools/testing/s3p/apex-s3p-results/apex_metrics_before_72h.txt
index 4a3d8835..4a3d8835 100644
--- a/docs/development/devtools/apex-s3p-results/apex_metrics_before_72h.txt
+++ b/docs/development/devtools/testing/s3p/apex-s3p-results/apex_metrics_before_72h.txt
diff --git a/docs/development/devtools/apex-s3p-results/apex_perf_jmeter_results.png b/docs/development/devtools/testing/s3p/apex-s3p-results/apex_perf_jmeter_results.png
index 0fa35c0b..0fa35c0b 100644
--- a/docs/development/devtools/apex-s3p-results/apex_perf_jmeter_results.png
+++ b/docs/development/devtools/testing/s3p/apex-s3p-results/apex_perf_jmeter_results.png
diff --git a/docs/development/devtools/apex-s3p-results/apex_stability_jmeter_results.png b/docs/development/devtools/testing/s3p/apex-s3p-results/apex_stability_jmeter_results.png
index 585f99c5..585f99c5 100644
--- a/docs/development/devtools/apex-s3p-results/apex_stability_jmeter_results.png
+++ b/docs/development/devtools/testing/s3p/apex-s3p-results/apex_stability_jmeter_results.png
diff --git a/docs/development/devtools/apex-s3p-results/apex_top_after_72h.png b/docs/development/devtools/testing/s3p/apex-s3p-results/apex_top_after_72h.png
index dafc7002..dafc7002 100644
--- a/docs/development/devtools/apex-s3p-results/apex_top_after_72h.png
+++ b/docs/development/devtools/testing/s3p/apex-s3p-results/apex_top_after_72h.png
diff --git a/docs/development/devtools/apex-s3p-results/apex_top_before_72h.png b/docs/development/devtools/testing/s3p/apex-s3p-results/apex_top_before_72h.png
index 2e2e7574..2e2e7574 100644
--- a/docs/development/devtools/apex-s3p-results/apex_top_before_72h.png
+++ b/docs/development/devtools/testing/s3p/apex-s3p-results/apex_top_before_72h.png
diff --git a/docs/development/devtools/apex-s3p.rst b/docs/development/devtools/testing/s3p/apex-s3p.rst
index 6a3be847..4fca626c 100644
--- a/docs/development/devtools/apex-s3p.rst
+++ b/docs/development/devtools/testing/s3p/apex-s3p.rst
@@ -57,7 +57,7 @@ phase or provisioned in AAI separately.
 Download & execute the steps in postman collection for creating the entities along with it’s dependencies.
 The steps needs to be performed sequentially one after another. And no input is required from user.
 
-:download:`Create VNF & PNF in AAI for Apex S3P  <postman/create-vnf-pnf-aai-for-apex-s3p.postman_collection.json>`
+:download:`Create VNF & PNF in AAI for Apex S3P  </development/devtools/postman/create-vnf-pnf-aai-for-apex-s3p.postman_collection.json>`
 
 Make sure to skip the delete VNF & PNF steps.
 
diff --git a/docs/development/devtools/api-s3p-results/api-response-time-distribution_J.png b/docs/development/devtools/testing/s3p/api-s3p-results/api-response-time-distribution_J.png
index 6b62b2b2..6b62b2b2 100644
--- a/docs/development/devtools/api-s3p-results/api-response-time-distribution_J.png
+++ b/docs/development/devtools/testing/s3p/api-s3p-results/api-response-time-distribution_J.png
diff --git a/docs/development/devtools/api-s3p-results/api-response-time-distribution_performance_J.png b/docs/development/devtools/testing/s3p/api-s3p-results/api-response-time-distribution_performance_J.png
index 60476027..60476027 100644
--- a/docs/development/devtools/api-s3p-results/api-response-time-distribution_performance_J.png
+++ b/docs/development/devtools/testing/s3p/api-s3p-results/api-response-time-distribution_performance_J.png
diff --git a/docs/development/devtools/api-s3p-results/api-response-time-overtime_J.png b/docs/development/devtools/testing/s3p/api-s3p-results/api-response-time-overtime_J.png
index b32ff6ae..b32ff6ae 100644
--- a/docs/development/devtools/api-s3p-results/api-response-time-overtime_J.png
+++ b/docs/development/devtools/testing/s3p/api-s3p-results/api-response-time-overtime_J.png
diff --git a/docs/development/devtools/api-s3p-results/api-response-time-overtime_performance_J.png b/docs/development/devtools/testing/s3p/api-s3p-results/api-response-time-overtime_performance_J.png
index 82a0b8ae..82a0b8ae 100644
--- a/docs/development/devtools/api-s3p-results/api-response-time-overtime_performance_J.png
+++ b/docs/development/devtools/testing/s3p/api-s3p-results/api-response-time-overtime_performance_J.png
diff --git a/docs/development/devtools/api-s3p-results/api-s3p-jm-1_J.png b/docs/development/devtools/testing/s3p/api-s3p-results/api-s3p-jm-1_J.png
index c219a63c..c219a63c 100644
--- a/docs/development/devtools/api-s3p-results/api-s3p-jm-1_J.png
+++ b/docs/development/devtools/testing/s3p/api-s3p-results/api-s3p-jm-1_J.png
diff --git a/docs/development/devtools/api-s3p-results/api-s3p-jm-2_J.png b/docs/development/devtools/testing/s3p/api-s3p-results/api-s3p-jm-2_J.png
index 0083f3ca..0083f3ca 100644
--- a/docs/development/devtools/api-s3p-results/api-s3p-jm-2_J.png
+++ b/docs/development/devtools/testing/s3p/api-s3p-results/api-s3p-jm-2_J.png
diff --git a/docs/development/devtools/api-s3p-results/api_top_after_72h.png b/docs/development/devtools/testing/s3p/api-s3p-results/api_top_after_72h.png
index de4c4553..de4c4553 100644
--- a/docs/development/devtools/api-s3p-results/api_top_after_72h.png
+++ b/docs/development/devtools/testing/s3p/api-s3p-results/api_top_after_72h.png
diff --git a/docs/development/devtools/api-s3p-results/api_top_before_72h.png b/docs/development/devtools/testing/s3p/api-s3p-results/api_top_before_72h.png
index 2b334377..2b334377 100644
--- a/docs/development/devtools/api-s3p-results/api_top_before_72h.png
+++ b/docs/development/devtools/testing/s3p/api-s3p-results/api_top_before_72h.png
diff --git a/docs/development/devtools/api-s3p.rst b/docs/development/devtools/testing/s3p/api-s3p.rst
index 12c3a516..12c3a516 100644
--- a/docs/development/devtools/api-s3p.rst
+++ b/docs/development/devtools/testing/s3p/api-s3p.rst
diff --git a/docs/development/devtools/clamp-s3p-results/Stability_after_stats.png b/docs/development/devtools/testing/s3p/clamp-s3p-results/Stability_after_stats.png
index 38242866..38242866 100644
--- a/docs/development/devtools/clamp-s3p-results/Stability_after_stats.png
+++ b/docs/development/devtools/testing/s3p/clamp-s3p-results/Stability_after_stats.png
diff --git a/docs/development/devtools/clamp-s3p-results/acm_performance_jmeter.png b/docs/development/devtools/testing/s3p/clamp-s3p-results/acm_performance_jmeter.png
index bad1cf71..bad1cf71 100644
--- a/docs/development/devtools/clamp-s3p-results/acm_performance_jmeter.png
+++ b/docs/development/devtools/testing/s3p/clamp-s3p-results/acm_performance_jmeter.png
diff --git a/docs/development/devtools/clamp-s3p-results/acm_stability_jmeter.png b/docs/development/devtools/testing/s3p/clamp-s3p-results/acm_stability_jmeter.png
index 2f576505..2f576505 100644
--- a/docs/development/devtools/clamp-s3p-results/acm_stability_jmeter.png
+++ b/docs/development/devtools/testing/s3p/clamp-s3p-results/acm_stability_jmeter.png
diff --git a/docs/development/devtools/clamp-s3p-results/acm_stability_table.png b/docs/development/devtools/testing/s3p/clamp-s3p-results/acm_stability_table.png
index 28942eff..28942eff 100644
--- a/docs/development/devtools/clamp-s3p-results/acm_stability_table.png
+++ b/docs/development/devtools/testing/s3p/clamp-s3p-results/acm_stability_table.png
diff --git a/docs/development/devtools/clamp-s3p.rst b/docs/development/devtools/testing/s3p/clamp-s3p.rst
index eb17d894..eb17d894 100644
--- a/docs/development/devtools/clamp-s3p.rst
+++ b/docs/development/devtools/testing/s3p/clamp-s3p.rst
diff --git a/docs/development/devtools/distribution-s3p-results/distribution-jmeter-testcases.png b/docs/development/devtools/testing/s3p/distribution-s3p-results/distribution-jmeter-testcases.png
index 86a437a7..86a437a7 100644
--- a/docs/development/devtools/distribution-s3p-results/distribution-jmeter-testcases.png
+++ b/docs/development/devtools/testing/s3p/distribution-s3p-results/distribution-jmeter-testcases.png
diff --git a/docs/development/devtools/distribution-s3p-results/distribution-visualvm-snapshot.png b/docs/development/devtools/testing/s3p/distribution-s3p-results/distribution-visualvm-snapshot.png
index 03b73d36..03b73d36 100644
--- a/docs/development/devtools/distribution-s3p-results/distribution-visualvm-snapshot.png
+++ b/docs/development/devtools/testing/s3p/distribution-s3p-results/distribution-visualvm-snapshot.png
diff --git a/docs/development/devtools/distribution-s3p-results/performance-monitor.png b/docs/development/devtools/testing/s3p/distribution-s3p-results/performance-monitor.png
index 71fd7fca..71fd7fca 100644
--- a/docs/development/devtools/distribution-s3p-results/performance-monitor.png
+++ b/docs/development/devtools/testing/s3p/distribution-s3p-results/performance-monitor.png
diff --git a/docs/development/devtools/distribution-s3p-results/performance-statistics.png b/docs/development/devtools/testing/s3p/distribution-s3p-results/performance-statistics.png
index fecd6c03..fecd6c03 100644
--- a/docs/development/devtools/distribution-s3p-results/performance-statistics.png
+++ b/docs/development/devtools/testing/s3p/distribution-s3p-results/performance-statistics.png
diff --git a/docs/development/devtools/distribution-s3p-results/performance-threads.png b/docs/development/devtools/testing/s3p/distribution-s3p-results/performance-threads.png
index 2488abd9..2488abd9 100644
--- a/docs/development/devtools/distribution-s3p-results/performance-threads.png
+++ b/docs/development/devtools/testing/s3p/distribution-s3p-results/performance-threads.png
diff --git a/docs/development/devtools/distribution-s3p-results/performance-threshold.png b/docs/development/devtools/testing/s3p/distribution-s3p-results/performance-threshold.png
index 73b20ff2..73b20ff2 100644
--- a/docs/development/devtools/distribution-s3p-results/performance-threshold.png
+++ b/docs/development/devtools/testing/s3p/distribution-s3p-results/performance-threshold.png
diff --git a/docs/development/devtools/distribution-s3p-results/stability-monitor.png b/docs/development/devtools/testing/s3p/distribution-s3p-results/stability-monitor.png
index bebaaeb0..bebaaeb0 100644
--- a/docs/development/devtools/distribution-s3p-results/stability-monitor.png
+++ b/docs/development/devtools/testing/s3p/distribution-s3p-results/stability-monitor.png
diff --git a/docs/development/devtools/distribution-s3p-results/stability-statistics.png b/docs/development/devtools/testing/s3p/distribution-s3p-results/stability-statistics.png
index 12ee2b5b..12ee2b5b 100644
--- a/docs/development/devtools/distribution-s3p-results/stability-statistics.png
+++ b/docs/development/devtools/testing/s3p/distribution-s3p-results/stability-statistics.png
diff --git a/docs/development/devtools/distribution-s3p-results/stability-threads.png b/docs/development/devtools/testing/s3p/distribution-s3p-results/stability-threads.png
index 4cfd7a78..4cfd7a78 100644
--- a/docs/development/devtools/distribution-s3p-results/stability-threads.png
+++ b/docs/development/devtools/testing/s3p/distribution-s3p-results/stability-threads.png
diff --git a/docs/development/devtools/distribution-s3p-results/stability-threshold.png b/docs/development/devtools/testing/s3p/distribution-s3p-results/stability-threshold.png
index f348761b..f348761b 100644
--- a/docs/development/devtools/distribution-s3p-results/stability-threshold.png
+++ b/docs/development/devtools/testing/s3p/distribution-s3p-results/stability-threshold.png
diff --git a/docs/development/devtools/distribution-s3p.rst b/docs/development/devtools/testing/s3p/distribution-s3p.rst
index 55966738..55966738 100644
--- a/docs/development/devtools/distribution-s3p.rst
+++ b/docs/development/devtools/testing/s3p/distribution-s3p.rst
diff --git a/docs/development/devtools/images/s3p-drools-1.png b/docs/development/devtools/testing/s3p/drools-s3p-results/s3p-drools-1.png
index 3c1e06f7..3c1e06f7 100644
--- a/docs/development/devtools/images/s3p-drools-1.png
+++ b/docs/development/devtools/testing/s3p/drools-s3p-results/s3p-drools-1.png
diff --git a/docs/development/devtools/images/s3p-drools-2.png b/docs/development/devtools/testing/s3p/drools-s3p-results/s3p-drools-2.png
index 7e124716..7e124716 100644
--- a/docs/development/devtools/images/s3p-drools-2.png
+++ b/docs/development/devtools/testing/s3p/drools-s3p-results/s3p-drools-2.png
diff --git a/docs/development/devtools/images/s3p-drools-3.png b/docs/development/devtools/testing/s3p/drools-s3p-results/s3p-drools-3.png
index 50f2c148..50f2c148 100644
--- a/docs/development/devtools/images/s3p-drools-3.png
+++ b/docs/development/devtools/testing/s3p/drools-s3p-results/s3p-drools-3.png
diff --git a/docs/development/devtools/images/s3p-drools-4.png b/docs/development/devtools/testing/s3p/drools-s3p-results/s3p-drools-4.png
index 369d1f33..369d1f33 100644
--- a/docs/development/devtools/images/s3p-drools-4.png
+++ b/docs/development/devtools/testing/s3p/drools-s3p-results/s3p-drools-4.png
diff --git a/docs/development/devtools/drools-s3p.rst b/docs/development/devtools/testing/s3p/drools-s3p.rst
index bc8b79b3..88f601bd 100644
--- a/docs/development/devtools/drools-s3p.rst
+++ b/docs/development/devtools/testing/s3p/drools-s3p.rst
@@ -56,9 +56,9 @@ started the next one 250 ms. later.
 
 The results are illustrated on the following graphs:
 
-.. image:: images/s3p-drools-1.png
-.. image:: images/s3p-drools-2.png
-.. image:: images/s3p-drools-3.png
+.. image:: drools-s3p-results/s3p-drools-1.png
+.. image:: drools-s3p-results/s3p-drools-2.png
+.. image:: drools-s3p-results/s3p-drools-3.png
 
 
 Commentary
diff --git a/docs/development/devtools/pap-s3p-results/pap_metrics_after_72h.txt b/docs/development/devtools/testing/s3p/pap-s3p-results/pap_metrics_after_72h.txt
index 8864726e..8864726e 100644
--- a/docs/development/devtools/pap-s3p-results/pap_metrics_after_72h.txt
+++ b/docs/development/devtools/testing/s3p/pap-s3p-results/pap_metrics_after_72h.txt
diff --git a/docs/development/devtools/pap-s3p-results/pap_metrics_before_72h.txt b/docs/development/devtools/testing/s3p/pap-s3p-results/pap_metrics_before_72h.txt
index 047ccf99..047ccf99 100644
--- a/docs/development/devtools/pap-s3p-results/pap_metrics_before_72h.txt
+++ b/docs/development/devtools/testing/s3p/pap-s3p-results/pap_metrics_before_72h.txt
diff --git a/docs/development/devtools/pap-s3p-results/pap_performance_jmeter_results.png b/docs/development/devtools/testing/s3p/pap-s3p-results/pap_performance_jmeter_results.png
index a6504789..a6504789 100644
--- a/docs/development/devtools/pap-s3p-results/pap_performance_jmeter_results.png
+++ b/docs/development/devtools/testing/s3p/pap-s3p-results/pap_performance_jmeter_results.png
diff --git a/docs/development/devtools/pap-s3p-results/pap_stability_jmeter_results.png b/docs/development/devtools/testing/s3p/pap-s3p-results/pap_stability_jmeter_results.png
index 5f54c02e..5f54c02e 100644
--- a/docs/development/devtools/pap-s3p-results/pap_stability_jmeter_results.png
+++ b/docs/development/devtools/testing/s3p/pap-s3p-results/pap_stability_jmeter_results.png
diff --git a/docs/development/devtools/pap-s3p-results/pap_top_after_72h.png b/docs/development/devtools/testing/s3p/pap-s3p-results/pap_top_after_72h.png
index 576b1c25..576b1c25 100644
--- a/docs/development/devtools/pap-s3p-results/pap_top_after_72h.png
+++ b/docs/development/devtools/testing/s3p/pap-s3p-results/pap_top_after_72h.png
diff --git a/docs/development/devtools/pap-s3p-results/pap_top_before_72h.png b/docs/development/devtools/testing/s3p/pap-s3p-results/pap_top_before_72h.png
index b59b2c95..b59b2c95 100644
--- a/docs/development/devtools/pap-s3p-results/pap_top_before_72h.png
+++ b/docs/development/devtools/testing/s3p/pap-s3p-results/pap_top_before_72h.png
diff --git a/docs/development/devtools/pap-s3p.rst b/docs/development/devtools/testing/s3p/pap-s3p.rst
index b42d7eb0..b42d7eb0 100644
--- a/docs/development/devtools/pap-s3p.rst
+++ b/docs/development/devtools/testing/s3p/pap-s3p.rst
diff --git a/docs/development/devtools/run-s3p.rst b/docs/development/devtools/testing/s3p/run-s3p.rst
index 17eba32a..17eba32a 100644
--- a/docs/development/devtools/run-s3p.rst
+++ b/docs/development/devtools/testing/s3p/run-s3p.rst
diff --git a/docs/development/devtools/images/s3p-perf-xacml.png b/docs/development/devtools/testing/s3p/xacml-s3p-results/s3p-perf-xacml.png
index 2c27967f..2c27967f 100644
--- a/docs/development/devtools/images/s3p-perf-xacml.png
+++ b/docs/development/devtools/testing/s3p/xacml-s3p-results/s3p-perf-xacml.png
diff --git a/docs/development/devtools/xacml-s3p.rst b/docs/development/devtools/testing/s3p/xacml-s3p.rst
index c52a21ab..5ea2e287 100644
--- a/docs/development/devtools/xacml-s3p.rst
+++ b/docs/development/devtools/testing/s3p/xacml-s3p.rst
@@ -65,7 +65,7 @@ The test was run for 20 minutes with 10 users (i.e., threads), with the followin
 
    10, 4603, 2
 
-.. image:: images/s3p-perf-xacml.png
+.. image:: xacml-s3p-results/s3p-perf-xacml.png
 
 
 Stability Test of Policy XACML PDP