diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
index cd9b205..2821a9e 100755
--- a/.scripts/build_steps.sh
+++ b/.scripts/build_steps.sh
@@ -90,4 +90,4 @@ fi
 
 ( startgroup "Final checks" ) 2> /dev/null
 
-touch "${FEEDSTOCK_ROOT}/build_artifacts/conda-forge-build-done-${CONFIG}"
\ No newline at end of file
+touch "${FEEDSTOCK_ROOT}/build_artifacts/conda-forge-build-done-${CONFIG}"
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
index b9cecc2..13f2da1 100755
--- a/.scripts/run_osx_build.sh
+++ b/.scripts/run_osx_build.sh
@@ -25,13 +25,16 @@ conda activate base
 export CONDA_SOLVER="libmamba"
 export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1
 
-mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \
+# mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \
+#     pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1"
+# mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \
+#     pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1"
+mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \
     pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1"
 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \
     pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1"
 
 
-
 echo -e "\n\nSetting up the condarc and mangling the compiler."
 setup_conda_rc ./ ./recipe ./.ci_support/${CONFIG}.yaml
 
@@ -100,4 +103,4 @@ else
     fi
 
     ( endgroup "Uploading packages" ) 2> /dev/null
-fi
\ No newline at end of file
+fi
diff --git a/recipe/build.sh b/recipe/build.sh
index 5e66142..62117e0 100644
--- a/recipe/build.sh
+++ b/recipe/build.sh
@@ -29,4 +29,3 @@ cmake \
 make
 
 make install
-
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index 16a4945..09becdc 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -10,8 +10,6 @@ package:
 source:
   git_url: https://github.com/tudat-team/tudatpy.git
   git_rev: {{ git_rev }}
-  patches:
-    - use_sysconfig_for_python_paths.patch
 
 build:
   # A non-negative integer representing the build number of the package.
@@ -35,7 +33,7 @@ requirements:
     # or native when not cross-compiling), and any source pre-processors.
     - {{ compiler('cxx') }}    # [not win]
     - {{ compiler('c') }}      # [not win]
-    - {{ compiler('clang') }}  # [win] 
+    - {{ compiler('clang') }}  # [win]
     - cmake
     - python                                 # [build_platform != target_platform]
     - cross-python_{{ target_platform }}     # [build_platform != target_platform]
@@ -82,23 +80,22 @@ requirements:
 test:
   imports:
     - tudatpy
-    - tudatpy.kernel
-    - tudatpy.kernel.math
-    - tudatpy.kernel.math.interpolators
-    - tudatpy.kernel.math.numerical_integrators
-    - tudatpy.kernel.math.root_finders
-    - tudatpy.kernel.interface
-    - tudatpy.kernel.interface.spice
-    - tudatpy.kernel.astro
-    - tudatpy.kernel.astro.frame_conversion
-    - tudatpy.kernel.astro.element_conversion
-    - tudatpy.kernel.astro.gravitation
-    - tudatpy.kernel.astro.two_body_dynamics
-    - tudatpy.kernel.constants
-    - tudatpy.kernel.numerical_simulation
-    - tudatpy.kernel.numerical_simulation.environment_setup
-    - tudatpy.kernel.numerical_simulation.propagation_setup
-    - tudatpy.kernel.numerical_simulation.estimation_setup
+    - tudatpy.math
+    - tudatpy.math.interpolators
+    - tudatpy.math.numerical_integrators
+    - tudatpy.math.root_finders
+    - tudatpy.interface
+    - tudatpy.interface.spice
+    - tudatpy.astro
+    - tudatpy.astro.frame_conversion
+    - tudatpy.astro.element_conversion
+    - tudatpy.astro.gravitation
+    - tudatpy.astro.two_body_dynamics
+    - tudatpy.constants
+    - tudatpy.numerical_simulation
+    - tudatpy.numerical_simulation.environment_setup
+    - tudatpy.numerical_simulation.propagation_setup
+    - tudatpy.numerical_simulation.estimation_setup
     - tudatpy.plotting
     - tudatpy.util
     - tudatpy.data
@@ -109,23 +106,23 @@ test:
     - tests/test_constants.py
     - tests/test_interface_spice.py
     - tests/test_io.py
-    - tests/test_hybrid_module_exposure.py
+    # - tests/test_hybrid_module_exposure.py
     - tests/test_time_conversions.py
-    - tests/test_dependent_variable_dictionary.py
-    - tests/test_data_mpc.py
+    # - tests/test_dependent_variable_dictionary.py
+    # - tests/test_data_mpc.py
     - tests/test_data_horizons.py
     - tests/test_data_biases.py
-    
+
   commands:
     - pip install astroquery==0.4.8.dev9321
-    - python -c "from tudatpy.io import get_resource_path; print(get_resource_path())"
-    - python -c "from tudatpy.io import save2txt"
+    - python -c "from tudatpy.data import get_resource_path; print(get_resource_path())"
+    - python -c "from tudatpy.data import save2txt"
     #- python -c "from tudatpy.apps.satellite_propagator import single; single()"
     - python -m pytest -v tests/test_constants.py
     - python -m pytest -v tests/test_io.py
