diff --git a/include/evalhyd/determinist.hpp b/include/evalhyd/evald.hpp
similarity index 97%
rename from include/evalhyd/determinist.hpp
rename to include/evalhyd/evald.hpp
index 06ad762ac4e786d0a27b36b42e170ca369ece6f2..6ba565dba36b899c4dc6277afebf93381d67244f 100644
--- a/include/evalhyd/determinist.hpp
+++ b/include/evalhyd/evald.hpp
@@ -6,8 +6,8 @@
 #include <xtensor/xexpression.hpp>
 #include <xtensor/xarray.hpp>
 
-#include "utils.hpp"
-#include "determinist/evaluator.hpp"
+#include "../../src/utils.hpp"
+#include "../../src/determinist/evaluator.hpp"
 
 namespace eh = evalhyd;
 
diff --git a/include/evalhyd/probabilist.hpp b/include/evalhyd/evalp.hpp
similarity index 98%
rename from include/evalhyd/probabilist.hpp
rename to include/evalhyd/evalp.hpp
index 8c401695e383a54925857f89eb0b845bb0c9d6fd..f2ff1004990035b17a0654b2ac5d59493cca9e59 100644
--- a/include/evalhyd/probabilist.hpp
+++ b/include/evalhyd/evalp.hpp
@@ -8,8 +8,8 @@
 #include <xtensor/xarray.hpp>
 #include <xtensor/xview.hpp>
 
-#include "utils.hpp"
-#include "probabilist/evaluator.h"
+#include "../../src/utils.hpp"
+#include "../../src/probabilist/evaluator.h"
 
 namespace eh = evalhyd;
 
diff --git a/include/evalhyd/determinist/evaluator.hpp b/src/determinist/evaluator.hpp
similarity index 100%
rename from include/evalhyd/determinist/evaluator.hpp
rename to src/determinist/evaluator.hpp
diff --git a/include/evalhyd/probabilist/evaluator.h b/src/probabilist/evaluator.h
similarity index 100%
rename from include/evalhyd/probabilist/evaluator.h
rename to src/probabilist/evaluator.h
diff --git a/include/evalhyd/probabilist/evaluator_brier.cpp b/src/probabilist/evaluator_brier.cpp
similarity index 100%
rename from include/evalhyd/probabilist/evaluator_brier.cpp
rename to src/probabilist/evaluator_brier.cpp
diff --git a/include/evalhyd/probabilist/evaluator_elements.cpp b/src/probabilist/evaluator_elements.cpp
similarity index 100%
rename from include/evalhyd/probabilist/evaluator_elements.cpp
rename to src/probabilist/evaluator_elements.cpp
diff --git a/include/evalhyd/probabilist/evaluator_quantiles.cpp b/src/probabilist/evaluator_quantiles.cpp
similarity index 100%
rename from include/evalhyd/probabilist/evaluator_quantiles.cpp
rename to src/probabilist/evaluator_quantiles.cpp
diff --git a/include/evalhyd/probabilist/evaluator_utils.cpp b/src/probabilist/evaluator_utils.cpp
similarity index 100%
rename from include/evalhyd/probabilist/evaluator_utils.cpp
rename to src/probabilist/evaluator_utils.cpp
diff --git a/include/evalhyd/utils.hpp b/src/utils.hpp
similarity index 100%
rename from include/evalhyd/utils.hpp
rename to src/utils.hpp
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 9b62835030aae524e69ccbb76143e57334732dfc..d60239f47d28c0cb28cd1b6e85e65adfb87fdaf0 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -28,15 +28,15 @@ include_directories(data)
 add_executable(
         evalhyd_tests
         test_determinist.cpp
-        ../include/evalhyd/utils.hpp
-        ../include/evalhyd/determinist.hpp
-        ../include/evalhyd/determinist/evaluator.hpp
+        ../include/evalhyd/evald.hpp
+        ../src/determinist/evaluator.hpp
+        ../src/utils.hpp
         test_probabilist.cpp
-        ../include/evalhyd/probabilist.hpp
-        ../include/evalhyd/probabilist/evaluator.h
-        ../include/evalhyd/probabilist/evaluator_brier.cpp
-        ../include/evalhyd/probabilist/evaluator_quantiles.cpp
-        ../include/evalhyd/probabilist/evaluator_elements.cpp
-        ../include/evalhyd/probabilist/evaluator_utils.cpp
+        ../include/evalhyd/evalp.hpp
+        ../src/probabilist/evaluator.h
+        ../src/probabilist/evaluator_brier.cpp
+        ../src/probabilist/evaluator_quantiles.cpp
+        ../src/probabilist/evaluator_elements.cpp
+        ../src/probabilist/evaluator_utils.cpp
 )
 target_link_libraries(evalhyd_tests gtest gtest_main)
diff --git a/tests/test_determinist.cpp b/tests/test_determinist.cpp
index 076d2072faa7f48f7056e779e4ed60d8209ab1ed..1ad4ff60a8b8b8ebdf65b695bdaa9842c18ab764 100644
--- a/tests/test_determinist.cpp
+++ b/tests/test_determinist.cpp
@@ -1,14 +1,12 @@
-#include <istream>
 #include <fstream>
 #include <vector>
 #include <gtest/gtest.h>
 #include <xtensor/xtensor.hpp>
-#include <xtensor/xarray.hpp>
 #include <xtensor/xview.hpp>
 #include <xtensor/xmanipulation.hpp>
 #include <xtensor/xcsv.hpp>
 
-#include "evalhyd/determinist.hpp"
+#include "evalhyd/evald.hpp"
 
 TEST(DeterministTests, TestNSE) {
     // read in data
diff --git a/tests/test_probabilist.cpp b/tests/test_probabilist.cpp
index 33a4009a767a149b6195995e32d3d08f3a1558bd..880993fdd5ebbc77efab7b734870fb0f6d80cfa3 100644
--- a/tests/test_probabilist.cpp
+++ b/tests/test_probabilist.cpp
@@ -1,13 +1,11 @@
-#include <istream>
 #include <fstream>
 #include <vector>
 #include <gtest/gtest.h>
 #include <xtensor/xtensor.hpp>
-#include <xtensor/xarray.hpp>
 #include <xtensor/xmanipulation.hpp>
 #include <xtensor/xcsv.hpp>
 
-#include "evalhyd/probabilist.hpp"
+#include "evalhyd/evalp.hpp"
 
 TEST(ProbabilistTests, TestBrier) {
     // read in data