DLR-AMR · spenke91 · Feb 2, 2026 · Feb 3, 2026 · Feb 3, 2026 · Feb 3, 2026
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;