diff --git a/benchmarks/dvcs/scripts/dvcs_ps_gen.cxx b/benchmarks/dvcs/analysis/dvcs_ps_gen.cxx
similarity index 100%
rename from benchmarks/dvcs/scripts/dvcs_ps_gen.cxx
rename to benchmarks/dvcs/analysis/dvcs_ps_gen.cxx
diff --git a/benchmarks/dvcs/scripts/dvcs_tests.cxx b/benchmarks/dvcs/analysis/dvcs_tests.cxx
similarity index 100%
rename from benchmarks/dvcs/scripts/dvcs_tests.cxx
rename to benchmarks/dvcs/analysis/dvcs_tests.cxx
diff --git a/benchmarks/dvcs/config.yml b/benchmarks/dvcs/config.yml
index ee77a0f3b6498bfc30da81457fbff4d7598a9d9e..9b00dfebafd6f75f413700ef4f9d7565c1bf3957 100644
--- a/benchmarks/dvcs/config.yml
+++ b/benchmarks/dvcs/config.yml
@@ -5,6 +5,7 @@ dvcs:process:
     - s3
   needs: ["common:detector"]
   script:
+    - compile_analyses.py dvcs
     - bash benchmarks/dvcs/dvcs.sh --all
 
 dvcs:results:
diff --git a/benchmarks/dvcs/dvcs.sh b/benchmarks/dvcs/dvcs.sh
index 7a47ac14b2c9522f08454dc4a84f4420bd52d050..c05c3486b292eb2aa2acb8d6809777aaf9cc50ba 100644
--- a/benchmarks/dvcs/dvcs.sh
+++ b/benchmarks/dvcs/dvcs.sh
@@ -145,7 +145,7 @@ if [[ -n "${DO_ANALYSIS}" || -n "${DO_ALL}" ]] ; then
   mkdir -p results/dvcs
 
   # here you can add as many scripts as you want.
-  root -b -q "benchmarks/dvcs/scripts/dvcs_tests.cxx(\"${JUGGLER_REC_FILE}\")"
+  root -b -q "benchmarks/dvcs/analysis/dvcs_tests.cxx+(\"${JUGGLER_REC_FILE}\")"
   if [[ "$?" -ne "0" ]] ; then
     echo "ERROR running root script"
     exit 1
diff --git a/benchmarks/single/config.yml b/benchmarks/single/config.yml
index 35ed2a0d046972fd4ccf7a18b60d9a334c79d155..a84da3f88880307899bfe1f16df1668cfe30bb4f 100644
--- a/benchmarks/single/config.yml
+++ b/benchmarks/single/config.yml
@@ -3,4 +3,5 @@ single:process:
   timeout: 24 hours
   stage: process
   script:
+    - compile_analyses.py single
     - bash benchmarks/single/single.sh e-_1GeV_45to135deg
diff --git a/benchmarks/u_omega/scripts/demo.cxx b/benchmarks/u_omega/analysis/demo.cxx
similarity index 100%
rename from benchmarks/u_omega/scripts/demo.cxx
rename to benchmarks/u_omega/analysis/demo.cxx
diff --git a/benchmarks/u_omega/config.yml b/benchmarks/u_omega/config.yml
index 9e4925b6d431097afec2363d590e7c2aeb26480a..8dacd4bd755269fccbcb99a74781a7bb1a51ce32 100644
--- a/benchmarks/u_omega/config.yml
+++ b/benchmarks/u_omega/config.yml
@@ -5,6 +5,7 @@ u_omega:process:
     - s3
   needs: ["common:detector"]
   script:
+    - compile_analysis.py u_omega
     - bash benchmarks/u_omega/u_omega.sh --all
 
 u_omega:results:
diff --git a/benchmarks/u_omega/u_omega.sh b/benchmarks/u_omega/u_omega.sh
index 6d051589e1851b77ce0485ee72e0a4929fc41d89..23bbf403af8899ab7cd9481db0a811d7967cbf1a 100644
--- a/benchmarks/u_omega/u_omega.sh
+++ b/benchmarks/u_omega/u_omega.sh
@@ -144,7 +144,7 @@ if [[ -n "${DO_ANALYSIS}" || -n "${DO_ALL}" ]] ; then
   mkdir -p "results/${FILE_NAME_TAG}"
 
   # here you can add as many scripts as you want.
-  root -b -q "benchmarks/${FILE_NAME_TAG}/scripts/demo.cxx(\"${JUGGLER_REC_FILE}\")"
+  root -b -q "benchmarks/${FILE_NAME_TAG}/analysis/demo.cxx+(\"${JUGGLER_REC_FILE}\")"
   if [[ "$?" -ne "0" ]] ; then
     echo "ERROR running root script"
     exit 1