diff --git a/bench-accel/bench_adp/Ni.adp b/test-user-omp/bench_adp/Ni.adp
similarity index 100%
rename from bench-accel/bench_adp/Ni.adp
rename to test-user-omp/bench_adp/Ni.adp
diff --git a/bench-accel/bench_adp/in.adp b/test-user-omp/bench_adp/in.adp
similarity index 100%
rename from bench-accel/bench_adp/in.adp
rename to test-user-omp/bench_adp/in.adp
diff --git a/bench-accel/bench_adp/log.adp.1 b/test-user-omp/bench_adp/log.adp.1
similarity index 100%
rename from bench-accel/bench_adp/log.adp.1
rename to test-user-omp/bench_adp/log.adp.1
diff --git a/bench-accel/bench_adp/log.adp.4 b/test-user-omp/bench_adp/log.adp.4
similarity index 100%
rename from bench-accel/bench_adp/log.adp.4
rename to test-user-omp/bench_adp/log.adp.4
diff --git a/bench-accel/bench_adp/refoutput/ref.0xOpenMP_1xMPI.gz b/test-user-omp/bench_adp/refoutput/ref.0xOpenMP_1xMPI.gz
similarity index 100%
rename from bench-accel/bench_adp/refoutput/ref.0xOpenMP_1xMPI.gz
rename to test-user-omp/bench_adp/refoutput/ref.0xOpenMP_1xMPI.gz
diff --git a/bench-accel/bench_airebo/CH.airebo b/test-user-omp/bench_airebo/CH.airebo
similarity index 100%
rename from bench-accel/bench_airebo/CH.airebo
rename to test-user-omp/bench_airebo/CH.airebo
diff --git a/bench-accel/bench_airebo/data.airebo b/test-user-omp/bench_airebo/data.airebo
similarity index 100%
rename from bench-accel/bench_airebo/data.airebo
rename to test-user-omp/bench_airebo/data.airebo
diff --git a/bench-accel/bench_airebo/in.airebo b/test-user-omp/bench_airebo/in.airebo
similarity index 100%
rename from bench-accel/bench_airebo/in.airebo
rename to test-user-omp/bench_airebo/in.airebo
diff --git a/bench-accel/bench_airebo/log.airebo.1 b/test-user-omp/bench_airebo/log.airebo.1
similarity index 100%
rename from bench-accel/bench_airebo/log.airebo.1
rename to test-user-omp/bench_airebo/log.airebo.1
diff --git a/bench-accel/bench_airebo/log.airebo.4 b/test-user-omp/bench_airebo/log.airebo.4
similarity index 100%
rename from bench-accel/bench_airebo/log.airebo.4
rename to test-user-omp/bench_airebo/log.airebo.4
diff --git a/bench-accel/bench_airebo/refoutput/ref.0xOpenMP_1xMPI.gz b/test-user-omp/bench_airebo/refoutput/ref.0xOpenMP_1xMPI.gz
similarity index 100%
rename from bench-accel/bench_airebo/refoutput/ref.0xOpenMP_1xMPI.gz
rename to test-user-omp/bench_airebo/refoutput/ref.0xOpenMP_1xMPI.gz
diff --git a/bench-accel/bench_beck/in.beck b/test-user-omp/bench_beck/in.beck
similarity index 100%
rename from bench-accel/bench_beck/in.beck
rename to test-user-omp/bench_beck/in.beck
diff --git a/bench-accel/bench_beck/log.beck.1 b/test-user-omp/bench_beck/log.beck.1
similarity index 100%
rename from bench-accel/bench_beck/log.beck.1
rename to test-user-omp/bench_beck/log.beck.1
diff --git a/bench-accel/bench_beck/log.beck.4 b/test-user-omp/bench_beck/log.beck.4
similarity index 100%
rename from bench-accel/bench_beck/log.beck.4
rename to test-user-omp/bench_beck/log.beck.4
diff --git a/bench-accel/bench_beck/refoutput/ref.0xOpenMP_1xMPI.gz b/test-user-omp/bench_beck/refoutput/ref.0xOpenMP_1xMPI.gz
similarity index 100%
rename from bench-accel/bench_beck/refoutput/ref.0xOpenMP_1xMPI.gz
rename to test-user-omp/bench_beck/refoutput/ref.0xOpenMP_1xMPI.gz
diff --git a/bench-accel/bench_comb/data.comb b/test-user-omp/bench_comb/data.comb
similarity index 100%
rename from bench-accel/bench_comb/data.comb
rename to test-user-omp/bench_comb/data.comb
diff --git a/bench-accel/bench_comb/ffield.comb b/test-user-omp/bench_comb/ffield.comb
similarity index 100%
rename from bench-accel/bench_comb/ffield.comb
rename to test-user-omp/bench_comb/ffield.comb
diff --git a/bench-accel/bench_comb/fq.out.1 b/test-user-omp/bench_comb/fq.out.1
similarity index 100%
rename from bench-accel/bench_comb/fq.out.1
rename to test-user-omp/bench_comb/fq.out.1
diff --git a/bench-accel/bench_comb/fq.out.4 b/test-user-omp/bench_comb/fq.out.4
similarity index 100%
rename from bench-accel/bench_comb/fq.out.4
rename to test-user-omp/bench_comb/fq.out.4
diff --git a/bench-accel/bench_comb/in.comb b/test-user-omp/bench_comb/in.comb
similarity index 100%
rename from bench-accel/bench_comb/in.comb
rename to test-user-omp/bench_comb/in.comb
diff --git a/bench-accel/bench_comb/refoutput/ref.0xOpenMP_1xMPI.gz b/test-user-omp/bench_comb/refoutput/ref.0xOpenMP_1xMPI.gz
similarity index 100%
rename from bench-accel/bench_comb/refoutput/ref.0xOpenMP_1xMPI.gz
rename to test-user-omp/bench_comb/refoutput/ref.0xOpenMP_1xMPI.gz
diff --git a/bench-accel/bench_dipole/data.dipole b/test-user-omp/bench_dipole/data.dipole
similarity index 100%
rename from bench-accel/bench_dipole/data.dipole
rename to test-user-omp/bench_dipole/data.dipole
diff --git a/bench-accel/bench_dipole/forcefield.elba b/test-user-omp/bench_dipole/forcefield.elba
similarity index 100%
rename from bench-accel/bench_dipole/forcefield.elba
rename to test-user-omp/bench_dipole/forcefield.elba
diff --git a/bench-accel/bench_dipole/in.dipole b/test-user-omp/bench_dipole/in.dipole
similarity index 100%
rename from bench-accel/bench_dipole/in.dipole
rename to test-user-omp/bench_dipole/in.dipole
diff --git a/bench-accel/bench_dipole/log.dipole.1 b/test-user-omp/bench_dipole/log.dipole.1
similarity index 100%
rename from bench-accel/bench_dipole/log.dipole.1
rename to test-user-omp/bench_dipole/log.dipole.1
diff --git a/bench-accel/bench_dipole/log.dipole.4 b/test-user-omp/bench_dipole/log.dipole.4
similarity index 100%
rename from bench-accel/bench_dipole/log.dipole.4
rename to test-user-omp/bench_dipole/log.dipole.4
diff --git a/bench-accel/bench_dipole/refoutput/ref.0xOpenMP_1xMPI.gz b/test-user-omp/bench_dipole/refoutput/ref.0xOpenMP_1xMPI.gz
similarity index 100%
rename from bench-accel/bench_dipole/refoutput/ref.0xOpenMP_1xMPI.gz
rename to test-user-omp/bench_dipole/refoutput/ref.0xOpenMP_1xMPI.gz
diff --git a/bench-accel/bench_dpd/data.dpd b/test-user-omp/bench_dpd/data.dpd
similarity index 100%
rename from bench-accel/bench_dpd/data.dpd
rename to test-user-omp/bench_dpd/data.dpd
diff --git a/bench-accel/bench_dpd/in.dpd b/test-user-omp/bench_dpd/in.dpd
similarity index 100%
rename from bench-accel/bench_dpd/in.dpd
rename to test-user-omp/bench_dpd/in.dpd
diff --git a/bench-accel/bench_eam/Cu_u3.eam b/test-user-omp/bench_eam/Cu_u3.eam
similarity index 100%
rename from bench-accel/bench_eam/Cu_u3.eam
rename to test-user-omp/bench_eam/Cu_u3.eam
diff --git a/bench-accel/bench_eam/in.eam b/test-user-omp/bench_eam/in.eam
similarity index 100%
rename from bench-accel/bench_eam/in.eam
rename to test-user-omp/bench_eam/in.eam
diff --git a/bench-accel/bench_eam/log.eam.1 b/test-user-omp/bench_eam/log.eam.1
similarity index 100%
rename from bench-accel/bench_eam/log.eam.1
rename to test-user-omp/bench_eam/log.eam.1
diff --git a/bench-accel/bench_eam/log.eam.4 b/test-user-omp/bench_eam/log.eam.4
similarity index 100%
rename from bench-accel/bench_eam/log.eam.4
rename to test-user-omp/bench_eam/log.eam.4
diff --git a/bench-accel/bench_eam/refoutput/ref.0xOpenMP_1xMPI.gz b/test-user-omp/bench_eam/refoutput/ref.0xOpenMP_1xMPI.gz
similarity index 100%
rename from bench-accel/bench_eam/refoutput/ref.0xOpenMP_1xMPI.gz
rename to test-user-omp/bench_eam/refoutput/ref.0xOpenMP_1xMPI.gz
diff --git a/bench-accel/bench_eim/data.eim b/test-user-omp/bench_eim/data.eim
similarity index 100%
rename from bench-accel/bench_eim/data.eim
rename to test-user-omp/bench_eim/data.eim
diff --git a/bench-accel/bench_eim/ffield.eim b/test-user-omp/bench_eim/ffield.eim
similarity index 100%
rename from bench-accel/bench_eim/ffield.eim
rename to test-user-omp/bench_eim/ffield.eim
diff --git a/bench-accel/bench_eim/in.eim b/test-user-omp/bench_eim/in.eim
similarity index 100%
rename from bench-accel/bench_eim/in.eim
rename to test-user-omp/bench_eim/in.eim
diff --git a/bench-accel/bench_eim/log.eim.1 b/test-user-omp/bench_eim/log.eim.1
similarity index 100%
rename from bench-accel/bench_eim/log.eim.1
rename to test-user-omp/bench_eim/log.eim.1
diff --git a/bench-accel/bench_eim/log.eim.4 b/test-user-omp/bench_eim/log.eim.4
similarity index 100%
rename from bench-accel/bench_eim/log.eim.4
rename to test-user-omp/bench_eim/log.eim.4
diff --git a/bench-accel/bench_eim/refoutput/ref.0xOpenMP_1xMPI.gz b/test-user-omp/bench_eim/refoutput/ref.0xOpenMP_1xMPI.gz
similarity index 100%
rename from bench-accel/bench_eim/refoutput/ref.0xOpenMP_1xMPI.gz
rename to test-user-omp/bench_eim/refoutput/ref.0xOpenMP_1xMPI.gz
diff --git a/bench-accel/bench_ewald/data.spce b/test-user-omp/bench_ewald/data.spce
similarity index 100%
rename from bench-accel/bench_ewald/data.spce
rename to test-user-omp/bench_ewald/data.spce
diff --git a/bench-accel/bench_ewald/in.spce b/test-user-omp/bench_ewald/in.spce
similarity index 100%
rename from bench-accel/bench_ewald/in.spce
rename to test-user-omp/bench_ewald/in.spce
diff --git a/bench-accel/bench_ewald/log.spce.1 b/test-user-omp/bench_ewald/log.spce.1
similarity index 100%
rename from bench-accel/bench_ewald/log.spce.1
rename to test-user-omp/bench_ewald/log.spce.1
diff --git a/bench-accel/bench_ewald/log.spce.4 b/test-user-omp/bench_ewald/log.spce.4
similarity index 100%
rename from bench-accel/bench_ewald/log.spce.4
rename to test-user-omp/bench_ewald/log.spce.4
diff --git a/bench-accel/bench_ewald/refoutput/ref.0xOpenMP_1xMPI.gz b/test-user-omp/bench_ewald/refoutput/ref.0xOpenMP_1xMPI.gz
similarity index 100%
rename from bench-accel/bench_ewald/refoutput/ref.0xOpenMP_1xMPI.gz
rename to test-user-omp/bench_ewald/refoutput/ref.0xOpenMP_1xMPI.gz
diff --git a/bench-accel/bench_fene/data.fene b/test-user-omp/bench_fene/data.fene
similarity index 100%
rename from bench-accel/bench_fene/data.fene
rename to test-user-omp/bench_fene/data.fene
diff --git a/bench-accel/bench_fene/in.fene b/test-user-omp/bench_fene/in.fene
similarity index 100%
rename from bench-accel/bench_fene/in.fene
rename to test-user-omp/bench_fene/in.fene
diff --git a/bench-accel/bench_fene/log.fene.1 b/test-user-omp/bench_fene/log.fene.1
similarity index 100%
rename from bench-accel/bench_fene/log.fene.1
rename to test-user-omp/bench_fene/log.fene.1
diff --git a/bench-accel/bench_fene/log.fene.4 b/test-user-omp/bench_fene/log.fene.4
similarity index 100%
rename from bench-accel/bench_fene/log.fene.4
rename to test-user-omp/bench_fene/log.fene.4
diff --git a/bench-accel/bench_fene/refoutput/ref.0xOpenMP_1xMPI.gz b/test-user-omp/bench_fene/refoutput/ref.0xOpenMP_1xMPI.gz
similarity index 100%
rename from bench-accel/bench_fene/refoutput/ref.0xOpenMP_1xMPI.gz
rename to test-user-omp/bench_fene/refoutput/ref.0xOpenMP_1xMPI.gz
diff --git a/bench-accel/bench_gauss-diel/data.gauss-diel b/test-user-omp/bench_gauss-diel/data.gauss-diel
similarity index 100%
rename from bench-accel/bench_gauss-diel/data.gauss-diel
rename to test-user-omp/bench_gauss-diel/data.gauss-diel
diff --git a/bench-accel/bench_gauss-diel/in.gauss-diel b/test-user-omp/bench_gauss-diel/in.gauss-diel
similarity index 100%
rename from bench-accel/bench_gauss-diel/in.gauss-diel
rename to test-user-omp/bench_gauss-diel/in.gauss-diel
diff --git a/bench-accel/bench_gauss-diel/log.gauss-diel.1 b/test-user-omp/bench_gauss-diel/log.gauss-diel.1
similarity index 100%
rename from bench-accel/bench_gauss-diel/log.gauss-diel.1
rename to test-user-omp/bench_gauss-diel/log.gauss-diel.1
diff --git a/bench-accel/bench_gauss-diel/log.gauss-diel.4 b/test-user-omp/bench_gauss-diel/log.gauss-diel.4
similarity index 100%
rename from bench-accel/bench_gauss-diel/log.gauss-diel.4
rename to test-user-omp/bench_gauss-diel/log.gauss-diel.4
diff --git a/bench-accel/bench_gauss-diel/refoutput/ref.0xOpenMP_1xMPI.gz b/test-user-omp/bench_gauss-diel/refoutput/ref.0xOpenMP_1xMPI.gz
similarity index 100%
rename from bench-accel/bench_gauss-diel/refoutput/ref.0xOpenMP_1xMPI.gz
rename to test-user-omp/bench_gauss-diel/refoutput/ref.0xOpenMP_1xMPI.gz
diff --git a/bench-accel/bench_gb/data.gb b/test-user-omp/bench_gb/data.gb
similarity index 100%
rename from bench-accel/bench_gb/data.gb
rename to test-user-omp/bench_gb/data.gb
diff --git a/bench-accel/bench_gb/in.gb b/test-user-omp/bench_gb/in.gb
similarity index 100%
rename from bench-accel/bench_gb/in.gb
rename to test-user-omp/bench_gb/in.gb
diff --git a/bench-accel/bench_gb/log.gb.1 b/test-user-omp/bench_gb/log.gb.1
similarity index 100%
rename from bench-accel/bench_gb/log.gb.1
rename to test-user-omp/bench_gb/log.gb.1
diff --git a/bench-accel/bench_gb/log.gb.4 b/test-user-omp/bench_gb/log.gb.4
similarity index 100%
rename from bench-accel/bench_gb/log.gb.4
rename to test-user-omp/bench_gb/log.gb.4
diff --git a/bench-accel/bench_gb/refoutput/ref.0xOpenMP_1xMPI.gz b/test-user-omp/bench_gb/refoutput/ref.0xOpenMP_1xMPI.gz
similarity index 100%
rename from bench-accel/bench_gb/refoutput/ref.0xOpenMP_1xMPI.gz
rename to test-user-omp/bench_gb/refoutput/ref.0xOpenMP_1xMPI.gz
diff --git a/bench-accel/bench_granular/data.granular b/test-user-omp/bench_granular/data.granular
similarity index 100%
rename from bench-accel/bench_granular/data.granular
rename to test-user-omp/bench_granular/data.granular
diff --git a/bench-accel/bench_granular/in.granular b/test-user-omp/bench_granular/in.granular
similarity index 100%
rename from bench-accel/bench_granular/in.granular
rename to test-user-omp/bench_granular/in.granular
diff --git a/bench-accel/bench_granular/log.granular.1 b/test-user-omp/bench_granular/log.granular.1
similarity index 100%
rename from bench-accel/bench_granular/log.granular.1
rename to test-user-omp/bench_granular/log.granular.1
diff --git a/bench-accel/bench_granular/log.granular.4 b/test-user-omp/bench_granular/log.granular.4
similarity index 100%
rename from bench-accel/bench_granular/log.granular.4
rename to test-user-omp/bench_granular/log.granular.4
diff --git a/bench-accel/bench_granular/refoutput/ref.0xOpenMP_1xMPI.gz b/test-user-omp/bench_granular/refoutput/ref.0xOpenMP_1xMPI.gz
similarity index 100%
rename from bench-accel/bench_granular/refoutput/ref.0xOpenMP_1xMPI.gz
rename to test-user-omp/bench_granular/refoutput/ref.0xOpenMP_1xMPI.gz
diff --git a/bench-accel/bench_lj-sdk/data.lj-sdk b/test-user-omp/bench_lj-sdk/data.lj-sdk
similarity index 100%
rename from bench-accel/bench_lj-sdk/data.lj-sdk
rename to test-user-omp/bench_lj-sdk/data.lj-sdk
diff --git a/bench-accel/bench_lj-sdk/in.lj-sdk b/test-user-omp/bench_lj-sdk/in.lj-sdk
similarity index 100%
rename from bench-accel/bench_lj-sdk/in.lj-sdk
rename to test-user-omp/bench_lj-sdk/in.lj-sdk
diff --git a/bench-accel/bench_lj-sdk/log.lj-sdk.1 b/test-user-omp/bench_lj-sdk/log.lj-sdk.1
similarity index 100%
rename from bench-accel/bench_lj-sdk/log.lj-sdk.1
rename to test-user-omp/bench_lj-sdk/log.lj-sdk.1
diff --git a/bench-accel/bench_lj-sdk/log.lj-sdk.4 b/test-user-omp/bench_lj-sdk/log.lj-sdk.4
similarity index 100%
rename from bench-accel/bench_lj-sdk/log.lj-sdk.4
rename to test-user-omp/bench_lj-sdk/log.lj-sdk.4
diff --git a/bench-accel/bench_lj-sdk/refoutput/ref.0xOpenMP_1xMPI.gz b/test-user-omp/bench_lj-sdk/refoutput/ref.0xOpenMP_1xMPI.gz
similarity index 100%
rename from bench-accel/bench_lj-sdk/refoutput/ref.0xOpenMP_1xMPI.gz
rename to test-user-omp/bench_lj-sdk/refoutput/ref.0xOpenMP_1xMPI.gz
diff --git a/bench-accel/bench_lj/in.lj b/test-user-omp/bench_lj/in.lj
similarity index 100%
rename from bench-accel/bench_lj/in.lj
rename to test-user-omp/bench_lj/in.lj
diff --git a/bench-accel/bench_lj/in.lj-full b/test-user-omp/bench_lj/in.lj-full
similarity index 100%
rename from bench-accel/bench_lj/in.lj-full
rename to test-user-omp/bench_lj/in.lj-full
diff --git a/bench-accel/bench_lj/log.lj.1 b/test-user-omp/bench_lj/log.lj.1
similarity index 100%
rename from bench-accel/bench_lj/log.lj.1
rename to test-user-omp/bench_lj/log.lj.1
diff --git a/bench-accel/bench_lj/log.lj.4 b/test-user-omp/bench_lj/log.lj.4
similarity index 100%
rename from bench-accel/bench_lj/log.lj.4
rename to test-user-omp/bench_lj/log.lj.4
diff --git a/bench-accel/bench_lj/refoutput/ref.0xOpenMP_1xMPI.gz b/test-user-omp/bench_lj/refoutput/ref.0xOpenMP_1xMPI.gz
similarity index 100%
rename from bench-accel/bench_lj/refoutput/ref.0xOpenMP_1xMPI.gz
rename to test-user-omp/bench_lj/refoutput/ref.0xOpenMP_1xMPI.gz
diff --git a/bench-accel/bench_meam-spline/Ti.meam.spline b/test-user-omp/bench_meam-spline/Ti.meam.spline
similarity index 100%
rename from bench-accel/bench_meam-spline/Ti.meam.spline
rename to test-user-omp/bench_meam-spline/Ti.meam.spline
diff --git a/bench-accel/bench_meam-spline/in.meam-spline b/test-user-omp/bench_meam-spline/in.meam-spline
similarity index 100%
rename from bench-accel/bench_meam-spline/in.meam-spline
rename to test-user-omp/bench_meam-spline/in.meam-spline
diff --git a/bench-accel/bench_meam-spline/in.meam-spline-void b/test-user-omp/bench_meam-spline/in.meam-spline-void
similarity index 100%
rename from bench-accel/bench_meam-spline/in.meam-spline-void
rename to test-user-omp/bench_meam-spline/in.meam-spline-void
diff --git a/bench-accel/bench_meam-spline/log.meam-spline.1 b/test-user-omp/bench_meam-spline/log.meam-spline.1
similarity index 100%
rename from bench-accel/bench_meam-spline/log.meam-spline.1
rename to test-user-omp/bench_meam-spline/log.meam-spline.1
diff --git a/bench-accel/bench_meam-spline/log.meam-spline.4 b/test-user-omp/bench_meam-spline/log.meam-spline.4
similarity index 100%
rename from bench-accel/bench_meam-spline/log.meam-spline.4
rename to test-user-omp/bench_meam-spline/log.meam-spline.4
diff --git a/bench-accel/bench_meam-spline/refoutput/ref.0xOpenMP_1xMPI.gz b/test-user-omp/bench_meam-spline/refoutput/ref.0xOpenMP_1xMPI.gz
similarity index 100%
rename from bench-accel/bench_meam-spline/refoutput/ref.0xOpenMP_1xMPI.gz
rename to test-user-omp/bench_meam-spline/refoutput/ref.0xOpenMP_1xMPI.gz
diff --git a/bench-accel/bench_msm/data.msm b/test-user-omp/bench_msm/data.msm
similarity index 100%
rename from bench-accel/bench_msm/data.msm
rename to test-user-omp/bench_msm/data.msm
diff --git a/bench-accel/bench_msm/in.msm b/test-user-omp/bench_msm/in.msm
similarity index 100%
rename from bench-accel/bench_msm/in.msm
rename to test-user-omp/bench_msm/in.msm
diff --git a/bench-accel/bench_nm/in.nm b/test-user-omp/bench_nm/in.nm
similarity index 100%
rename from bench-accel/bench_nm/in.nm
rename to test-user-omp/bench_nm/in.nm
diff --git a/bench-accel/bench_nm_coul/in.nm_coul b/test-user-omp/bench_nm_coul/in.nm_coul
similarity index 100%
rename from bench-accel/bench_nm_coul/in.nm_coul
rename to test-user-omp/bench_nm_coul/in.nm_coul
diff --git a/bench-accel/bench_nm_long/in.nm_long b/test-user-omp/bench_nm_long/in.nm_long
similarity index 100%
rename from bench-accel/bench_nm_long/in.nm_long
rename to test-user-omp/bench_nm_long/in.nm_long
diff --git a/bench-accel/bench_peri/in.peri b/test-user-omp/bench_peri/in.peri
similarity index 100%
rename from bench-accel/bench_peri/in.peri
rename to test-user-omp/bench_peri/in.peri
diff --git a/bench-accel/bench_peri/log.peri.1 b/test-user-omp/bench_peri/log.peri.1
similarity index 100%
rename from bench-accel/bench_peri/log.peri.1
rename to test-user-omp/bench_peri/log.peri.1
diff --git a/bench-accel/bench_peri/log.peri.4 b/test-user-omp/bench_peri/log.peri.4
similarity index 100%
rename from bench-accel/bench_peri/log.peri.4
rename to test-user-omp/bench_peri/log.peri.4
diff --git a/bench-accel/bench_peri/refoutput/ref.0xOpenMP_1xMPI.gz b/test-user-omp/bench_peri/refoutput/ref.0xOpenMP_1xMPI.gz
similarity index 100%
rename from bench-accel/bench_peri/refoutput/ref.0xOpenMP_1xMPI.gz
rename to test-user-omp/bench_peri/refoutput/ref.0xOpenMP_1xMPI.gz
diff --git a/bench-accel/bench_pppm_disp/data.pppm_disp b/test-user-omp/bench_pppm_disp/data.pppm_disp
similarity index 100%
rename from bench-accel/bench_pppm_disp/data.pppm_disp
rename to test-user-omp/bench_pppm_disp/data.pppm_disp
diff --git a/bench-accel/bench_pppm_disp/in.pppm_disp b/test-user-omp/bench_pppm_disp/in.pppm_disp
similarity index 100%
rename from bench-accel/bench_pppm_disp/in.pppm_disp
rename to test-user-omp/bench_pppm_disp/in.pppm_disp
diff --git a/bench-accel/bench_protein/data.protein b/test-user-omp/bench_protein/data.protein
similarity index 100%
rename from bench-accel/bench_protein/data.protein
rename to test-user-omp/bench_protein/data.protein
diff --git a/bench-accel/bench_protein/in.protein b/test-user-omp/bench_protein/in.protein
similarity index 100%
rename from bench-accel/bench_protein/in.protein
rename to test-user-omp/bench_protein/in.protein
diff --git a/bench-accel/bench_protein/log.protein.1 b/test-user-omp/bench_protein/log.protein.1
similarity index 100%
rename from bench-accel/bench_protein/log.protein.1
rename to test-user-omp/bench_protein/log.protein.1
diff --git a/bench-accel/bench_protein/log.protein.4 b/test-user-omp/bench_protein/log.protein.4
similarity index 100%
rename from bench-accel/bench_protein/log.protein.4
rename to test-user-omp/bench_protein/log.protein.4
diff --git a/bench-accel/bench_protein/refoutput/ref.0xOpenMP_1xMPI.gz b/test-user-omp/bench_protein/refoutput/ref.0xOpenMP_1xMPI.gz
similarity index 100%
rename from bench-accel/bench_protein/refoutput/ref.0xOpenMP_1xMPI.gz
rename to test-user-omp/bench_protein/refoutput/ref.0xOpenMP_1xMPI.gz
diff --git a/bench-accel/bench_rebo/CH.airebo b/test-user-omp/bench_rebo/CH.airebo
similarity index 100%
rename from bench-accel/bench_rebo/CH.airebo
rename to test-user-omp/bench_rebo/CH.airebo
diff --git a/bench-accel/bench_rebo/data.rebo b/test-user-omp/bench_rebo/data.rebo
similarity index 100%
rename from bench-accel/bench_rebo/data.rebo
rename to test-user-omp/bench_rebo/data.rebo
diff --git a/bench-accel/bench_rebo/in.rebo b/test-user-omp/bench_rebo/in.rebo
similarity index 100%
rename from bench-accel/bench_rebo/in.rebo
rename to test-user-omp/bench_rebo/in.rebo
diff --git a/bench-accel/bench_rebo/log.rebo.1 b/test-user-omp/bench_rebo/log.rebo.1
similarity index 100%
rename from bench-accel/bench_rebo/log.rebo.1
rename to test-user-omp/bench_rebo/log.rebo.1
diff --git a/bench-accel/bench_rebo/log.rebo.4 b/test-user-omp/bench_rebo/log.rebo.4
similarity index 100%
rename from bench-accel/bench_rebo/log.rebo.4
rename to test-user-omp/bench_rebo/log.rebo.4
diff --git a/bench-accel/bench_rebo/refoutput/ref.0xOpenMP_1xMPI.gz b/test-user-omp/bench_rebo/refoutput/ref.0xOpenMP_1xMPI.gz
similarity index 100%
rename from bench-accel/bench_rebo/refoutput/ref.0xOpenMP_1xMPI.gz
rename to test-user-omp/bench_rebo/refoutput/ref.0xOpenMP_1xMPI.gz
diff --git a/bench-accel/bench_sdk-coul/data.sdk-coul b/test-user-omp/bench_sdk-coul/data.sdk-coul
similarity index 100%
rename from bench-accel/bench_sdk-coul/data.sdk-coul
rename to test-user-omp/bench_sdk-coul/data.sdk-coul
diff --git a/bench-accel/bench_sdk-coul/in.sdk-coul b/test-user-omp/bench_sdk-coul/in.sdk-coul
similarity index 100%
rename from bench-accel/bench_sdk-coul/in.sdk-coul
rename to test-user-omp/bench_sdk-coul/in.sdk-coul
diff --git a/bench-accel/bench_sdk-coul/log.sdk-coul.1 b/test-user-omp/bench_sdk-coul/log.sdk-coul.1
similarity index 100%
rename from bench-accel/bench_sdk-coul/log.sdk-coul.1
rename to test-user-omp/bench_sdk-coul/log.sdk-coul.1
diff --git a/bench-accel/bench_sdk-coul/log.sdk-coul.4 b/test-user-omp/bench_sdk-coul/log.sdk-coul.4
similarity index 100%
rename from bench-accel/bench_sdk-coul/log.sdk-coul.4
rename to test-user-omp/bench_sdk-coul/log.sdk-coul.4
diff --git a/bench-accel/bench_sdk-coul/refoutput/ref.0xOpenMP_1xMPI.gz b/test-user-omp/bench_sdk-coul/refoutput/ref.0xOpenMP_1xMPI.gz
similarity index 100%
rename from bench-accel/bench_sdk-coul/refoutput/ref.0xOpenMP_1xMPI.gz
rename to test-user-omp/bench_sdk-coul/refoutput/ref.0xOpenMP_1xMPI.gz
diff --git a/bench-accel/bench_spce/data.spce b/test-user-omp/bench_spce/data.spce
similarity index 100%
rename from bench-accel/bench_spce/data.spce
rename to test-user-omp/bench_spce/data.spce
diff --git a/bench-accel/bench_spce/in.spce b/test-user-omp/bench_spce/in.spce
similarity index 100%
rename from bench-accel/bench_spce/in.spce
rename to test-user-omp/bench_spce/in.spce
diff --git a/bench-accel/bench_spce/log.spce.1 b/test-user-omp/bench_spce/log.spce.1
similarity index 100%
rename from bench-accel/bench_spce/log.spce.1
rename to test-user-omp/bench_spce/log.spce.1
diff --git a/bench-accel/bench_spce/log.spce.4 b/test-user-omp/bench_spce/log.spce.4
similarity index 100%
rename from bench-accel/bench_spce/log.spce.4
rename to test-user-omp/bench_spce/log.spce.4
diff --git a/bench-accel/bench_spce/refoutput/ref.0xOpenMP_1xMPI.gz b/test-user-omp/bench_spce/refoutput/ref.0xOpenMP_1xMPI.gz
similarity index 100%
rename from bench-accel/bench_spce/refoutput/ref.0xOpenMP_1xMPI.gz
rename to test-user-omp/bench_spce/refoutput/ref.0xOpenMP_1xMPI.gz
diff --git a/bench-accel/bench_sw/Si.sw b/test-user-omp/bench_sw/Si.sw
similarity index 100%
rename from bench-accel/bench_sw/Si.sw
rename to test-user-omp/bench_sw/Si.sw
diff --git a/bench-accel/bench_sw/in.sw b/test-user-omp/bench_sw/in.sw
similarity index 100%
rename from bench-accel/bench_sw/in.sw
rename to test-user-omp/bench_sw/in.sw
diff --git a/bench-accel/bench_sw/log.sw.1 b/test-user-omp/bench_sw/log.sw.1
similarity index 100%
rename from bench-accel/bench_sw/log.sw.1
rename to test-user-omp/bench_sw/log.sw.1
diff --git a/bench-accel/bench_sw/log.sw.4 b/test-user-omp/bench_sw/log.sw.4
similarity index 100%
rename from bench-accel/bench_sw/log.sw.4
rename to test-user-omp/bench_sw/log.sw.4
diff --git a/bench-accel/bench_sw/refoutput/ref.0xOpenMP_1xMPI.gz b/test-user-omp/bench_sw/refoutput/ref.0xOpenMP_1xMPI.gz
similarity index 100%
rename from bench-accel/bench_sw/refoutput/ref.0xOpenMP_1xMPI.gz
rename to test-user-omp/bench_sw/refoutput/ref.0xOpenMP_1xMPI.gz
diff --git a/bench-accel/bench_table/in.table b/test-user-omp/bench_table/in.table
similarity index 100%
rename from bench-accel/bench_table/in.table
rename to test-user-omp/bench_table/in.table
diff --git a/bench-accel/bench_tersoff-table/Si.tersoff b/test-user-omp/bench_tersoff-table/Si.tersoff
similarity index 100%
rename from bench-accel/bench_tersoff-table/Si.tersoff
rename to test-user-omp/bench_tersoff-table/Si.tersoff
diff --git a/bench-accel/bench_tersoff-table/in.tersoff-table b/test-user-omp/bench_tersoff-table/in.tersoff-table
similarity index 100%
rename from bench-accel/bench_tersoff-table/in.tersoff-table
rename to test-user-omp/bench_tersoff-table/in.tersoff-table
diff --git a/bench-accel/bench_tersoff-table/refoutput/ref.0xOpenMP_1xMPI.gz b/test-user-omp/bench_tersoff-table/refoutput/ref.0xOpenMP_1xMPI.gz
similarity index 100%
rename from bench-accel/bench_tersoff-table/refoutput/ref.0xOpenMP_1xMPI.gz
rename to test-user-omp/bench_tersoff-table/refoutput/ref.0xOpenMP_1xMPI.gz
diff --git a/bench-accel/bench_tersoff/Si.tersoff b/test-user-omp/bench_tersoff/Si.tersoff
similarity index 100%
rename from bench-accel/bench_tersoff/Si.tersoff
rename to test-user-omp/bench_tersoff/Si.tersoff
diff --git a/bench-accel/bench_tersoff/in.tersoff b/test-user-omp/bench_tersoff/in.tersoff
similarity index 100%
rename from bench-accel/bench_tersoff/in.tersoff
rename to test-user-omp/bench_tersoff/in.tersoff
diff --git a/bench-accel/bench_tersoff/in.tersoff-table b/test-user-omp/bench_tersoff/in.tersoff-table
similarity index 100%
rename from bench-accel/bench_tersoff/in.tersoff-table
rename to test-user-omp/bench_tersoff/in.tersoff-table
diff --git a/bench-accel/bench_tersoff/log.tersoff.1 b/test-user-omp/bench_tersoff/log.tersoff.1
similarity index 100%
rename from bench-accel/bench_tersoff/log.tersoff.1
rename to test-user-omp/bench_tersoff/log.tersoff.1
diff --git a/bench-accel/bench_tersoff/log.tersoff.4 b/test-user-omp/bench_tersoff/log.tersoff.4
similarity index 100%
rename from bench-accel/bench_tersoff/log.tersoff.4
rename to test-user-omp/bench_tersoff/log.tersoff.4
diff --git a/bench-accel/bench_tersoff/refoutput/ref.0xOpenMP_1xMPI.gz b/test-user-omp/bench_tersoff/refoutput/ref.0xOpenMP_1xMPI.gz
similarity index 100%
rename from bench-accel/bench_tersoff/refoutput/ref.0xOpenMP_1xMPI.gz
rename to test-user-omp/bench_tersoff/refoutput/ref.0xOpenMP_1xMPI.gz
diff --git a/bench-accel/bench_tip4p-rigid/data.rigid-tip4p b/test-user-omp/bench_tip4p-rigid/data.rigid-tip4p
similarity index 100%
rename from bench-accel/bench_tip4p-rigid/data.rigid-tip4p
rename to test-user-omp/bench_tip4p-rigid/data.rigid-tip4p
diff --git a/bench-accel/bench_tip4p-rigid/in.rigid-tip4p b/test-user-omp/bench_tip4p-rigid/in.rigid-tip4p
similarity index 100%
rename from bench-accel/bench_tip4p-rigid/in.rigid-tip4p
rename to test-user-omp/bench_tip4p-rigid/in.rigid-tip4p
diff --git a/bench-accel/bench_tip4p-rigid/log.rigid-tip4p.1 b/test-user-omp/bench_tip4p-rigid/log.rigid-tip4p.1
similarity index 100%
rename from bench-accel/bench_tip4p-rigid/log.rigid-tip4p.1
rename to test-user-omp/bench_tip4p-rigid/log.rigid-tip4p.1
diff --git a/bench-accel/bench_tip4p-rigid/log.rigid-tip4p.4 b/test-user-omp/bench_tip4p-rigid/log.rigid-tip4p.4
similarity index 100%
rename from bench-accel/bench_tip4p-rigid/log.rigid-tip4p.4
rename to test-user-omp/bench_tip4p-rigid/log.rigid-tip4p.4
diff --git a/bench-accel/bench_tip4p-rigid/refoutput/ref.0xOpenMP_1xMPI.gz b/test-user-omp/bench_tip4p-rigid/refoutput/ref.0xOpenMP_1xMPI.gz
similarity index 100%
rename from bench-accel/bench_tip4p-rigid/refoutput/ref.0xOpenMP_1xMPI.gz
rename to test-user-omp/bench_tip4p-rigid/refoutput/ref.0xOpenMP_1xMPI.gz
diff --git a/bench-accel/bench_tip4p-shake/data.tip4p-shake b/test-user-omp/bench_tip4p-shake/data.tip4p-shake
similarity index 100%
rename from bench-accel/bench_tip4p-shake/data.tip4p-shake
rename to test-user-omp/bench_tip4p-shake/data.tip4p-shake
diff --git a/bench-accel/bench_tip4p-shake/in.tip4p-shake b/test-user-omp/bench_tip4p-shake/in.tip4p-shake
similarity index 100%
rename from bench-accel/bench_tip4p-shake/in.tip4p-shake
rename to test-user-omp/bench_tip4p-shake/in.tip4p-shake
diff --git a/bench-accel/bench_tip4p-shake/log.tip4p-shake b/test-user-omp/bench_tip4p-shake/log.tip4p-shake
similarity index 100%
rename from bench-accel/bench_tip4p-shake/log.tip4p-shake
rename to test-user-omp/bench_tip4p-shake/log.tip4p-shake
diff --git a/bench-accel/bench_tip4p-shake/log.tip4p-shake.1 b/test-user-omp/bench_tip4p-shake/log.tip4p-shake.1
similarity index 100%
rename from bench-accel/bench_tip4p-shake/log.tip4p-shake.1
rename to test-user-omp/bench_tip4p-shake/log.tip4p-shake.1
diff --git a/bench-accel/bench_tip4p-shake/log.tip4p-shake.4 b/test-user-omp/bench_tip4p-shake/log.tip4p-shake.4
similarity index 100%
rename from bench-accel/bench_tip4p-shake/log.tip4p-shake.4
rename to test-user-omp/bench_tip4p-shake/log.tip4p-shake.4
diff --git a/bench-accel/bench_tip4p-shake/refoutput/ref.0xOpenMP_1xMPI.gz b/test-user-omp/bench_tip4p-shake/refoutput/ref.0xOpenMP_1xMPI.gz
similarity index 100%
rename from bench-accel/bench_tip4p-shake/refoutput/ref.0xOpenMP_1xMPI.gz
rename to test-user-omp/bench_tip4p-shake/refoutput/ref.0xOpenMP_1xMPI.gz
diff --git a/bench-accel/bench_zbl/in.zbl b/test-user-omp/bench_zbl/in.zbl
similarity index 100%
rename from bench-accel/bench_zbl/in.zbl
rename to test-user-omp/bench_zbl/in.zbl
diff --git a/bench-accel/clean.sh b/test-user-omp/clean.sh
similarity index 100%
rename from bench-accel/clean.sh
rename to test-user-omp/clean.sh
diff --git a/bench-accel/compare.sh b/test-user-omp/compare.sh
similarity index 100%
rename from bench-accel/compare.sh
rename to test-user-omp/compare.sh
diff --git a/bench-accel/runtests.sh b/test-user-omp/runtests.sh
similarity index 100%
rename from bench-accel/runtests.sh
rename to test-user-omp/runtests.sh
diff --git a/bench-accel/updateref.sh b/test-user-omp/updateref.sh
similarity index 100%
rename from bench-accel/updateref.sh
rename to test-user-omp/updateref.sh