tudat-team · DominicDirkx · Nov 3, 2023 · Nov 1, 2023 · Nov 2, 2023
diff --git a/tudatpy/CMakeLists.txt b/tudatpy/CMakeLists.txt
@@ -157,35 +157,30 @@ install(TARGETS kernel
         LIBRARY DESTINATION ${TUDATPY_INSTALL_PATH}
         )
 
-# Install the Python files.
+# Install Python files.
 install(FILES ${TUDATPY_PYTHON_FILES} "${CMAKE_CURRENT_BINARY_DIR}/_version.py"
         DESTINATION ${TUDATPY_INSTALL_PATH})
 
-# Install the Python modules.
-macro(INSTALL_PURE_PYTHON_MODULE_DIR module_dir_name)
+# Install hybrid C++/Python modules
+macro(INSTALL_HYBRID_CPP_PYTHON_MODULE module_dir_name)
     install(DIRECTORY ${module_dir_name}/ DESTINATION "${TUDATPY_INSTALL_PATH}/${module_dir_name}")
     file(COPY ${module_dir_name}/ DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/${module_dir_name}/)
 endmacro()
-INSTALL_PURE_PYTHON_MODULE_DIR(apps)
-INSTALL_PURE_PYTHON_MODULE_DIR(bodies)
-INSTALL_PURE_PYTHON_MODULE_DIR(plotting)
-INSTALL_PURE_PYTHON_MODULE_DIR(data)
-INSTALL_PURE_PYTHON_MODULE_DIR(util)
-INSTALL_PURE_PYTHON_MODULE_DIR(io)
-
-# Create hybrid C++/Python modules
-macro(CREATE_HYBRID_CPP_PYTHON_MODULE module_dir_name)
-    install(DIRECTORY kernel_hybrid/${module_dir_name}/ DESTINATION "${TUDATPY_INSTALL_PATH}/${module_dir_name}")
-    file(COPY kernel_hybrid/${module_dir_name}/ DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/${module_dir_name}/)
-endmacro()
-# CREATE_HYBRID_CPP_PYTHON_MODULE(utils)
-CREATE_HYBRID_CPP_PYTHON_MODULE(astro)
-CREATE_HYBRID_CPP_PYTHON_MODULE(trajectory_design)
-CREATE_HYBRID_CPP_PYTHON_MODULE(constants)
-CREATE_HYBRID_CPP_PYTHON_MODULE(interface)
-# CREATE_HYBRID_CPP_PYTHON_MODULE(io)
-CREATE_HYBRID_CPP_PYTHON_MODULE(math)
-CREATE_HYBRID_CPP_PYTHON_MODULE(numerical_simulation)
+
+# Hybrid modules
+INSTALL_HYBRID_CPP_PYTHON_MODULE(astro)
+INSTALL_HYBRID_CPP_PYTHON_MODULE(trajectory_design)
+INSTALL_HYBRID_CPP_PYTHON_MODULE(constants)
+INSTALL_HYBRID_CPP_PYTHON_MODULE(interface)
+INSTALL_HYBRID_CPP_PYTHON_MODULE(math)
+INSTALL_HYBRID_CPP_PYTHON_MODULE(numerical_simulation)
+# Pure Python modules
+INSTALL_HYBRID_CPP_PYTHON_MODULE(apps)
+INSTALL_HYBRID_CPP_PYTHON_MODULE(bodies)
+INSTALL_HYBRID_CPP_PYTHON_MODULE(plotting)
+INSTALL_HYBRID_CPP_PYTHON_MODULE(data)
+INSTALL_HYBRID_CPP_PYTHON_MODULE(util)
+INSTALL_HYBRID_CPP_PYTHON_MODULE(io)
 
 # TODO: Automatic exposure of hybrid C++/Python modules
 # This involves solving the dependencies which conda

