diff --git a/Makefile b/Makefile
index 62889c4..ddac521 100644
--- a/Makefile
+++ b/Makefile
@@ -11,4 +11,7 @@ setup-python:
 	exit
 build-packed-data:
 	mkdir -p out/PKIMetadata
-	
\ No newline at end of file
+	make setup-venv
+	make setup-python
+clean:
+	rm -rf out/
\ No newline at end of file
diff --git a/make_out.sh b/make_out.sh
index 4c1dfd1..711ec0f 100755
--- a/make_out.sh
+++ b/make_out.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-mkdir -p out/PKIMetadata/2000
+mkdir -p out/PKIMetadata/
 SCRIPT_DIR=$(dirname $0)
 if [ $# -lt 1 ]
 then
@@ -9,19 +9,19 @@ fi
 # Copy all directories, and will be modified by future calls
 rm -rvf "${SCRIPT_DIR}"/out
 mkdir "${SCRIPT_DIR}"/out
-mkdir -p "${SCRIPT_DIR}"/out/PKIMetadata/2000/.
-cp -rvf "${SCRIPT_DIR}"/original/PKIMetadata/2000/. "${SCRIPT_DIR}"/out/PKIMetadata/2000
-rm -rvf "${SCRIPT_DIR}"/out/PKIMetadata/2000/_metadata # verified contents not necessary
-rm -rvf "${SCRIPT_DIR}out/PKIMetadata/2000/"*.fingerprint
-python3 ./src/root_store_gen/generate_new_pbs.py "${SCRIPT_DIR}/original/PKIMetadata/2000/crs.pb" "$@" "${SCRIPT_DIR}/out/PKIMetadata/2000/crs.pb"
+mkdir -p "${SCRIPT_DIR}"/out/PKIMetadata/.
+cp -rvf "${SCRIPT_DIR}"/original/PKIMetadata/. "${SCRIPT_DIR}"/out/PKIMetadata
+rm -rvf "${SCRIPT_DIR}"/out/PKIMetadata/_metadata # verified contents not necessary
+rm -rvf "${SCRIPT_DIR}out/PKIMetadata/"*.fingerprint
+python3 ./src/root_store_gen/generate_new_pbs.py "${SCRIPT_DIR}/original/PKIMetadata/crs.pb" "$@" "${SCRIPT_DIR}/out/PKIMetadata/crs.pb"
 # Modify version in manifest
 
 python3 <<EOF # Set version in manifest
 import json
 from pathlib import Path 
-mjs = '${SCRIPT_DIR}/original/PKIMetadata/2000/manifest.json'
+mjs = '${SCRIPT_DIR}/original/PKIMetadata/manifest.json'
 mjs = Path(mjs)
-newfile = Path('${SCRIPT_DIR}/out/PKIMetadata/2000/manifest.json')
+newfile = Path('${SCRIPT_DIR}/out/PKIMetadata/manifest.json')
 dat = Path.read_text(mjs)
 x = json.loads(dat)
 x['version'] = "2000"