diff --git a/src/tests/tools/perf_plots/Component_RPC_Methods.py b/src/tests/tools/perf_plots/Component_RPC_Methods.py
index d39686ae0426bfc6c8c28dee7b61b747e637838f..231e388cf3ed099000eb641783db563cd8e0306a 100644
--- a/src/tests/tools/perf_plots/Component_RPC_Methods.py
+++ b/src/tests/tools/perf_plots/Component_RPC_Methods.py
@@ -22,9 +22,9 @@ from .tools.Histogram import results_to_histograms, save_histograms, unaccumulat
 
 ##### EXPERIMENT SETTINGS ##############################################################################################
 
-from .experiments.Emu_Onboard import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
-#from .experiments.L2NM_EMU_Service import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
-#from .experiments.L3NM_EMU_Service import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
+from .experiments.scenario_1.Emu_Onboard import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
+#from .experiments.scenario_1.L2NM_EMU_Service import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
+#from .experiments.scenario_1.L3NM_EMU_Service import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
 TIME_STEP       = '1m'
 LABEL_FILTERS   = {}
 
diff --git a/src/tests/tools/perf_plots/Device_Driver_Details.py b/src/tests/tools/perf_plots/Device_Driver_Details.py
index 995fd882371ca8207faf707caba9654774c99af1..7a371817e2f198a2fcae8978cd632f480006a846 100644
--- a/src/tests/tools/perf_plots/Device_Driver_Details.py
+++ b/src/tests/tools/perf_plots/Device_Driver_Details.py
@@ -22,9 +22,9 @@ from .tools.Histogram import results_to_histograms, save_histograms, unaccumulat
 
 ##### EXPERIMENT SETTINGS ##############################################################################################
 
-from .experiments.Emu_Onboard import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
-#from .experiments.L2NM_EMU_Service import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
-#from .experiments.L3NM_EMU_Service import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
+from .experiments.scenario_1.Emu_Onboard import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
+#from .experiments.scenario_1.L2NM_EMU_Service import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
+#from .experiments.scenario_1.L3NM_EMU_Service import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
 TIME_STEP       = '1m'
 LABEL_FILTERS   = {
     #'driver': 'emulated',
diff --git a/src/tests/tools/perf_plots/Device_Driver_Methods.py b/src/tests/tools/perf_plots/Device_Driver_Methods.py
index 8d61b23c7a2f6f083168bb2b3a71b676226b1703..732e05b7a66a7c27b3c6a96166dc16f323c34ba9 100644
--- a/src/tests/tools/perf_plots/Device_Driver_Methods.py
+++ b/src/tests/tools/perf_plots/Device_Driver_Methods.py
@@ -22,9 +22,9 @@ from .tools.Histogram import results_to_histograms, save_histograms, unaccumulat
 
 ##### EXPERIMENT SETTINGS ##############################################################################################
 
-from .experiments.Emu_Onboard import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
-#from .experiments.L2NM_EMU_Service import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
-#from .experiments.L3NM_EMU_Service import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
+from .experiments.scenario_1.Emu_Onboard import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
+#from .experiments.scenario_1.L2NM_EMU_Service import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
+#from .experiments.scenario_1.L3NM_EMU_Service import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
 TIME_STEP       = '1m'
 LABEL_FILTERS   = {
     #'driver': 'emulated',
diff --git a/src/tests/tools/perf_plots/Service_Handler_Methods.py b/src/tests/tools/perf_plots/Service_Handler_Methods.py
index cd9d210f52d8d19d2720660d3782c3a19730d7cf..e122e9c5153ba85b07f56a7f866f0e3daeca1f23 100644
--- a/src/tests/tools/perf_plots/Service_Handler_Methods.py
+++ b/src/tests/tools/perf_plots/Service_Handler_Methods.py
@@ -22,9 +22,9 @@ from .tools.Histogram import results_to_histograms, save_histograms, unaccumulat
 
 ##### EXPERIMENT SETTINGS ##############################################################################################
 
-from .experiments.Emu_Onboard import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
-#from .experiments.L2NM_EMU_Service import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
-#from .experiments.L3NM_EMU_Service import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
+from .experiments.scenario_1.Emu_Onboard import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
+#from .experiments.scenario_1.L2NM_EMU_Service import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
+#from .experiments.scenario_1.L3NM_EMU_Service import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
 TIME_STEP       = '1m'
 LABEL_FILTERS   = {
     #'handler': 'l2nm_emulated',
diff --git a/src/tests/tools/perf_plots/experiments/__init__.py b/src/tests/tools/perf_plots/experiments/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..1549d9811aa5d1c193a44ad45d0d7773236c0612
--- /dev/null
+++ b/src/tests/tools/perf_plots/experiments/__init__.py
@@ -0,0 +1,14 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
diff --git a/src/tests/tools/perf_plots/experiments/details-l2vpn.txt b/src/tests/tools/perf_plots/experiments/details-l2vpn.txt
deleted file mode 100644
index 6e6fbc94cbf3553cf73522c2e7d8d20c97ea2c37..0000000000000000000000000000000000000000
--- a/src/tests/tools/perf_plots/experiments/details-l2vpn.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-CEST times (UTC+2)
-
-10:00 - 10:03: onboard emulated devices
-
-10:03 - 10:15: l2nm_emulated service setup
-    1000 requests
-    - service L2NM
-    off load: 50 erlang
-    hold time: 10 sec
-    inter arrival time: 0.2 sec
-    workers: 10 threads
-    1 replica per service
-    horizontal pod auto-scalers off
diff --git a/src/tests/tools/perf_plots/experiments/details-l3vpn.txt b/src/tests/tools/perf_plots/experiments/details-l3vpn.txt
deleted file mode 100644
index cf26e7f71fc1315c62b1a0dab251f6117e385795..0000000000000000000000000000000000000000
--- a/src/tests/tools/perf_plots/experiments/details-l3vpn.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-CEST times (UTC+2)
-
-10:29 - 10:42: l3nm_emulated service setup
-    1000 requests
-    - service L3NM
-    off load: 50 erlang
-    hold time: 10 sec
-    inter arrival time: 0.2 sec
-    workers: 10 threads
-    1 replica per service
-    horizontal pod auto-scalers off
diff --git a/src/tests/tools/perf_plots/experiments/old_details.txt b/src/tests/tools/perf_plots/experiments/old_details.txt
deleted file mode 100644
index 9e7675e7deaf702de22d10daa24911583f57cb9e..0000000000000000000000000000000000000000
--- a/src/tests/tools/perf_plots/experiments/old_details.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-CEST times (UTC+2)
-
-18:45 - 18:50: onboard emulated devices
-
-18:50 - 19:00: l2nm_emulated service setup
-    1000 requests
-    - service L2NM
-    off load: 50 erlang
-    hold time: 10 sec
-    inter arrival time: 0.2 sec
-    workers: 10 threads
-    1 replica per service
-    horizontal pod auto-scalers off
-
-19:03 - 19:14: l3nm_emulated service setup
-    1000 requests
-    - service L3NM
-    off load: 50 erlang
-    hold time: 10 sec
-    inter arrival time: 0.2 sec
-    workers: 10 threads
-    1 replica per service
-    horizontal pod auto-scalers off
diff --git a/src/tests/tools/perf_plots/experiments/Emu_Onboard.py b/src/tests/tools/perf_plots/experiments/scenario_1/Emu_Onboard.py
similarity index 100%
rename from src/tests/tools/perf_plots/experiments/Emu_Onboard.py
rename to src/tests/tools/perf_plots/experiments/scenario_1/Emu_Onboard.py
diff --git a/src/tests/tools/perf_plots/experiments/L2NM_EMU_Service.py b/src/tests/tools/perf_plots/experiments/scenario_1/L2NM_EMU_Service.py
similarity index 76%
rename from src/tests/tools/perf_plots/experiments/L2NM_EMU_Service.py
rename to src/tests/tools/perf_plots/experiments/scenario_1/L2NM_EMU_Service.py
index 781109ffcdeeb6104d13bbe098a4f1cfc7655336..ae10f3b546631adb4ddfca4af9c8ce1af11c0057 100644
--- a/src/tests/tools/perf_plots/experiments/L2NM_EMU_Service.py
+++ b/src/tests/tools/perf_plots/experiments/scenario_1/L2NM_EMU_Service.py
@@ -12,6 +12,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# CEST times (UTC+2)
+#
+# 10:03 - 10:15: l2nm_emulated service setup
+#     1000 requests
+#     - service L2NM
+#     off load: 50 erlang
+#     hold time: 10 sec
+#     inter arrival time: 0.2 sec
+#     workers: 10 threads
+#     1 replica per service
+#     horizontal pod auto-scalers off
+
 import datetime
 
 EXPERIMENT_NAME = 'L2VPN with Emulated'
diff --git a/src/tests/tools/perf_plots/experiments/L3NM_EMU_Service.py b/src/tests/tools/perf_plots/experiments/scenario_1/L3NM_EMU_Service.py
similarity index 76%
rename from src/tests/tools/perf_plots/experiments/L3NM_EMU_Service.py
rename to src/tests/tools/perf_plots/experiments/scenario_1/L3NM_EMU_Service.py
index aade813b106799623fcac186ae4630d01c4c9845..ed46c1b86432a37b2cdb9862d2b67aa683777abd 100644
--- a/src/tests/tools/perf_plots/experiments/L3NM_EMU_Service.py
+++ b/src/tests/tools/perf_plots/experiments/scenario_1/L3NM_EMU_Service.py
@@ -12,6 +12,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# CEST times (UTC+2)
+#
+# 10:29 - 10:42: l3nm_emulated service setup
+#     1000 requests
+#     - service L3NM
+#     off load: 50 erlang
+#     hold time: 10 sec
+#     inter arrival time: 0.2 sec
+#     workers: 10 threads
+#     1 replica per service
+#     horizontal pod auto-scalers off
+
 import datetime
 
 EXPERIMENT_NAME = 'L3VPN with Emulated'
diff --git a/src/tests/tools/perf_plots/experiments/scenario_1/__init__.py b/src/tests/tools/perf_plots/experiments/scenario_1/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..1549d9811aa5d1c193a44ad45d0d7773236c0612
--- /dev/null
+++ b/src/tests/tools/perf_plots/experiments/scenario_1/__init__.py
@@ -0,0 +1,14 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+