diff --git a/tudatpy/kernel_hybrid/astro/__init__.py → tudatpy/astro/__init__.py b/tudatpy/kernel_hybrid/astro/__init__.py → tudatpy/astro/__init__.py
@@ -1,6 +1,6 @@
 # This file, by virtue of the import statement below, merges
 # the Tudat kernel module `tudatpy.kernel.astro` with
-# its Python extensions defined in `tudatpy/kernel_hybrid/astro`.
+# its Python extensions defined in `tudatpy/astro`.
 # 
 # This allows the import of all the C++ and Python submodules of the 
 # `astro` kernel module directly from tudatpy:

diff --git a/...brid/astro/element_conversion/__init__.py → tudatpy/astro/element_conversion/__init__.py b/...brid/astro/element_conversion/__init__.py → tudatpy/astro/element_conversion/__init__.py
@@ -1,6 +1,6 @@
 # This file, by virtue of the import statement below, merges
 # the Tudat kernel module `tudatpy.kernel.astro.element_conversion` with
-# its Python extensions defined in `tudatpy/kernel_hybrid/astro/element_conversion`.
+# its Python extensions defined in `tudatpy/astro/element_conversion`.
 # 
 # This allows the import of all the C++ and Python submodules of the 
 # `astro.element_conversion` kernel module directly from tudatpy:

diff --git a/...hybrid/astro/frame_conversion/__init__.py → tudatpy/astro/frame_conversion/__init__.py b/...hybrid/astro/frame_conversion/__init__.py → tudatpy/astro/frame_conversion/__init__.py
@@ -1,6 +1,6 @@
 # This file, by virtue of the import statement below, merges
 # the Tudat kernel module `tudatpy.kernel.astro.frame_conversion` with
-# its Python extensions defined in `tudatpy/kernel_hybrid/astro/frame_conversion`.
+# its Python extensions defined in `tudatpy/astro/frame_conversion`.
 # 
 # This allows the import of all the C++ and Python submodules of the 
 # `astro.frame_conversion` kernel module directly from tudatpy:

diff --git a/...nel_hybrid/astro/fundamentals/__init__.py → tudatpy/astro/fundamentals/__init__.py b/...nel_hybrid/astro/fundamentals/__init__.py → tudatpy/astro/fundamentals/__init__.py
@@ -1,6 +1,6 @@
 # This file, by virtue of the import statement below, merges
 # the Tudat kernel module `tudatpy.kernel.astro.fundamentals` with
-# its Python extensions defined in `tudatpy/kernel_hybrid/astro/fundamentals`.
+# its Python extensions defined in `tudatpy/astro/fundamentals`.
 # 
 # This allows the import of all the C++ and Python submodules of the 
 # `astro.fundamentals` kernel module directly from tudatpy:

diff --git a/...rnel_hybrid/astro/gravitation/__init__.py → tudatpy/astro/gravitation/__init__.py b/...rnel_hybrid/astro/gravitation/__init__.py → tudatpy/astro/gravitation/__init__.py
@@ -1,6 +1,6 @@
 # This file, by virtue of the import statement below, merges
 # the Tudat kernel module `tudatpy.kernel.astro.gravitation` with
-# its Python extensions defined in `tudatpy/kernel_hybrid/astro/gravitation`.
+# its Python extensions defined in `tudatpy/astro/gravitation`.
 # 
 # This allows the import of all the C++ and Python submodules of the 
 # `astro.gravitation` kernel module directly from tudatpy:

diff --git a/...id/astro/polyhedron_utilities/__init__.py → ...py/astro/polyhedron_utilities/__init__.py b/...id/astro/polyhedron_utilities/__init__.py → ...py/astro/polyhedron_utilities/__init__.py
@@ -1,6 +1,6 @@
 # This file, by virtue of the import statement below, merges
 # the Tudat kernel module `tudatpy.kernel.astro.polyhedron_utilities` with
