diff --git a/.typos.toml b/.typos.toml
index fdab8ed1cc..11d8700b70 100644
--- a/.typos.toml
+++ b/.typos.toml
@@ -3,4 +3,4 @@ eles = "eles"
 packageid = "packageid"
 
 [files]
-extend-exclude = ["scripts/t8indent.sh", "thirdparty/", "t8code_logo.png", "cmake/FindOpenCASCADE.cmake", "src/t8_with_macro_error.h", "doc/Doxyfile.in"]
+extend-exclude = ["scripts/t8indent.sh", "thirdparty/", "t8code_logo.png", "cmake/FindOpenCASCADE.cmake", "src/t8_misc/t8_with_macro_error.h", "doc/Doxyfile.in"]
diff --git a/benchmarks/t8_time_fractal.cxx b/benchmarks/t8_time_fractal.cxx
index 8288f2f211..b3d4b7caf2 100644
--- a/benchmarks/t8_time_fractal.cxx
+++ b/benchmarks/t8_time_fractal.cxx
@@ -25,7 +25,7 @@
 #include <t8_forest/t8_forest_partition.h>
 #include <t8_forest/t8_forest_types.h>
 #include <t8_forest/t8_forest_adapt.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_cmesh/t8_cmesh.h>
 #include <t8_cmesh/t8_cmesh_examples.h>
 #include <t8_schemes/t8_default/t8_default.hxx>
diff --git a/benchmarks/t8_time_set_join_by_vertices.cxx b/benchmarks/t8_time_set_join_by_vertices.cxx
index d9e7518b3a..b36714b631 100644
--- a/benchmarks/t8_time_set_join_by_vertices.cxx
+++ b/benchmarks/t8_time_set_join_by_vertices.cxx
@@ -26,7 +26,7 @@
 
 #include <t8.h>
 #include <t8_cmesh/t8_cmesh.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_cmesh/t8_cmesh_io/t8_cmesh_readmshfile.h>
 #include <t8_cmesh/t8_cmesh_examples.h>
 #include <t8_cmesh/t8_cmesh_helpers.h>
diff --git a/example/IO/cmesh/vtk/t8_cmesh_read_from_vtk.cxx b/example/IO/cmesh/vtk/t8_cmesh_read_from_vtk.cxx
index f5b62c84b0..0da13bbcad 100644
--- a/example/IO/cmesh/vtk/t8_cmesh_read_from_vtk.cxx
+++ b/example/IO/cmesh/vtk/t8_cmesh_read_from_vtk.cxx
@@ -21,7 +21,7 @@ along with t8code; if not, write to the Free Software Foundation, Inc.,
 #include <t8_cmesh/t8_cmesh.h>
 #include <sc_options.h>
 #include <t8.h>
-#include <t8_vtk.h>
+#include <t8_vtk/t8_vtk.h>
 
 #include <t8_forest/t8_forest.h>
 #include <t8_schemes/t8_default/t8_default.hxx>
diff --git a/example/cmesh/t8_cmesh_set_join_by_vertices.cxx b/example/cmesh/t8_cmesh_set_join_by_vertices.cxx
index e4529e8928..9ee2e87fba 100644
--- a/example/cmesh/t8_cmesh_set_join_by_vertices.cxx
+++ b/example/cmesh/t8_cmesh_set_join_by_vertices.cxx
@@ -24,7 +24,7 @@
 
 #include <t8.h>
 #include <t8_cmesh/t8_cmesh.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_cmesh/t8_cmesh_io/t8_cmesh_readmshfile.h>
 #include <t8_cmesh/t8_cmesh_examples.h>
 #include <t8_cmesh/t8_cmesh_helpers.h>
diff --git a/example/forest/t8_test_face_iterate.cxx b/example/forest/t8_test_face_iterate.cxx
index 6b987f871c..fe51e449c3 100644
--- a/example/forest/t8_test_face_iterate.cxx
+++ b/example/forest/t8_test_face_iterate.cxx
@@ -23,7 +23,7 @@
 #include <t8_forest/t8_forest_iterate.h>
 #include <sc_options.h>
 #include <sc_refcount.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_schemes/t8_scheme.hxx>
 #include <t8_forest/t8_forest_general.h>
 #include <t8_forest/t8_forest_io.h>
diff --git a/example/forest/t8_test_ghost.cxx b/example/forest/t8_test_ghost.cxx
index 4121ba77fb..ec58ef3392 100644
--- a/example/forest/t8_test_ghost.cxx
+++ b/example/forest/t8_test_ghost.cxx
@@ -22,7 +22,7 @@
 
 #include <sc_options.h>
 #include <sc_refcount.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_schemes/t8_default/t8_default.hxx>
 #include <t8_forest/t8_forest_general.h>
 #include <t8_forest/t8_forest_io.h>
diff --git a/example/version/t8_version.cxx b/example/version/t8_version.cxx
index ff85cbf15f..89774d0c66 100644
--- a/example/version/t8_version.cxx
+++ b/example/version/t8_version.cxx
@@ -22,7 +22,7 @@
 
 #include <sc_options.h>
 #include <t8.h>
-#include <t8_version.h>
+#include <t8_misc/t8_version.h>
 
 int
 main (int argc, char **argv)
diff --git a/mesh_handle/element.hxx b/mesh_handle/element.hxx
index 51615ec637..b71c2236f2 100644
--- a/mesh_handle/element.hxx
+++ b/mesh_handle/element.hxx
@@ -27,8 +27,8 @@ along with t8code; if not, write to the Free Software Foundation, Inc.,
 #pragma once
 
 #include <t8.h>
-#include <t8_element.h>
-#include <t8_eclass.h>
+#include <t8_element/t8_element.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_forest/t8_forest_general.h>
 #include <t8_forest/t8_forest_geometrical.h>
 #include <t8_schemes/t8_scheme.hxx>
diff --git a/scripts/check_macros.sh b/scripts/check_macros.sh
index 7e5e8645c1..cd6cc8e5cf 100755
--- a/scripts/check_macros.sh
+++ b/scripts/check_macros.sh
@@ -29,9 +29,9 @@ file_path=$1
 
 echo "$file_path"
 
-if [[ "$file_path" -ef "src/t8_with_macro_error.h" ]]
+if [[ "$file_path" -ef "src/t8_misc/t8_with_macro_error.h" ]]
 then
-  echo The file \"src/t8_with_macro_error.h\" will be ignored by the check_macros.sh script.
+  echo The file \"src/t8_misc/t8_with_macro_error.h\" will be ignored by the check_macros.sh script.
   exit 0
 fi
 
diff --git a/scripts/t8indent_ignore.sh b/scripts/t8indent_ignore.sh
index 2aebf60489..6a0c982c23 100755
--- a/scripts/t8indent_ignore.sh
+++ b/scripts/t8indent_ignore.sh
@@ -32,4 +32,4 @@
 # the usage of macros using the character '@'.
 # This causes clang to not recognize the file as a C++
 # file and will throw an error when trying to indent it.
-src/t8_with_macro_error.h
+src/t8_misc/t8_with_macro_error.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0d9d630b6d..f70145269a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -136,36 +136,33 @@ endif()
 
 target_sources( T8 PRIVATE
     t8.c
-    t8_eclass.c
-    t8_element_shape.c
-    t8_element.cxx
-    t8_refcount.c 
-    t8_version.c 
-    t8_vtk.c 
-    t8_cmesh/t8_cmesh.cxx 
-    t8_cmesh/t8_cmesh_cad.cxx 
-    t8_cmesh/t8_cmesh_geometry.cxx 
+    t8_cmesh/t8_cmesh.cxx
+    t8_cmesh/t8_cmesh_cad.cxx
+    t8_cmesh/t8_cmesh_geometry.cxx
     t8_cmesh/t8_cmesh_examples.cxx
     t8_cmesh/t8_cmesh_helpers.cxx
-    t8_cmesh/t8_cmesh_internal/t8_cmesh_commit.cxx 
-    t8_cmesh/t8_cmesh_internal/t8_cmesh_copy.c 
-    t8_cmesh/t8_cmesh_internal/t8_cmesh_offset.c 
-    t8_cmesh/t8_cmesh_internal/t8_cmesh_partition.cxx 
-    t8_cmesh/t8_cmesh_internal/t8_cmesh_stash.c 
-    t8_cmesh/t8_cmesh_internal/t8_cmesh_trees.cxx 
-    t8_cmesh/t8_cmesh_vertex_connectivity/t8_cmesh_vertex_conn_tree_to_vertex.cxx 
-    t8_cmesh/t8_cmesh_vertex_connectivity/t8_cmesh_vertex_conn_vertex_to_tree.cxx 
-    t8_cmesh/t8_cmesh_vertex_connectivity/t8_cmesh_vertex_connectivity.cxx 
+    t8_cmesh/t8_cmesh_internal/t8_cmesh_commit.cxx
+    t8_cmesh/t8_cmesh_internal/t8_cmesh_copy.c
+    t8_cmesh/t8_cmesh_internal/t8_cmesh_offset.c
+    t8_cmesh/t8_cmesh_internal/t8_cmesh_partition.cxx
+    t8_cmesh/t8_cmesh_internal/t8_cmesh_stash.c
+    t8_cmesh/t8_cmesh_internal/t8_cmesh_trees.cxx
+    t8_cmesh/t8_cmesh_vertex_connectivity/t8_cmesh_vertex_conn_tree_to_vertex.cxx
+    t8_cmesh/t8_cmesh_vertex_connectivity/t8_cmesh_vertex_conn_vertex_to_tree.cxx
+    t8_cmesh/t8_cmesh_vertex_connectivity/t8_cmesh_vertex_connectivity.cxx
     t8_cmesh/t8_cmesh_io/t8_cmesh_readmshfile.cxx
-    t8_cmesh/t8_cmesh_io/t8_cmesh_save.cxx 
-    t8_cmesh/t8_cmesh_io/t8_cmesh_triangle.cxx 
-    t8_data/t8_shmem.c 
-    t8_data/t8_containers.cxx 
-    t8_forest/t8_forest_adapt.cxx 
-    t8_forest/t8_forest_partition.cxx 
+    t8_cmesh/t8_cmesh_io/t8_cmesh_save.cxx
+    t8_cmesh/t8_cmesh_io/t8_cmesh_triangle.cxx
+    t8_data/t8_shmem.c
+    t8_data/t8_containers.cxx
+    t8_eclass/t8_eclass.c
+    t8_element/t8_element_shape.c
+    t8_element/t8_element.cxx
+    t8_forest/t8_forest_adapt.cxx
+    t8_forest/t8_forest_partition.cxx
     t8_forest/t8_forest_partition_for_coarsening.cxx
-    t8_forest/t8_forest_pfc_helper.cxx 
-    t8_forest/t8_forest.cxx 
+    t8_forest/t8_forest_pfc_helper.cxx
+    t8_forest/t8_forest.cxx
     t8_forest/t8_forest_private.cxx
     t8_forest/t8_forest_ghost.cxx
     t8_forest/t8_forest_iterate.cxx
@@ -182,6 +179,8 @@ target_sources( T8 PRIVATE
     t8_geometry/t8_geometry_implementations/t8_geometry_lagrange.cxx
     t8_geometry/t8_geometry_implementations/t8_geometry_zero.cxx
     t8_geometry/t8_geometry_implementations/t8_geometry_examples.cxx
+    t8_helper_functions/t8_refcount.c
+    t8_misc/t8_version.c
     t8_schemes/t8_scheme.cxx
     t8_schemes/t8_default/t8_default.cxx
     t8_schemes/t8_default/t8_default_hex/t8_default_hex.cxx
@@ -204,6 +203,7 @@ target_sources( T8 PRIVATE
     t8_schemes/t8_default/t8_default_vertex/t8_default_vertex.cxx
     t8_types/t8_vec.cxx
     t8_schemes/t8_standalone/t8_standalone.cxx
+    t8_vtk/t8_vtk.c
     t8_vtk/t8_vtk_writer.cxx
     t8_vtk/t8_vtk_write_ASCII.cxx
     t8_vtk/t8_vtk_writer_helper.cxx
@@ -229,14 +229,6 @@ target_compile_definitions( T8 PUBLIC T8_LIBS="${T8_LIBS}" )
 
 install( FILES
     t8.h
-    t8_eclass.h
-    t8_element.h
-    t8_element_shape.h
-    t8_mat.h
-    t8_refcount.h
-    t8_version.h
-    t8_vtk.h 
-    t8_with_macro_error.h
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} 
 )
 
@@ -249,6 +241,7 @@ install( FILES
 install( DIRECTORY t8_helper_functions 
   DESTINATION PRIVATE_HEADER 
   FILES_MATCHING 
+    PATTERN "*.h" 
     PATTERN "*.hxx" 
 )
 install( DIRECTORY t8_cmesh
@@ -266,6 +259,18 @@ install( DIRECTORY t8_data
     PATTERN "*.h"
     PATTERN "*.hxx"
 )
+install( DIRECTORY t8_eclass 
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} 
+  FILES_MATCHING 
+    PATTERN "*.h"
+    PATTERN "*.hxx"
+)
+install( DIRECTORY t8_element 
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} 
+  FILES_MATCHING 
+    PATTERN "*.h"
+    PATTERN "*.hxx"
+)
 install( DIRECTORY t8_forest
   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} 
   FILES_MATCHING 
@@ -283,12 +288,24 @@ install( DIRECTORY t8_geometry
     PATTERN "t8_geometry/t8_geometry_implementations/t8_geometry_cad.h" EXCLUDE
     PATTERN "t8_geometry/t8_geometry_implementations/t8_geometry_cad.hxx" EXCLUDE
 )
+install( DIRECTORY t8_misc
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} 
+  FILES_MATCHING 
+    PATTERN "*.h"
+    PATTERN "*.hxx"
+)
 install( DIRECTORY t8_schemes 
   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} 
   FILES_MATCHING 
     PATTERN "*.h"
     PATTERN "*.hxx" 
 )
