From 9e0b609c9d787adfa86f0c6e9bcce732741686ba Mon Sep 17 00:00:00 2001
From: Mazet Laurent <laurent.mazet@thalesgroup.com>
Date: Wed, 7 May 2025 15:57:47 +0200
Subject: [PATCH] reordering files in directory

---
 README.md                                     |  2 +-
 cryptomod.c                                   | 24 ++++++-------
 morep_valid.c                                 |  4 +--
 script-bypass.eth                             |  7 ----
 morep_simulator.c => simulator.c              | 34 +++++++++----------
 simulator/script-simulator.sh                 |  2 +-
 .../script-bypass-si.eth                      |  0
 test/script-bypass.eth                        |  7 ++++
 .../script-control-si.eth                     |  0
 script-control.eth => test/script-control.eth |  0
 .../script-cross_crypto-error.eth             | 10 +++---
 .../script-cross_crypto.eth                   | 12 +++----
 .../script-cross_crypto_b2r-si.eth            |  0
 .../script-cross_crypto_r2b-si.eth            |  0
 script-lo.eth => test/script-lo.eth           |  4 +--
 .../script-local_crypto-si.eth                |  0
 .../script-local_crypto.eth                   |  8 ++---
 script-prng-si.eth => test/script-prng-si.eth |  0
 script-prng.eth => test/script-prng.eth       |  2 +-
 .../script-provisioning-si.eth                |  0
 .../script-provisioning.eth                   |  0
 script-rx.eth => test/script-rx.eth           |  0
 script-tx.eth => test/script-tx.eth           |  0
 23 files changed, 58 insertions(+), 58 deletions(-)
 delete mode 100644 script-bypass.eth
 rename morep_simulator.c => simulator.c (93%)
 rename script-bypass-si.eth => test/script-bypass-si.eth (100%)
 create mode 100644 test/script-bypass.eth
 rename script-control-si.eth => test/script-control-si.eth (100%)
 rename script-control.eth => test/script-control.eth (100%)
 rename script-cross_crypto-error.eth => test/script-cross_crypto-error.eth (64%)
 rename script-cross_crypto.eth => test/script-cross_crypto.eth (56%)
 rename script-cross_crypto_b2r-si.eth => test/script-cross_crypto_b2r-si.eth (100%)
 rename script-cross_crypto_r2b-si.eth => test/script-cross_crypto_r2b-si.eth (100%)
 rename script-lo.eth => test/script-lo.eth (87%)
 rename script-local_crypto-si.eth => test/script-local_crypto-si.eth (100%)
 rename script-local_crypto.eth => test/script-local_crypto.eth (62%)
 rename script-prng-si.eth => test/script-prng-si.eth (100%)
 rename script-prng.eth => test/script-prng.eth (82%)
 rename script-provisioning-si.eth => test/script-provisioning-si.eth (100%)
 rename script-provisioning.eth => test/script-provisioning.eth (100%)
 rename script-rx.eth => test/script-rx.eth (100%)
 rename script-tx.eth => test/script-tx.eth (100%)