-# its Python extensions defined in `tudatpy/kernel_hybrid/astro/polyhedron_utilities`.
+# its Python extensions defined in `tudatpy/astro/polyhedron_utilities`.
 # 
 # This allows the import of all the C++ and Python submodules of the 
 # `astro.polyhedron_utilities` kernel module directly from tudatpy:

diff --git a/..._hybrid/astro/time_conversion/__init__.py → tudatpy/astro/time_conversion/__init__.py b/..._hybrid/astro/time_conversion/__init__.py → tudatpy/astro/time_conversion/__init__.py
@@ -1,6 +1,6 @@
 # This file, by virtue of the import statement below, merges
 # the Tudat kernel module `tudatpy.kernel.astro.time_conversion` with
-# its Python extensions defined in `tudatpy/kernel_hybrid/astro/time_conversion`.
+# its Python extensions defined in `tudatpy/astro/time_conversion`.
 # 
 # This allows the import of all the C++ and Python submodules of the 
 # `astro.time_conversion` kernel module directly from tudatpy:

diff --git a/...ybrid/astro/two_body_dynamics/__init__.py → tudatpy/astro/two_body_dynamics/__init__.py b/...ybrid/astro/two_body_dynamics/__init__.py → tudatpy/astro/two_body_dynamics/__init__.py
@@ -1,6 +1,6 @@
 # This file, by virtue of the import statement below, merges
 # the Tudat kernel module `tudatpy.kernel.astro.two_body_dynamics` with
-# its Python extensions defined in `tudatpy/kernel_hybrid/astro/two_body_dynamics`.
+# its Python extensions defined in `tudatpy/astro/two_body_dynamics`.
 # 
 # This allows the import of all the C++ and Python submodules of the 
 # `astro.two_body_dynamics` kernel module directly from tudatpy:

diff --git a/tudatpy/kernel_hybrid/constants/__init__.py → tudatpy/constants/__init__.py b/tudatpy/kernel_hybrid/constants/__init__.py → tudatpy/constants/__init__.py
@@ -1,6 +1,6 @@
 # This file, by virtue of the import statement below, merges
 # the Tudat kernel module `tudatpy.kernel.constants` with
-# its Python extensions defined in `tudatpy/kernel_hybrid/constants`.
+# its Python extensions defined in `tudatpy/constants`.
 # 
 # This allows the import of all the C++ and Python submodules of the 
 # `constants` kernel module directly from tudatpy:

diff --git a/tudatpy/data/horizons.py b/tudatpy/data/horizons.py
@@ -11,8 +11,8 @@
 from typing import Union, List, Tuple
 import datetime
 
-from ..kernel import constants
-from ..kernel.numerical_simulation import environment_setup
+from tudatpy import constants
+from tudatpy.numerical_simulation import environment_setup
 
 import re
 

diff --git a/tudatpy/kernel_hybrid/interface/__init__.py → tudatpy/interface/__init__.py b/tudatpy/kernel_hybrid/interface/__init__.py → tudatpy/interface/__init__.py
@@ -1,6 +1,6 @@
 # This file, by virtue of the import statement below, merges
 # the Tudat kernel module `tudatpy.kernel.interface` with
-# its Python extensions defined in `tudatpy/kernel_hybrid/interface`.
+# its Python extensions defined in `tudatpy/interface`.
 # 
 # This allows the import of all the C++ and Python submodules of the 
 # `interface` kernel module directly from tudatpy:

diff --git a/...kernel_hybrid/interface/spice/__init__.py → tudatpy/interface/spice/__init__.py b/...kernel_hybrid/interface/spice/__init__.py → tudatpy/interface/spice/__init__.py
@@ -1,6 +1,6 @@
 # This file, by virtue of the import statement below, merges
 # the Tudat kernel module `tudatpy.kernel.interface.spice` with
-# its Python extensions defined in `tudatpy/kernel_hybrid/interface/spice`.
+# its Python extensions defined in `tudatpy/interface/spice`.
 # 
 # This allows the import of all the C++ and Python submodules of the 
 # `interface.spice` kernel module directly from tudatpy:

diff --git a/tudatpy/kernel_hybrid/math/__init__.py → tudatpy/math/__init__.py b/tudatpy/kernel_hybrid/math/__init__.py → tudatpy/math/__init__.py
@@ -1,6 +1,6 @@
 # This file, by virtue of the import statement below, merges
 # the Tudat kernel module `tudatpy.kernel.math` with
-# its Python extensions defined in `tudatpy/kernel_hybrid/math`.
+# its Python extensions defined in `tudatpy/math`.
 # 
 # This allows the import of all the C++ and Python submodules of the 
 # `math` kernel module directly from tudatpy:

diff --git a/...y/kernel_hybrid/math/geometry/__init__.py → tudatpy/math/geometry/__init__.py b/...y/kernel_hybrid/math/geometry/__init__.py → tudatpy/math/geometry/__init__.py
@@ -1,6 +1,6 @@
 # This file, by virtue of the import statement below, merges
 # the Tudat kernel module `tudatpy.kernel.math.geometry` with
-# its Python extensions defined in `tudatpy/kernel_hybrid/math/geometry`.
+# its Python extensions defined in `tudatpy/math/geometry`.
 # 
 # This allows the import of all the C++ and Python submodules of the 
 # `math.geometry` kernel module directly from tudatpy:

diff --git a/...nel_hybrid/math/interpolators/__init__.py → tudatpy/math/interpolators/__init__.py b/...nel_hybrid/math/interpolators/__init__.py → tudatpy/math/interpolators/__init__.py
@@ -1,6 +1,6 @@
 # This file, by virtue of the import statement below, merges
 # the Tudat kernel module `tudatpy.kernel.math.interpolators` with
-# its Python extensions defined in `tudatpy/kernel_hybrid/math/interpolators`.
+# its Python extensions defined in `tudatpy/math/interpolators`.
 # 
 # This allows the import of all the C++ and Python submodules of the 
 # `math.interpolators` kernel module directly from tudatpy:

diff --git a/...id/math/numerical_integrators/__init__.py → ...py/math/numerical_integrators/__init__.py b/...id/math/numerical_integrators/__init__.py → ...py/math/numerical_integrators/__init__.py
@@ -1,6 +1,6 @@
 # This file, by virtue of the import statement below, merges
 # the Tudat kernel module `tudatpy.kernel.math.numerical_integrators` with
-# its Python extensions defined in `tudatpy/kernel_hybrid/math/numerical_integrators`.
+# its Python extensions defined in `tudatpy/math/numerical_integrators`.
 # 
 # This allows the import of all the C++ and Python submodules of the 
 # `math.numerical_integrators` kernel module directly from tudatpy:

diff --git a/...rnel_hybrid/math/root_finders/__init__.py → tudatpy/math/root_finders/__init__.py b/...rnel_hybrid/math/root_finders/__init__.py → tudatpy/math/root_finders/__init__.py
@@ -1,6 +1,6 @@
 # This file, by virtue of the import statement below, merges
 # the Tudat kernel module `tudatpy.kernel.math.root_finders` with
-# its Python extensions defined in `tudatpy/kernel_hybrid/math/root_finders`.
+# its Python extensions defined in `tudatpy/math/root_finders`.
 # 
 # This allows the import of all the C++ and Python submodules of the 
 # `math.root_finders` kernel module directly from tudatpy:

diff --git a/...l_hybrid/numerical_simulation/__init__.py → tudatpy/numerical_simulation/__init__.py b/...l_hybrid/numerical_simulation/__init__.py → tudatpy/numerical_simulation/__init__.py
@@ -1,6 +1,6 @@
 # This file, by virtue of the import statement below, merges
 # the Tudat kernel module `tudatpy.kernel.numerical_simulation` with