-    - python -m pytest -v tests/test_hybrid_module_exposure.py
+    # - python -m pytest -v tests/test_hybrid_module_exposure.py
     - python -m pytest -v tests/test_time_conversions.py
-    - python -m pytest -v tests/test_dependent_variable_dictionary.py
+    # - python -m pytest -v tests/test_dependent_variable_dictionary.py
    # - python -m pytest -v tests/test_data_mpc.py
     - python -m pytest -v tests/test_data_horizons.py
     - python -m pytest -v tests/test_data_biases.py
diff --git a/recipe/use_sysconfig_for_python_paths.patch b/recipe/use_sysconfig_for_python_paths.patch
deleted file mode 100644
index 3399d57..0000000
--- a/recipe/use_sysconfig_for_python_paths.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/cmake/YACMAPythonSetup.cmake b/cmake/YACMAPythonSetup.cmake
-index 0387c37..7f6af84 100644
---- a/cmake/YACMAPythonSetup.cmake
-+++ b/cmake/YACMAPythonSetup.cmake
-@@ -24,7 +24,7 @@ if(_YACMA_PYTHON_MODULE_NEED_LINK)
- else()
-     # NOTE: we need to determine the include dir on our own.
-     if(NOT YACMA_PYTHON_INCLUDE_DIR)
--        execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from __future__ import print_function\nfrom distutils import sysconfig\nprint(sysconfig.get_python_inc())"
-+        execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from sysconfig import get_paths as gp; print(gp()['include'])"
-                 OUTPUT_VARIABLE _YACMA_PYTHON_INCLUDE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
-         if(_YACMA_PYTHON_INCLUDE_DIR)
-             set(YACMA_PYTHON_INCLUDE_DIR "${_YACMA_PYTHON_INCLUDE_DIR}" CACHE PATH "Path to the Python include dir.")
-@@ -64,10 +64,12 @@ if(UNIX)
-         message(STATUS "Generic UNIX platform detected.")
-     endif()
-     if(NOT YACMA_PYTHON_MODULES_INSTALL_PATH)
--        # NOTE: here we use this contraption (instead of the simple method below for Win32) because like this we can
--        # support installation into the CMake prefix (e.g., in the user's home dir).
--        execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from __future__ import print_function\nimport distutils.sysconfig\nimport os\nprint(os.path.split(distutils.sysconfig.get_python_lib())[-1])"
--                OUTPUT_VARIABLE _YACMA_PY_PACKAGES_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
-+        # Using sysconfig instead of distutils.sysconfig
-+        execute_process(
-+                COMMAND ${PYTHON_EXECUTABLE} -c "from sysconfig import get_paths; import os; print(os.path.split(get_paths()['purelib'])[-1])"
-+                OUTPUT_VARIABLE _YACMA_PY_PACKAGES_DIR
-+                OUTPUT_STRIP_TRAILING_WHITESPACE
-+        )
-         message(STATUS "Python packages dir is: ${_YACMA_PY_PACKAGES_DIR}")
-         set(YACMA_PYTHON_MODULES_INSTALL_PATH "lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/${_YACMA_PY_PACKAGES_DIR}" CACHE PATH "Install path for Python modules.")
-         mark_as_advanced(YACMA_PYTHON_MODULES_INSTALL_PATH)
-@@ -77,9 +79,12 @@ elseif(WIN32)
-     message(STATUS "Output extension for compiled modules will be '.pyd'.")
-     set(_YACMA_PY_MODULE_EXTENSION "pyd")
-     if(NOT YACMA_PYTHON_MODULES_INSTALL_PATH)
--        # On Windows, we will install directly into the install path of the Python interpreter.
--        execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"
--                OUTPUT_VARIABLE _YACMA_PYTHON_MODULES_INSTALL_PATH OUTPUT_STRIP_TRAILING_WHITESPACE)
-+        # Using sysconfig instead of distutils.sysconfig
-+        execute_process(
-+                COMMAND ${PYTHON_EXECUTABLE} -c "from sysconfig import get_paths; print(get_paths()['purelib'])"
-+                OUTPUT_VARIABLE _YACMA_PYTHON_MODULES_INSTALL_PATH
-+                OUTPUT_STRIP_TRAILING_WHITESPACE
-+        )
-         set(YACMA_PYTHON_MODULES_INSTALL_PATH "${_YACMA_PYTHON_MODULES_INSTALL_PATH}" CACHE PATH "Install path for Python modules.")
-         mark_as_advanced(YACMA_PYTHON_MODULES_INSTALL_PATH)
-     endif()
-@@ -87,6 +92,7 @@ else()
-     message(FATAL_ERROR "Platform not supported.")
- endif()
- 
-+
- # Check the install path was actually detected.
- if("${YACMA_PYTHON_MODULES_INSTALL_PATH}" STREQUAL "")
-     message(FATAL_ERROR "Python module install path not detected correctly.")