+install( DIRECTORY t8_types 
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} 
+  FILES_MATCHING 
+    PATTERN "*.hxx" 
+    PATTERN "*.h"
+)
 install( DIRECTORY t8_vtk 
   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
   FILES_MATCHING 
@@ -300,12 +317,6 @@ install( DIRECTORY t8_vtk
     PATTERN "t8_vtk/t8_vtk_write_ASCII.hxx"   EXCLUDE
     PATTERN "t8_vtk/t8_vtk_writer_helper.hxx" EXCLUDE
 )
-install( DIRECTORY t8_types 
-  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} 
-  FILES_MATCHING 
-    PATTERN "*.hxx" 
-    PATTERN "*.h"
-)
 
 install( TARGETS T8
   EXPORT ${PROJECT_NAME}-targets
diff --git a/src/t8.c b/src/t8.c
index f7c091ace7..b409ee974a 100644
--- a/src/t8.c
+++ b/src/t8.c
@@ -25,7 +25,7 @@
  */
 
 #include <t8.h>
-#include <t8_version.h>
+#include <t8_misc/t8_version.h>
 
 static int t8_package_id = -1;
 static void (*external_log_fcn) (int category, int priority, const char *msg) = NULL;
diff --git a/src/t8.h b/src/t8.h
index 80adbff415..6528ce6e13 100644
--- a/src/t8.h
+++ b/src/t8.h
@@ -29,7 +29,7 @@
 #ifndef T8_H
 #define T8_H
 
-#include <t8_with_macro_error.h>
+#include <t8_misc/t8_with_macro_error.h>
 #ifdef __cplusplus
 #include <cinttypes>
 #else
diff --git a/src/t8_cmesh/t8_cmesh.cxx b/src/t8_cmesh/t8_cmesh.cxx
index f81db4907a..2d55efd120 100644
--- a/src/t8_cmesh/t8_cmesh.cxx
+++ b/src/t8_cmesh/t8_cmesh.cxx
@@ -28,10 +28,10 @@
 #include <t8_geometry/t8_geometry_implementations/t8_geometry_linear.h>
 #include <t8_geometry/t8_geometry_implementations/t8_geometry_linear_axis_aligned.h>
 #include <t8_schemes/t8_scheme.hxx>
-#include <t8_refcount.h>
+#include <t8_helper_functions/t8_refcount.h>
 #include <t8_data/t8_shmem.h>
 #include <t8_types/t8_vec.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_cmesh/t8_cmesh_internal/t8_cmesh_types.h>
 #include <t8_helper_functions/t8_vector_algorithms.hxx>
 #include <t8_cmesh/t8_cmesh.hxx>
@@ -41,7 +41,7 @@
 #endif
 #include <t8_cmesh/t8_cmesh_internal/t8_cmesh_trees.h>
 
-#include <t8_element.h>
+#include <t8_element/t8_element.h>
 
 /** \file t8_cmesh.cxx
  *  This file collects all general cmesh routines that need c++ compilation.
diff --git a/src/t8_cmesh/t8_cmesh.h b/src/t8_cmesh/t8_cmesh.h
index 6b5725010e..d012465056 100644
--- a/src/t8_cmesh/t8_cmesh.h
+++ b/src/t8_cmesh/t8_cmesh.h
@@ -30,7 +30,7 @@
 #include <t8.h>
 #include <t8_data/t8_shmem.h>
 #include <t8_cmesh/t8_cmesh_io/t8_cmesh_save.h>
-#include <t8_element.h>
+#include <t8_element/t8_element.h>
 #include <t8_schemes/t8_scheme.h>
 
 /** Forward pointer reference to hidden cmesh implementation.
@@ -47,7 +47,7 @@ typedef struct t8_cmesh *t8_cmesh_t;
  *       Actually, we need eclass in the type definition in cmesh.c.
  *       So we might as well use tree-related virtual functions there too.
  */
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 
 /* TODO: make it legal to call cmesh_set functions multiple times,
  *       just overwrite the previous setting if no inconsistency can occur.
diff --git a/src/t8_cmesh/t8_cmesh_examples.cxx b/src/t8_cmesh/t8_cmesh_examples.cxx
index 738ab04d0e..276fb6ff3a 100644
--- a/src/t8_cmesh/t8_cmesh_examples.cxx
+++ b/src/t8_cmesh/t8_cmesh_examples.cxx
@@ -31,8 +31,8 @@
 #include <t8_geometry/t8_geometry_implementations/t8_geometry_examples.hxx>
 #include <t8_geometry/t8_geometry_implementations/t8_geometry_zero.hxx>
 #include <t8_types/t8_vec.h>
-#include <t8_mat.h>
-#include <t8_eclass.h>
+#include <t8_helper_functions/t8_mat.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_forest/t8_forest_general.h>
 #include <t8_forest/t8_forest_geometrical.h>
 #include <t8_schemes/t8_default/t8_default_c_interface.h> /* default refinement scheme. */
diff --git a/src/t8_cmesh/t8_cmesh_helpers.cxx b/src/t8_cmesh/t8_cmesh_helpers.cxx
index 17e7c2411c..495b740a65 100644
--- a/src/t8_cmesh/t8_cmesh_helpers.cxx
+++ b/src/t8_cmesh/t8_cmesh_helpers.cxx
@@ -27,7 +27,7 @@
 
 #include <t8.h>
 #include <t8_cmesh/t8_cmesh.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_cmesh/t8_cmesh_internal/t8_cmesh_types.h>
 #include <t8_cmesh/t8_cmesh_internal/t8_cmesh_stash.h>
 #include <t8_cmesh/t8_cmesh_helpers.h>
diff --git a/src/t8_cmesh/t8_cmesh_helpers.h b/src/t8_cmesh/t8_cmesh_helpers.h
index 4e129c7f97..37dbc2783b 100644
--- a/src/t8_cmesh/t8_cmesh_helpers.h
+++ b/src/t8_cmesh/t8_cmesh_helpers.h
@@ -30,7 +30,7 @@
 
 #include <t8.h>
 #include <t8_cmesh/t8_cmesh.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 
 T8_EXTERN_C_BEGIN ();
 
diff --git a/src/t8_cmesh/t8_cmesh_internal/t8_cmesh_partition.cxx b/src/t8_cmesh/t8_cmesh_internal/t8_cmesh_partition.cxx
index 318f9dcffa..a59fb436cc 100644
--- a/src/t8_cmesh/t8_cmesh_internal/t8_cmesh_partition.cxx
+++ b/src/t8_cmesh/t8_cmesh_internal/t8_cmesh_partition.cxx
@@ -29,7 +29,7 @@
 
 #include <t8_data/t8_shmem.h>
 #include <t8_cmesh/t8_cmesh.h>
-#include <t8_element.h>
+#include <t8_element/t8_element.h>
 #include <t8_cmesh/t8_cmesh_internal/t8_cmesh_types.h>
 #include <t8_cmesh/t8_cmesh_internal/t8_cmesh_trees.h>
 #include <t8_cmesh/t8_cmesh_internal/t8_cmesh_partition.h>
diff --git a/src/t8_cmesh/t8_cmesh_internal/t8_cmesh_stash.c b/src/t8_cmesh/t8_cmesh_internal/t8_cmesh_stash.c
index 9f1275a18d..9cd9a8a535 100644
--- a/src/t8_cmesh/t8_cmesh_internal/t8_cmesh_stash.c
+++ b/src/t8_cmesh/t8_cmesh_internal/t8_cmesh_stash.c
@@ -25,7 +25,7 @@
  */
 
 #include <t8.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_cmesh/t8_cmesh_internal/t8_cmesh_stash.h>
 
 void
diff --git a/src/t8_cmesh/t8_cmesh_internal/t8_cmesh_stash.h b/src/t8_cmesh/t8_cmesh_internal/t8_cmesh_stash.h
index 5838b246b7..f3883244c6 100644
--- a/src/t8_cmesh/t8_cmesh_internal/t8_cmesh_stash.h
+++ b/src/t8_cmesh/t8_cmesh_internal/t8_cmesh_stash.h
@@ -28,7 +28,7 @@
 #define T8_CMESH_STASH_H
 
 #include <t8.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 
 /**
  * Opaque pointer to a stash data structure.
diff --git a/src/t8_cmesh/t8_cmesh_internal/t8_cmesh_types.h b/src/t8_cmesh/t8_cmesh_internal/t8_cmesh_types.h
index 701cb9c5a3..b7e47b1c41 100644
--- a/src/t8_cmesh/t8_cmesh_internal/t8_cmesh_types.h
+++ b/src/t8_cmesh/t8_cmesh_internal/t8_cmesh_types.h
@@ -28,12 +28,12 @@
 #define T8_CMESH_TYPES_H
 
 #include <t8.h>
-#include <t8_refcount.h>
+#include <t8_helper_functions/t8_refcount.h>
 #include <t8_data/t8_shmem.h>
 #include <t8_geometry/t8_geometry.h>
 #include <t8_cmesh/t8_cmesh_vertex_connectivity/t8_cmesh_vertex_connectivity.h>
 #include <t8_cmesh/t8_cmesh_internal/t8_cmesh_stash.h>
-#include "t8_element.h"
+#include <t8_element/t8_element.h>
 
 /** Opaque pointer to a t8_part_tree */
 typedef struct t8_part_tree *t8_part_tree_t;
diff --git a/src/t8_cmesh/t8_cmesh_io/t8_cmesh_readmshfile.cxx b/src/t8_cmesh/t8_cmesh_io/t8_cmesh_readmshfile.cxx
index aaa39c5e92..4335210028 100644
--- a/src/t8_cmesh/t8_cmesh_io/t8_cmesh_readmshfile.cxx
+++ b/src/t8_cmesh/t8_cmesh_io/t8_cmesh_readmshfile.cxx
@@ -24,7 +24,7 @@
  * Implements functions declared in \ref t8_cmesh_readmshfile.h.
  */
 
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_cmesh/t8_cmesh_io/t8_cmesh_readmshfile.h>
 #include <t8_cmesh/t8_cmesh.hxx>
 #include <t8_geometry/t8_geometry_implementations/t8_geometry_linear.hxx>
@@ -40,7 +40,7 @@
 #include <array>
 
 #ifdef _WIN32
-#include "t8_windows.h"
+#include <t8_misc/t8_windows.h>
 #endif
 
 /** The supported number of gmsh tree classes.
diff --git a/src/t8_cmesh/t8_cmesh_io/t8_cmesh_readmshfile.h b/src/t8_cmesh/t8_cmesh_io/t8_cmesh_readmshfile.h
index 4153728ef9..639bb6a3ee 100644
--- a/src/t8_cmesh/t8_cmesh_io/t8_cmesh_readmshfile.h
+++ b/src/t8_cmesh/t8_cmesh_io/t8_cmesh_readmshfile.h
@@ -29,7 +29,7 @@
 #define T8_CMESH_READMSHFILE_H
 
 #include <t8.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_cmesh/t8_cmesh.h>
 
 /** The supported .msh file versions.
diff --git a/src/t8_cmesh/t8_cmesh_io/t8_cmesh_save.cxx b/src/t8_cmesh/t8_cmesh_io/t8_cmesh_save.cxx
index 20f481a6cc..a5e22fcb12 100644
--- a/src/t8_cmesh/t8_cmesh_io/t8_cmesh_save.cxx
+++ b/src/t8_cmesh/t8_cmesh_io/t8_cmesh_save.cxx
@@ -27,8 +27,8 @@
  * TODO: document this file
  */
 
-#include <t8_version.h>
-#include <t8_eclass.h>
+#include <t8_misc/t8_version.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_cmesh/t8_cmesh_internal/t8_cmesh_types.h>
 #include <t8_cmesh/t8_cmesh_internal/t8_cmesh_trees.h>
 #include <t8_cmesh/t8_cmesh_io/t8_cmesh_save.h>
diff --git a/src/t8_cmesh/t8_cmesh_io/t8_cmesh_tetgen.h b/src/t8_cmesh/t8_cmesh_io/t8_cmesh_tetgen.h
index 93082ae012..a8310c0b1c 100644
--- a/src/t8_cmesh/t8_cmesh_io/t8_cmesh_tetgen.h
+++ b/src/t8_cmesh/t8_cmesh_io/t8_cmesh_tetgen.h
@@ -29,7 +29,7 @@
 #define T8_CMESH_TETGEN_H
 
 #include <t8.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_cmesh/t8_cmesh.h>
 #include <sc_flops.h>
 #include <sc_statistics.h>
diff --git a/src/t8_cmesh/t8_cmesh_io/t8_cmesh_triangle.cxx b/src/t8_cmesh/t8_cmesh_io/t8_cmesh_triangle.cxx
index ae82acf419..916f6d4af3 100644
--- a/src/t8_cmesh/t8_cmesh_io/t8_cmesh_triangle.cxx
+++ b/src/t8_cmesh/t8_cmesh_io/t8_cmesh_triangle.cxx
@@ -28,7 +28,7 @@
 #include <t8_cmesh/t8_cmesh_internal/t8_cmesh_stash.h>
 
 #ifdef _WIN32
-#include "t8_windows.h"
+#include <t8_misc/t8_windows.h>
 #endif
 
 /* TODO: if partitioned then only add the needed face-connections to join faces
diff --git a/src/t8_cmesh/t8_cmesh_io/t8_cmesh_triangle.h b/src/t8_cmesh/t8_cmesh_io/t8_cmesh_triangle.h
index 277218214a..962cda6b0c 100644
--- a/src/t8_cmesh/t8_cmesh_io/t8_cmesh_triangle.h
+++ b/src/t8_cmesh/t8_cmesh_io/t8_cmesh_triangle.h
@@ -29,7 +29,7 @@
 #define T8_CMESH_TRIANGLE_H
 
 #include <t8.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_cmesh/t8_cmesh.h>
 
 /* put typedefs here */
diff --git a/src/t8_data/t8_containers.h b/src/t8_data/t8_containers.h
index efa2ff6d6b..3663914440 100644
--- a/src/t8_data/t8_containers.h
+++ b/src/t8_data/t8_containers.h
@@ -29,7 +29,7 @@
 #define T8_CONTAINERS_H
 
 #include <t8.h>
-#include <t8_element.h>
+#include <t8_element/t8_element.h>
 #include <t8_schemes/t8_scheme.h>
 
 /** The t8_element_array_t is an array to store t8_element_t * of a given
diff --git a/src/t8_data/t8_element_array_iterator.hxx b/src/t8_data/t8_element_array_iterator.hxx
index 069bfaa47e..e792d24b8d 100644
--- a/src/t8_data/t8_element_array_iterator.hxx
+++ b/src/t8_data/t8_element_array_iterator.hxx
@@ -29,7 +29,7 @@
 #define T8_ELEMENT_ARRAY_ITERATOR_HXX
 
 #include <t8.h>
-#include <t8_element.h>
+#include <t8_element/t8_element.h>
 #include <t8_data/t8_containers.h>
 
 #include <cstddef>
diff --git a/src/t8_eclass.c b/src/t8_eclass/t8_eclass.c
similarity index 99%
rename from src/t8_eclass.c
rename to src/t8_eclass/t8_eclass.c
index 160bbd8aa4..813d2c0494 100644
--- a/src/t8_eclass.c
+++ b/src/t8_eclass/t8_eclass.c
@@ -25,7 +25,7 @@
  */
 
 #define KEEP_ECLASS_VALUE_DEFINITIONS
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #undef KEEP_ECLASS_VALUE_DEFINITIONS
 
 const int t8_eclass_to_dimension[T8_ECLASS_COUNT] = T8_ECLASS_TO_DIMENSION_VALUES;
diff --git a/src/t8_eclass.h b/src/t8_eclass/t8_eclass.h
similarity index 100%
rename from src/t8_eclass.h
rename to src/t8_eclass/t8_eclass.h
diff --git a/src/t8_element.cxx b/src/t8_element/t8_element.cxx
similarity index 98%
rename from src/t8_element.cxx
rename to src/t8_element/t8_element.cxx
index 54e63589dc..58657dbaea 100644
--- a/src/t8_element.cxx
+++ b/src/t8_element/t8_element.cxx
@@ -20,7 +20,7 @@
   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-#include <t8_element.h>
+#include <t8_element/t8_element.h>
 
 /* We want to export the whole implementation to be callable from "C" */
 T8_EXTERN_C_BEGIN ();
diff --git a/src/t8_element.h b/src/t8_element/t8_element.h
similarity index 96%
rename from src/t8_element.h
rename to src/t8_element/t8_element.h
index 59e0870b5e..0995c74dec 100644
--- a/src/t8_element.h
+++ b/src/t8_element/t8_element.h
@@ -29,8 +29,8 @@
 #define T8_ELEMENT_H
 
 #include <t8.h>
-#include <t8_eclass.h>
-#include <t8_element_shape.h>
+#include <t8_eclass/t8_eclass.h>
+#include <t8_element/t8_element_shape.h>
 
 /** We want to export the whole implementation to be callable from "C". */
 T8_EXTERN_C_BEGIN ();
diff --git a/src/t8_element_shape.c b/src/t8_element/t8_element_shape.c
similarity index 98%
rename from src/t8_element_shape.c
rename to src/t8_element/t8_element_shape.c
index a9cf4f0a68..acc64a43aa 100644
--- a/src/t8_element_shape.c
+++ b/src/t8_element/t8_element_shape.c
@@ -20,7 +20,7 @@
   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-#include <t8_element_shape.h>
+#include <t8_element/t8_element_shape.h>
 
 const int t8_element_shape_max_num_corner[T8_ECLASS_MAX_DIM + 1] = { 0, 2, 4, 8 };
 
diff --git a/src/t8_element_shape.h b/src/t8_element/t8_element_shape.h
similarity index 99%
rename from src/t8_element_shape.h
rename to src/t8_element/t8_element_shape.h
index 59abca1c38..4486afd2df 100644
--- a/src/t8_element_shape.h
+++ b/src/t8_element/t8_element_shape.h
@@ -28,7 +28,7 @@
 #define T8_ELEMENT_SHAPE_H
 
 #include <t8.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 
 /** We want to export the whole implementation to be callable from "C". */
 T8_EXTERN_C_BEGIN ();
diff --git a/src/t8_forest/t8_forest.cxx b/src/t8_forest/t8_forest.cxx
index 16e43864e8..f66522f471 100644
--- a/src/t8_forest/t8_forest.cxx
+++ b/src/t8_forest/t8_forest.cxx
@@ -25,7 +25,7 @@
  */
 
 #include <sc_statistics.h>
-#include <t8_refcount.h>
+#include <t8_helper_functions/t8_refcount.h>
 #include <t8_types/t8_vec.h>
 #include <t8_forest/t8_forest_general.h>
 #include <t8_forest/t8_forest_geometrical.h>
diff --git a/src/t8_forest/t8_forest_general.h b/src/t8_forest/t8_forest_general.h
index 0cfe5372f9..b57878b920 100644
--- a/src/t8_forest/t8_forest_general.h
+++ b/src/t8_forest/t8_forest_general.h
@@ -28,7 +28,7 @@
 #define T8_FOREST_GENERAL_H
 
 #include <t8_cmesh/t8_cmesh.h>
-#include <t8_element.h>
+#include <t8_element/t8_element.h>
 #include <t8_data/t8_containers.h>
 
 /** Opaque pointer to a forest implementation. */
diff --git a/src/t8_forest/t8_forest_io.h b/src/t8_forest/t8_forest_io.h
index ab0d1bd0ce..558bf8df9b 100644
--- a/src/t8_forest/t8_forest_io.h
+++ b/src/t8_forest/t8_forest_io.h
@@ -27,7 +27,7 @@
 #ifndef T8_FOREST_IO_H
 #define T8_FOREST_IO_H
 
-#include <t8_vtk.h>
+#include <t8_vtk/t8_vtk.h>
 T8_EXTERN_C_BEGIN ();
 
 /** TODO: implement */
diff --git a/src/t8_forest/t8_forest_partition_for_coarsening.cxx b/src/t8_forest/t8_forest_partition_for_coarsening.cxx
index 1708b9050b..986d81aaef 100644
--- a/src/t8_forest/t8_forest_partition_for_coarsening.cxx
+++ b/src/t8_forest/t8_forest_partition_for_coarsening.cxx
@@ -31,9 +31,9 @@
 #include <t8_forest/t8_forest_pfc_message.hxx>
 #include <t8_forest/t8_forest_pfc_helper.hxx>
 #include <t8_data/t8_shmem.h>
-#include <t8_element.h>
+#include <t8_element/t8_element.h>
 #include <t8_forest/t8_forest_partition_for_coarsening.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <vector>
 #include <algorithm>
 
diff --git a/src/t8_forest/t8_forest_pfc_helper.cxx b/src/t8_forest/t8_forest_pfc_helper.cxx
index 580cf9c5ee..93b62f4538 100644
--- a/src/t8_forest/t8_forest_pfc_helper.cxx
+++ b/src/t8_forest/t8_forest_pfc_helper.cxx
@@ -31,7 +31,7 @@
 #include <t8_forest/t8_forest_pfc_helper.hxx>
 #include <t8_schemes/t8_scheme.h>
 #include <t8_schemes/t8_scheme.hxx>
-#include <t8_element.h>
+#include <t8_element/t8_element.h>
 #include <algorithm>
 
 t8_locidx_t
diff --git a/src/t8_forest/t8_forest_pfc_helper.hxx b/src/t8_forest/t8_forest_pfc_helper.hxx
index 09ec4d2ca2..0c3ab21db2 100644
--- a/src/t8_forest/t8_forest_pfc_helper.hxx
+++ b/src/t8_forest/t8_forest_pfc_helper.hxx
@@ -29,7 +29,7 @@
 
 #include <t8.h>
 #include <t8_data/t8_shmem.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 
 /** Determine the sibling with the biggest difference in IDs (in the given direction).
  *
diff --git a/src/t8_forest/t8_forest_pfc_message.hxx b/src/t8_forest/t8_forest_pfc_message.hxx
index 46ab106521..868aae6d24 100644
--- a/src/t8_forest/t8_forest_pfc_message.hxx
+++ b/src/t8_forest/t8_forest_pfc_message.hxx
@@ -30,7 +30,7 @@
 #define T8_FOREST_PFC_MESSAGE_H
 
 #include <t8.h>
-#include <t8_element.h>
+#include <t8_element/t8_element.h>
 #include <t8_forest/t8_forest.h>
 #include <t8_forest/t8_forest_pfc_helper.hxx>
 #include <t8_schemes/t8_scheme.h>
diff --git a/src/t8_forest/t8_forest_types.h b/src/t8_forest/t8_forest_types.h
index 852a06db93..a6fbc712a6 100644
--- a/src/t8_forest/t8_forest_types.h
+++ b/src/t8_forest/t8_forest_types.h
@@ -29,9 +29,9 @@
 
 #include <t8.h>
 #include <sc_statistics.h>
-#include <t8_refcount.h>
+#include <t8_helper_functions/t8_refcount.h>
 #include <t8_cmesh/t8_cmesh.h>
-#include <t8_element.h>
+#include <t8_element/t8_element.h>
 #include <t8_data/t8_containers.h>
 #include <t8_forest/t8_forest_adapt.h>
 #include <t8_forest/t8_forest_general.h>
diff --git a/src/t8_geometry/t8_geometry.h b/src/t8_geometry/t8_geometry.h
index 9f4f6888b0..d0da4659c2 100644
--- a/src/t8_geometry/t8_geometry.h
+++ b/src/t8_geometry/t8_geometry.h
@@ -29,7 +29,7 @@
 #define T8_GEOMETRY_H
 
 #include <t8.h>
-#include <t8_refcount.h>
+#include <t8_helper_functions/t8_refcount.h>
 
 /** This enumeration contains all possible geometries. */
 typedef enum t8_geometry_type {
diff --git a/src/t8_geometry/t8_geometry_helpers.c b/src/t8_geometry/t8_geometry_helpers.c
index 4fc1e59132..23235bbdf2 100644
--- a/src/t8_geometry/t8_geometry_helpers.c
+++ b/src/t8_geometry/t8_geometry_helpers.c
@@ -25,7 +25,7 @@
  */
 
 #include <t8_types/t8_vec.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_geometry/t8_geometry_helpers.h>
 #include <t8_geometry/t8_geometry_implementations/t8_geometry_cad.h>
 
diff --git a/src/t8_geometry/t8_geometry_implementations/t8_geometry_cad.cxx b/src/t8_geometry/t8_geometry_implementations/t8_geometry_cad.cxx
index 502feb834c..ffd3f0b4db 100644
--- a/src/t8_geometry/t8_geometry_implementations/t8_geometry_cad.cxx
+++ b/src/t8_geometry/t8_geometry_implementations/t8_geometry_cad.cxx
@@ -28,7 +28,7 @@
 #include <t8.h>
 #include <t8_geometry/t8_geometry_implementations/t8_geometry_cad.hxx>
 #include <t8_geometry/t8_geometry_implementations/t8_geometry_cad.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_geometry/t8_geometry_helpers.h>
 #include <t8_schemes/t8_default/t8_default_prism/t8_dprism.h>
 
diff --git a/src/t8_geometry/t8_geometry_implementations/t8_geometry_lagrange.cxx b/src/t8_geometry/t8_geometry_implementations/t8_geometry_lagrange.cxx
index d0a73b547e..1bc5be6d09 100644
--- a/src/t8_geometry/t8_geometry_implementations/t8_geometry_lagrange.cxx
+++ b/src/t8_geometry/t8_geometry_implementations/t8_geometry_lagrange.cxx
@@ -33,7 +33,7 @@
 #include <t8_cmesh/t8_cmesh_internal/t8_cmesh_types.h>
 #include <t8_geometry/t8_geometry_implementations/t8_geometry_lagrange.hxx>
 #include <t8_geometry/t8_geometry_implementations/t8_geometry_lagrange.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_schemes/t8_default/t8_default.hxx>
 #include <t8_forest/t8_forest_general.h>
 #include <t8_forest/t8_forest_io.h>
diff --git a/src/t8_mat.h b/src/t8_helper_functions/t8_mat.h
similarity index 100%
rename from src/t8_mat.h
rename to src/t8_helper_functions/t8_mat.h
diff --git a/src/t8_refcount.c b/src/t8_helper_functions/t8_refcount.c
similarity index 96%
rename from src/t8_refcount.c
rename to src/t8_helper_functions/t8_refcount.c
index fb61f8171e..6f0deda235 100644
--- a/src/t8_refcount.c
+++ b/src/t8_helper_functions/t8_refcount.c
@@ -24,7 +24,7 @@
  * Implements reference counting functions declared in \ref t8_refcount.h.
  */
 
-#include <t8_refcount.h>
+#include <t8_helper_functions/t8_refcount.h>
 
 void
 t8_refcount_init (t8_refcount_t *rc)
diff --git a/src/t8_refcount.h b/src/t8_helper_functions/t8_refcount.h
similarity index 100%
rename from src/t8_refcount.h
rename to src/t8_helper_functions/t8_refcount.h
diff --git a/src/t8_version.c b/src/t8_misc/t8_version.c
similarity index 97%
rename from src/t8_version.c
rename to src/t8_misc/t8_version.c
index f35589f5a4..0c19db489e 100644
--- a/src/t8_version.c
+++ b/src/t8_misc/t8_version.c
@@ -24,7 +24,7 @@
  * Implements functions declared in \ref t8_version.h.
  */
 
-#include <t8_version.h>
+#include <t8_misc/t8_version.h>
 
 const char *
 t8_get_package_string ()
diff --git a/src/t8_version.h b/src/t8_misc/t8_version.h
similarity index 100%
rename from src/t8_version.h
rename to src/t8_misc/t8_version.h
diff --git a/src/t8_windows.h b/src/t8_misc/t8_windows.h
similarity index 100%
rename from src/t8_windows.h
rename to src/t8_misc/t8_windows.h
diff --git a/src/t8_with_macro_error.h b/src/t8_misc/t8_with_macro_error.h
similarity index 100%
rename from src/t8_with_macro_error.h
rename to src/t8_misc/t8_with_macro_error.h
diff --git a/src/t8_schemes/t8_default/t8_default_c_interface.h b/src/t8_schemes/t8_default/t8_default_c_interface.h
index 0de15119ae..701b830f05 100644
--- a/src/t8_schemes/t8_default/t8_default_c_interface.h
+++ b/src/t8_schemes/t8_default/t8_default_c_interface.h
@@ -27,7 +27,7 @@
 #ifndef T8_DEFAULT_C_INTERFACE_H
 #define T8_DEFAULT_C_INTERFACE_H
 
-#include <t8_element.h>
+#include <t8_element/t8_element.h>
 
 T8_EXTERN_C_BEGIN ();
 
diff --git a/src/t8_schemes/t8_default/t8_default_common/t8_default_common.hxx b/src/t8_schemes/t8_default/t8_default_common/t8_default_common.hxx
index f1f8146ff2..9cd1a2281e 100644
--- a/src/t8_schemes/t8_default/t8_default_common/t8_default_common.hxx
+++ b/src/t8_schemes/t8_default/t8_default_common/t8_default_common.hxx
@@ -27,7 +27,7 @@
 #ifndef T8_DEFAULT_COMMON_HXX
 #define T8_DEFAULT_COMMON_HXX
 
-#include <t8_element.h>
+#include <t8_element/t8_element.h>
 #include <t8_types/t8_operators.hxx>
 #include <t8_schemes/t8_scheme_helpers.hxx>
 #include <sc_functions.h>
diff --git a/src/t8_schemes/t8_default/t8_default_hex/t8_default_hex.hxx b/src/t8_schemes/t8_default/t8_default_hex/t8_default_hex.hxx
index 9c6052012c..c24f60b53b 100644
--- a/src/t8_schemes/t8_default/t8_default_hex/t8_default_hex.hxx
+++ b/src/t8_schemes/t8_default/t8_default_hex/t8_default_hex.hxx
@@ -27,7 +27,7 @@
 #define T8_DEFAULT_HEX_HXX
 
 #include <p8est.h>
-#include <t8_element.h>
+#include <t8_element/t8_element.h>
 #include <t8_schemes/t8_default/t8_default_hex/t8_dhex.h>
 #include <t8_schemes/t8_default/t8_default_hex/t8_dhex_bits.h>
 #include <t8_schemes/t8_default/t8_default_quad/t8_default_quad.hxx>
diff --git a/src/t8_schemes/t8_default/t8_default_hex/t8_dhex_bits.h b/src/t8_schemes/t8_default/t8_default_hex/t8_dhex_bits.h
index 92c5ec8cec..476313f1c1 100644
--- a/src/t8_schemes/t8_default/t8_default_hex/t8_dhex_bits.h
+++ b/src/t8_schemes/t8_default/t8_default_hex/t8_dhex_bits.h
@@ -27,7 +27,7 @@
 #ifndef T8_DHEX_BITS_H
 #define T8_DHEX_BITS_H
 
-#include <t8_element.h>
+#include <t8_element/t8_element.h>
 #include <t8_schemes/t8_default/t8_default_hex/t8_dhex.h>
 
 T8_EXTERN_C_BEGIN ();
diff --git a/src/t8_schemes/t8_default/t8_default_line/t8_default_line.hxx b/src/t8_schemes/t8_default/t8_default_line/t8_default_line.hxx
index 8732d7e542..26122929e5 100644
--- a/src/t8_schemes/t8_default/t8_default_line/t8_default_line.hxx
+++ b/src/t8_schemes/t8_default/t8_default_line/t8_default_line.hxx
@@ -29,7 +29,7 @@
 #ifndef T8_DEFAULT_LINES_HXX
 #define T8_DEFAULT_LINES_HXX
 
-#include <t8_element.h>
+#include <t8_element/t8_element.h>
 #include <t8_schemes/t8_default/t8_default_common/t8_default_common.hxx>
 #include <t8_schemes/t8_default/t8_default_line/t8_dline_bits.h>
 
diff --git a/src/t8_schemes/t8_default/t8_default_line/t8_dline_bits.h b/src/t8_schemes/t8_default/t8_default_line/t8_dline_bits.h
index d2da50557d..f7dbeef411 100644
--- a/src/t8_schemes/t8_default/t8_default_line/t8_dline_bits.h
+++ b/src/t8_schemes/t8_default/t8_default_line/t8_dline_bits.h
@@ -27,7 +27,7 @@
 #ifndef T8_DLINE_BITS_H
 #define T8_DLINE_BITS_H
 
-#include <t8_element.h>
+#include <t8_element/t8_element.h>
 #include <t8_schemes/t8_default/t8_default_line/t8_dline.h>
 #include <t8_schemes/t8_default/t8_default_vertex/t8_dvertex.h>
 
diff --git a/src/t8_schemes/t8_default/t8_default_prism/t8_default_prism.hxx b/src/t8_schemes/t8_default/t8_default_prism/t8_default_prism.hxx
index f07417b7b8..e7079f3cb3 100644
--- a/src/t8_schemes/t8_default/t8_default_prism/t8_default_prism.hxx
+++ b/src/t8_schemes/t8_default/t8_default_prism/t8_default_prism.hxx
@@ -29,7 +29,7 @@
 #ifndef T8_DEFAULT_PRISM_HXX
 #define T8_DEFAULT_PRISM_HXX
 
-#include <t8_element.h>
+#include <t8_element/t8_element.h>
 #include <t8_schemes/t8_default/t8_default_line/t8_default_line.hxx>
 #include <t8_schemes/t8_default/t8_default_tri/t8_default_tri.hxx>
 #include <t8_schemes/t8_default/t8_default_common/t8_default_common.hxx>
diff --git a/src/t8_schemes/t8_default/t8_default_prism/t8_dprism_bits.h b/src/t8_schemes/t8_default/t8_default_prism/t8_dprism_bits.h
index 60726cf5d2..24a19f7e8d 100644
--- a/src/t8_schemes/t8_default/t8_default_prism/t8_dprism_bits.h
+++ b/src/t8_schemes/t8_default/t8_default_prism/t8_dprism_bits.h
@@ -27,7 +27,7 @@
 #ifndef T8_DPRISM_BITS_H
 #define T8_DPRISM_BITS_H
 
-#include <t8_element.h>
+#include <t8_element/t8_element.h>
 #include <t8_schemes/t8_default/t8_default_prism/t8_dprism.h>
 
 T8_EXTERN_C_BEGIN ();
diff --git a/src/t8_schemes/t8_default/t8_default_pyramid/t8_default_pyramid.hxx b/src/t8_schemes/t8_default/t8_default_pyramid/t8_default_pyramid.hxx
index b60b9015ec..f8d81486a8 100644
--- a/src/t8_schemes/t8_default/t8_default_pyramid/t8_default_pyramid.hxx
+++ b/src/t8_schemes/t8_default/t8_default_pyramid/t8_default_pyramid.hxx
@@ -29,7 +29,7 @@
 #ifndef T8_DEFAULT_PYRAMID_HXX
 #define T8_DEFAULT_PYRAMID_HXX
 
-#include <t8_element.h>
+#include <t8_element/t8_element.h>
 #include <t8_schemes/t8_default/t8_default_common/t8_default_common.hxx>
 #include <t8_schemes/t8_default/t8_default_pyramid/t8_dpyramid_bits.h>
 
diff --git a/src/t8_schemes/t8_default/t8_default_pyramid/t8_dpyramid_bits.h b/src/t8_schemes/t8_default/t8_default_pyramid/t8_dpyramid_bits.h
index 411355bbff..61251e1557 100644
--- a/src/t8_schemes/t8_default/t8_default_pyramid/t8_dpyramid_bits.h
+++ b/src/t8_schemes/t8_default/t8_default_pyramid/t8_dpyramid_bits.h
@@ -27,7 +27,7 @@
 #ifndef T8_DPYRAMID_BITS_H
 #define T8_DPYRAMID_BITS_H
 
-#include "t8_element.h"
+#include <t8_element/t8_element.h>
 #include "t8_dpyramid.h"
 
 T8_EXTERN_C_BEGIN ();
diff --git a/src/t8_schemes/t8_default/t8_default_quad/t8_default_quad.hxx b/src/t8_schemes/t8_default/t8_default_quad/t8_default_quad.hxx
index a9f199ee9f..a6e107417c 100644
--- a/src/t8_schemes/t8_default/t8_default_quad/t8_default_quad.hxx
+++ b/src/t8_schemes/t8_default/t8_default_quad/t8_default_quad.hxx
@@ -32,7 +32,7 @@
 #define T8_DEFAULT_QUAD_HXX
 
 #include <p4est.h>
-#include <t8_element.h>
+#include <t8_element/t8_element.h>
 #include <t8_schemes/t8_default/t8_default_line/t8_default_line.hxx>
 #include <t8_schemes/t8_default/t8_default_common/t8_default_common.hxx>
 
diff --git a/src/t8_schemes/t8_default/t8_default_quad/t8_default_quad_bits.hxx b/src/t8_schemes/t8_default/t8_default_quad/t8_default_quad_bits.hxx
index b51c4bebbf..7f63f0813e 100644
--- a/src/t8_schemes/t8_default/t8_default_quad/t8_default_quad_bits.hxx
+++ b/src/t8_schemes/t8_default/t8_default_quad/t8_default_quad_bits.hxx
@@ -27,7 +27,7 @@
 #ifndef T8_DQUAD_BITS_H
 #define T8_DQUAD_BITS_H
 
-#include <t8_element.h>
+#include <t8_element/t8_element.h>
 #include <t8_schemes/t8_default/t8_default_quad/t8_default_quad.hxx>
 
 T8_EXTERN_C_BEGIN ();
diff --git a/src/t8_schemes/t8_default/t8_default_tet/t8_default_tet.hxx b/src/t8_schemes/t8_default/t8_default_tet/t8_default_tet.hxx
index e5223e7261..cde4d5fdbd 100644
--- a/src/t8_schemes/t8_default/t8_default_tet/t8_default_tet.hxx
+++ b/src/t8_schemes/t8_default/t8_default_tet/t8_default_tet.hxx
@@ -29,7 +29,7 @@
 #ifndef T8_DEFAULT_TET_HXX
 #define T8_DEFAULT_TET_HXX
 
-#include <t8_element.h>
+#include <t8_element/t8_element.h>
 #include <t8_schemes/t8_default/t8_default_tri/t8_default_tri.hxx>
 #include <t8_schemes/t8_default/t8_default_common/t8_default_common.hxx>
 #include <t8_schemes/t8_default/t8_default_tet/t8_dtet_bits.h>
diff --git a/src/t8_schemes/t8_default/t8_default_tet/t8_dtet_bits.h b/src/t8_schemes/t8_default/t8_default_tet/t8_dtet_bits.h
index 6a707982ac..b5b8e84ecd 100644
--- a/src/t8_schemes/t8_default/t8_default_tet/t8_dtet_bits.h
+++ b/src/t8_schemes/t8_default/t8_default_tet/t8_dtet_bits.h
@@ -30,7 +30,7 @@
 #ifndef T8_DTET_BITS_H
 #define T8_DTET_BITS_H
 
-#include <t8_element.h>
+#include <t8_element/t8_element.h>
 #include <t8_schemes/t8_default/t8_default_tet/t8_dtet.h>
 
 T8_EXTERN_C_BEGIN ();
diff --git a/src/t8_schemes/t8_default/t8_default_tet/t8_dtet_connectivity.h b/src/t8_schemes/t8_default/t8_default_tet/t8_dtet_connectivity.h
index 9a203dc9b6..dfac92ba99 100644
--- a/src/t8_schemes/t8_default/t8_default_tet/t8_dtet_connectivity.h
+++ b/src/t8_schemes/t8_default/t8_default_tet/t8_dtet_connectivity.h
@@ -28,7 +28,7 @@
 #define T8_DTET_CONNECTIVITY_H
 
 #include <t8.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 
 T8_EXTERN_C_BEGIN ();
 
diff --git a/src/t8_schemes/t8_default/t8_default_tri/t8_default_tri.hxx b/src/t8_schemes/t8_default/t8_default_tri/t8_default_tri.hxx
index cb346c612f..5181ab6fe0 100644
--- a/src/t8_schemes/t8_default/t8_default_tri/t8_default_tri.hxx
+++ b/src/t8_schemes/t8_default/t8_default_tri/t8_default_tri.hxx
@@ -29,7 +29,7 @@
 #ifndef T8_DEFAULT_TRI_HXX
 #define T8_DEFAULT_TRI_HXX
 
-#include <t8_element.h>
+#include <t8_element/t8_element.h>
 #include <t8_schemes/t8_default/t8_default_line/t8_default_line.hxx>
 #include <t8_schemes/t8_default/t8_default_common/t8_default_common.hxx>
 #include <t8_schemes/t8_default/t8_default_tri/t8_dtri_bits.h>
diff --git a/src/t8_schemes/t8_default/t8_default_tri/t8_dtri_bits.h b/src/t8_schemes/t8_default/t8_default_tri/t8_dtri_bits.h
index da3296991c..fa6f5b2f0b 100644
--- a/src/t8_schemes/t8_default/t8_default_tri/t8_dtri_bits.h
+++ b/src/t8_schemes/t8_default/t8_default_tri/t8_dtri_bits.h
@@ -27,7 +27,7 @@
 #ifndef T8_DTRI_BITS_H
 #define T8_DTRI_BITS_H
 
-#include <t8_element.h>
+#include <t8_element/t8_element.h>
 #include <t8_schemes/t8_default/t8_default_tri/t8_dtri.h>
 
 T8_EXTERN_C_BEGIN ();
diff --git a/src/t8_schemes/t8_default/t8_default_tri/t8_dtri_connectivity.h b/src/t8_schemes/t8_default/t8_default_tri/t8_dtri_connectivity.h
index 06182dda1e..5961ce5194 100644
--- a/src/t8_schemes/t8_default/t8_default_tri/t8_dtri_connectivity.h
+++ b/src/t8_schemes/t8_default/t8_default_tri/t8_dtri_connectivity.h
@@ -27,7 +27,7 @@
 #define T8_DTRI_CONNECTIVITY_H
 
 #include <t8_schemes/t8_default/t8_default_tri/t8_dtri.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 
 T8_EXTERN_C_BEGIN ();
 
diff --git a/src/t8_schemes/t8_default/t8_default_vertex/t8_default_vertex.hxx b/src/t8_schemes/t8_default/t8_default_vertex/t8_default_vertex.hxx
index 987d993b40..894c7a5b66 100644
--- a/src/t8_schemes/t8_default/t8_default_vertex/t8_default_vertex.hxx
+++ b/src/t8_schemes/t8_default/t8_default_vertex/t8_default_vertex.hxx
@@ -27,7 +27,7 @@
 #ifndef T8_DEFAULT_VERTEX_HXX
 #define T8_DEFAULT_VERTEX_HXX
 
-#include <t8_element.h>
+#include <t8_element/t8_element.h>
 #include <t8_schemes/t8_default/t8_default_tri/t8_default_tri.hxx>
 #include <t8_schemes/t8_default/t8_default_common/t8_default_common.hxx>
 
diff --git a/src/t8_schemes/t8_scheme.cxx b/src/t8_schemes/t8_scheme.cxx
index 6f909ff635..d4a92da3c6 100644
--- a/src/t8_schemes/t8_scheme.cxx
+++ b/src/t8_schemes/t8_scheme.cxx
@@ -24,7 +24,7 @@
  * Implements functions declared in \ref t8_scheme.h.
  */
 
-#include <t8_element.h>
+#include <t8_element/t8_element.h>
 #include <t8_schemes/t8_scheme.hxx>
 #include <t8_schemes/t8_scheme.h>
 #include <t8_forest/t8_forest_types.h>
diff --git a/src/t8_schemes/t8_scheme.h b/src/t8_schemes/t8_scheme.h
index 3b36bc4f4a..0c3d16ef49 100644
--- a/src/t8_schemes/t8_scheme.h
+++ b/src/t8_schemes/t8_scheme.h
@@ -29,7 +29,7 @@
 #define T8_SCHEME_H
 
 #include <t8.h>
-#include <t8_element.h>
+#include <t8_element/t8_element.h>
 
 /** The scheme holds implementations for one or more element classes.
  *  Opaque pointer for C interface.
diff --git a/src/t8_schemes/t8_scheme.hxx b/src/t8_schemes/t8_scheme.hxx
index fd398584a7..a6cbc3fb4c 100644
--- a/src/t8_schemes/t8_scheme.hxx
+++ b/src/t8_schemes/t8_scheme.hxx
@@ -30,8 +30,8 @@
 
 #include <variant>
 #include <vector>
-#include <t8_refcount.h>
-#include <t8_eclass.h>
+#include <t8_helper_functions/t8_refcount.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_schemes/t8_default/t8_default.hxx>
 #include <t8_schemes/t8_default/t8_default_vertex/t8_default_vertex.hxx>
 #include <t8_schemes/t8_default/t8_default_line/t8_default_line.hxx>
diff --git a/src/t8_schemes/t8_scheme_helpers.hxx b/src/t8_schemes/t8_scheme_helpers.hxx
index 4bcfc652c6..87bbc6e56e 100644
--- a/src/t8_schemes/t8_scheme_helpers.hxx
+++ b/src/t8_schemes/t8_scheme_helpers.hxx
@@ -27,9 +27,9 @@
 #ifndef T8_SCHEME_HELPERS_HXX
 #define T8_SCHEME_HELPERS_HXX
 
-#include <t8_element.h>
+#include <t8_element/t8_element.h>
 #include <t8_types/t8_crtp.hxx>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 
 /**
   * Class which provides helper functions and default implementations for different schemes.
diff --git a/src/t8_schemes/t8_standalone/t8_standalone_implementation.hxx b/src/t8_schemes/t8_standalone/t8_standalone_implementation.hxx
index 5338e72625..ea573238d4 100644
--- a/src/t8_schemes/t8_standalone/t8_standalone_implementation.hxx
+++ b/src/t8_schemes/t8_standalone/t8_standalone_implementation.hxx
@@ -28,7 +28,7 @@
 #define T8_STANDALONE_IMPLEMENTATION_HXX
 
 #include <t8_schemes/t8_scheme.hxx>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <sc_functions.h>
 #include <t8_schemes/t8_standalone/t8_standalone_elements.hxx>
 #include <t8_schemes/t8_scheme_helpers.hxx>
diff --git a/src/t8_vtk.c b/src/t8_vtk/t8_vtk.c
similarity index 99%
rename from src/t8_vtk.c
rename to src/t8_vtk/t8_vtk.c
index f4602932c7..3a9480b080 100644
--- a/src/t8_vtk.c
+++ b/src/t8_vtk/t8_vtk.c
@@ -20,7 +20,7 @@
   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-#include <t8_vtk.h>
+#include <t8_vtk/t8_vtk.h>
 
 /* Writes the pvtu header file that links to the processor local files.
  * This function should only be called by one process.
diff --git a/src/t8_vtk.h b/src/t8_vtk/t8_vtk.h
similarity index 100%
rename from src/t8_vtk.h
rename to src/t8_vtk/t8_vtk.h
diff --git a/src/t8_vtk/t8_vtk_types.h b/src/t8_vtk/t8_vtk_types.h
index 429f0af1bb..9e8ede013f 100644
--- a/src/t8_vtk/t8_vtk_types.h
+++ b/src/t8_vtk/t8_vtk_types.h
@@ -28,7 +28,7 @@
 #ifndef T8_VTK_TYPES
 #define T8_VTK_TYPES
 
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 
 /**
  * Translator between vtk-type of elements and t8code-elements. 
diff --git a/src/t8_vtk/t8_vtk_write_ASCII.cxx b/src/t8_vtk/t8_vtk_write_ASCII.cxx
index 14f02d8da5..c088904948 100644
--- a/src/t8_vtk/t8_vtk_write_ASCII.cxx
+++ b/src/t8_vtk/t8_vtk_write_ASCII.cxx
@@ -22,7 +22,7 @@
 
 #include "t8_vtk/t8_vtk_write_ASCII.hxx"
 #include "t8_vtk/t8_vtk_writer_helper.hxx"
-#include <t8_vtk.h>
+#include <t8_vtk/t8_vtk.h>
 #include <t8_forest/t8_forest_ghost.h>
 #include <t8_types/t8_vec.hxx>
 #include "t8_forest/t8_forest_types.h"
diff --git a/src/t8_vtk/t8_vtk_writer.h b/src/t8_vtk/t8_vtk_writer.h
index 0b1ccf1567..202be19986 100644
--- a/src/t8_vtk/t8_vtk_writer.h
+++ b/src/t8_vtk/t8_vtk_writer.h
@@ -29,7 +29,7 @@
 #define T8_VTK_WRITER_C_INTERFACE_H
 
 #include <t8.h>
-#include <t8_vtk.h>
+#include <t8_vtk/t8_vtk.h>
 #include <t8_forest/t8_forest_types.h>
 
 #if T8_ENABLE_VTK
diff --git a/src/t8_vtk/t8_vtk_writer.hxx b/src/t8_vtk/t8_vtk_writer.hxx
index 2e8c1b8aa0..03327900bf 100644
--- a/src/t8_vtk/t8_vtk_writer.hxx
+++ b/src/t8_vtk/t8_vtk_writer.hxx
@@ -38,7 +38,7 @@
 #include "t8_vtk/t8_vtk_write_ASCII.hxx"
 
 #include <string>
-#include <t8_vtk.h>
+#include <t8_vtk/t8_vtk.h>
 #include <t8_types/t8_vec.hxx>
 
 #if T8_ENABLE_VTK
diff --git a/test/t8_cmesh/t8_gtest_cmesh_readmshfile.cxx b/test/t8_cmesh/t8_gtest_cmesh_readmshfile.cxx
index 0d14982baa..b983413a37 100644
--- a/test/t8_cmesh/t8_gtest_cmesh_readmshfile.cxx
+++ b/test/t8_cmesh/t8_gtest_cmesh_readmshfile.cxx
@@ -23,7 +23,7 @@
 #include <gtest/gtest.h>
 #include <unistd.h> /* Needed to check for file access */
 #include <t8.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_cmesh/t8_cmesh.h>
 #include <t8_cmesh/t8_cmesh_io/t8_cmesh_readmshfile.h>
 #include <t8_cmesh/t8_cmesh_internal/t8_cmesh_trees.h>
diff --git a/test/t8_cmesh/t8_gtest_cmesh_set_join_by_vertices.cxx b/test/t8_cmesh/t8_gtest_cmesh_set_join_by_vertices.cxx
index eeeae6e902..8632e4ef44 100644
--- a/test/t8_cmesh/t8_gtest_cmesh_set_join_by_vertices.cxx
+++ b/test/t8_cmesh/t8_gtest_cmesh_set_join_by_vertices.cxx
@@ -22,7 +22,7 @@
 
 #include <gtest/gtest.h>
 #include <t8.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_cmesh/t8_cmesh.h>
 #include <t8_cmesh/t8_cmesh_internal/t8_cmesh_types.h>
 #include <t8_cmesh/t8_cmesh_examples.h>
diff --git a/test/t8_cmesh_generator/t8_cmesh_parameterized_examples/t8_cmesh_new_bigmesh_param.hxx b/test/t8_cmesh_generator/t8_cmesh_parameterized_examples/t8_cmesh_new_bigmesh_param.hxx
index 542c2f4dc1..092489035e 100644
--- a/test/t8_cmesh_generator/t8_cmesh_parameterized_examples/t8_cmesh_new_bigmesh_param.hxx
+++ b/test/t8_cmesh_generator/t8_cmesh_parameterized_examples/t8_cmesh_new_bigmesh_param.hxx
@@ -26,7 +26,7 @@
 #include "test/t8_cmesh_generator/t8_gtest_cmesh_cartesian_product.hxx"
 #include "test/t8_cmesh_generator/t8_cmesh_parameterized_examples/t8_cmesh_params.hxx"
 #include "t8_cmesh/t8_cmesh_examples.h"
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 
 namespace new_bigmesh
 {
diff --git a/test/t8_cmesh_generator/t8_cmesh_parameterized_examples/t8_cmesh_new_empty.hxx b/test/t8_cmesh_generator/t8_cmesh_parameterized_examples/t8_cmesh_new_empty.hxx
index 2445986f9d..3cad3a7529 100644
--- a/test/t8_cmesh_generator/t8_cmesh_parameterized_examples/t8_cmesh_new_empty.hxx
+++ b/test/t8_cmesh_generator/t8_cmesh_parameterized_examples/t8_cmesh_new_empty.hxx
@@ -26,7 +26,7 @@
 #include <test/t8_cmesh_generator/t8_gtest_cmesh_cartesian_product.hxx>
 #include <test/t8_cmesh_generator/t8_cmesh_parameterized_examples/t8_cmesh_params.hxx>
 #include <t8_cmesh/t8_cmesh_examples.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 
 namespace new_empty
 {
diff --git a/test/t8_cmesh_generator/t8_cmesh_parameterized_examples/t8_cmesh_new_from_class_param.hxx b/test/t8_cmesh_generator/t8_cmesh_parameterized_examples/t8_cmesh_new_from_class_param.hxx
index 07de7fe3e5..ac26d97d0f 100644
--- a/test/t8_cmesh_generator/t8_cmesh_parameterized_examples/t8_cmesh_new_from_class_param.hxx
+++ b/test/t8_cmesh_generator/t8_cmesh_parameterized_examples/t8_cmesh_new_from_class_param.hxx
@@ -23,7 +23,7 @@
 #include "test/t8_cmesh_generator/t8_gtest_cmesh_cartesian_product.hxx"
 #include "test/t8_cmesh_generator/t8_cmesh_parameterized_examples/t8_cmesh_params.hxx"
 #include <t8_cmesh/t8_cmesh_examples.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 
 #ifndef T8_CMESH_NEW_FROM_CLASS_PARAM
 #define T8_CMESH_NEW_FROM_CLASS_PARAM
diff --git a/test/t8_cmesh_generator/t8_cmesh_parameterized_examples/t8_cmesh_new_hypercube_param.hxx b/test/t8_cmesh_generator/t8_cmesh_parameterized_examples/t8_cmesh_new_hypercube_param.hxx
index b04ccc95de..d9eeb065c0 100644
--- a/test/t8_cmesh_generator/t8_cmesh_parameterized_examples/t8_cmesh_new_hypercube_param.hxx
+++ b/test/t8_cmesh_generator/t8_cmesh_parameterized_examples/t8_cmesh_new_hypercube_param.hxx
@@ -23,7 +23,7 @@
 #ifndef T8_CMESH_NEW_HYPERCUBE_PARAM_HXX
 #define T8_CMESH_NEW_HYPERCUBE_PARAM_HXX
 
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include "test/t8_cmesh_generator/t8_gtest_cmesh_cartesian_product.hxx"
 #include "test/t8_cmesh_generator/t8_cmesh_parameterized_examples/t8_cmesh_params.hxx"
 #include <t8_cmesh/t8_cmesh_examples.h>
diff --git a/test/t8_cmesh_generator/t8_cmesh_parameterized_examples/t8_cmesh_new_periodic.hxx b/test/t8_cmesh_generator/t8_cmesh_parameterized_examples/t8_cmesh_new_periodic.hxx
index 4cfc3ab75e..11113a79ce 100644
--- a/test/t8_cmesh_generator/t8_cmesh_parameterized_examples/t8_cmesh_new_periodic.hxx
+++ b/test/t8_cmesh_generator/t8_cmesh_parameterized_examples/t8_cmesh_new_periodic.hxx
@@ -26,7 +26,7 @@
 #include <test/t8_cmesh_generator/t8_gtest_cmesh_cartesian_product.hxx>
 #include <test/t8_cmesh_generator/t8_cmesh_parameterized_examples/t8_cmesh_params.hxx>
 #include <t8_cmesh/t8_cmesh_examples.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 
 namespace new_periodic
 {
diff --git a/test/t8_cmesh_generator/t8_cmesh_parameterized_examples/t8_cmesh_params.hxx b/test/t8_cmesh_generator/t8_cmesh_parameterized_examples/t8_cmesh_params.hxx
index 92fd2bfd1d..235879ddc9 100644
--- a/test/t8_cmesh_generator/t8_cmesh_parameterized_examples/t8_cmesh_params.hxx
+++ b/test/t8_cmesh_generator/t8_cmesh_parameterized_examples/t8_cmesh_params.hxx
@@ -26,7 +26,7 @@
 
 #ifndef T8_CMESH_PARAMS_HXX
 #define T8_CMESH_PARAMS_HXX
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <vector>
 #include <numeric>
 #include <algorithm>
diff --git a/test/t8_forest/t8_gtest_balance.cxx b/test/t8_forest/t8_gtest_balance.cxx
index 464ef97ff9..422abc87bc 100644
--- a/test/t8_forest/t8_gtest_balance.cxx
+++ b/test/t8_forest/t8_gtest_balance.cxx
@@ -29,7 +29,7 @@
 #include <test/t8_gtest_schemes.hxx>
 #include <test/t8_gtest_custom_assertion.hxx>
 
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_cmesh/t8_cmesh.h>
 #include <t8_cmesh/t8_cmesh_examples.h>
 #include <t8_forest/t8_forest_general.h>
diff --git a/test/t8_forest/t8_gtest_element_is_leaf.cxx b/test/t8_forest/t8_gtest_element_is_leaf.cxx
index f19af2371c..8d5164daa1 100644
--- a/test/t8_forest/t8_gtest_element_is_leaf.cxx
+++ b/test/t8_forest/t8_gtest_element_is_leaf.cxx
@@ -22,7 +22,7 @@
 
 #include <gtest/gtest.h>
 #include <test/t8_gtest_schemes.hxx>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_cmesh/t8_cmesh.h>
 #include <t8_forest/t8_forest_general.h>
 #include <t8_schemes/t8_default/t8_default.hxx>
diff --git a/test/t8_forest/t8_gtest_element_volume.cxx b/test/t8_forest/t8_gtest_element_volume.cxx
index 43efbf5b01..e93eb0d6e2 100644
--- a/test/t8_forest/t8_gtest_element_volume.cxx
+++ b/test/t8_forest/t8_gtest_element_volume.cxx
@@ -22,7 +22,7 @@
 
 #include <sc_functions.h>
 #include <gtest/gtest.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <test/t8_gtest_schemes.hxx>
 #include <t8_schemes/t8_default/t8_default.hxx>
 #include <t8_schemes/t8_default/t8_default_pyramid/t8_dpyramid_bits.h>
diff --git a/test/t8_forest/t8_gtest_find_owner.cxx b/test/t8_forest/t8_gtest_find_owner.cxx
index e748ae35a9..50f4876bb2 100644
--- a/test/t8_forest/t8_gtest_find_owner.cxx
+++ b/test/t8_forest/t8_gtest_find_owner.cxx
@@ -21,7 +21,7 @@
 */
 
 #include <gtest/gtest.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <test/t8_gtest_schemes.hxx>
 #include <t8_cmesh/t8_cmesh.h>
 #include <t8_forest/t8_forest_general.h>
diff --git a/test/t8_forest/t8_gtest_forest_commit.cxx b/test/t8_forest/t8_gtest_forest_commit.cxx
index 7234ecc6db..6f16ad23df 100644
--- a/test/t8_forest/t8_gtest_forest_commit.cxx
+++ b/test/t8_forest/t8_gtest_forest_commit.cxx
@@ -21,7 +21,7 @@
 */
 
 #include <gtest/gtest.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_cmesh/t8_cmesh.h>
 #include <t8_forest/t8_forest_general.h>
 #include <t8_schemes/t8_default/t8_default.hxx>
diff --git a/test/t8_forest/t8_gtest_forest_face_normal.cxx b/test/t8_forest/t8_gtest_forest_face_normal.cxx
index 13f6d1a4a8..e48c7d8efe 100644
--- a/test/t8_forest/t8_gtest_forest_face_normal.cxx
+++ b/test/t8_forest/t8_gtest_forest_face_normal.cxx
@@ -22,7 +22,7 @@
 
 #include <sc_functions.h>
 #include <gtest/gtest.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_schemes/t8_scheme.hxx>
 #include <t8_cmesh/t8_cmesh_examples.h>
 #include <t8_forest/t8_forest_general.h>
diff --git a/test/t8_forest/t8_gtest_ghost_and_owner.cxx b/test/t8_forest/t8_gtest_ghost_and_owner.cxx
index 69dd9eae61..71a045190c 100644
--- a/test/t8_forest/t8_gtest_ghost_and_owner.cxx
+++ b/test/t8_forest/t8_gtest_ghost_and_owner.cxx
@@ -21,7 +21,7 @@
 */
 
 #include <gtest/gtest.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_schemes/t8_default/t8_default.hxx>
 #include <t8_forest/t8_forest_general.h>
 #include <t8_forest/t8_forest_ghost.h>
diff --git a/test/t8_forest/t8_gtest_ghost_delete.cxx b/test/t8_forest/t8_gtest_ghost_delete.cxx
index ea7e37ce71..65a8e01e75 100644
--- a/test/t8_forest/t8_gtest_ghost_delete.cxx
+++ b/test/t8_forest/t8_gtest_ghost_delete.cxx
@@ -21,7 +21,7 @@
 */
 
 #include <gtest/gtest.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_schemes/t8_default/t8_default.hxx>
 #include <t8_forest/t8_forest_general.h>
 #include <t8_forest/t8_forest_geometrical.h>
diff --git a/test/t8_forest/t8_gtest_ghost_exchange.cxx b/test/t8_forest/t8_gtest_ghost_exchange.cxx
index 4c05fe6db8..2286603032 100644
--- a/test/t8_forest/t8_gtest_ghost_exchange.cxx
+++ b/test/t8_forest/t8_gtest_ghost_exchange.cxx
@@ -21,7 +21,7 @@
 */
 
 #include <gtest/gtest.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_schemes/t8_default/t8_default.hxx>
 #include <t8_forest/t8_forest_general.h>
 #include <t8_forest/t8_forest_ghost.h>
diff --git a/test/t8_forest/t8_gtest_half_neighbors.cxx b/test/t8_forest/t8_gtest_half_neighbors.cxx
index 918b642f21..b40fe34212 100644
--- a/test/t8_forest/t8_gtest_half_neighbors.cxx
+++ b/test/t8_forest/t8_gtest_half_neighbors.cxx
@@ -24,7 +24,7 @@
 #include <test/t8_gtest_custom_assertion.hxx>
 #include <test/t8_gtest_memory_macros.hxx>
 
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_cmesh/t8_cmesh.h>
 #include <t8_forest/t8_forest_general.h>
 #include <t8_forest/t8_forest_types.h>
diff --git a/test/t8_forest/t8_gtest_search.cxx b/test/t8_forest/t8_gtest_search.cxx
index 214021dec6..1a454d21d4 100644
--- a/test/t8_forest/t8_gtest_search.cxx
+++ b/test/t8_forest/t8_gtest_search.cxx
@@ -22,7 +22,7 @@
 
 #include <gtest/gtest.h>
 #include <test/t8_gtest_custom_assertion.hxx>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_cmesh/t8_cmesh.h>
 #include <t8_cmesh/t8_cmesh_examples.h>
 #include <t8_forest/t8_forest_general.h>
diff --git a/test/t8_forest/t8_gtest_transform.cxx b/test/t8_forest/t8_gtest_transform.cxx
index 66593080a7..e949869782 100644
--- a/test/t8_forest/t8_gtest_transform.cxx
+++ b/test/t8_forest/t8_gtest_transform.cxx
@@ -30,7 +30,7 @@
 #include <gtest/gtest.h>
 #include <test/t8_gtest_custom_assertion.hxx>
 
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_cmesh/t8_cmesh.h>
 #include <t8_cmesh/t8_cmesh_examples.h>
 #include <t8_forest/t8_forest_general.h>
diff --git a/test/t8_geometry/t8_geometry_implementations/t8_gtest_geometry_cad.cxx b/test/t8_geometry/t8_geometry_implementations/t8_gtest_geometry_cad.cxx
index c3f8584e57..e920c36ceb 100644
--- a/test/t8_geometry/t8_geometry_implementations/t8_gtest_geometry_cad.cxx
+++ b/test/t8_geometry/t8_geometry_implementations/t8_gtest_geometry_cad.cxx
@@ -23,13 +23,13 @@
 #include <gtest/gtest.h>
 #include <t8_cmesh/t8_cmesh.hxx>
 #include <t8_forest/t8_forest_general.h>
-#include <t8_vtk.h>
+#include <t8_vtk/t8_vtk.h>
 #include <t8_schemes/t8_default/t8_default.hxx>
 #include <t8_geometry/t8_geometry_implementations/t8_geometry_cad.hxx>
 #include <t8_cmesh/t8_cmesh_examples.h>
 #include <test/t8_gtest_macros.hxx>
 #include <test/t8_gtest_custom_assertion.hxx>
-#include <t8_element.h>
+#include <t8_element/t8_element.h>
 #include <t8_vtk/t8_vtk_writer.h>
 #include <t8_types/t8_vec.hxx>
 
@@ -48,7 +48,7 @@
 #include <Geom_BSplineSurface.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Edge.hxx>
-#include <t8_element.h>
+#include <t8_element/t8_element.h>
 
 #include <test/t8_gtest_custom_assertion.hxx>
 
diff --git a/test/t8_geometry/t8_geometry_implementations/t8_gtest_geometry_lagrange.cxx b/test/t8_geometry/t8_geometry_implementations/t8_gtest_geometry_lagrange.cxx
index 778df8c415..a0ada582c8 100644
--- a/test/t8_geometry/t8_geometry_implementations/t8_gtest_geometry_lagrange.cxx
+++ b/test/t8_geometry/t8_geometry_implementations/t8_gtest_geometry_lagrange.cxx
@@ -32,7 +32,7 @@
 
 #include <gtest/gtest.h>
 #include <test/t8_gtest_macros.hxx>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_types/t8_vec.hxx>
 #include <t8_cmesh/t8_cmesh.hxx>
 #include <t8_vtk/t8_vtk_writer.h>
diff --git a/test/t8_geometry/t8_geometry_implementations/t8_gtest_geometry_linear.cxx b/test/t8_geometry/t8_geometry_implementations/t8_gtest_geometry_linear.cxx
index a0546cfaaf..a602e27cff 100644
--- a/test/t8_geometry/t8_geometry_implementations/t8_gtest_geometry_linear.cxx
+++ b/test/t8_geometry/t8_geometry_implementations/t8_gtest_geometry_linear.cxx
@@ -27,13 +27,13 @@
 #include <test/t8_gtest_macros.hxx>
 #include <test/t8_gtest_custom_assertion.hxx>
 #include <gtest/gtest.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_cmesh/t8_cmesh.hxx>
 #include <t8_cmesh/t8_cmesh_examples.h>
 #include <t8_geometry/t8_geometry.h>
 #include <t8_geometry/t8_geometry_implementations/t8_geometry_linear.hxx>
 #include <t8_geometry/t8_geometry_implementations/t8_geometry_linear_axis_aligned.hxx>
-#include <t8_element.h>
+#include <t8_element/t8_element.h>
 #include <t8_types/t8_vec.hxx>
 
 struct geometry_test: public testing::TestWithParam<std::tuple<int, t8_eclass>>
diff --git a/test/t8_geometry/t8_gtest_geometry_handling.cxx b/test/t8_geometry/t8_gtest_geometry_handling.cxx
index 42bd429659..0617cc049f 100644
--- a/test/t8_geometry/t8_gtest_geometry_handling.cxx
+++ b/test/t8_geometry/t8_gtest_geometry_handling.cxx
@@ -25,7 +25,7 @@
  */
 
 #include <gtest/gtest.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_cmesh/t8_cmesh.hxx>
 #include <t8_vtk/t8_vtk_writer.h>
 #include <t8_cmesh/t8_cmesh_examples.h>
diff --git a/test/t8_geometry/t8_gtest_geometry_negative_volume.cxx b/test/t8_geometry/t8_gtest_geometry_negative_volume.cxx
index 1b218bff12..bc8a09b109 100644
--- a/test/t8_geometry/t8_gtest_geometry_negative_volume.cxx
+++ b/test/t8_geometry/t8_gtest_geometry_negative_volume.cxx
@@ -26,7 +26,7 @@
 */
 
 #include <gtest/gtest.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_cmesh/t8_cmesh.hxx>
 #include <t8_geometry/t8_geometry_implementations/t8_geometry_linear.hxx>
 #include <test/t8_gtest_memory_macros.hxx>
diff --git a/test/t8_geometry/t8_gtest_point_inside.cxx b/test/t8_geometry/t8_gtest_point_inside.cxx
index d7f80d64b3..40e05ea735 100644
--- a/test/t8_geometry/t8_gtest_point_inside.cxx
+++ b/test/t8_geometry/t8_gtest_point_inside.cxx
@@ -23,7 +23,7 @@
 #include <gtest/gtest.h>
 #include <test/t8_gtest_memory_macros.hxx>
 #include <sc_functions.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_cmesh/t8_cmesh.hxx>
 #include <t8_cmesh/t8_cmesh_examples.h>
 #include <t8_forest/t8_forest_general.h>
diff --git a/test/t8_gtest_eclass.cxx b/test/t8_gtest_eclass.cxx
index 31f112cf55..2e2703bf61 100644
--- a/test/t8_gtest_eclass.cxx
+++ b/test/t8_gtest_eclass.cxx
@@ -21,7 +21,7 @@
 */
 
 #include <gtest/gtest.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_cmesh/t8_cmesh.h>
 #include <t8_cmesh/t8_cmesh_examples.h>
 #include <t8_types/t8_vec.h>
diff --git a/test/t8_gtest_macros.hxx b/test/t8_gtest_macros.hxx
index 6b8cfd7a7e..5e5de3fb7e 100644
--- a/test/t8_gtest_macros.hxx
+++ b/test/t8_gtest_macros.hxx
@@ -28,7 +28,7 @@
 #define T8_GTEST_MACROS_HXX
 
 #include <gtest/gtest.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_schemes/t8_default/t8_default.hxx>
 #include <iostream>
 #include <t8_schemes/t8_scheme.hxx>
diff --git a/test/t8_gtest_mat.cxx b/test/t8_gtest_mat.cxx
index fa6b3c5654..895cae3c5d 100644
--- a/test/t8_gtest_mat.cxx
+++ b/test/t8_gtest_mat.cxx
@@ -23,7 +23,7 @@
 /* In this file we collect tests for the routines in `t8_mat.h`. */
 
 #include <t8.h>
-#include <t8_mat.h>
+#include <t8_helper_functions/t8_mat.h>
 #include <gtest/gtest.h>
 
 /* Test the `t8_mat_mult_vec` function. Here we also test the rotation matrices
diff --git a/test/t8_gtest_memory_macros.hxx b/test/t8_gtest_memory_macros.hxx
index 7b0b170f8d..bb69f6e0ce 100644
--- a/test/t8_gtest_memory_macros.hxx
+++ b/test/t8_gtest_memory_macros.hxx
@@ -26,7 +26,7 @@
 #ifndef T8_GTEST_MEMORY_MACROS_HXX
 #define T8_GTEST_MEMORY_MACROS_HXX
 
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_schemes/t8_default/t8_default.hxx>
 #include <iostream>
 #include <t8_schemes/t8_scheme.hxx>
diff --git a/test/t8_gtest_refcount.cxx b/test/t8_gtest_refcount.cxx
index 09ef36559d..e0d3f0d31e 100644
--- a/test/t8_gtest_refcount.cxx
+++ b/test/t8_gtest_refcount.cxx
@@ -21,7 +21,7 @@
 */
 
 #include <gtest/gtest.h>
-#include <t8_refcount.h>
+#include <t8_helper_functions/t8_refcount.h>
 
 TEST (t8_gtest_refcount, Init)
 {
diff --git a/test/t8_gtest_version.cxx b/test/t8_gtest_version.cxx
index 5331f76b99..462fd9d200 100644
--- a/test/t8_gtest_version.cxx
+++ b/test/t8_gtest_version.cxx
@@ -21,7 +21,7 @@
 */
 
 #include <gtest/gtest.h>
-#include <t8_version.h>
+#include <t8_misc/t8_version.h>
 
 /* The following three tests check whether t8code computes the correct
  * version.
diff --git a/test/t8_schemes/t8_gtest_ancestor.cxx b/test/t8_schemes/t8_gtest_ancestor.cxx
index 5b48eb596d..4d45a8a817 100644
--- a/test/t8_schemes/t8_gtest_ancestor.cxx
+++ b/test/t8_schemes/t8_gtest_ancestor.cxx
@@ -28,7 +28,7 @@
 #include <gtest/gtest.h>
 #include <test/t8_gtest_custom_assertion.hxx>
 #include <test/t8_gtest_macros.hxx>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_schemes/t8_default/t8_default_pyramid/t8_dpyramid_bits.h>
 #include <test/t8_gtest_schemes.hxx>
 
diff --git a/test/t8_schemes/t8_gtest_ancestor_id.cxx b/test/t8_schemes/t8_gtest_ancestor_id.cxx
index 7a0c01a92a..9e36fc13fa 100644
--- a/test/t8_schemes/t8_gtest_ancestor_id.cxx
+++ b/test/t8_schemes/t8_gtest_ancestor_id.cxx
@@ -27,7 +27,7 @@
  */
 
 #include <gtest/gtest.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_schemes/t8_default/t8_default.hxx>
 #include <test/t8_gtest_custom_assertion.hxx>
 #include "t8_gtest_dfs_base.hxx"
diff --git a/test/t8_schemes/t8_gtest_bfs_base.hxx b/test/t8_schemes/t8_gtest_bfs_base.hxx
index 49de65b599..26b501964d 100644
--- a/test/t8_schemes/t8_gtest_bfs_base.hxx
+++ b/test/t8_schemes/t8_gtest_bfs_base.hxx
@@ -29,7 +29,7 @@
 #define T8_GTEST_BFS_BASE_HXX
 
 #include <gtest/gtest.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <test/t8_gtest_schemes.hxx>
 #include <queue>
 
diff --git a/test/t8_schemes/t8_gtest_boundary_extrude.cxx b/test/t8_schemes/t8_gtest_boundary_extrude.cxx
index eacd6bff2e..4b6abe640b 100644
--- a/test/t8_schemes/t8_gtest_boundary_extrude.cxx
+++ b/test/t8_schemes/t8_gtest_boundary_extrude.cxx
@@ -21,7 +21,7 @@
 */
 
 #include <gtest/gtest.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_schemes/t8_default/t8_default.hxx>
 #include <test/t8_gtest_custom_assertion.hxx>
 #include <test/t8_gtest_macros.hxx>
diff --git a/test/t8_schemes/t8_gtest_child_parent_face.cxx b/test/t8_schemes/t8_gtest_child_parent_face.cxx
index ad5785e30e..1f6805f435 100644
--- a/test/t8_schemes/t8_gtest_child_parent_face.cxx
+++ b/test/t8_schemes/t8_gtest_child_parent_face.cxx
@@ -21,7 +21,7 @@
 */
 
 #include <gtest/gtest.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_schemes/t8_default/t8_default.hxx>
 #include <test/t8_gtest_custom_assertion.hxx>
 #include "t8_gtest_dfs_base.hxx"
diff --git a/test/t8_schemes/t8_gtest_descendant.cxx b/test/t8_schemes/t8_gtest_descendant.cxx
index 8fb0604c77..5c5a611825 100644
--- a/test/t8_schemes/t8_gtest_descendant.cxx
+++ b/test/t8_schemes/t8_gtest_descendant.cxx
@@ -21,7 +21,7 @@
 */
 
 #include <gtest/gtest.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <test/t8_gtest_schemes.hxx>
 #include <test/t8_gtest_custom_assertion.hxx>
 #include <test/t8_gtest_macros.hxx>
diff --git a/test/t8_schemes/t8_gtest_dfs_base.hxx b/test/t8_schemes/t8_gtest_dfs_base.hxx
index 156ddfb358..f4dc2221ac 100644
--- a/test/t8_schemes/t8_gtest_dfs_base.hxx
+++ b/test/t8_schemes/t8_gtest_dfs_base.hxx
@@ -24,7 +24,7 @@
 #define T8_GTEST_SCHEME_HELPER_H
 
 #include <gtest/gtest.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <test/t8_gtest_schemes.hxx>
 
 struct TestDFS: public testing::TestWithParam<std::tuple<int, t8_eclass_t>>
diff --git a/test/t8_schemes/t8_gtest_element_ref_coords.cxx b/test/t8_schemes/t8_gtest_element_ref_coords.cxx
index 97ee0f62d4..deecc3894d 100644
--- a/test/t8_schemes/t8_gtest_element_ref_coords.cxx
+++ b/test/t8_schemes/t8_gtest_element_ref_coords.cxx
@@ -26,7 +26,7 @@
 */
 
 #include <gtest/gtest.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_types/t8_vec.h>
 #include <t8_schemes/t8_default/t8_default.hxx>
 #include <t8_forest/t8_forest.h>
diff --git a/test/t8_schemes/t8_gtest_elements_are_family.cxx b/test/t8_schemes/t8_gtest_elements_are_family.cxx
index 365b645edd..e0d3a5f876 100644
--- a/test/t8_schemes/t8_gtest_elements_are_family.cxx
+++ b/test/t8_schemes/t8_gtest_elements_are_family.cxx
@@ -21,7 +21,7 @@
 */
 
 #include <gtest/gtest.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <test/t8_gtest_schemes.hxx>
 #include <test/t8_gtest_macros.hxx>
 #include "t8_gtest_dfs_base.hxx"
diff --git a/test/t8_schemes/t8_gtest_equal.cxx b/test/t8_schemes/t8_gtest_equal.cxx
index fdf98b39ba..731f32b447 100644
--- a/test/t8_schemes/t8_gtest_equal.cxx
+++ b/test/t8_schemes/t8_gtest_equal.cxx
@@ -21,7 +21,7 @@
 */
 
 #include <gtest/gtest.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <test/t8_gtest_schemes.hxx>
 #include <test/t8_gtest_custom_assertion.hxx>
 #include <test/t8_gtest_macros.hxx>
diff --git a/test/t8_schemes/t8_gtest_face_corner.cxx b/test/t8_schemes/t8_gtest_face_corner.cxx
index 3d17d6ba01..bb6cfc36fb 100644
--- a/test/t8_schemes/t8_gtest_face_corner.cxx
+++ b/test/t8_schemes/t8_gtest_face_corner.cxx
@@ -21,7 +21,7 @@
 */
 
 #include <gtest/gtest.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <test/t8_gtest_schemes.hxx>
 #include <test/t8_gtest_custom_assertion.hxx>
 #include <test/t8_gtest_macros.hxx>
diff --git a/test/t8_schemes/t8_gtest_face_descendant.cxx b/test/t8_schemes/t8_gtest_face_descendant.cxx
index 32c3db6f20..b3d7d1aa94 100644
--- a/test/t8_schemes/t8_gtest_face_descendant.cxx
+++ b/test/t8_schemes/t8_gtest_face_descendant.cxx
@@ -21,7 +21,7 @@
 */
 
 #include <gtest/gtest.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <test/t8_gtest_schemes.hxx>
 #include <test/t8_gtest_custom_assertion.hxx>
 #include <test/t8_gtest_macros.hxx>
diff --git a/test/t8_schemes/t8_gtest_face_neigh.cxx b/test/t8_schemes/t8_gtest_face_neigh.cxx
index 875b9e536a..e1f3c81b6e 100644
--- a/test/t8_schemes/t8_gtest_face_neigh.cxx
+++ b/test/t8_schemes/t8_gtest_face_neigh.cxx
@@ -22,7 +22,7 @@
 
 #include <gtest/gtest.h>
 #include <test/t8_gtest_custom_assertion.hxx>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <test/t8_gtest_schemes.hxx>
 #include <test/t8_gtest_macros.hxx>
 
diff --git a/test/t8_schemes/t8_gtest_find_parent.cxx b/test/t8_schemes/t8_gtest_find_parent.cxx
index 6f58b165e5..d92c163170 100644
--- a/test/t8_schemes/t8_gtest_find_parent.cxx
+++ b/test/t8_schemes/t8_gtest_find_parent.cxx
@@ -21,7 +21,7 @@
 */
 
 #include <gtest/gtest.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <test/t8_gtest_schemes.hxx>
 #include <test/t8_gtest_custom_assertion.hxx>
 #include "t8_gtest_dfs_base.hxx"
diff --git a/test/t8_schemes/t8_gtest_get_linear_id.cxx b/test/t8_schemes/t8_gtest_get_linear_id.cxx
index 62764c3924..5bd386daf0 100644
--- a/test/t8_schemes/t8_gtest_get_linear_id.cxx
+++ b/test/t8_schemes/t8_gtest_get_linear_id.cxx
@@ -21,7 +21,7 @@
 */
 
 #include <gtest/gtest.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_forest/t8_forest_general.h>
 #include <test/t8_gtest_schemes.hxx>
 #include <sc_functions.h>
diff --git a/test/t8_schemes/t8_gtest_input_equal_output.cxx b/test/t8_schemes/t8_gtest_input_equal_output.cxx
index 7738482073..7bf52f04d5 100644
--- a/test/t8_schemes/t8_gtest_input_equal_output.cxx
+++ b/test/t8_schemes/t8_gtest_input_equal_output.cxx
@@ -21,7 +21,7 @@
 */
 
 #include <gtest/gtest.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <test/t8_gtest_schemes.hxx>
 #include <test/t8_gtest_custom_assertion.hxx>
 #include <test/t8_gtest_macros.hxx>
diff --git a/test/t8_schemes/t8_gtest_nca.cxx b/test/t8_schemes/t8_gtest_nca.cxx
index 252911581a..5465c879bb 100644
--- a/test/t8_schemes/t8_gtest_nca.cxx
+++ b/test/t8_schemes/t8_gtest_nca.cxx
@@ -27,7 +27,7 @@
 
 #include <gtest/gtest.h>
 #include <test/t8_gtest_custom_assertion.hxx>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <test/t8_gtest_schemes.hxx>
 #include <test/t8_gtest_macros.hxx>
 
diff --git a/test/t8_schemes/t8_gtest_pack_unpack.cxx b/test/t8_schemes/t8_gtest_pack_unpack.cxx
index 0a70d5b383..33fcbdde1c 100644
--- a/test/t8_schemes/t8_gtest_pack_unpack.cxx
+++ b/test/t8_schemes/t8_gtest_pack_unpack.cxx
@@ -21,7 +21,7 @@
 */
 
 #include <gtest/gtest.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <test/t8_gtest_custom_assertion.hxx>
 #include <test/t8_gtest_macros.hxx>
 #include <test/t8_gtest_schemes.hxx>
diff --git a/test/t8_schemes/t8_gtest_root.cxx b/test/t8_schemes/t8_gtest_root.cxx
index 41711c24bd..bbc04b12c0 100644
--- a/test/t8_schemes/t8_gtest_root.cxx
+++ b/test/t8_schemes/t8_gtest_root.cxx
@@ -27,7 +27,7 @@
 #include <test/t8_gtest_custom_assertion.hxx>
 #include <test/t8_gtest_macros.hxx>
 #include <test/t8_gtest_schemes.hxx>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_schemes/t8_default/t8_default.hxx>
 #include <test/t8_gtest_macros.hxx>
 
diff --git a/test/t8_schemes/t8_gtest_set_linear_id.cxx b/test/t8_schemes/t8_gtest_set_linear_id.cxx
index 38fb7bd583..c0b61b09b9 100644
--- a/test/t8_schemes/t8_gtest_set_linear_id.cxx
+++ b/test/t8_schemes/t8_gtest_set_linear_id.cxx
@@ -21,7 +21,7 @@
 */
 
 #include <gtest/gtest.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <test/t8_gtest_schemes.hxx>
 #include <test/t8_gtest_custom_assertion.hxx>
 #include <test/t8_gtest_macros.hxx>
diff --git a/test/t8_schemes/t8_gtest_successor.cxx b/test/t8_schemes/t8_gtest_successor.cxx
index 34a6e7eb33..b184a4019b 100644
--- a/test/t8_schemes/t8_gtest_successor.cxx
+++ b/test/t8_schemes/t8_gtest_successor.cxx
@@ -21,7 +21,7 @@
 */
 
 #include <gtest/gtest.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <test/t8_gtest_schemes.hxx>
 #include <test/t8_gtest_custom_assertion.hxx>
 #include <test/t8_gtest_macros.hxx>
diff --git a/tutorials/general/t8_step7_interpolation.cxx b/tutorials/general/t8_step7_interpolation.cxx
index 9f4eae297d..0d3991ab6d 100644
--- a/tutorials/general/t8_step7_interpolation.cxx
+++ b/tutorials/general/t8_step7_interpolation.cxx
@@ -28,7 +28,7 @@
 
 #include <iostream>
 #include <t8.h>
-#include <t8_eclass.h>
+#include <t8_eclass/t8_eclass.h>
 #include <t8_cmesh/t8_cmesh.h>
 #include <t8_cmesh/t8_cmesh_examples.h>
 #include <t8_forest/t8_forest_general.h>