-# its Python extensions defined in `tudatpy/kernel_hybrid/numerical_simulation`.
+# its Python extensions defined in `tudatpy/numerical_simulation`.
 # 
 # This allows the import of all the C++ and Python submodules of the 
 # `numerical_simulation` kernel module directly from tudatpy:

diff --git a/...erical_simulation/environment/__init__.py → ...erical_simulation/environment/__init__.py b/...erical_simulation/environment/__init__.py → ...erical_simulation/environment/__init__.py
@@ -1,6 +1,6 @@
 # This file, by virtue of the import statement below, merges
 # the Tudat kernel module `tudatpy.kernel.numerical_simulation.environment` with
-# its Python extensions defined in `tudatpy/kernel_hybrid/numerical_simulation/environment`.
+# its Python extensions defined in `tudatpy/numerical_simulation/environment`.
 # 
 # This allows the import of all the C++ and Python submodules of the 
 # `numerical_simulation.environment` kernel module directly from tudatpy:

diff --git a/..._simulation/environment_setup/__init__.py → ..._simulation/environment_setup/__init__.py b/..._simulation/environment_setup/__init__.py → ..._simulation/environment_setup/__init__.py
@@ -1,6 +1,6 @@
 # This file, by virtue of the import statement below, merges
 # the Tudat kernel module `tudatpy.kernel.numerical_simulation.environment_setup` with
-# its Python extensions defined in `tudatpy/kernel_hybrid/numerical_simulation/environment_setup`.
+# its Python extensions defined in `tudatpy/numerical_simulation/environment_setup`.
 # 
 # This allows the import of all the C++ and Python submodules of the 
 # `numerical_simulation.environment_setup` kernel module directly from tudatpy:

diff --git a/...etup/aerodynamic_coefficients/__init__.py → ...etup/aerodynamic_coefficients/__init__.py b/...etup/aerodynamic_coefficients/__init__.py → ...etup/aerodynamic_coefficients/__init__.py
@@ -1,6 +1,6 @@
 # This file, by virtue of the import statement below, merges
 # the Tudat kernel module `tudatpy.kernel.numerical_simulation.environment_setup.aerodynamic_coefficients` with
-# its Python extensions defined in `tudatpy/kernel_hybrid/numerical_simulation/environment_setup/aerodynamic_coefficients`.
+# its Python extensions defined in `tudatpy/numerical_simulation/environment_setup/aerodynamic_coefficients`.
 # 
 # This allows the import of all the C++ and Python submodules of the 
 # `numerical_simulation.environment_setup.aerodynamic_coefficients` kernel module directly from tudatpy:

diff --git a/.../environment_setup/atmosphere/__init__.py → .../environment_setup/atmosphere/__init__.py b/.../environment_setup/atmosphere/__init__.py → .../environment_setup/atmosphere/__init__.py
@@ -1,6 +1,6 @@
 # This file, by virtue of the import statement below, merges
 # the Tudat kernel module `tudatpy.kernel.numerical_simulation.environment_setup.atmosphere` with
-# its Python extensions defined in `tudatpy/kernel_hybrid/numerical_simulation/environment_setup/atmosphere`.
+# its Python extensions defined in `tudatpy/numerical_simulation/environment_setup/atmosphere`.
 # 
 # This allows the import of all the C++ and Python submodules of the 
 # `numerical_simulation.environment_setup.atmosphere` kernel module directly from tudatpy:

diff --git a/...n/environment_setup/ephemeris/__init__.py → ...n/environment_setup/ephemeris/__init__.py b/...n/environment_setup/ephemeris/__init__.py → ...n/environment_setup/ephemeris/__init__.py
@@ -1,6 +1,6 @@
 # This file, by virtue of the import statement below, merges
 # the Tudat kernel module `tudatpy.kernel.numerical_simulation.environment_setup.ephemeris` with
