88 files changed, 2 insertions, 2 deletions

diff --git a/default.nix b/default.nix
index 6f6b3ff..8e4322f 100644
--- a/default.nix
+++ b/default.nix
@@ -70,10 +70,10 @@ let
 in rec {
 	kel = {
 		lbm = {
-			core = pkgs.callPackage ./lib/core/.nix/derivation.nix {
+			core = pkgs.callPackage ./modules/core/.nix/derivation.nix {
 				inherit forstio stdenv clang-tools pname version;
 			};
-			sycl = pkgs.callPackage ./lib/sycl/.nix/derivation.nix {
+			sycl = pkgs.callPackage ./modules/sycl/.nix/derivation.nix {
 				inherit forstio stdenv clang-tools pname version kel adaptive-cpp;
 			};
 		};
diff --git a/lib/core/.nix/derivation.nix b/modules/core/.nix/derivation.nix
index 55a414f..55a414f 100644
--- a/lib/core/.nix/derivation.nix
+++ b/modules/core/.nix/derivation.nix
diff --git a/lib/core/SConstruct b/modules/core/SConstruct
index 8b3ab01..8b3ab01 100644
--- a/lib/core/SConstruct
+++ b/modules/core/SConstruct
diff --git a/lib/core/c++/SConscript b/modules/core/c++/SConscript
index 91f5b3e..91f5b3e 100644
--- a/lib/core/c++/SConscript
+++ b/modules/core/c++/SConscript
diff --git a/lib/core/c++/abstract/data.hpp b/modules/core/c++/abstract/data.hpp
index ed23268..ed23268 100644
--- a/lib/core/c++/abstract/data.hpp
+++ b/modules/core/c++/abstract/data.hpp
diff --git a/lib/core/c++/abstract/templates.hpp b/modules/core/c++/abstract/templates.hpp
index d9d9faa..d9d9faa 100644
--- a/lib/core/c++/abstract/templates.hpp
+++ b/modules/core/c++/abstract/templates.hpp
diff --git a/lib/core/c++/args.hpp b/modules/core/c++/args.hpp
index a0aa941..a0aa941 100644
--- a/lib/core/c++/args.hpp
+++ b/modules/core/c++/args.hpp
diff --git a/lib/core/c++/boundary.hpp b/modules/core/c++/boundary.hpp
index 01ae7b5..01ae7b5 100644
--- a/lib/core/c++/boundary.hpp
+++ b/modules/core/c++/boundary.hpp
diff --git a/lib/core/c++/chunk.hpp b/modules/core/c++/chunk.hpp
index 635af91..635af91 100644
--- a/lib/core/c++/chunk.hpp
+++ b/modules/core/c++/chunk.hpp
diff --git a/lib/core/c++/collision.hpp b/modules/core/c++/collision.hpp
index 023f61f..023f61f 100644
--- a/lib/core/c++/collision.hpp
+++ b/modules/core/c++/collision.hpp
diff --git a/lib/core/c++/common.hpp b/modules/core/c++/common.hpp
index 280d953..280d953 100644
--- a/lib/core/c++/common.hpp
+++ b/modules/core/c++/common.hpp
diff --git a/lib/core/c++/component.hpp b/modules/core/c++/component.hpp
index 1e5dbbf..1e5dbbf 100644
--- a/lib/core/c++/component.hpp
+++ b/modules/core/c++/component.hpp
diff --git a/lib/core/c++/config.hpp b/modules/core/c++/config.hpp
index 64f7a0f..64f7a0f 100644
--- a/lib/core/c++/config.hpp
+++ b/modules/core/c++/config.hpp
diff --git a/lib/core/c++/converter.hpp b/modules/core/c++/converter.hpp
index 4370a2c..4370a2c 100644
--- a/lib/core/c++/converter.hpp
+++ b/modules/core/c++/converter.hpp
diff --git a/lib/core/c++/descriptor.hpp b/modules/core/c++/descriptor.hpp
index 9f7399a..9f7399a 100644
--- a/lib/core/c++/descriptor.hpp
+++ b/modules/core/c++/descriptor.hpp
diff --git a/lib/core/c++/dfs.hpp b/modules/core/c++/dfs.hpp
index 175e9f2..175e9f2 100644
--- a/lib/core/c++/dfs.hpp
+++ b/modules/core/c++/dfs.hpp
diff --git a/lib/core/c++/environment.hpp b/modules/core/c++/environment.hpp
index d8aa9ae..d8aa9ae 100644
--- a/lib/core/c++/environment.hpp
+++ b/modules/core/c++/environment.hpp
diff --git a/lib/core/c++/equilibrium.hpp b/modules/core/c++/equilibrium.hpp
index eb2b043..eb2b043 100644
--- a/lib/core/c++/equilibrium.hpp
+++ b/modules/core/c++/equilibrium.hpp
diff --git a/lib/core/c++/flatten.hpp b/modules/core/c++/flatten.hpp
index 1609589..1609589 100644
--- a/lib/core/c++/flatten.hpp
+++ b/modules/core/c++/flatten.hpp
diff --git a/lib/core/c++/fplbm.hpp b/modules/core/c++/fplbm.hpp
index c974472..c974472 100644
--- a/lib/core/c++/fplbm.hpp
+++ b/modules/core/c++/fplbm.hpp
diff --git a/lib/core/c++/geometry.hpp b/modules/core/c++/geometry.hpp
index 1c5d0a3..1c5d0a3 100644
--- a/lib/core/c++/geometry.hpp
+++ b/modules/core/c++/geometry.hpp
diff --git a/lib/core/c++/geometry/poiseulle_channel.hpp b/modules/core/c++/geometry/poiseulle_channel.hpp
index f719ec4..f719ec4 100644
--- a/lib/core/c++/geometry/poiseulle_channel.hpp
+++ b/modules/core/c++/geometry/poiseulle_channel.hpp
diff --git a/lib/core/c++/grid.hpp b/modules/core/c++/grid.hpp
index c9a3b05..c9a3b05 100644
--- a/lib/core/c++/grid.hpp
+++ b/modules/core/c++/grid.hpp
diff --git a/lib/core/c++/hlbm.hpp b/modules/core/c++/hlbm.hpp
index 18c32a5..18c32a5 100644
--- a/lib/core/c++/hlbm.hpp
+++ b/modules/core/c++/hlbm.hpp
diff --git a/lib/core/c++/index.hpp b/modules/core/c++/index.hpp
index 00e597e..00e597e 100644
--- a/lib/core/c++/index.hpp
+++ b/modules/core/c++/index.hpp
diff --git a/lib/core/c++/iterator.hpp b/modules/core/c++/iterator.hpp
index 7fd6f58..7fd6f58 100644
--- a/lib/core/c++/iterator.hpp
+++ b/modules/core/c++/iterator.hpp
diff --git a/lib/core/c++/lbm.hpp b/modules/core/c++/lbm.hpp
index 23d30b1..23d30b1 100644
--- a/lib/core/c++/lbm.hpp
+++ b/modules/core/c++/lbm.hpp
diff --git a/lib/core/c++/lbm_unit.hpp b/modules/core/c++/lbm_unit.hpp
index 2d90652..2d90652 100644
--- a/lib/core/c++/lbm_unit.hpp
+++ b/modules/core/c++/lbm_unit.hpp
diff --git a/lib/core/c++/macroscopic.hpp b/modules/core/c++/macroscopic.hpp
index 19ab3e9..19ab3e9 100644
--- a/lib/core/c++/macroscopic.hpp
+++ b/modules/core/c++/macroscopic.hpp
diff --git a/lib/core/c++/math/math.hpp b/modules/core/c++/math/math.hpp
index 3920bec..3920bec 100644
--- a/lib/core/c++/math/math.hpp
+++ b/modules/core/c++/math/math.hpp
diff --git a/lib/core/c++/math/n_closest.hpp b/modules/core/c++/math/n_closest.hpp
index ac0fe2f..ac0fe2f 100644
--- a/lib/core/c++/math/n_closest.hpp
+++ b/modules/core/c++/math/n_closest.hpp
diff --git a/lib/core/c++/math/n_linear.hpp b/modules/core/c++/math/n_linear.hpp
index b378440..b378440 100644
--- a/lib/core/c++/math/n_linear.hpp
+++ b/modules/core/c++/math/n_linear.hpp
diff --git a/lib/core/c++/math/round.hpp b/modules/core/c++/math/round.hpp
index d3a2586..d3a2586 100644
--- a/lib/core/c++/math/round.hpp
+++ b/modules/core/c++/math/round.hpp
diff --git a/lib/core/c++/memory.hpp b/modules/core/c++/memory.hpp
index e97c7fc..e97c7fc 100644
--- a/lib/core/c++/memory.hpp
+++ b/modules/core/c++/memory.hpp
diff --git a/lib/core/c++/momentum_gather.hpp b/modules/core/c++/momentum_gather.hpp
index 7b1fc96..7b1fc96 100644
--- a/lib/core/c++/momentum_gather.hpp
+++ b/modules/core/c++/momentum_gather.hpp
diff --git a/lib/core/c++/particle.hpp b/modules/core/c++/particle.hpp
index 691a74b..691a74b 100644
--- a/lib/core/c++/particle.hpp
+++ b/modules/core/c++/particle.hpp
diff --git a/lib/core/c++/particle/aabb.hpp b/modules/core/c++/particle/aabb.hpp
index 1773dea..1773dea 100644
--- a/lib/core/c++/particle/aabb.hpp
+++ b/modules/core/c++/particle/aabb.hpp
diff --git a/lib/core/c++/particle/blur.hpp b/modules/core/c++/particle/blur.hpp
index b7a1988..b7a1988 100644
--- a/lib/core/c++/particle/blur.hpp
+++ b/modules/core/c++/particle/blur.hpp
diff --git a/lib/core/c++/particle/common.hpp b/modules/core/c++/particle/common.hpp
index 9e673c2..9e673c2 100644
--- a/lib/core/c++/particle/common.hpp
+++ b/modules/core/c++/particle/common.hpp
diff --git a/lib/core/c++/particle/geometry/circle.hpp b/modules/core/c++/particle/geometry/circle.hpp
index cf9b87e..cf9b87e 100644
--- a/lib/core/c++/particle/geometry/circle.hpp
+++ b/modules/core/c++/particle/geometry/circle.hpp
diff --git a/lib/core/c++/particle/geometry/cube.hpp b/modules/core/c++/particle/geometry/cube.hpp
index 6392de8..6392de8 100644
--- a/lib/core/c++/particle/geometry/cube.hpp
+++ b/modules/core/c++/particle/geometry/cube.hpp
diff --git a/lib/core/c++/particle/particle.hpp b/modules/core/c++/particle/particle.hpp
index 8e75e5a..8e75e5a 100644
--- a/lib/core/c++/particle/particle.hpp
+++ b/modules/core/c++/particle/particle.hpp
diff --git a/lib/core/c++/particle/particle_opa.hpp b/modules/core/c++/particle/particle_opa.hpp
index a5e6c28..a5e6c28 100644
--- a/lib/core/c++/particle/particle_opa.hpp
+++ b/modules/core/c++/particle/particle_opa.hpp
diff --git a/lib/core/c++/particle/porosity.hpp b/modules/core/c++/particle/porosity.hpp
index 2f39d2e..2f39d2e 100644
--- a/lib/core/c++/particle/porosity.hpp
+++ b/modules/core/c++/particle/porosity.hpp
diff --git a/lib/core/c++/particle/schema.hpp b/modules/core/c++/particle/schema.hpp
index 714a16f..714a16f 100644
--- a/lib/core/c++/particle/schema.hpp
+++ b/modules/core/c++/particle/schema.hpp
diff --git a/lib/core/c++/psm.hpp b/modules/core/c++/psm.hpp
index 6dc146f..6dc146f 100644
--- a/lib/core/c++/psm.hpp
+++ b/modules/core/c++/psm.hpp
diff --git a/lib/core/c++/rar.hpp b/modules/core/c++/rar.hpp
index dc2b61c..dc2b61c 100644
--- a/lib/core/c++/rar.hpp
+++ b/modules/core/c++/rar.hpp
diff --git a/lib/core/c++/schema.hpp b/modules/core/c++/schema.hpp
index 7712f99..7712f99 100644
--- a/lib/core/c++/schema.hpp
+++ b/modules/core/c++/schema.hpp
diff --git a/lib/core/c++/simulation/common.hpp b/modules/core/c++/simulation/common.hpp
index f675a99..f675a99 100644
--- a/lib/core/c++/simulation/common.hpp
+++ b/modules/core/c++/simulation/common.hpp
diff --git a/lib/core/c++/simulation/hlbm.hpp b/modules/core/c++/simulation/hlbm.hpp
index 93df9a7..93df9a7 100644
--- a/lib/core/c++/simulation/hlbm.hpp
+++ b/modules/core/c++/simulation/hlbm.hpp
diff --git a/lib/core/c++/statistics.hpp b/modules/core/c++/statistics.hpp
index c07ccb7..c07ccb7 100644
--- a/lib/core/c++/statistics.hpp
+++ b/modules/core/c++/statistics.hpp
diff --git a/lib/core/c++/stream.hpp b/modules/core/c++/stream.hpp
index dc7cfb3..dc7cfb3 100644
--- a/lib/core/c++/stream.hpp
+++ b/modules/core/c++/stream.hpp
diff --git a/lib/core/c++/util.hpp b/modules/core/c++/util.hpp
index 0bdebd1..0bdebd1 100644
--- a/lib/core/c++/util.hpp
+++ b/modules/core/c++/util.hpp
diff --git a/lib/core/c++/write_csv.hpp b/modules/core/c++/write_csv.hpp
index a60e208..a60e208 100644
--- a/lib/core/c++/write_csv.hpp
+++ b/modules/core/c++/write_csv.hpp
diff --git a/lib/core/c++/write_json.hpp b/modules/core/c++/write_json.hpp
index 19bbfa6..19bbfa6 100644
--- a/lib/core/c++/write_json.hpp
+++ b/modules/core/c++/write_json.hpp
diff --git a/lib/core/c++/write_vtk.hpp b/modules/core/c++/write_vtk.hpp
index e852172..e852172 100644
--- a/lib/core/c++/write_vtk.hpp
+++ b/modules/core/c++/write_vtk.hpp
diff --git a/lib/core/tests/SConscript b/modules/core/tests/SConscript
index d1b381e..d1b381e 100644
--- a/lib/core/tests/SConscript
+++ b/modules/core/tests/SConscript
diff --git a/lib/core/tests/chunk.cpp b/modules/core/tests/chunk.cpp
index 008d4c6..008d4c6 100644
--- a/lib/core/tests/chunk.cpp
+++ b/modules/core/tests/chunk.cpp
diff --git a/lib/core/tests/collision.cpp b/modules/core/tests/collision.cpp
index cd53336..cd53336 100644
--- a/lib/core/tests/collision.cpp
+++ b/modules/core/tests/collision.cpp
diff --git a/lib/core/tests/converter.cpp b/modules/core/tests/converter.cpp
index 4fc536f..4fc536f 100644
--- a/lib/core/tests/converter.cpp
+++ b/modules/core/tests/converter.cpp
diff --git a/lib/core/tests/descriptor.cpp b/modules/core/tests/descriptor.cpp
index 7f743ce..7f743ce 100644
--- a/lib/core/tests/descriptor.cpp
+++ b/modules/core/tests/descriptor.cpp
diff --git a/lib/core/tests/equilibrium.cpp b/modules/core/tests/equilibrium.cpp
index 20a1f08..20a1f08 100644
--- a/lib/core/tests/equilibrium.cpp
+++ b/modules/core/tests/equilibrium.cpp
diff --git a/lib/core/tests/flatten.cpp b/modules/core/tests/flatten.cpp
index 84b3fa4..84b3fa4 100644
--- a/lib/core/tests/flatten.cpp
+++ b/modules/core/tests/flatten.cpp
diff --git a/lib/core/tests/iterator.cpp b/modules/core/tests/iterator.cpp
index 919c12c..919c12c 100644
--- a/lib/core/tests/iterator.cpp
+++ b/modules/core/tests/iterator.cpp
diff --git a/lib/core/tests/math.cpp b/modules/core/tests/math.cpp
index d456ce8..d456ce8 100644
--- a/lib/core/tests/math.cpp
+++ b/modules/core/tests/math.cpp
diff --git a/lib/core/tests/memory.cpp b/modules/core/tests/memory.cpp
index d59d212..d59d212 100644
--- a/lib/core/tests/memory.cpp
+++ b/modules/core/tests/memory.cpp
diff --git a/lib/core/tests/particles.cpp b/modules/core/tests/particles.cpp
index 133c343..133c343 100644
--- a/lib/core/tests/particles.cpp
+++ b/modules/core/tests/particles.cpp
diff --git a/lib/core/tests/vtk_write.cpp b/modules/core/tests/vtk_write.cpp
index c99d752..c99d752 100644
--- a/lib/core/tests/vtk_write.cpp
+++ b/modules/core/tests/vtk_write.cpp
diff --git a/lib/heterogenous/.nix/derivation.nix b/modules/heterogenous/.nix/derivation.nix
index 3686e21..3686e21 100644
--- a/lib/heterogenous/.nix/derivation.nix
+++ b/modules/heterogenous/.nix/derivation.nix
diff --git a/lib/heterogenous/SConstruct b/modules/heterogenous/SConstruct
index 8b3ab01..8b3ab01 100644
--- a/lib/heterogenous/SConstruct
+++ b/modules/heterogenous/SConstruct
diff --git a/lib/heterogenous/c++/SConscript b/modules/heterogenous/c++/SConscript
index b66e979..b66e979 100644
--- a/lib/heterogenous/c++/SConscript
+++ b/modules/heterogenous/c++/SConscript
diff --git a/lib/heterogenous/c++/common.hpp b/modules/heterogenous/c++/common.hpp
index 789c876..789c876 100644
--- a/lib/heterogenous/c++/common.hpp
+++ b/modules/heterogenous/c++/common.hpp
diff --git a/lib/heterogenous/tests/SConscript b/modules/heterogenous/tests/SConscript
index d1b381e..d1b381e 100644
--- a/lib/heterogenous/tests/SConscript
+++ b/modules/heterogenous/tests/SConscript
diff --git a/lib/png/.nix/derivation.nix b/modules/png/.nix/derivation.nix
index 6e52083..6e52083 100644
--- a/lib/png/.nix/derivation.nix
+++ b/modules/png/.nix/derivation.nix
diff --git a/lib/png/SConstruct b/modules/png/SConstruct
index 8b3ab01..8b3ab01 100644
--- a/lib/png/SConstruct
+++ b/modules/png/SConstruct
diff --git a/lib/png/c++/SConscript b/modules/png/c++/SConscript
index 75b8645..75b8645 100644
--- a/lib/png/c++/SConscript
+++ b/modules/png/c++/SConscript
diff --git a/lib/png/c++/png.cpp b/modules/png/c++/png.cpp
index 248a8a5..248a8a5 100644
--- a/lib/png/c++/png.cpp
+++ b/modules/png/c++/png.cpp
diff --git a/lib/png/c++/png.hpp b/modules/png/c++/png.hpp
index f675a99..f675a99 100644
--- a/lib/png/c++/png.hpp
+++ b/modules/png/c++/png.hpp
diff --git a/lib/sycl/.nix/derivation.nix b/modules/sycl/.nix/derivation.nix
index 4422739..4422739 100644
--- a/lib/sycl/.nix/derivation.nix
+++ b/modules/sycl/.nix/derivation.nix
diff --git a/lib/sycl/SConstruct b/modules/sycl/SConstruct
index f8bfbcb..f8bfbcb 100644
--- a/lib/sycl/SConstruct
+++ b/modules/sycl/SConstruct
diff --git a/lib/sycl/c++/SConscript b/modules/sycl/c++/SConscript
index 2ed63ba..2ed63ba 100644
--- a/lib/sycl/c++/SConscript
+++ b/modules/sycl/c++/SConscript
diff --git a/lib/sycl/c++/common.hpp b/modules/sycl/c++/common.hpp
index 8ff76fc..8ff76fc 100644
--- a/lib/sycl/c++/common.hpp
+++ b/modules/sycl/c++/common.hpp
diff --git a/lib/sycl/c++/data.hpp b/modules/sycl/c++/data.hpp
index 9f43848..9f43848 100644
--- a/lib/sycl/c++/data.hpp
+++ b/modules/sycl/c++/data.hpp
diff --git a/lib/sycl/c++/index.hpp b/modules/sycl/c++/index.hpp
index 0d2c035..0d2c035 100644
--- a/lib/sycl/c++/index.hpp
+++ b/modules/sycl/c++/index.hpp
diff --git a/lib/sycl/c++/lbm.hpp b/modules/sycl/c++/lbm.hpp
index 3e67ae6..3e67ae6 100644
--- a/lib/sycl/c++/lbm.hpp
+++ b/modules/sycl/c++/lbm.hpp
diff --git a/lib/sycl/c++/sycl.hpp b/modules/sycl/c++/sycl.hpp
index 973b511..973b511 100644
--- a/lib/sycl/c++/sycl.hpp
+++ b/modules/sycl/c++/sycl.hpp
diff --git a/lib/sycl/tests/SConscript b/modules/sycl/tests/SConscript
index d1b381e..d1b381e 100644
--- a/lib/sycl/tests/SConscript
+++ b/modules/sycl/tests/SConscript
diff --git a/lib/sycl/tests/data.cpp b/modules/sycl/tests/data.cpp
index 4321a0d..4321a0d 100644
--- a/lib/sycl/tests/data.cpp
+++ b/modules/sycl/tests/data.cpp