diff --git a/test/CUDA/LBM/Makefile b/benchmark/LBM/Makefile
similarity index 100%
rename from test/CUDA/LBM/Makefile
rename to benchmark/LBM/Makefile
diff --git a/test/CUDA/LBM/args.c b/benchmark/LBM/args.c
similarity index 100%
rename from test/CUDA/LBM/args.c
rename to benchmark/LBM/args.c
diff --git a/test/CUDA/LBM/bench.py b/benchmark/LBM/bench.py
similarity index 100%
rename from test/CUDA/LBM/bench.py
rename to benchmark/LBM/bench.py
diff --git a/test/CUDA/LBM/datasets/lbm/long/input/120_120_150_ldc.of b/benchmark/LBM/datasets/lbm/long/input/120_120_150_ldc.of
similarity index 100%
rename from test/CUDA/LBM/datasets/lbm/long/input/120_120_150_ldc.of
rename to benchmark/LBM/datasets/lbm/long/input/120_120_150_ldc.of
diff --git a/test/CUDA/LBM/datasets/lbm/long/input/DESCRIPTION b/benchmark/LBM/datasets/lbm/long/input/DESCRIPTION
similarity index 100%
rename from test/CUDA/LBM/datasets/lbm/long/input/DESCRIPTION
rename to benchmark/LBM/datasets/lbm/long/input/DESCRIPTION
diff --git a/test/CUDA/LBM/datasets/lbm/long/output/reference.dat b/benchmark/LBM/datasets/lbm/long/output/reference.dat
similarity index 100%
rename from test/CUDA/LBM/datasets/lbm/long/output/reference.dat
rename to benchmark/LBM/datasets/lbm/long/output/reference.dat
diff --git a/test/CUDA/LBM/datasets/lbm/short/input/120_120_150_ldc.of b/benchmark/LBM/datasets/lbm/short/input/120_120_150_ldc.of
similarity index 100%
rename from test/CUDA/LBM/datasets/lbm/short/input/120_120_150_ldc.of
rename to benchmark/LBM/datasets/lbm/short/input/120_120_150_ldc.of
diff --git a/test/CUDA/LBM/datasets/lbm/short/input/DESCRIPTION b/benchmark/LBM/datasets/lbm/short/input/DESCRIPTION
similarity index 100%
rename from test/CUDA/LBM/datasets/lbm/short/input/DESCRIPTION
rename to benchmark/LBM/datasets/lbm/short/input/DESCRIPTION
diff --git a/test/CUDA/LBM/datasets/lbm/short/output/reference.dat b/benchmark/LBM/datasets/lbm/short/output/reference.dat
similarity index 100%
rename from test/CUDA/LBM/datasets/lbm/short/output/reference.dat
rename to benchmark/LBM/datasets/lbm/short/output/reference.dat
diff --git a/test/CUDA/LBM/layout_config.h b/benchmark/LBM/layout_config.h
similarity index 100%
rename from test/CUDA/LBM/layout_config.h
rename to benchmark/LBM/layout_config.h
diff --git a/test/CUDA/LBM/lbm.cu b/benchmark/LBM/lbm.cu
similarity index 100%
rename from test/CUDA/LBM/lbm.cu
rename to benchmark/LBM/lbm.cu
diff --git a/test/CUDA/LBM/lbm.h b/benchmark/LBM/lbm.h
similarity index 100%
rename from test/CUDA/LBM/lbm.h
rename to benchmark/LBM/lbm.h
diff --git a/test/CUDA/LBM/lbm_kernel.cu b/benchmark/LBM/lbm_kernel.cu
similarity index 100%
rename from test/CUDA/LBM/lbm_kernel.cu
rename to benchmark/LBM/lbm_kernel.cu
diff --git a/test/CUDA/LBM/lbm_macros.h b/benchmark/LBM/lbm_macros.h
similarity index 100%
rename from test/CUDA/LBM/lbm_macros.h
rename to benchmark/LBM/lbm_macros.h
diff --git a/test/CUDA/LBM/main.cc b/benchmark/LBM/main.cc
similarity index 100%
rename from test/CUDA/LBM/main.cc
rename to benchmark/LBM/main.cc
diff --git a/test/CUDA/LBM/main.h b/benchmark/LBM/main.h
similarity index 100%
rename from test/CUDA/LBM/main.h
rename to benchmark/LBM/main.h
diff --git a/test/CUDA/LBM/parboil.h b/benchmark/LBM/parboil.h
similarity index 100%
rename from test/CUDA/LBM/parboil.h
rename to benchmark/LBM/parboil.h
diff --git a/test/CUDA/LBM/parboil_cuda.c b/benchmark/LBM/parboil_cuda.c
similarity index 100%
rename from test/CUDA/LBM/parboil_cuda.c
rename to benchmark/LBM/parboil_cuda.c
diff --git a/test/CUDA/RSBench/LICENSE b/benchmark/RSBench/LICENSE
similarity index 100%
rename from test/CUDA/RSBench/LICENSE
rename to benchmark/RSBench/LICENSE
diff --git a/test/CUDA/RSBench/Makefile b/benchmark/RSBench/Makefile
similarity index 100%
rename from test/CUDA/RSBench/Makefile
rename to benchmark/RSBench/Makefile
diff --git a/test/CUDA/RSBench/bench.py b/benchmark/RSBench/bench.py
similarity index 100%
rename from test/CUDA/RSBench/bench.py
rename to benchmark/RSBench/bench.py
diff --git a/test/CUDA/RSBench/init.cu b/benchmark/RSBench/init.cu
similarity index 100%
rename from test/CUDA/RSBench/init.cu
rename to benchmark/RSBench/init.cu
diff --git a/test/CUDA/RSBench/io.cu b/benchmark/RSBench/io.cu
similarity index 100%
rename from test/CUDA/RSBench/io.cu
rename to benchmark/RSBench/io.cu
diff --git a/test/CUDA/RSBench/main.cu b/benchmark/RSBench/main.cu
similarity index 100%
rename from test/CUDA/RSBench/main.cu
rename to benchmark/RSBench/main.cu
diff --git a/test/CUDA/RSBench/material.cu b/benchmark/RSBench/material.cu
similarity index 100%
rename from test/CUDA/RSBench/material.cu
rename to benchmark/RSBench/material.cu
diff --git a/test/CUDA/RSBench/rsbench.cuh b/benchmark/RSBench/rsbench.cuh
similarity index 100%
rename from test/CUDA/RSBench/rsbench.cuh
rename to benchmark/RSBench/rsbench.cuh
diff --git a/test/CUDA/RSBench/simulation.cu b/benchmark/RSBench/simulation.cu
similarity index 100%
rename from test/CUDA/RSBench/simulation.cu
rename to benchmark/RSBench/simulation.cu
diff --git a/test/CUDA/RSBench/tmp.cu b/benchmark/RSBench/tmp.cu
similarity index 100%
rename from test/CUDA/RSBench/tmp.cu
rename to benchmark/RSBench/tmp.cu
diff --git a/test/CUDA/RSBench/utils.cu b/benchmark/RSBench/utils.cu
similarity index 100%
rename from test/CUDA/RSBench/utils.cu
rename to benchmark/RSBench/utils.cu
diff --git a/test/CUDA/XSBench/GridInit.cu b/benchmark/XSBench/GridInit.cu
similarity index 100%
rename from test/CUDA/XSBench/GridInit.cu
rename to benchmark/XSBench/GridInit.cu
diff --git a/test/CUDA/XSBench/LICENSE b/benchmark/XSBench/LICENSE
similarity index 100%
rename from test/CUDA/XSBench/LICENSE
rename to benchmark/XSBench/LICENSE
diff --git a/test/CUDA/XSBench/Main.cu b/benchmark/XSBench/Main.cu
similarity index 100%
rename from test/CUDA/XSBench/Main.cu
rename to benchmark/XSBench/Main.cu
diff --git a/test/CUDA/XSBench/Makefile b/benchmark/XSBench/Makefile
similarity index 100%
rename from test/CUDA/XSBench/Makefile
rename to benchmark/XSBench/Makefile
diff --git a/test/CUDA/XSBench/Materials.cu b/benchmark/XSBench/Materials.cu
similarity index 100%
rename from test/CUDA/XSBench/Materials.cu
rename to benchmark/XSBench/Materials.cu
diff --git a/test/CUDA/XSBench/Simulation.cu b/benchmark/XSBench/Simulation.cu
similarity index 100%
rename from test/CUDA/XSBench/Simulation.cu
rename to benchmark/XSBench/Simulation.cu
diff --git a/test/CUDA/XSBench/XSbench_header.cuh b/benchmark/XSBench/XSbench_header.cuh
similarity index 100%
rename from test/CUDA/XSBench/XSbench_header.cuh
rename to benchmark/XSBench/XSbench_header.cuh
diff --git a/test/CUDA/XSBench/XSutils.cu b/benchmark/XSBench/XSutils.cu
similarity index 100%
rename from test/CUDA/XSBench/XSutils.cu
rename to benchmark/XSBench/XSutils.cu
diff --git a/test/CUDA/XSBench/bench.py b/benchmark/XSBench/bench.py
similarity index 100%
rename from test/CUDA/XSBench/bench.py
rename to benchmark/XSBench/bench.py
diff --git a/test/CUDA/XSBench/io.cu b/benchmark/XSBench/io.cu
similarity index 100%
rename from test/CUDA/XSBench/io.cu
rename to benchmark/XSBench/io.cu