diff --git a/marvin-toolkit/entrypoint.sh b/marvin-toolkit/entrypoint.sh
index 770dd13d..bd9fc931 100644
--- a/marvin-toolkit/entrypoint.sh
+++ b/marvin-toolkit/entrypoint.sh
@@ -73,15 +73,12 @@ echo "RSA $size bit private key in PKCS#8 PEM format is in" $(x509Key --pkcs8 $n
 echo "RSA $size bit private key in PKCS#8 DER format is in" $(x509Key --der --pkcs8 $name)
 echo "RSA $size bit private key in PKCS#12 format is in" $(x509Key --with-cert --pkcs12 $name)
 echo "RSA $size bit self-signed certificate is in" $(x509Cert $name)
-mv rsa${size} keys  # Keys generated under rsa${size}/
+cp -r rsa${size} keys  # Keys generated under rsa${size}/
 echo
 
 # Generate ciphertexts
-if [ ! -d "results" ]; then
-  mkdir -p "results"
-fi
 PYTHONPATH=tlsfuzzer ./marvin-venv/bin/python ./step2.py \
--c keys/cert.pem -o results \
+-c keys/cert.pem -o rsa${size} \
 --repeat 100000 --verbose \
 no_structure no_padding=48 signature_padding=8 \
 valid_repeated_byte_payload="246 0xff" \
@@ -92,11 +89,11 @@ valid=0 valid=192 valid=246
 
 # Run decryptions and analyze data
 ./example/rust-crypto/target/release/rust-crypto \
-    -i results/ciphers.bin \
-    -o results/raw_times.csv -k keys/pkcs8.pem -n $size_bytes
+    -i rsa${size}/ciphers.bin \
+    -o rsa${size}/raw_times.csv -k keys/pkcs8.pem -n $size_bytes
 PYTHONPATH=tlsfuzzer marvin-venv/bin/python3 tlsfuzzer/tlsfuzzer/extract.py \
--l results/log.csv --raw-times results/raw_times.csv \
--o results/ \
+-l rsa${size}/log.csv --raw-times rsa${size}/raw_times.csv \
+-o rsa${size}/ \
 --clock-frequency 1000
 PYTHONPATH=tlsfuzzer marvin-venv/bin/python3 tlsfuzzer/tlsfuzzer/analysis.py \
--o results/ --verbose
\ No newline at end of file
+-o rsa${size}/ --verbose
\ No newline at end of file