diff --git a/README.md b/README.md
index ae56948..de1d8e2 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ With a simple set of macros and functions, the library eases the implementation
 ### Usage
 
 ```bash
-./morep_simulator.exe \
+./simulator.exe \
     -l script-cross_crypto.log -V 3 \
     -s CROSS_CRYPTO -t lo://00:00:00:00:00:00/0808 -r lo://00:00:00:00:00:00/0808 \
     script-cross_crypto.eth 
diff --git a/cryptomod.c b/cryptomod.c
index a726369..de3551a 100644
--- a/cryptomod.c
+++ b/cryptomod.c
@@ -12,7 +12,7 @@
   - initial version
 */
 
-/* depend: morep_simulator.exe */
+/* depend: simulator.exe */
 /* cflags: */
 /* linker: core.o function.o morep.o parse.o pdu_channel.o pdu_encrypted_data.o pdu_prng_param.o pdu_status.o pdu_clear_data.o pdu_key.o pdu_raw_data.o task.o */
 
@@ -628,24 +628,24 @@ int main (int argc, char **argv)
 /* test: cryptomod.exe -v | grep 'morep verbose level not specified' */
 /* test: cryptomod.exe -V | grep 'cryptomod verbose level not specified' */
 
-/* test: cryptomod.exe -V 3 -l script-cross_crypto_r2b-cm.log & pid=$!; sleep 1; ./morep_simulator.exe -l script-cross_crypto_r2b-si.log -s CROSS_CRYPTO -t lo://00:00:00:00:00:00/0819 -r lo://00:00:00:00:00:00/0829 script-cross_crypto_r2b-si.eth; rc=$?; sleep 1; kill -TERM $pid; test $rc -eq 0 */
-/* test: cryptomod.exe -V 3 -l script-cross_crypto_b2r-cm.log & pid=$!; sleep 1; ./morep_simulator.exe -l script-cross_crypto_b2r-si.log -s CROSS_CRYPTO -t lo://00:00:00:00:00:00/0839 -r lo://00:00:00:00:00:00/0809 script-cross_crypto_b2r-si.eth; rc=$?; sleep 1; kill -TERM $pid; test $rc -eq 0 */
+/* test: cryptomod.exe -V 3 -l script-cross_crypto_r2b-cm.log & pid=$!; sleep 1; ./simulator.exe -l script-cross_crypto_r2b-si.log -s CROSS_CRYPTO -t lo://00:00:00:00:00:00/0819 -r lo://00:00:00:00:00:00/0829 test/script-cross_crypto_r2b-si.eth; rc=$?; sleep 1; kill -TERM $pid; test $rc -eq 0 */
+/* test: cryptomod.exe -V 3 -l script-cross_crypto_b2r-cm.log & pid=$!; sleep 1; ./simulator.exe -l script-cross_crypto_b2r-si.log -s CROSS_CRYPTO -t lo://00:00:00:00:00:00/0839 -r lo://00:00:00:00:00:00/0809 test/script-cross_crypto_b2r-si.eth; rc=$?; sleep 1; kill -TERM $pid; test $rc -eq 0 */
 
-/* test: cryptomod.exe -V 3 -l script-local_crypto_black-cm.log & pid=$!; sleep 1; ./morep_simulator.exe -l script-local_crypto_black-si.log -s LOCAL_CRYPTO -t lo://00:00:00:00:00:00/083a -r lo://00:00:00:00:00:00/082a script-local_crypto-si.eth; rc=$?; sleep 1; kill -TERM $pid; test $rc -eq 0 */
+/* test: cryptomod.exe -V 3 -l script-local_crypto_black-cm.log & pid=$!; sleep 1; ./simulator.exe -l script-local_crypto_black-si.log -s LOCAL_CRYPTO -t lo://00:00:00:00:00:00/083a -r lo://00:00:00:00:00:00/082a test/script-local_crypto-si.eth; rc=$?; sleep 1; kill -TERM $pid; test $rc -eq 0 */
 
-/* test: cryptomod.exe -V 3 -l script-local_crypto_red-cm.log & pid=$!; sleep 1; ./morep_simulator.exe -l script-local_crypto_red-si.log -s LOCAL_CRYPTO -t lo://00:00:00:00:00:00/081a -r lo://00:00:00:00:00:00/080a script-local_crypto-si.eth; rc=$?; sleep 1; kill -TERM $pid; test $rc -eq 0 */
+/* test: cryptomod.exe -V 3 -l script-local_crypto_red-cm.log & pid=$!; sleep 1; ./simulator.exe -l script-local_crypto_red-si.log -s LOCAL_CRYPTO -t lo://00:00:00:00:00:00/081a -r lo://00:00:00:00:00:00/080a test/script-local_crypto-si.eth; rc=$?; sleep 1; kill -TERM $pid; test $rc -eq 0 */
 
-/* test: cryptomod.exe -V 3 -l script-provisioning-cm.log & pid=$!; sleep 1; ./morep_simulator.exe -l script-provisioning-si.log -s PROVISIONING -t lo://00:00:00:00:00:00/081b -r lo://00:00:00:00:00:00/080b script-provisioning-si.eth; rc=$?; sleep 1; kill -TERM $pid; test $rc -eq 0 */
+/* test: cryptomod.exe -V 3 -l script-provisioning-cm.log & pid=$!; sleep 1; ./simulator.exe -l script-provisioning-si.log -s PROVISIONING -t lo://00:00:00:00:00:00/081b -r lo://00:00:00:00:00:00/080b test/script-provisioning-si.eth; rc=$?; sleep 1; kill -TERM $pid; test $rc -eq 0 */
 
-/* test: cryptomod.exe -V 3 -l script-prng_black-cm.log & pid=$!; sleep 1; ./morep_simulator.exe -l script-prng_black-si.log -s PRNG -t lo://00:00:00:00:00:00/083c -r lo://00:00:00:00:00:00/082c script-prng-si.eth; rc=$?; sleep 1; kill -TERM $pid; test $rc -eq 0 */
+/* test: cryptomod.exe -V 3 -l script-prng_black-cm.log & pid=$!; sleep 1; ./simulator.exe -l script-prng_black-si.log -s PRNG -t lo://00:00:00:00:00:00/083c -r lo://00:00:00:00:00:00/082c test/script-prng-si.eth; rc=$?; sleep 1; kill -TERM $pid; test $rc -eq 0 */
 
-/* test: cryptomod.exe -V 3 -l script-prng_red-cm.log & pid=$!; sleep 1; ./morep_simulator.exe -l script-prng_red-si.log -s PRNG -t lo://00:00:00:00:00:00/081c -r lo://00:00:00:00:00:00/080c script-prng-si.eth; rc=$?; sleep 1; kill -TERM $pid; test $rc -eq 0 */
+/* test: cryptomod.exe -V 3 -l script-prng_red-cm.log & pid=$!; sleep 1; ./simulator.exe -l script-prng_red-si.log -s PRNG -t lo://00:00:00:00:00:00/081c -r lo://00:00:00:00:00:00/080c test/script-prng-si.eth; rc=$?; sleep 1; kill -TERM $pid; test $rc -eq 0 */
 
-/* test: cryptomod.exe -V 3 -l script-bypass_b2r-cm.log & pid=$!; sleep 1; ./morep_simulator.exe -l script-bypass_b2r-si.log -s BYPASS -t lo://00:00:00:00:00:00/083d -r lo://00:00:00:00:00:00/080d script-bypass-si.eth; rc=$?; sleep 1; kill -TERM $pid; test $rc -eq 0 */
+/* test: cryptomod.exe -V 3 -l script-bypass_b2r-cm.log & pid=$!; sleep 1; ./simulator.exe -l script-bypass_b2r-si.log -s BYPASS -t lo://00:00:00:00:00:00/083d -r lo://00:00:00:00:00:00/080d test/script-bypass-si.eth; rc=$?; sleep 1; kill -TERM $pid; test $rc -eq 0 */
 
-/* test: cryptomod.exe -V 3 -l script-bypass_r2b-cm.log & pid=$!; sleep 1; ./morep_simulator.exe -l script-bypass_r2b-si.log -s BYPASS -t lo://00:00:00:00:00:00/081d -r lo://00:00:00:00:00:00/082d script-bypass-si.eth; rc=$?; sleep 1; kill -TERM $pid; test $rc -eq 0 */
+/* test: cryptomod.exe -V 3 -l script-bypass_r2b-cm.log & pid=$!; sleep 1; ./simulator.exe -l script-bypass_r2b-si.log -s BYPASS -t lo://00:00:00:00:00:00/081d -r lo://00:00:00:00:00:00/082d test/script-bypass-si.eth; rc=$?; sleep 1; kill -TERM $pid; test $rc -eq 0 */
 
-/* test: cryptomod.exe -V 3 -l script-control-cm.log & pid=$!; sleep 1; ./morep_simulator.exe -l script-control-si.log -s CONTROL -t lo://00:00:00:00:00:00/081e -r lo://00:00:00:00:00:00/080e script-control-si.eth; rc=$?; sleep 1; kill -TERM $pid; test $rc -eq 0 */
-/* test: cryptomod.exe -V 3 -l script-control-cm.log & pid=$!; sleep 1; ./morep_simulator.exe -l script-control-si.log -s CONTROL -t lo://00:00:00:00:00:00/081e -r lo://00:00:00:00:00:00/080e script-control-si.eth; sleep 1;kill -TERM $pid 2>&1 | grep "No such process" */
+/* test: cryptomod.exe -V 3 -l script-control-cm.log & pid=$!; sleep 1; ./simulator.exe -l script-control-si.log -s CONTROL -t lo://00:00:00:00:00:00/081e -r lo://00:00:00:00:00:00/080e test/script-control-si.eth; rc=$?; sleep 1; kill -TERM $pid; test $rc -eq 0 */
+/* test: cryptomod.exe -V 3 -l script-control-cm.log & pid=$!; sleep 1; ./simulator.exe -l script-control-si.log -s CONTROL -t lo://00:00:00:00:00:00/081e -r lo://00:00:00:00:00:00/080e test/script-control-si.eth; sleep 1;kill -TERM $pid 2>&1 | grep "No such process" */
 
 /* vim: set ts=4 sw=4 si et: */
diff --git a/morep_valid.c b/morep_valid.c
index 40602cd..87d4f15 100644
--- a/morep_valid.c
+++ b/morep_valid.c
@@ -353,7 +353,7 @@ int main (int argc, char **argv)
 /* test: morep_valid.exe -r 2>&1 | grep 'url not specified' */
 /* test: morep_valid.exe -t 2>&1 | grep 'url not specified' */
 /* test: morep_valid.exe -l 2>&1 | grep 'log file not specified' */
-/* test: morep_valid.exe -l - -t lo://00:00:00:00:00:00/0808 -v 4 script-lo.eth */
-/* test: morep_valid.exe -l script.log -t lo://00:00:00:00:00:00/0808 -r lo://00:00:00:00:00:00/0808 script-lo.eth */
+/* test: morep_valid.exe -l - -t lo://00:00:00:00:00:00/0808 -v 4 test/script-lo.eth */
+/* test: morep_valid.exe -l script.log -t lo://00:00:00:00:00:00/0808 -r lo://00:00:00:00:00:00/0808 test/script-lo.eth */
 
 /* vim: set ts=4 sw=4 si et: */
diff --git a/script-bypass.eth b/script-bypass.eth
deleted file mode 100644
index 322635d..0000000
--- a/script-bypass.eth
+++ /dev/null
@@ -1,7 +0,0 @@
-# Bypass test script
-
-T:BYPASS BYPASS_CROSS_ASYNC DATA=@script-bypass.eth
-R:BYPASS BYPASS_CROSS_ASYNC DATA=@script-bypass.eth
-
-T:BYPASS BYPASSED_CROSS_ASYNC DATA=@script-bypass.eth
-R:BYPASS BYPASSED_CROSS_ASYNC
diff --git a/morep_simulator.c b/simulator.c
similarity index 93%
rename from morep_simulator.c
rename to simulator.c
index fa9eabd..99fdd88 100644
--- a/morep_simulator.c
+++ b/simulator.c
@@ -1,5 +1,5 @@
 /*
-  File name        : morep_simulator.c
+  File name        : simulator.c
   Projet           : MERLIN
   Date of creation : 2025/04/09
   Version          : 1.0
@@ -659,21 +659,21 @@ int main (int argc, char **argv)
     return rc + GET_VERBOSE_ERRORS (morep) + GET_VERBOSE_ERRORS (simul);
 }
 
-/* test: morep_simulator.exe -h | grep usage */
-/* test: morep_simulator.exe -l | grep 'log file not specified' */
-/* test: morep_simulator.exe -r | grep 'url not specified' */
-/* test: morep_simulator.exe -s | grep 'service not specified' */
-/* test: morep_simulator.exe -t | grep 'url not specified' */
-/* test: morep_simulator.exe -v | grep 'morep verbose level not specified' */
-/* test: morep_simulator.exe -V | grep 'simulator verbose level not specified' */
-/* test: morep_simulator.exe -l - -t lo://00:00:00:00:00:00/0809 -v 4 script-lo.eth */
-/* test: morep_simulator.exe -l script-cross_crypto-error.log -s CROSS_CRYPTO -t lo://00:00:00:00:00:00/0808 -r lo://00:00:00:00:00:00/0808 script-cross_crypto-error.eth -V 3; test $? -ne 0 */
-/* test: morep_simulator.exe -l script-cross_crypto-error.log -s CROSS_CRYPTO -t lo://00:00:00:00:00:00/0808 -r lo://00:00:00:00:00:00/0808 script-cross_crypto-error.eth -V 3 | grep WARNING */
-/* test: morep_simulator.exe -l script-cross_crypto.log -s CROSS_CRYPTO -t lo://00:00:00:00:00:00/0808 -r lo://00:00:00:00:00:00/0808 script-cross_crypto.eth -V 3 */
-/* test: morep_simulator.exe -l script-local_crypto.log -s LOCAL_CRYPTO -t lo://00:00:00:00:00:00/0808 -r lo://00:00:00:00:00:00/0808 script-local_crypto.eth -V 3 */
-/* test: morep_simulator.exe -l script-provisioning.log -s PROVISIONING -t lo://00:00:00:00:00:00/0808 -r lo://00:00:00:00:00:00/0808 script-provisioning.eth -V 3 */
-/* test: morep_simulator.exe -l script-prng.log -s PRNG -t lo://00:00:00:00:00:00/0808 -r lo://00:00:00:00:00:00/0808 script-prng.eth -V 3 */
-/* test: morep_simulator.exe -l script-bypass.log -s BYPASS -t lo://00:00:00:00:00:00/0808 -r lo://00:00:00:00:00:00/0808 script-bypass.eth -V 3 */
-/* test: morep_simulator.exe -l script-control.log -s CONTROL -t lo://00:00:00:00:00:00/0808 -r lo://00:00:00:00:00:00/0808 script-control.eth -v 3 -V 3 */
+/* test: simulator.exe -h | grep usage */
+/* test: simulator.exe -l | grep 'log file not specified' */
+/* test: simulator.exe -r | grep 'url not specified' */
+/* test: simulator.exe -s | grep 'service not specified' */
+/* test: simulator.exe -t | grep 'url not specified' */
+/* test: simulator.exe -v | grep 'morep verbose level not specified' */
+/* test: simulator.exe -V | grep 'simulator verbose level not specified' */
+/* test: simulator.exe -l - -t lo://00:00:00:00:00:00/0809 -v 4 test/script-lo.eth */
+/* test: simulator.exe -l script-cross_crypto-error.log -s CROSS_CRYPTO -t lo://00:00:00:00:00:00/0808 -r lo://00:00:00:00:00:00/0808 test/script-cross_crypto-error.eth -V 3; test $? -ne 0 */
+/* test: simulator.exe -l script-cross_crypto-error.log -s CROSS_CRYPTO -t lo://00:00:00:00:00:00/0808 -r lo://00:00:00:00:00:00/0808 test/script-cross_crypto-error.eth -V 3 | grep WARNING */
+/* test: simulator.exe -l script-cross_crypto.log -s CROSS_CRYPTO -t lo://00:00:00:00:00:00/0808 -r lo://00:00:00:00:00:00/0808 test/script-cross_crypto.eth -V 3 */
+/* test: simulator.exe -l script-local_crypto.log -s LOCAL_CRYPTO -t lo://00:00:00:00:00:00/0808 -r lo://00:00:00:00:00:00/0808 test/script-local_crypto.eth -V 3 */
+/* test: simulator.exe -l script-provisioning.log -s PROVISIONING -t lo://00:00:00:00:00:00/0808 -r lo://00:00:00:00:00:00/0808 test/script-provisioning.eth -V 3 */
+/* test: simulator.exe -l script-prng.log -s PRNG -t lo://00:00:00:00:00:00/0808 -r lo://00:00:00:00:00:00/0808 test/script-prng.eth -V 3 */
+/* test: simulator.exe -l script-bypass.log -s BYPASS -t lo://00:00:00:00:00:00/0808 -r lo://00:00:00:00:00:00/0808 test/script-bypass.eth -V 3 */
+/* test: simulator.exe -l script-control.log -s CONTROL -t lo://00:00:00:00:00:00/0808 -r lo://00:00:00:00:00:00/0808 test/script-control.eth -v 3 -V 3 */
 
 /* vim: set ts=4 sw=4 si et: */
diff --git a/simulator/script-simulator.sh b/simulator/script-simulator.sh
index b8ede40..151c47c 100755
--- a/simulator/script-simulator.sh
+++ b/simulator/script-simulator.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-[ "$SIMULATOR" ] || SIMULATOR=./morep_simulator.exe
+[ "$SIMULATOR" ] || SIMULATOR=./simulator.exe
 
 ETH_RADIORED=enp0s4://52:54:00:12:34:57
 ETH_SECRED=enp0s4://52:54:00:12:34:59
diff --git a/script-bypass-si.eth b/test/script-bypass-si.eth
similarity index 100%
rename from script-bypass-si.eth
rename to test/script-bypass-si.eth
diff --git a/test/script-bypass.eth b/test/script-bypass.eth
new file mode 100644
index 0000000..b402fa8
--- /dev/null
+++ b/test/script-bypass.eth
@@ -0,0 +1,7 @@
+# Bypass test script
+
+T:BYPASS BYPASS_CROSS_ASYNC DATA=@test/script-bypass.eth
+R:BYPASS BYPASS_CROSS_ASYNC DATA=@test/script-bypass.eth
+
+T:BYPASS BYPASSED_CROSS_ASYNC DATA=@test/script-bypass.eth
+R:BYPASS BYPASSED_CROSS_ASYNC
diff --git a/script-control-si.eth b/test/script-control-si.eth
similarity index 100%
rename from script-control-si.eth
rename to test/script-control-si.eth
diff --git a/script-control.eth b/test/script-control.eth
similarity index 100%
rename from script-control.eth
rename to test/script-control.eth
diff --git a/script-cross_crypto-error.eth b/test/script-cross_crypto-error.eth
similarity index 64%
rename from script-cross_crypto-error.eth
rename to test/script-cross_crypto-error.eth
index 777b845..81ee39d 100644
--- a/script-cross_crypto-error.eth
+++ b/test/script-cross_crypto-error.eth
@@ -1,13 +1,13 @@
 # Cross crypto test script
 
-T:CROSS_CRYPTO ENCRYPT_CROSS_ASYNC CHANNELID=2 BYPASSLEN=4 BYPASS=11:22:33:44 DATA=@script-local_crypto.eth
+T:CROSS_CRYPTO ENCRYPT_CROSS_ASYNC CHANNELID=2 BYPASSLEN=4 BYPASS=11:22:33:44 DATA=@test/script-local_crypto.eth
 R:CROSS_CRYPTO ENCRYPT_CROSS_ASYNC CHANNELID=2 BYPASSLEN=3 BYPASS=11:22:33
 
-T:CROSS_CRYPTO ENCRYPTED_CROSS_ASYNC CHANNELID=9 BYPASSLEN=1 BYPASS=55 DATA=@script-local_crypto.eth
+T:CROSS_CRYPTO ENCRYPTED_CROSS_ASYNC CHANNELID=9 BYPASSLEN=1 BYPASS=55 DATA=@test/script-local_crypto.eth
 R:CROSS_CRYPTO ENCRYPT_CROSS_ASYNC
 
-T:CROSS_CRYPTO DECRYPT_CROSS_ASYNC CHANNELID=5 BYPASSLEN=0 DATA=@script-local_crypto.eth
-R:CROSS_CRYPTO DECRYPT_CROSS_ASYNC DATA=@script-cross_crypto.eth
+T:CROSS_CRYPTO DECRYPT_CROSS_ASYNC CHANNELID=5 BYPASSLEN=0 DATA=@test/script-local_crypto.eth
+R:CROSS_CRYPTO DECRYPT_CROSS_ASYNC DATA=@test/script-cross_crypto.eth
 
-T:CROSS_CRYPTO DECRYPTED_CROSS_ASYNC CHANNELID=0 BYPASSLEN=4 BYPASS=11:22:33:44 DATA=@script-cross_crypto.eth
+T:CROSS_CRYPTO DECRYPTED_CROSS_ASYNC CHANNELID=0 BYPASSLEN=4 BYPASS=11:22:33:44 DATA=@test/script-cross_crypto.eth
 R:CROSS_CRYPTO DECRYPTED_CROSS_ASYNC CHANNELID=9
diff --git a/script-cross_crypto.eth b/test/script-cross_crypto.eth
similarity index 56%
rename from script-cross_crypto.eth
rename to test/script-cross_crypto.eth
index 57a10bb..dd7ce18 100644
--- a/script-cross_crypto.eth
+++ b/test/script-cross_crypto.eth
@@ -1,13 +1,13 @@
 # Cross crypto test script
 
-T:CROSS_CRYPTO ENCRYPT_CROSS_ASYNC CHANNELID=2 BYPASSLEN=4 BYPASS=11:22:33:44 DATA=@script-local_crypto.eth
+T:CROSS_CRYPTO ENCRYPT_CROSS_ASYNC CHANNELID=2 BYPASSLEN=4 BYPASS=11:22:33:44 DATA=@test/script-local_crypto.eth
 R:CROSS_CRYPTO ENCRYPT_CROSS_ASYNC CHANNELID=2 BYPASSLEN=4 BYPASS=11:22:33:44
 
-T:CROSS_CRYPTO ENCRYPTED_CROSS_ASYNC CHANNELID=9 BYPASSLEN=1 BYPASS=55 DATA=@script-local_crypto.eth
+T:CROSS_CRYPTO ENCRYPTED_CROSS_ASYNC CHANNELID=9 BYPASSLEN=1 BYPASS=55 DATA=@test/script-local_crypto.eth
 R:CROSS_CRYPTO ENCRYPTED_CROSS_ASYNC BYPASSLEN=1 BYPASS=55
 
-T:CROSS_CRYPTO DECRYPT_CROSS_ASYNC CHANNELID=5 BYPASSLEN=0 DATA=@script-local_crypto.eth
-R:CROSS_CRYPTO DECRYPT_CROSS_ASYNC DATA=@script-local_crypto.eth
+T:CROSS_CRYPTO DECRYPT_CROSS_ASYNC CHANNELID=5 BYPASSLEN=0 DATA=@test/script-local_crypto.eth
+R:CROSS_CRYPTO DECRYPT_CROSS_ASYNC DATA=@test/script-local_crypto.eth
 
-T:CROSS_CRYPTO DECRYPTED_CROSS_ASYNC CHANNELID=0 BYPASSLEN=4 BYPASS=11:22:33:44 DATA=@script-cross_crypto.eth
-R:CROSS_CRYPTO DECRYPTED_CROSS_ASYNC DATA=@script-cross_crypto.eth CHANNELID=0
+T:CROSS_CRYPTO DECRYPTED_CROSS_ASYNC CHANNELID=0 BYPASSLEN=4 BYPASS=11:22:33:44 DATA=@test/script-cross_crypto.eth
+R:CROSS_CRYPTO DECRYPTED_CROSS_ASYNC DATA=@test/script-cross_crypto.eth CHANNELID=0
diff --git a/script-cross_crypto_b2r-si.eth b/test/script-cross_crypto_b2r-si.eth
similarity index 100%
rename from script-cross_crypto_b2r-si.eth
rename to test/script-cross_crypto_b2r-si.eth
diff --git a/script-cross_crypto_r2b-si.eth b/test/script-cross_crypto_r2b-si.eth
similarity index 100%
rename from script-cross_crypto_r2b-si.eth
rename to test/script-cross_crypto_r2b-si.eth
diff --git a/script-lo.eth b/test/script-lo.eth
similarity index 87%
rename from script-lo.eth
rename to test/script-lo.eth
index 3c85640..86c7684 100644
--- a/script-lo.eth
+++ b/test/script-lo.eth
@@ -8,8 +8,8 @@ SLEEP 1000
 T0808 MSG=24 DATA=42:79:65:20:77:6f:72:6c:64
 R0808 MSG=24 DATA=42:79:65:20:77:6f:72:6c:64
 
-T0808 MSG=10 DATA=@script-lo.eth
-R0808 MSG=10 DATA=@script-lo.eth
+T0808 MSG=10 DATA=@test/script-lo.eth
+R0808 MSG=10 DATA=@test/script-lo.eth
 
 T0808 MSG=15 DATA="123456789\ 12345"
 R0808 MSG=15 DATA="123456789\ 12345" DATALEN=15
diff --git a/script-local_crypto-si.eth b/test/script-local_crypto-si.eth
similarity index 100%
rename from script-local_crypto-si.eth
rename to test/script-local_crypto-si.eth
diff --git a/script-local_crypto.eth b/test/script-local_crypto.eth
similarity index 62%
rename from script-local_crypto.eth
rename to test/script-local_crypto.eth
index 380e69b..1d0792a 100644
--- a/script-local_crypto.eth
+++ b/test/script-local_crypto.eth
@@ -1,13 +1,13 @@
 # Local crypto test script
 
-T:LOCAL_CRYPTO ENCRYPT_LOCAL_REQ CHANNELID=2 BYPASSLEN=3 BYPASS=11:22:33 DATA=@script-cross_crypto.eth
+T:LOCAL_CRYPTO ENCRYPT_LOCAL_REQ CHANNELID=2 BYPASSLEN=3 BYPASS=11:22:33 DATA=@test/script-cross_crypto.eth
 R:LOCAL_CRYPTO ENCRYPT_LOCAL_REQ
 
-T:LOCAL_CRYPTO ENCRYPTED_LOCAL_RESP CHANNELID=9 BYPASSLEN=0 DATA=@script-local_crypto.eth
+T:LOCAL_CRYPTO ENCRYPTED_LOCAL_RESP CHANNELID=9 BYPASSLEN=0 DATA=@test/script-local_crypto.eth
 R:LOCAL_CRYPTO ENCRYPTED_LOCAL_RESP
 
-T:LOCAL_CRYPTO DECRYPT_LOCAL_REQ CHANNELID=5 BYPASSLEN=0 DATA=@script-local_crypto.eth
+T:LOCAL_CRYPTO DECRYPT_LOCAL_REQ CHANNELID=5 BYPASSLEN=0 DATA=@test/script-local_crypto.eth
 R:LOCAL_CRYPTO DECRYPT_LOCAL_REQ
 
-T:LOCAL_CRYPTO DECRYPTED_LOCAL_RESP CHANNELID=0 BYPASSLEN=3 BYPASS=22:33:44 DATA=@script-cross_crypto.eth
+T:LOCAL_CRYPTO DECRYPTED_LOCAL_RESP CHANNELID=0 BYPASSLEN=3 BYPASS=22:33:44 DATA=@test/script-cross_crypto.eth
 R:LOCAL_CRYPTO DECRYPTED_LOCAL_RESP
diff --git a/script-prng-si.eth b/test/script-prng-si.eth
similarity index 100%
rename from script-prng-si.eth
rename to test/script-prng-si.eth
diff --git a/script-prng.eth b/test/script-prng.eth
similarity index 82%
rename from script-prng.eth
rename to test/script-prng.eth
index 61b61fd..ac1350c 100644
--- a/script-prng.eth
+++ b/test/script-prng.eth
@@ -3,5 +3,5 @@
 T:PRNG RANDOM_REQ PRNGID=0 SEQLEN=64 SEED=01:02:03:04:05:06:07:08:09:0A:0B:0C:0D:0E:0F:10
 R:PRNG RANDOM_REQ PRNGID=0 SEQLEN=64 SEED=01:02:03:04:05:06:07:08:09:0A:0B:0C:0D:0E:0F:10
 
-T:PRNG RANDOM_RESP DATA=@script-prng.eth
+T:PRNG RANDOM_RESP DATA=@test/script-prng.eth
 R:PRNG RANDOM_RESP
diff --git a/script-provisioning-si.eth b/test/script-provisioning-si.eth
similarity index 100%
rename from script-provisioning-si.eth
rename to test/script-provisioning-si.eth
diff --git a/script-provisioning.eth b/test/script-provisioning.eth
similarity index 100%
rename from script-provisioning.eth
rename to test/script-provisioning.eth
diff --git a/script-rx.eth b/test/script-rx.eth
similarity index 100%
rename from script-rx.eth
rename to test/script-rx.eth
diff --git a/script-tx.eth b/test/script-tx.eth
similarity index 100%
rename from script-tx.eth
rename to test/script-tx.eth
-- 
2.30.2