-# its Python extensions defined in `tudatpy/kernel_hybrid/numerical_simulation/environment_setup/ephemeris`.
+# its Python extensions defined in `tudatpy/numerical_simulation/environment_setup/ephemeris`.
 # 
 # This allows the import of all the C++ and Python submodules of the 
 # `numerical_simulation.environment_setup.ephemeris` kernel module directly from tudatpy:

diff --git a/...vironment_setup/gravity_field/__init__.py → ...vironment_setup/gravity_field/__init__.py b/...vironment_setup/gravity_field/__init__.py → ...vironment_setup/gravity_field/__init__.py
@@ -1,6 +1,6 @@
 # This file, by virtue of the import statement below, merges
 # the Tudat kernel module `tudatpy.kernel.numerical_simulation.environment_setup.gravity_field` with
-# its Python extensions defined in `tudatpy/kernel_hybrid/numerical_simulation/environment_setup/gravity_field`.
+# its Python extensions defined in `tudatpy/numerical_simulation/environment_setup/gravity_field`.
 # 
 # This allows the import of all the C++ and Python submodules of the 
 # `numerical_simulation.environment_setup.gravity_field` kernel module directly from tudatpy:

diff --git a/...setup/gravity_field_variation/__init__.py → ...setup/gravity_field_variation/__init__.py b/...setup/gravity_field_variation/__init__.py → ...setup/gravity_field_variation/__init__.py
@@ -1,6 +1,6 @@
 # This file, by virtue of the import statement below, merges
 # the Tudat kernel module `tudatpy.kernel.numerical_simulation.environment_setup.gravity_field_variation` with
-# its Python extensions defined in `tudatpy/kernel_hybrid/numerical_simulation/environment_setup/gravity_field_variation`.
+# its Python extensions defined in `tudatpy/numerical_simulation/environment_setup/gravity_field_variation`.
 # 
 # This allows the import of all the C++ and Python submodules of the 
 # `numerical_simulation.environment_setup.gravity_field_variation` kernel module directly from tudatpy:

diff --git a/...ironment_setup/ground_station/__init__.py → ...ironment_setup/ground_station/__init__.py b/...ironment_setup/ground_station/__init__.py → ...ironment_setup/ground_station/__init__.py
@@ -1,6 +1,6 @@
 # This file, by virtue of the import statement below, merges
 # the Tudat kernel module `tudatpy.kernel.numerical_simulation.environment_setup.ground_station` with
-# its Python extensions defined in `tudatpy/kernel_hybrid/numerical_simulation/environment_setup/ground_station`.
+# its Python extensions defined in `tudatpy/numerical_simulation/environment_setup/ground_station`.
 # 
 # This allows the import of all the C++ and Python submodules of the 
 # `numerical_simulation.environment_setup.ground_station` kernel module directly from tudatpy:

diff --git a/...ment_setup/radiation_pressure/__init__.py → ...ment_setup/radiation_pressure/__init__.py b/...ment_setup/radiation_pressure/__init__.py → ...ment_setup/radiation_pressure/__init__.py
@@ -1,6 +1,6 @@
 # This file, by virtue of the import statement below, merges
 # the Tudat kernel module `tudatpy.kernel.numerical_simulation.environment_setup.radiation_pressure` with
-# its Python extensions defined in `tudatpy/kernel_hybrid/numerical_simulation/environment_setup/radiation_pressure`.
+# its Python extensions defined in `tudatpy/numerical_simulation/environment_setup/radiation_pressure`.
 # 
 # This allows the import of all the C++ and Python submodules of the 
 # `numerical_simulation.environment_setup.radiation_pressure` kernel module directly from tudatpy:

diff --git a/.../environment_setup/rigid_body/__init__.py → .../environment_setup/rigid_body/__init__.py b/.../environment_setup/rigid_body/__init__.py → .../environment_setup/rigid_body/__init__.py
@@ -1,6 +1,6 @@
 # This file, by virtue of the import statement below, merges
 # the Tudat kernel module `tudatpy.kernel.numerical_simulation.environment_setup.rigid_body` with
