diff --git a/src/tests/eina/Ecore_Data.h b/src/benchmarks/eina/Ecore_Data.h
similarity index 100%
rename from src/tests/eina/Ecore_Data.h
rename to src/benchmarks/eina/Ecore_Data.h
diff --git a/src/tests/eina/Evas_Data.h b/src/benchmarks/eina/Evas_Data.h
similarity index 100%
rename from src/tests/eina/Evas_Data.h
rename to src/benchmarks/eina/Evas_Data.h
diff --git a/src/tests/eina/city.cc b/src/benchmarks/eina/city.cc
similarity index 100%
rename from src/tests/eina/city.cc
rename to src/benchmarks/eina/city.cc
diff --git a/src/tests/eina/city.h b/src/benchmarks/eina/city.h
similarity index 100%
rename from src/tests/eina/city.h
rename to src/benchmarks/eina/city.h
diff --git a/src/tests/eina/ecore_hash.c b/src/benchmarks/eina/ecore_hash.c
similarity index 100%
rename from src/tests/eina/ecore_hash.c
rename to src/benchmarks/eina/ecore_hash.c
diff --git a/src/tests/eina/ecore_list.c b/src/benchmarks/eina/ecore_list.c
similarity index 100%
rename from src/tests/eina/ecore_list.c
rename to src/benchmarks/eina/ecore_list.c
diff --git a/src/tests/eina/ecore_sheap.c b/src/benchmarks/eina/ecore_sheap.c
similarity index 100%
rename from src/tests/eina/ecore_sheap.c
rename to src/benchmarks/eina/ecore_sheap.c
diff --git a/src/tests/eina/ecore_strings.c b/src/benchmarks/eina/ecore_strings.c
similarity index 100%
rename from src/tests/eina/ecore_strings.c
rename to src/benchmarks/eina/ecore_strings.c
diff --git a/src/tests/eina/eina_bench.c b/src/benchmarks/eina/eina_bench.c
similarity index 100%
rename from src/tests/eina/eina_bench.c
rename to src/benchmarks/eina/eina_bench.c
diff --git a/src/tests/eina/eina_bench.h b/src/benchmarks/eina/eina_bench.h
similarity index 100%
rename from src/tests/eina/eina_bench.h
rename to src/benchmarks/eina/eina_bench.h
diff --git a/src/tests/eina/eina_bench_array.c b/src/benchmarks/eina/eina_bench_array.c
similarity index 100%
rename from src/tests/eina/eina_bench_array.c
rename to src/benchmarks/eina/eina_bench_array.c
diff --git a/src/tests/eina/eina_bench_convert.c b/src/benchmarks/eina/eina_bench_convert.c
similarity index 100%
rename from src/tests/eina/eina_bench_convert.c
rename to src/benchmarks/eina/eina_bench_convert.c
diff --git a/src/tests/eina/eina_bench_hash.c b/src/benchmarks/eina/eina_bench_hash.c
similarity index 100%
rename from src/tests/eina/eina_bench_hash.c
rename to src/benchmarks/eina/eina_bench_hash.c
diff --git a/src/tests/eina/eina_bench_mempool.c b/src/benchmarks/eina/eina_bench_mempool.c
similarity index 100%
rename from src/tests/eina/eina_bench_mempool.c
rename to src/benchmarks/eina/eina_bench_mempool.c
diff --git a/src/tests/eina/eina_bench_quad.c b/src/benchmarks/eina/eina_bench_quad.c
similarity index 100%
rename from src/tests/eina/eina_bench_quad.c
rename to src/benchmarks/eina/eina_bench_quad.c
diff --git a/src/tests/eina/eina_bench_rectangle_pool.c b/src/benchmarks/eina/eina_bench_rectangle_pool.c
similarity index 100%
rename from src/tests/eina/eina_bench_rectangle_pool.c
rename to src/benchmarks/eina/eina_bench_rectangle_pool.c
diff --git a/src/tests/eina/eina_bench_sort.c b/src/benchmarks/eina/eina_bench_sort.c
similarity index 100%
rename from src/tests/eina/eina_bench_sort.c
rename to src/benchmarks/eina/eina_bench_sort.c
diff --git a/src/tests/eina/eina_bench_stringshare.c b/src/benchmarks/eina/eina_bench_stringshare.c
similarity index 100%
rename from src/tests/eina/eina_bench_stringshare.c
rename to src/benchmarks/eina/eina_bench_stringshare.c
diff --git a/src/tests/eina/eina_bench_stringshare_e17.c b/src/benchmarks/eina/eina_bench_stringshare_e17.c
similarity index 100%
rename from src/tests/eina/eina_bench_stringshare_e17.c
rename to src/benchmarks/eina/eina_bench_stringshare_e17.c
diff --git a/src/tests/eina/evas_hash.c b/src/benchmarks/eina/evas_hash.c
similarity index 100%
rename from src/tests/eina/evas_hash.c
rename to src/benchmarks/eina/evas_hash.c
diff --git a/src/tests/eina/evas_list.c b/src/benchmarks/eina/evas_list.c
similarity index 100%
rename from src/tests/eina/evas_list.c
rename to src/benchmarks/eina/evas_list.c
diff --git a/src/tests/eina/evas_mempool.c b/src/benchmarks/eina/evas_mempool.c
similarity index 100%
rename from src/tests/eina/evas_mempool.c
rename to src/benchmarks/eina/evas_mempool.c
diff --git a/src/tests/eina/evas_mempool.h b/src/benchmarks/eina/evas_mempool.h
similarity index 100%
rename from src/tests/eina/evas_mempool.h
rename to src/benchmarks/eina/evas_mempool.h
diff --git a/src/tests/eina/evas_object_list.c b/src/benchmarks/eina/evas_object_list.c
similarity index 100%
rename from src/tests/eina/evas_object_list.c
rename to src/benchmarks/eina/evas_object_list.c
diff --git a/src/tests/eina/evas_stringshare.c b/src/benchmarks/eina/evas_stringshare.c
similarity index 100%
rename from src/tests/eina/evas_stringshare.c
rename to src/benchmarks/eina/evas_stringshare.c
diff --git a/src/tests/eina/strlog b/src/benchmarks/eina/strlog
similarity index 100%
rename from src/tests/eina/strlog
rename to src/benchmarks/eina/strlog