diff --git a/certs/make_ca_cert.sh b/scripts/make_ca_cert.sh
similarity index 83%
rename from certs/make_ca_cert.sh
rename to scripts/make_ca_cert.sh
index 0e53998..6516425 100755
--- a/certs/make_ca_cert.sh
+++ b/scripts/make_ca_cert.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-cd "$(dirname "$0")"
+cd "$(dirname "$0")/../certs"
 
 cn="streamana test CA"
 
@@ -12,5 +12,4 @@ done
 
 openssl req -new -x509 -nodes -newkey rsa:2048 -keyout ca.key -out ca.crt -days 3650 -subj "/CN=$cn/"
 
-rm ca.srl
-
+rm -f ca.srl
diff --git a/make_empty_video.sh b/scripts/make_empty_video.sh
similarity index 57%
rename from make_empty_video.sh
rename to scripts/make_empty_video.sh
index ef75d21..ba15ee6 100755
--- a/make_empty_video.sh
+++ b/scripts/make_empty_video.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 cd "$(dirname "$0")"
-ffmpeg -f lavfi -i color=white:640x480:d=1,format=rgb24 -f lavfi -i anullsrc=cl=mono:r=48000 -vf format=yuv420p -t 1 site/empty.mp4
+ffmpeg -f lavfi -i color=white:640x480:d=1,format=rgb24 -f lavfi -i anullsrc=cl=mono:r=48000 -vf format=yuv420p -t 1 ../site/empty.mp4
diff --git a/certs/make_server_cert.sh b/scripts/make_server_cert.sh
similarity index 91%
rename from certs/make_server_cert.sh
rename to scripts/make_server_cert.sh
index 40b0fa5..50a2e0a 100755
--- a/certs/make_server_cert.sh
+++ b/scripts/make_server_cert.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-cd "$(dirname "$0")"
+cd "$(dirname "$0")/../certs"
 
 host=DNS:localhost
 
diff --git a/run_http_server.sh b/scripts/run_http_server.sh
similarity index 85%
rename from run_http_server.sh
rename to scripts/run_http_server.sh
index b2e77b7..395f8b5 100755
--- a/run_http_server.sh
+++ b/scripts/run_http_server.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-cd "$(dirname "$0")/site"
+cd "$(dirname "$0")/../site"
 if test "$1" = "--https"; then
   serve -S -l tcp://0.0.0.0 --ssl-cert ../certs/server.crt --ssl-key ../certs/server.key
 else