-# its Python extensions defined in `tudatpy/kernel_hybrid/numerical_simulation/environment_setup/rigid_body`.
+# its Python extensions defined in `tudatpy/numerical_simulation/environment_setup/rigid_body`.
 # 
 # This allows the import of all the C++ and Python submodules of the 
 # `numerical_simulation.environment_setup.rigid_body` kernel module directly from tudatpy:

diff --git a/...ironment_setup/rotation_model/__init__.py → ...ironment_setup/rotation_model/__init__.py b/...ironment_setup/rotation_model/__init__.py → ...ironment_setup/rotation_model/__init__.py
@@ -1,6 +1,6 @@
 # This file, by virtue of the import statement below, merges
 # the Tudat kernel module `tudatpy.kernel.numerical_simulation.environment_setup.rotation_model` with
-# its Python extensions defined in `tudatpy/kernel_hybrid/numerical_simulation/environment_setup/rotation_model`.
+# its Python extensions defined in `tudatpy/numerical_simulation/environment_setup/rotation_model`.
 # 
 # This allows the import of all the C++ and Python submodules of the 
 # `numerical_simulation.environment_setup.rotation_model` kernel module directly from tudatpy:

diff --git a/...ation/environment_setup/shape/__init__.py → ...ation/environment_setup/shape/__init__.py b/...ation/environment_setup/shape/__init__.py → ...ation/environment_setup/shape/__init__.py
@@ -1,6 +1,6 @@
 # This file, by virtue of the import statement below, merges
 # the Tudat kernel module `tudatpy.kernel.numerical_simulation.environment_setup.shape` with
-# its Python extensions defined in `tudatpy/kernel_hybrid/numerical_simulation/environment_setup/shape`.
+# its Python extensions defined in `tudatpy/numerical_simulation/environment_setup/shape`.
 # 
 # This allows the import of all the C++ and Python submodules of the 
 # `numerical_simulation.environment_setup.shape` kernel module directly from tudatpy:

diff --git a/...nment_setup/shape_deformation/__init__.py → ...nment_setup/shape_deformation/__init__.py b/...nment_setup/shape_deformation/__init__.py → ...nment_setup/shape_deformation/__init__.py
@@ -1,6 +1,6 @@
 # This file, by virtue of the import statement below, merges
 # the Tudat kernel module `tudatpy.kernel.numerical_simulation.environment_setup.shape_deformation` with
-# its Python extensions defined in `tudatpy/kernel_hybrid/numerical_simulation/environment_setup/shape_deformation`.
+# its Python extensions defined in `tudatpy/numerical_simulation/environment_setup/shape_deformation`.
 # 
 # This allows the import of all the C++ and Python submodules of the 
 # `numerical_simulation.environment_setup.shape_deformation` kernel module directly from tudatpy:

diff --git a/...merical_simulation/estimation/__init__.py → ...merical_simulation/estimation/__init__.py b/...merical_simulation/estimation/__init__.py → ...merical_simulation/estimation/__init__.py
@@ -1,6 +1,6 @@
 # This file, by virtue of the import statement below, merges
 # the Tudat kernel module `tudatpy.kernel.numerical_simulation.estimation` with
-# its Python extensions defined in `tudatpy/kernel_hybrid/numerical_simulation/estimation`.
+# its Python extensions defined in `tudatpy/numerical_simulation/estimation`.
 # 
 # This allows the import of all the C++ and Python submodules of the 
 # `numerical_simulation.estimation` kernel module directly from tudatpy:

diff --git a/...l_simulation/estimation_setup/__init__.py → ...l_simulation/estimation_setup/__init__.py b/...l_simulation/estimation_setup/__init__.py → ...l_simulation/estimation_setup/__init__.py
@@ -1,6 +1,6 @@
 # This file, by virtue of the import statement below, merges
 # the Tudat kernel module `tudatpy.kernel.numerical_simulation.estimation_setup` with
