diff --git a/benchmarks/calorimeters/config.yml b/benchmarks/calorimeters/config.yml
new file mode 100644
index 0000000000000000000000000000000000000000..7ff610bdf9a288715dbceaab35cb1f85df72bd4a
--- /dev/null
+++ b/benchmarks/calorimeters/config.yml
@@ -0,0 +1,148 @@
+#####################
+# Simulations
+# - Generate datasets
+# - Run Geant4
+# - Run Juggler
+#####################
+
+sim_emcal_barrel_pions:
+  image: eicweb.phy.anl.gov:4567/eic/juggler/juggler:$JUGGLER_TAG
+  stage: simulate
+  artifacts:
+    expire_in: 20 weeks
+    paths:
+      - results/
+      - sim_output/
+  script:
+    - bash calorimeters/run_emcal_barrel_pions.sh
+  allow_failure: true
+
+sim_emcal_barrel_electrons:
+  image: eicweb.phy.anl.gov:4567/eic/juggler/juggler:$JUGGLER_TAG
+  stage: simulate
+  tags:
+    - silicon
+  artifacts:
+    expire_in: 20 weeks
+    paths:
+      - results/
+      - sim_output/
+  script:
+    - bash calorimeters/run_emcal_barrel_electrons.sh
+  allow_failure: true
+
+crystal_emcal_simulation:
+  stage: simulate
+  needs: 
+    - ["get_data"]
+  tags:
+    - silicon
+  script:
+    - cp NPDet/src/detectors/calorimeters/compact/elements.xml ./.
+    - cp NPDet/src/detectors/calorimeters/compact/materials.xml ./.
+    - bash calorimeters/run_simulation_crystal.sh
+
+crystal_pion_simulation:
+  stage: simulate
+  needs:
+    - ["get_data"]
+  tags:
+    - silicon
+  script:
+    - cd topside  && ls -l
+    - npsim --runType batch --numberOfEvents 100 --compactFile topside.xml --inputFiles  ../data/emcal_electrons.hepmc  --outputFile  ../sim_output/output_emcal_electrons.root
+
+    #zdc_simulation:
+    #stage: simulate
+    #needs: 
+    #- ["get_data"]
+    #tags:
+    #- silicon
+    #script:
+    #- cp NPDet/src/detectors/calorimeters/compact/elements.xml ./.
+    #- cp NPDet/src/detectors/calorimeters/compact/materials.xml ./.
+    #- bash calorimeters/run_simulation_zdc.sh
+
+###################
+# Benchmarks
+###################
+
+ben_emcal_barrel_pions:
+  stage: benchmarks
+  tags:
+    - silicon
+  artifacts:
+    expire_in: 20 weeks
+    paths:
+      - results/
+  needs:
+    - ["sim_emcal_barrel_pions"]
+  script:
+    - ls -lrth sim_output
+    - root -b -q calorimeters/scripts/emcal_barrel_pions_analysis.cxx+
+  allow_failure: true
+
+ben_emcal_barrel_electrons:
+  stage: benchmarks
+  tags:
+    - silicon
+  artifacts:
+    expire_in: 20 weeks
+    paths:
+      - results/
+  needs:
+    - ["sim_emcal_barrel_electrons"]
+  script:
+    - ls -lrth sim_output
+    - root -b -q calorimeters/scripts/emcal_barrel_electrons_analysis.cxx+
+  allow_failure: true
+
+crystal_benchmark:
+  stage: benchmarks
+  tags:
+    - silicon
+  needs:
+    - ["crystal_emcal_simulation"]
+  script:
+    - ls -lrth sim_output
+    - root -b -q calorimeters/simple_checking_crystal.cxx+
+  allow_failure: true
+
+    #cal_test_3_zdc_neutrons_reader:
+    #stage: benchmarks
+    #tags:
+    #- sodium
+    #script:
+    #- root -b -q calorimeters/zdc_neutrons_reader.cxx
+      #artifact:
+      #  paths: 
+      #    - results/
+      #allow_failure: true
+
+    #zdc_benchmark:
+    #stage: benchmarks
+    #tags:
+    #- silicon
+    #needs: 
+    #- ["zdc_simulation"]
+    #dependencies:
+    #- zdc_simulation
+    #script:
+    #- ls -lrth sim_output
+    #- root -b -q calorimeters/simple_checking.cxx+
+    #allow_failure: true
+
+    #zdc_benchmark_info_histogram:
+    #stage: benchmarks
+    #needs: 
+    #- ["zdc_simulation"]
+    #tags:
+    #- silicon
+    #dependencies:
+    #- zdc_simulation
+    #script:
+    #- cp NPDet/src/detectors/calorimeters/compact/elements.xml calorimeters/
+    #- cp NPDet/src/detectors/calorimeters/compact/materials.xml calorimeters/
+    #- root -b -q calorimeters/simple_info_plot_histograms.cxx+
+    #allow_failure: true
+
diff --git a/benchmarks/calorimeters/dummy_test.sh b/benchmarks/calorimeters/dummy_test.sh
deleted file mode 100644
index 968865ec143bec7552d13230e05625346a73497f..0000000000000000000000000000000000000000
--- a/benchmarks/calorimeters/dummy_test.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-echo "Calorimeter Dummy Test..."
-echo "fails."
-
-exit 1
diff --git a/benchmarks/calorimeters/dummy_test2.sh b/benchmarks/calorimeters/dummy_test2.sh
deleted file mode 100644
index bfca0dfaacf2a614c15e30aa32c82f8fecfa62eb..0000000000000000000000000000000000000000
--- a/benchmarks/calorimeters/dummy_test2.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-echo "Calorimeter Dummy Test 2..."
-echo "passes."
-
-exit 0
diff --git a/benchmarks/calorimeters/edep_histo_zdc_photons.png b/benchmarks/calorimeters/edep_histo_zdc_photons.png
deleted file mode 100644
index 5e1985b21c7316b75ea4c70b42c2927caff48a6f..0000000000000000000000000000000000000000
Binary files a/benchmarks/calorimeters/edep_histo_zdc_photons.png and /dev/null differ
diff --git a/benchmarks/calorimeters/hit_postion_histo_zdc_photons.png b/benchmarks/calorimeters/hit_postion_histo_zdc_photons.png
deleted file mode 100644
index da904eaa47c323bf762c50f9722fc470cda94f4c..0000000000000000000000000000000000000000
Binary files a/benchmarks/calorimeters/hit_postion_histo_zdc_photons.png and /dev/null differ
diff --git a/benchmarks/calorimeters/nhits_histo_zdc_photons.png b/benchmarks/calorimeters/nhits_histo_zdc_photons.png
deleted file mode 100644
index 3e519f1ff0f7edef6c23d38aaede1b1cd0ecf8df..0000000000000000000000000000000000000000
Binary files a/benchmarks/calorimeters/nhits_histo_zdc_photons.png and /dev/null differ
diff --git a/benchmarks/calorimeters/volID_histo_zdc_photons.png b/benchmarks/calorimeters/volID_histo_zdc_photons.png
deleted file mode 100644
index 81479c86ae858b78e474bbb9c409ae0da1606763..0000000000000000000000000000000000000000
Binary files a/benchmarks/calorimeters/volID_histo_zdc_photons.png and /dev/null differ
diff --git a/benchmarks/pid/pid_config.yml b/benchmarks/pid/config.yml
similarity index 79%
rename from benchmarks/pid/pid_config.yml
rename to benchmarks/pid/config.yml
index b133b27fb9860de0ab498383ad36d2d68057ae57..00917f4dedfa319214d6f5bd6b5a9e60d612f989 100644
--- a/benchmarks/pid/pid_config.yml
+++ b/benchmarks/pid/config.yml
@@ -4,7 +4,7 @@
 pid_test_1_dummy_test:
   stage: benchmarks
   script:
-    - bash pid/dummy_test.sh
+    - bash benchmarks/pid/dummy_test.sh
   artifact:
     paths: 
       - results/
diff --git a/benchmarks/trackers/trackers_config.yml b/benchmarks/trackers/config.yml
similarity index 77%
rename from benchmarks/trackers/trackers_config.yml
rename to benchmarks/trackers/config.yml
index efa664c0b05d102fae2c7bac4c5ee60c88d8d2ec..cc326f29e2ecfba187e86a30c9ef2acf324f5036 100644
--- a/benchmarks/trackers/trackers_config.yml
+++ b/benchmarks/trackers/config.yml
@@ -4,7 +4,7 @@
 track_test_1_dummy_test:
   stage: benchmarks
   script:
-    - bash trackers/dummy_test.sh
+    - bash benchmarks/trackers/dummy_test.sh
   artifact:
     paths: 
       - results/
diff --git a/benchmarks/trackers/dummy_test.sh b/benchmarks/trackers/dummy_test.sh
deleted file mode 100644
index d7e83841010de3940c34a55b6a3b3c7a2a746a55..0000000000000000000000000000000000000000
--- a/benchmarks/trackers/dummy_test.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-echo "Tracker Dummy Test..."
-echo "passes."
-
-
-ls -lrth
-
-exit 0