diff --git a/src/tests/p4/README.md b/src/tests/p4-fwd-l1/README.md
similarity index 100%
rename from src/tests/p4/README.md
rename to src/tests/p4-fwd-l1/README.md
diff --git a/src/tests/p4/__init__.py b/src/tests/p4-fwd-l1/__init__.py
similarity index 100%
rename from src/tests/p4/__init__.py
rename to src/tests/p4-fwd-l1/__init__.py
diff --git a/src/tests/p4/deploy_specs.sh b/src/tests/p4-fwd-l1/deploy_specs.sh
similarity index 100%
rename from src/tests/p4/deploy_specs.sh
rename to src/tests/p4-fwd-l1/deploy_specs.sh
diff --git a/src/tests/p4/mininet/1switch1path.py b/src/tests/p4-fwd-l1/mininet/1switch1path.py
similarity index 100%
rename from src/tests/p4/mininet/1switch1path.py
rename to src/tests/p4-fwd-l1/mininet/1switch1path.py
diff --git a/src/tests/p4/mininet/2switch1path.py b/src/tests/p4-fwd-l1/mininet/2switch1path.py
similarity index 100%
rename from src/tests/p4/mininet/2switch1path.py
rename to src/tests/p4-fwd-l1/mininet/2switch1path.py
diff --git a/src/tests/p4/mininet/4switch2path.py b/src/tests/p4-fwd-l1/mininet/4switch2path.py
similarity index 100%
rename from src/tests/p4/mininet/4switch2path.py
rename to src/tests/p4-fwd-l1/mininet/4switch2path.py
diff --git a/src/tests/p4/mininet/6switch2path.py b/src/tests/p4-fwd-l1/mininet/6switch2path.py
similarity index 100%
rename from src/tests/p4/mininet/6switch2path.py
rename to src/tests/p4-fwd-l1/mininet/6switch2path.py
diff --git a/src/tests/p4/mininet/8switch3path.py b/src/tests/p4-fwd-l1/mininet/8switch3path.py
similarity index 100%
rename from src/tests/p4/mininet/8switch3path.py
rename to src/tests/p4-fwd-l1/mininet/8switch3path.py
diff --git a/src/tests/p4/p4/bmv2.json b/src/tests/p4-fwd-l1/p4/bmv2.json
similarity index 100%
rename from src/tests/p4/p4/bmv2.json
rename to src/tests/p4-fwd-l1/p4/bmv2.json
diff --git a/src/tests/p4/p4/main.p4 b/src/tests/p4-fwd-l1/p4/main.p4
similarity index 100%
rename from src/tests/p4/p4/main.p4
rename to src/tests/p4-fwd-l1/p4/main.p4
diff --git a/src/tests/p4/p4/p4info.txt b/src/tests/p4-fwd-l1/p4/p4info.txt
similarity index 100%
rename from src/tests/p4/p4/p4info.txt
rename to src/tests/p4-fwd-l1/p4/p4info.txt
diff --git a/src/tests/p4/probe/README.md b/src/tests/p4-fwd-l1/probe/README.md
similarity index 100%
rename from src/tests/p4/probe/README.md
rename to src/tests/p4-fwd-l1/probe/README.md
diff --git a/src/tests/p4/probe/monitoring_kpis.ipynb b/src/tests/p4-fwd-l1/probe/monitoring_kpis.ipynb
similarity index 100%
rename from src/tests/p4/probe/monitoring_kpis.ipynb
rename to src/tests/p4-fwd-l1/probe/monitoring_kpis.ipynb
diff --git a/src/tests/p4/probe/monitoring_kpis.py b/src/tests/p4-fwd-l1/probe/monitoring_kpis.py
similarity index 100%
rename from src/tests/p4/probe/monitoring_kpis.py
rename to src/tests/p4-fwd-l1/probe/monitoring_kpis.py
diff --git a/src/tests/p4/probe/probe-tfs/.gitignore b/src/tests/p4-fwd-l1/probe/probe-tfs/.gitignore
similarity index 100%
rename from src/tests/p4/probe/probe-tfs/.gitignore
rename to src/tests/p4-fwd-l1/probe/probe-tfs/.gitignore
diff --git a/src/tests/p4/probe/probe-tfs/Cargo.toml b/src/tests/p4-fwd-l1/probe/probe-tfs/Cargo.toml
similarity index 100%
rename from src/tests/p4/probe/probe-tfs/Cargo.toml
rename to src/tests/p4-fwd-l1/probe/probe-tfs/Cargo.toml
diff --git a/src/tests/p4/probe/probe-tfs/LICENSE b/src/tests/p4-fwd-l1/probe/probe-tfs/LICENSE
similarity index 100%
rename from src/tests/p4/probe/probe-tfs/LICENSE
rename to src/tests/p4-fwd-l1/probe/probe-tfs/LICENSE
diff --git a/src/tests/p4/probe/probe-tfs/README.md b/src/tests/p4-fwd-l1/probe/probe-tfs/README.md
similarity index 100%
rename from src/tests/p4/probe/probe-tfs/README.md
rename to src/tests/p4-fwd-l1/probe/probe-tfs/README.md
diff --git a/src/tests/p4/probe/probe-tfs/build.rs b/src/tests/p4-fwd-l1/probe/probe-tfs/build.rs
similarity index 100%
rename from src/tests/p4/probe/probe-tfs/build.rs
rename to src/tests/p4-fwd-l1/probe/probe-tfs/build.rs
diff --git a/src/tests/p4/probe/probe-tfs/connect_to_mininet.sh b/src/tests/p4-fwd-l1/probe/probe-tfs/connect_to_mininet.sh
similarity index 100%
rename from src/tests/p4/probe/probe-tfs/connect_to_mininet.sh
rename to src/tests/p4-fwd-l1/probe/probe-tfs/connect_to_mininet.sh
diff --git a/src/tests/p4/probe/probe-tfs/deploy.sh b/src/tests/p4-fwd-l1/probe/probe-tfs/deploy.sh
similarity index 100%
rename from src/tests/p4/probe/probe-tfs/deploy.sh
rename to src/tests/p4-fwd-l1/probe/probe-tfs/deploy.sh
diff --git a/src/tests/p4/probe/probe-tfs/proto b/src/tests/p4-fwd-l1/probe/probe-tfs/proto
similarity index 100%
rename from src/tests/p4/probe/probe-tfs/proto
rename to src/tests/p4-fwd-l1/probe/probe-tfs/proto
diff --git a/src/tests/p4/probe/probe-tfs/src/agent.rs b/src/tests/p4-fwd-l1/probe/probe-tfs/src/agent.rs
similarity index 100%
rename from src/tests/p4/probe/probe-tfs/src/agent.rs
rename to src/tests/p4-fwd-l1/probe/probe-tfs/src/agent.rs
diff --git a/src/tests/p4/probe/probe-tfs/src/ping.rs b/src/tests/p4-fwd-l1/probe/probe-tfs/src/ping.rs
similarity index 100%
rename from src/tests/p4/probe/probe-tfs/src/ping.rs
rename to src/tests/p4-fwd-l1/probe/probe-tfs/src/ping.rs
diff --git a/src/tests/p4/run_test_01_bootstrap.sh b/src/tests/p4-fwd-l1/run_test_01_bootstrap.sh
similarity index 100%
rename from src/tests/p4/run_test_01_bootstrap.sh
rename to src/tests/p4-fwd-l1/run_test_01_bootstrap.sh
diff --git a/src/tests/p4/run_test_02_create_service.sh b/src/tests/p4-fwd-l1/run_test_02_create_service.sh
similarity index 100%
rename from src/tests/p4/run_test_02_create_service.sh
rename to src/tests/p4-fwd-l1/run_test_02_create_service.sh
diff --git a/src/tests/p4/run_test_03_delete_service.sh b/src/tests/p4-fwd-l1/run_test_03_delete_service.sh
similarity index 100%
rename from src/tests/p4/run_test_03_delete_service.sh
rename to src/tests/p4-fwd-l1/run_test_03_delete_service.sh
diff --git a/src/tests/p4/run_test_04_cleanup.sh b/src/tests/p4-fwd-l1/run_test_04_cleanup.sh
similarity index 100%
rename from src/tests/p4/run_test_04_cleanup.sh
rename to src/tests/p4-fwd-l1/run_test_04_cleanup.sh
diff --git a/src/tests/p4/setup.sh b/src/tests/p4-fwd-l1/setup.sh
similarity index 100%
rename from src/tests/p4/setup.sh
rename to src/tests/p4-fwd-l1/setup.sh
diff --git a/src/tests/p4/tests/.gitignore b/src/tests/p4-fwd-l1/tests/.gitignore
similarity index 100%
rename from src/tests/p4/tests/.gitignore
rename to src/tests/p4-fwd-l1/tests/.gitignore
diff --git a/src/tests/p4/tests/BuildDescriptors.py b/src/tests/p4-fwd-l1/tests/BuildDescriptors.py
similarity index 100%
rename from src/tests/p4/tests/BuildDescriptors.py
rename to src/tests/p4-fwd-l1/tests/BuildDescriptors.py
diff --git a/src/tests/p4/tests/LoadDescriptors.py b/src/tests/p4-fwd-l1/tests/LoadDescriptors.py
similarity index 100%
rename from src/tests/p4/tests/LoadDescriptors.py
rename to src/tests/p4-fwd-l1/tests/LoadDescriptors.py
diff --git a/src/tests/p4/tests/Objects.py b/src/tests/p4-fwd-l1/tests/Objects.py
similarity index 100%
rename from src/tests/p4/tests/Objects.py
rename to src/tests/p4-fwd-l1/tests/Objects.py
diff --git a/src/tests/p4/tests/__init__.py b/src/tests/p4-fwd-l1/tests/__init__.py
similarity index 100%
rename from src/tests/p4/tests/__init__.py
rename to src/tests/p4-fwd-l1/tests/__init__.py
diff --git a/src/tests/p4/tests/test_functional_bootstrap.py b/src/tests/p4-fwd-l1/tests/test_functional_bootstrap.py
similarity index 100%
rename from src/tests/p4/tests/test_functional_bootstrap.py
rename to src/tests/p4-fwd-l1/tests/test_functional_bootstrap.py
diff --git a/src/tests/p4/tests/test_functional_cleanup.py b/src/tests/p4-fwd-l1/tests/test_functional_cleanup.py
similarity index 100%
rename from src/tests/p4/tests/test_functional_cleanup.py
rename to src/tests/p4-fwd-l1/tests/test_functional_cleanup.py
diff --git a/src/tests/p4/tests/test_functional_create_service.py b/src/tests/p4-fwd-l1/tests/test_functional_create_service.py
similarity index 100%
rename from src/tests/p4/tests/test_functional_create_service.py
rename to src/tests/p4-fwd-l1/tests/test_functional_create_service.py
diff --git a/src/tests/p4/tests/test_functional_delete_service.py b/src/tests/p4-fwd-l1/tests/test_functional_delete_service.py
similarity index 100%
rename from src/tests/p4/tests/test_functional_delete_service.py
rename to src/tests/p4-fwd-l1/tests/test_functional_delete_service.py
diff --git a/src/tests/p4/tests/topologies/6switchObjects.py b/src/tests/p4-fwd-l1/tests/topologies/6switchObjects.py
similarity index 100%
rename from src/tests/p4/tests/topologies/6switchObjects.py
rename to src/tests/p4-fwd-l1/tests/topologies/6switchObjects.py
diff --git a/src/tests/p4/probe/probe-tfs/target/x86_64-unknown-linux-musl/release/tfsagent b/src/tests/p4/probe/probe-tfs/target/x86_64-unknown-linux-musl/release/tfsagent
deleted file mode 100755
index b7cef11a433c6bf2eeb94638fa90d93f25acd3c8..0000000000000000000000000000000000000000
Binary files a/src/tests/p4/probe/probe-tfs/target/x86_64-unknown-linux-musl/release/tfsagent and /dev/null differ
diff --git a/src/tests/p4/probe/probe-tfs/target/x86_64-unknown-linux-musl/release/tfsping b/src/tests/p4/probe/probe-tfs/target/x86_64-unknown-linux-musl/release/tfsping
deleted file mode 100755
index 6e943d292dd6653e857bf5eea3258d38ad246026..0000000000000000000000000000000000000000
Binary files a/src/tests/p4/probe/probe-tfs/target/x86_64-unknown-linux-musl/release/tfsping and /dev/null differ