-# its Python extensions defined in `tudatpy/kernel_hybrid/numerical_simulation/estimation_setup`.
+# its Python extensions defined in `tudatpy/numerical_simulation/estimation_setup`.
 # 
 # This allows the import of all the C++ and Python submodules of the 
 # `numerical_simulation.estimation_setup` kernel module directly from tudatpy:

diff --git a/.../estimation_setup/observation/__init__.py → .../estimation_setup/observation/__init__.py b/.../estimation_setup/observation/__init__.py → .../estimation_setup/observation/__init__.py
@@ -1,6 +1,6 @@
 # This file, by virtue of the import statement below, merges
 # the Tudat kernel module `tudatpy.kernel.numerical_simulation.estimation_setup.observation` with
-# its Python extensions defined in `tudatpy/kernel_hybrid/numerical_simulation/estimation_setup/observation`.
+# its Python extensions defined in `tudatpy/numerical_simulation/estimation_setup/observation`.
 # 
 # This allows the import of all the C++ and Python submodules of the 
 # `numerical_simulation.estimation_setup.observation` kernel module directly from tudatpy:

diff --git a/...on/estimation_setup/parameter/__init__.py → ...on/estimation_setup/parameter/__init__.py b/...on/estimation_setup/parameter/__init__.py → ...on/estimation_setup/parameter/__init__.py
@@ -1,6 +1,6 @@
 # This file, by virtue of the import statement below, merges
 # the Tudat kernel module `tudatpy.kernel.numerical_simulation.estimation_setup.parameter` with
-# its Python extensions defined in `tudatpy/kernel_hybrid/numerical_simulation/estimation_setup/parameter`.
+# its Python extensions defined in `tudatpy/numerical_simulation/estimation_setup/parameter`.
 # 
 # This allows the import of all the C++ and Python submodules of the 
 # `numerical_simulation.estimation_setup.parameter` kernel module directly from tudatpy:

diff --git a/...erical_simulation/propagation/__init__.py → ...erical_simulation/propagation/__init__.py b/...erical_simulation/propagation/__init__.py → ...erical_simulation/propagation/__init__.py
@@ -1,6 +1,6 @@
 # This file, by virtue of the import statement below, merges
 # the Tudat kernel module `tudatpy.kernel.numerical_simulation.propagation` with
-# its Python extensions defined in `tudatpy/kernel_hybrid/numerical_simulation/propagation`.
+# its Python extensions defined in `tudatpy/numerical_simulation/propagation`.
 # 
 # This allows the import of all the C++ and Python submodules of the 
 # `numerical_simulation.propagation` kernel module directly from tudatpy:

diff --git a/...dependent_variable_dictionary/__init__.py → ...dependent_variable_dictionary/__init__.py b/...dependent_variable_dictionary/__init__.py → ...dependent_variable_dictionary/__init__.py
diff --git a/...ctionary/dependent_variable_dictionary.py → ...ctionary/dependent_variable_dictionary.py b/...ctionary/dependent_variable_dictionary.py → ...ctionary/dependent_variable_dictionary.py
diff --git a/..._simulation/propagation_setup/__init__.py → ..._simulation/propagation_setup/__init__.py b/..._simulation/propagation_setup/__init__.py → ..._simulation/propagation_setup/__init__.py
@@ -1,6 +1,6 @@
 # This file, by virtue of the import statement below, merges
 # the Tudat kernel module `tudatpy.kernel.numerical_simulation.propagation_setup` with
-# its Python extensions defined in `tudatpy/kernel_hybrid/numerical_simulation/propagation_setup`.
+# its Python extensions defined in `tudatpy/numerical_simulation/propagation_setup`.
 # 
 # This allows the import of all the C++ and Python submodules of the 
 # `numerical_simulation.propagation_setup` kernel module directly from tudatpy: