New folder structure for C++ code

- All C++ code has been moved to cpp: - All source files for executables reside in cpp/cmd - Everything that was previously in core and src is now built as a single library inside cpp/lib - Version matching logic for library and executable has been updated
MRtrix3 · Sep 25, 2024 · 991a438 · 991a438
1 parent ca13e7f
commit 991a438
Show file tree

Hide file tree

Showing 820 changed files with 139 additions and 73 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -73,16 +73,6 @@ file(RELATIVE_PATH relDir
 set(CMAKE_INSTALL_RPATH ${base} ${base}/${relDir})
 
 include(BuildType)
-include(LinkerSetup)
-include(FindFFTW)
-include(CompilerCache)
-include(ECMEnableSanitizers)
-include(Dependencies)
-if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
-    include(MacOSBundle)
-endif()
-
-use_compiler_cache()
 
 if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git AND NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git/hooks/pre-commit)
     message(WARNING
@@ -91,37 +81,6 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git AND NOT EXISTS ${CMAKE_CURRENT_SOURCE
         "and then run `pre-commit install` from the ${CMAKE_CURRENT_SOURCE_DIR} directory.")
 endif()
 
-add_library(mrtrix-common INTERFACE)
-add_library(mrtrix::common ALIAS mrtrix-common)
-target_compile_definitions(mrtrix-common INTERFACE
-    MRTRIX_BUILD_TYPE="${CMAKE_BUILD_TYPE}"
-    $<$<PLATFORM_ID:Windows>:MRTRIX_WINDOWS>
-    $<$<PLATFORM_ID:Darwin>:MRTRIX_MACOSX>
-    $<$<PLATFORM_ID:FreeBSD>:MRTRIX_FREEBSD>
-)
-
-if(MRTRIX_STL_DEBUGGING AND NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
-    message(STATUS "Enabling STL debug mode")
-    target_compile_definitions(mrtrix-common INTERFACE
-        $<$<CXX_COMPILER_ID:MSVC>:_ITERATOR_DEBUG_LEVEL=1>
-        $<$<CXX_COMPILER_ID:GNU>:_GLIBCXX_DEBUG _GLIBCXX_DEBUG_PEDANTIC>
-        $<$<CXX_COMPILER_ID:Clang>:_LIBCPP_DEBUG=1>
-    )
-endif()
-
-if(MRTRIX_WARNINGS_AS_ERRORS)
-    message(STATUS "Enabling warnings as errors")
-    target_compile_options(mrtrix-common INTERFACE
-        $<$<CXX_COMPILER_ID:MSVC>:/WX>
-        $<$<CXX_COMPILER_ID:GNU,Clang>:-Werror>
-    )
-endif()
-
-# Allow compilation of big object of files in debug mode on MINGW
-if(MINGW AND CMAKE_BUILD_TYPE MATCHES "Debug")
-    target_compile_options(mrtrix-common INTERFACE -Wa,-mbig-obj)
-endif()
-
 
 if(MRTRIX_STRIP_CONDA AND DEFINED ENV{CONDA_PREFIX})
     message(WARNING "CONDA_PREFIX is set to ${CONDA_PREFIX}, adding conda diretories to CMAKE_IGNORE_PATH to avoid conflicts.\n"
@@ -145,11 +104,9 @@ if(COMPILER_PATH MATCHES "fsl/bin" OR LINKER_PATH MATCHES "fsl/bin")
     )
 endif()
 
-add_subdirectory(cmd)
-add_subdirectory(core)
+add_subdirectory(cpp)
 add_subdirectory(python)
 add_subdirectory(share)
-add_subdirectory(src)
 
 if(PROJECT_IS_TOP_LEVEL AND MRTRIX_BUILD_TESTS)
     add_subdirectory(testing)

diff --git a/cmake/MacOSBundle.cmake b/cmake/MacOSBundle.cmake
@@ -1,7 +1,7 @@
 function(set_bundle_properties executable_name)
-    set(icon_files ${CMAKE_CURRENT_SOURCE_DIR}/../icons/macos/${executable_name}.icns)
+    set(icon_files ${PROJECT_SOURCE_DIR}/icons/macos/${executable_name}.icns)
     if(${executable_name} STREQUAL "mrview")
-        list(APPEND icon_files ${CMAKE_CURRENT_SOURCE_DIR}/../icons/macos/mrview_doc.icns)
+        list(APPEND icon_files ${PROJECT_SOURCE_DIR}/icons/macos/mrview_doc.icns)
     endif()
 
     string(TIMESTAMP CURRENT_YEAR "%Y")
@@ -10,14 +10,15 @@ function(set_bundle_properties executable_name)
     target_sources(${executable_name} PRIVATE ${icon_files})
     set_target_properties(${executable_name} PROPERTIES
         MACOSX_BUNDLE TRUE
-        MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/../packaging/macos/bundle/${executable_name}.plist.in"
+        MACOSX_BUNDLE_INFO_PLIST "${PROJECT_SOURCE_DIR}/packaging/macos/bundle/${executable_name}.plist.in"
         RESOURCE "${icon_files}"
         INSTALL_RPATH "@executable_path/../../../../lib"
     )
 endfunction()
 
 function(install_bundle_wrapper_scripts executable_name)
-    set(wrapper_script ${CMAKE_CURRENT_SOURCE_DIR}/../packaging/macos/bundle/wrapper_launcher.sh.in)
+    message(STATUS "CURRENT_LIST_DIR: ${CMAKE_CURRENT_LIST_DIR}")
+    set(wrapper_script ${PROJECT_SOURCE_DIR}/packaging/macos/bundle/wrapper_launcher.sh.in)
     configure_file(${wrapper_script} ${PROJECT_BINARY_DIR}/bin/${executable_name}
         FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
         @ONLY

diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -0,0 +1,40 @@
+include(LinkerSetup)
+include(FindFFTW)
+include(ECMEnableSanitizers)
+include(Dependencies)
+include(CompilerCache)
+use_compiler_cache()
+
+add_library(mrtrix-common INTERFACE)
+add_library(mrtrix::common ALIAS mrtrix-common)
+target_compile_definitions(mrtrix-common INTERFACE
+    MRTRIX_BUILD_TYPE="${CMAKE_BUILD_TYPE}"
+    $<$<PLATFORM_ID:Windows>:MRTRIX_WINDOWS>
+    $<$<PLATFORM_ID:Darwin>:MRTRIX_MACOSX>
+    $<$<PLATFORM_ID:FreeBSD>:MRTRIX_FREEBSD>
+)
+
+if(MRTRIX_STL_DEBUGGING AND NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
+    message(STATUS "Enabling STL debug mode")
+    target_compile_definitions(mrtrix-common INTERFACE
+        $<$<CXX_COMPILER_ID:MSVC>:_ITERATOR_DEBUG_LEVEL=1>
+        $<$<CXX_COMPILER_ID:GNU>:_GLIBCXX_DEBUG _GLIBCXX_DEBUG_PEDANTIC>
+        $<$<CXX_COMPILER_ID:Clang>:_LIBCPP_DEBUG=1>
+    )
+endif()
+
+if(MRTRIX_WARNINGS_AS_ERRORS)
+    message(STATUS "Enabling warnings as errors")
+    target_compile_options(mrtrix-common INTERFACE
+        $<$<CXX_COMPILER_ID:MSVC>:/WX>
+        $<$<CXX_COMPILER_ID:GNU,Clang>:-Werror>
+    )
+endif()
+
+# Allow compilation of big object of files in debug mode on MINGW
+if(MINGW AND CMAKE_BUILD_TYPE MATCHES "Debug")
+    target_compile_options(mrtrix-common INTERFACE -Wa,-mbig-obj)
+endif()
+
+add_subdirectory(lib)
+add_subdirectory(cmd)
diff --git a/cmd/5tt2gmwmi.cpp → cpp/cmd/5tt2gmwmi.cpp b/cmd/5tt2gmwmi.cpp → cpp/cmd/5tt2gmwmi.cpp
diff --git a/cmd/5tt2vis.cpp → cpp/cmd/5tt2vis.cpp b/cmd/5tt2vis.cpp → cpp/cmd/5tt2vis.cpp
diff --git a/cmd/5ttcheck.cpp → cpp/cmd/5ttcheck.cpp b/cmd/5ttcheck.cpp → cpp/cmd/5ttcheck.cpp
diff --git a/cmd/5ttedit.cpp → cpp/cmd/5ttedit.cpp b/cmd/5ttedit.cpp → cpp/cmd/5ttedit.cpp
diff --git a/cmd/CMakeLists.txt → cpp/cmd/CMakeLists.txt b/cmd/CMakeLists.txt → cpp/cmd/CMakeLists.txt
@@ -1,3 +1,7 @@
+if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+    include(MacOSBundle)
+endif()
+
 set(GUI_CMD_SRCS mrview.cpp shview.cpp)
 
 file(GLOB HEADLESS_CMD_SRCS *.cpp)
@@ -8,7 +12,7 @@ endforeach(CMD)
 if(MRTRIX_USE_PCH)
     file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pch_cmd.cpp CONTENT "int main(){}")
     add_executable(pch_cmd ${CMAKE_CURRENT_BINARY_DIR}/pch_cmd.cpp)
-    target_include_directories(pch_cmd PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../core)
+    target_include_directories(pch_cmd PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/core)
     target_link_libraries(pch_cmd PRIVATE Eigen3::Eigen half::half mrtrix::common)
     target_precompile_headers(pch_cmd PRIVATE
         [["app.h"]]
@@ -27,7 +31,7 @@ function(add_cmd CMD_SRC IS_GUI)
     add_executable(${CMD_NAME} ${CMD_SRC})
     target_link_libraries(${CMD_NAME} PRIVATE
         $<IF:$<BOOL:${IS_GUI}>,mrtrix::gui,mrtrix::headless>
-        mrtrix::exec-version-lib
+        mrtrix::cmd-version-lib
     )
     set_target_properties(${CMD_NAME} PROPERTIES
         LINK_DEPENDS_NO_SHARED true

diff --git a/cmd/afdconnectivity.cpp → cpp/cmd/afdconnectivity.cpp b/cmd/afdconnectivity.cpp → cpp/cmd/afdconnectivity.cpp
@@ -23,7 +23,7 @@
 #include "dwi/tractography/mapping/mapping.h"
 #include "dwi/tractography/properties.h"
 #include "memory.h"
-#include "version.h"
+#include "mrtrix_version.h"
 
 using namespace MR;
 using namespace MR::DWI;

diff --git a/cmd/amp2response.cpp → cpp/cmd/amp2response.cpp b/cmd/amp2response.cpp → cpp/cmd/amp2response.cpp
diff --git a/cmd/amp2sh.cpp → cpp/cmd/amp2sh.cpp b/cmd/amp2sh.cpp → cpp/cmd/amp2sh.cpp
diff --git a/cmd/connectome2tck.cpp → cpp/cmd/connectome2tck.cpp b/cmd/connectome2tck.cpp → cpp/cmd/connectome2tck.cpp
diff --git a/cmd/connectomeedit.cpp → cpp/cmd/connectomeedit.cpp b/cmd/connectomeedit.cpp → cpp/cmd/connectomeedit.cpp
diff --git a/cmd/connectomestats.cpp → cpp/cmd/connectomestats.cpp b/cmd/connectomestats.cpp → cpp/cmd/connectomestats.cpp
diff --git a/cmd/dcmedit.cpp → cpp/cmd/dcmedit.cpp b/cmd/dcmedit.cpp → cpp/cmd/dcmedit.cpp
diff --git a/cmd/dcminfo.cpp → cpp/cmd/dcminfo.cpp b/cmd/dcminfo.cpp → cpp/cmd/dcminfo.cpp
diff --git a/cmd/dirflip.cpp → cpp/cmd/dirflip.cpp b/cmd/dirflip.cpp → cpp/cmd/dirflip.cpp
diff --git a/cmd/dirgen.cpp → cpp/cmd/dirgen.cpp b/cmd/dirgen.cpp → cpp/cmd/dirgen.cpp
diff --git a/cmd/dirmerge.cpp → cpp/cmd/dirmerge.cpp b/cmd/dirmerge.cpp → cpp/cmd/dirmerge.cpp
diff --git a/cmd/dirorder.cpp → cpp/cmd/dirorder.cpp b/cmd/dirorder.cpp → cpp/cmd/dirorder.cpp
diff --git a/cmd/dirrotate.cpp → cpp/cmd/dirrotate.cpp b/cmd/dirrotate.cpp → cpp/cmd/dirrotate.cpp
diff --git a/cmd/dirsplit.cpp → cpp/cmd/dirsplit.cpp b/cmd/dirsplit.cpp → cpp/cmd/dirsplit.cpp
diff --git a/cmd/dirstat.cpp → cpp/cmd/dirstat.cpp b/cmd/dirstat.cpp → cpp/cmd/dirstat.cpp
diff --git a/cmd/dwi2adc.cpp → cpp/cmd/dwi2adc.cpp b/cmd/dwi2adc.cpp → cpp/cmd/dwi2adc.cpp
diff --git a/cmd/dwi2fod.cpp → cpp/cmd/dwi2fod.cpp b/cmd/dwi2fod.cpp → cpp/cmd/dwi2fod.cpp
diff --git a/cmd/dwi2tensor.cpp → cpp/cmd/dwi2tensor.cpp b/cmd/dwi2tensor.cpp → cpp/cmd/dwi2tensor.cpp
diff --git a/cmd/dwidenoise.cpp → cpp/cmd/dwidenoise.cpp b/cmd/dwidenoise.cpp → cpp/cmd/dwidenoise.cpp
diff --git a/cmd/dwiextract.cpp → cpp/cmd/dwiextract.cpp b/cmd/dwiextract.cpp → cpp/cmd/dwiextract.cpp
diff --git a/cmd/fixel2peaks.cpp → cpp/cmd/fixel2peaks.cpp b/cmd/fixel2peaks.cpp → cpp/cmd/fixel2peaks.cpp
diff --git a/cmd/fixel2sh.cpp → cpp/cmd/fixel2sh.cpp b/cmd/fixel2sh.cpp → cpp/cmd/fixel2sh.cpp
diff --git a/cmd/fixel2tsf.cpp → cpp/cmd/fixel2tsf.cpp b/cmd/fixel2tsf.cpp → cpp/cmd/fixel2tsf.cpp
diff --git a/cmd/fixel2voxel.cpp → cpp/cmd/fixel2voxel.cpp b/cmd/fixel2voxel.cpp → cpp/cmd/fixel2voxel.cpp
diff --git a/cmd/fixelcfestats.cpp → cpp/cmd/fixelcfestats.cpp b/cmd/fixelcfestats.cpp → cpp/cmd/fixelcfestats.cpp
diff --git a/cmd/fixelconnectivity.cpp → cpp/cmd/fixelconnectivity.cpp b/cmd/fixelconnectivity.cpp → cpp/cmd/fixelconnectivity.cpp
diff --git a/cmd/fixelconvert.cpp → cpp/cmd/fixelconvert.cpp b/cmd/fixelconvert.cpp → cpp/cmd/fixelconvert.cpp
diff --git a/cmd/fixelcorrespondence.cpp → cpp/cmd/fixelcorrespondence.cpp b/cmd/fixelcorrespondence.cpp → cpp/cmd/fixelcorrespondence.cpp
diff --git a/cmd/fixelcrop.cpp → cpp/cmd/fixelcrop.cpp b/cmd/fixelcrop.cpp → cpp/cmd/fixelcrop.cpp
diff --git a/cmd/fixelfilter.cpp → cpp/cmd/fixelfilter.cpp b/cmd/fixelfilter.cpp → cpp/cmd/fixelfilter.cpp
diff --git a/cmd/fixelreorient.cpp → cpp/cmd/fixelreorient.cpp b/cmd/fixelreorient.cpp → cpp/cmd/fixelreorient.cpp
diff --git a/cmd/fod2dec.cpp → cpp/cmd/fod2dec.cpp b/cmd/fod2dec.cpp → cpp/cmd/fod2dec.cpp
diff --git a/cmd/fod2fixel.cpp → cpp/cmd/fod2fixel.cpp b/cmd/fod2fixel.cpp → cpp/cmd/fod2fixel.cpp
diff --git a/cmd/label2colour.cpp → cpp/cmd/label2colour.cpp b/cmd/label2colour.cpp → cpp/cmd/label2colour.cpp
diff --git a/cmd/label2mesh.cpp → cpp/cmd/label2mesh.cpp b/cmd/label2mesh.cpp → cpp/cmd/label2mesh.cpp
diff --git a/cmd/labelconvert.cpp → cpp/cmd/labelconvert.cpp b/cmd/labelconvert.cpp → cpp/cmd/labelconvert.cpp
diff --git a/cmd/labelstats.cpp → cpp/cmd/labelstats.cpp b/cmd/labelstats.cpp → cpp/cmd/labelstats.cpp
diff --git a/cmd/maskdump.cpp → cpp/cmd/maskdump.cpp b/cmd/maskdump.cpp → cpp/cmd/maskdump.cpp
diff --git a/cmd/maskfilter.cpp → cpp/cmd/maskfilter.cpp b/cmd/maskfilter.cpp → cpp/cmd/maskfilter.cpp
diff --git a/cmd/mesh2voxel.cpp → cpp/cmd/mesh2voxel.cpp b/cmd/mesh2voxel.cpp → cpp/cmd/mesh2voxel.cpp
diff --git a/cmd/meshconvert.cpp → cpp/cmd/meshconvert.cpp b/cmd/meshconvert.cpp → cpp/cmd/meshconvert.cpp
diff --git a/cmd/meshfilter.cpp → cpp/cmd/meshfilter.cpp b/cmd/meshfilter.cpp → cpp/cmd/meshfilter.cpp
diff --git a/cmd/mraverageheader.cpp → cpp/cmd/mraverageheader.cpp b/cmd/mraverageheader.cpp → cpp/cmd/mraverageheader.cpp
diff --git a/cmd/mrcalc.cpp → cpp/cmd/mrcalc.cpp b/cmd/mrcalc.cpp → cpp/cmd/mrcalc.cpp
diff --git a/cmd/mrcat.cpp → cpp/cmd/mrcat.cpp b/cmd/mrcat.cpp → cpp/cmd/mrcat.cpp
diff --git a/cmd/mrcentroid.cpp → cpp/cmd/mrcentroid.cpp b/cmd/mrcentroid.cpp → cpp/cmd/mrcentroid.cpp
diff --git a/cmd/mrcheckerboardmask.cpp → cpp/cmd/mrcheckerboardmask.cpp b/cmd/mrcheckerboardmask.cpp → cpp/cmd/mrcheckerboardmask.cpp
diff --git a/cmd/mrclusterstats.cpp → cpp/cmd/mrclusterstats.cpp b/cmd/mrclusterstats.cpp → cpp/cmd/mrclusterstats.cpp
diff --git a/cmd/mrcolour.cpp → cpp/cmd/mrcolour.cpp b/cmd/mrcolour.cpp → cpp/cmd/mrcolour.cpp
diff --git a/cmd/mrconvert.cpp → cpp/cmd/mrconvert.cpp b/cmd/mrconvert.cpp → cpp/cmd/mrconvert.cpp
diff --git a/cmd/mrdegibbs.cpp → cpp/cmd/mrdegibbs.cpp b/cmd/mrdegibbs.cpp → cpp/cmd/mrdegibbs.cpp
diff --git a/cmd/mrdump.cpp → cpp/cmd/mrdump.cpp b/cmd/mrdump.cpp → cpp/cmd/mrdump.cpp
diff --git a/cmd/mredit.cpp → cpp/cmd/mredit.cpp b/cmd/mredit.cpp → cpp/cmd/mredit.cpp
diff --git a/cmd/mrfilter.cpp → cpp/cmd/mrfilter.cpp b/cmd/mrfilter.cpp → cpp/cmd/mrfilter.cpp
diff --git a/cmd/mrgrid.cpp → cpp/cmd/mrgrid.cpp b/cmd/mrgrid.cpp → cpp/cmd/mrgrid.cpp
diff --git a/cmd/mrhistmatch.cpp → cpp/cmd/mrhistmatch.cpp b/cmd/mrhistmatch.cpp → cpp/cmd/mrhistmatch.cpp
diff --git a/cmd/mrhistogram.cpp → cpp/cmd/mrhistogram.cpp b/cmd/mrhistogram.cpp → cpp/cmd/mrhistogram.cpp
diff --git a/cmd/mrinfo.cpp → cpp/cmd/mrinfo.cpp b/cmd/mrinfo.cpp → cpp/cmd/mrinfo.cpp
diff --git a/cmd/mrmath.cpp → cpp/cmd/mrmath.cpp b/cmd/mrmath.cpp → cpp/cmd/mrmath.cpp
diff --git a/cmd/mrmetric.cpp → cpp/cmd/mrmetric.cpp b/cmd/mrmetric.cpp → cpp/cmd/mrmetric.cpp
diff --git a/cmd/mrregister.cpp → cpp/cmd/mrregister.cpp b/cmd/mrregister.cpp → cpp/cmd/mrregister.cpp
diff --git a/cmd/mrstats.cpp → cpp/cmd/mrstats.cpp b/cmd/mrstats.cpp → cpp/cmd/mrstats.cpp
diff --git a/cmd/mrthreshold.cpp → cpp/cmd/mrthreshold.cpp b/cmd/mrthreshold.cpp → cpp/cmd/mrthreshold.cpp
diff --git a/cmd/mrtransform.cpp → cpp/cmd/mrtransform.cpp b/cmd/mrtransform.cpp → cpp/cmd/mrtransform.cpp
diff --git a/cmd/mrview.cpp → cpp/cmd/mrview.cpp b/cmd/mrview.cpp → cpp/cmd/mrview.cpp
diff --git a/cmd/mtnormalise.cpp → cpp/cmd/mtnormalise.cpp b/cmd/mtnormalise.cpp → cpp/cmd/mtnormalise.cpp
diff --git a/cmd/peaks2amp.cpp → cpp/cmd/peaks2amp.cpp b/cmd/peaks2amp.cpp → cpp/cmd/peaks2amp.cpp
diff --git a/cmd/peaks2fixel.cpp → cpp/cmd/peaks2fixel.cpp b/cmd/peaks2fixel.cpp → cpp/cmd/peaks2fixel.cpp
diff --git a/cmd/sh2amp.cpp → cpp/cmd/sh2amp.cpp b/cmd/sh2amp.cpp → cpp/cmd/sh2amp.cpp
diff --git a/cmd/sh2peaks.cpp → cpp/cmd/sh2peaks.cpp b/cmd/sh2peaks.cpp → cpp/cmd/sh2peaks.cpp
diff --git a/cmd/sh2power.cpp → cpp/cmd/sh2power.cpp b/cmd/sh2power.cpp → cpp/cmd/sh2power.cpp
diff --git a/cmd/sh2response.cpp → cpp/cmd/sh2response.cpp b/cmd/sh2response.cpp → cpp/cmd/sh2response.cpp
diff --git a/cmd/shbasis.cpp → cpp/cmd/shbasis.cpp b/cmd/shbasis.cpp → cpp/cmd/shbasis.cpp
diff --git a/cmd/shconv.cpp → cpp/cmd/shconv.cpp b/cmd/shconv.cpp → cpp/cmd/shconv.cpp
diff --git a/cmd/shview.cpp → cpp/cmd/shview.cpp b/cmd/shview.cpp → cpp/cmd/shview.cpp
diff --git a/cmd/tck2connectome.cpp → cpp/cmd/tck2connectome.cpp b/cmd/tck2connectome.cpp → cpp/cmd/tck2connectome.cpp
diff --git a/cmd/tck2fixel.cpp → cpp/cmd/tck2fixel.cpp b/cmd/tck2fixel.cpp → cpp/cmd/tck2fixel.cpp
diff --git a/cmd/tckconvert.cpp → cpp/cmd/tckconvert.cpp b/cmd/tckconvert.cpp → cpp/cmd/tckconvert.cpp
diff --git a/cmd/tckdfc.cpp → cpp/cmd/tckdfc.cpp b/cmd/tckdfc.cpp → cpp/cmd/tckdfc.cpp
diff --git a/cmd/tckedit.cpp → cpp/cmd/tckedit.cpp b/cmd/tckedit.cpp → cpp/cmd/tckedit.cpp
diff --git a/cmd/tckgen.cpp → cpp/cmd/tckgen.cpp b/cmd/tckgen.cpp → cpp/cmd/tckgen.cpp
diff --git a/cmd/tckglobal.cpp → cpp/cmd/tckglobal.cpp b/cmd/tckglobal.cpp → cpp/cmd/tckglobal.cpp
diff --git a/cmd/tckinfo.cpp → cpp/cmd/tckinfo.cpp b/cmd/tckinfo.cpp → cpp/cmd/tckinfo.cpp
diff --git a/cmd/tckmap.cpp → cpp/cmd/tckmap.cpp b/cmd/tckmap.cpp → cpp/cmd/tckmap.cpp
diff --git a/cmd/tckresample.cpp → cpp/cmd/tckresample.cpp b/cmd/tckresample.cpp → cpp/cmd/tckresample.cpp
diff --git a/cmd/tcksample.cpp → cpp/cmd/tcksample.cpp b/cmd/tcksample.cpp → cpp/cmd/tcksample.cpp
diff --git a/cmd/tcksift.cpp → cpp/cmd/tcksift.cpp b/cmd/tcksift.cpp → cpp/cmd/tcksift.cpp
diff --git a/cmd/tcksift2.cpp → cpp/cmd/tcksift2.cpp b/cmd/tcksift2.cpp → cpp/cmd/tcksift2.cpp
diff --git a/cmd/tckstats.cpp → cpp/cmd/tckstats.cpp b/cmd/tckstats.cpp → cpp/cmd/tckstats.cpp
diff --git a/cmd/tcktransform.cpp → cpp/cmd/tcktransform.cpp b/cmd/tcktransform.cpp → cpp/cmd/tcktransform.cpp
diff --git a/cmd/tensor2metric.cpp → cpp/cmd/tensor2metric.cpp b/cmd/tensor2metric.cpp → cpp/cmd/tensor2metric.cpp
diff --git a/cmd/transformcalc.cpp → cpp/cmd/transformcalc.cpp b/cmd/transformcalc.cpp → cpp/cmd/transformcalc.cpp
diff --git a/cmd/transformcompose.cpp → cpp/cmd/transformcompose.cpp b/cmd/transformcompose.cpp → cpp/cmd/transformcompose.cpp
diff --git a/cmd/transformconvert.cpp → cpp/cmd/transformconvert.cpp b/cmd/transformconvert.cpp → cpp/cmd/transformconvert.cpp
diff --git a/cmd/tsfdivide.cpp → cpp/cmd/tsfdivide.cpp b/cmd/tsfdivide.cpp → cpp/cmd/tsfdivide.cpp
diff --git a/cmd/tsfinfo.cpp → cpp/cmd/tsfinfo.cpp b/cmd/tsfinfo.cpp → cpp/cmd/tsfinfo.cpp
diff --git a/cmd/tsfmult.cpp → cpp/cmd/tsfmult.cpp b/cmd/tsfmult.cpp → cpp/cmd/tsfmult.cpp
diff --git a/cmd/tsfsmooth.cpp → cpp/cmd/tsfsmooth.cpp b/cmd/tsfsmooth.cpp → cpp/cmd/tsfsmooth.cpp
diff --git a/cmd/tsfthreshold.cpp → cpp/cmd/tsfthreshold.cpp b/cmd/tsfthreshold.cpp → cpp/cmd/tsfthreshold.cpp
diff --git a/cmd/tsfvalidate.cpp → cpp/cmd/tsfvalidate.cpp b/cmd/tsfvalidate.cpp → cpp/cmd/tsfvalidate.cpp
diff --git a/cmd/vectorstats.cpp → cpp/cmd/vectorstats.cpp b/cmd/vectorstats.cpp → cpp/cmd/vectorstats.cpp
diff --git a/cmd/voxel2fixel.cpp → cpp/cmd/voxel2fixel.cpp b/cmd/voxel2fixel.cpp → cpp/cmd/voxel2fixel.cpp
diff --git a/cmd/voxel2mesh.cpp → cpp/cmd/voxel2mesh.cpp b/cmd/voxel2mesh.cpp → cpp/cmd/voxel2mesh.cpp
diff --git a/cmd/warp2metric.cpp → cpp/cmd/warp2metric.cpp b/cmd/warp2metric.cpp → cpp/cmd/warp2metric.cpp
diff --git a/cmd/warpconvert.cpp → cpp/cmd/warpconvert.cpp b/cmd/warpconvert.cpp → cpp/cmd/warpconvert.cpp
diff --git a/cmd/warpcorrect.cpp → cpp/cmd/warpcorrect.cpp b/cmd/warpcorrect.cpp → cpp/cmd/warpcorrect.cpp
diff --git a/cmd/warpinit.cpp → cpp/cmd/warpinit.cpp b/cmd/warpinit.cpp → cpp/cmd/warpinit.cpp
diff --git a/cmd/warpinvert.cpp → cpp/cmd/warpinvert.cpp b/cmd/warpinvert.cpp → cpp/cmd/warpinvert.cpp
diff --git a/src/CMakeLists.txt → cpp/lib/CMakeLists.txt b/src/CMakeLists.txt → cpp/lib/CMakeLists.txt
@@ -1,3 +1,23 @@
+include(CheckSymbolExists)
+find_package(ZLIB REQUIRED)
+find_package(FFTW REQUIRED)
+find_package(Git QUIET)
+find_package(Threads REQUIRED)
+find_package(PNG QUIET)
+if(PNG_FOUND)
+    message(STATUS "Found PNG: ${PNG_LIBRARIES}")
+endif()
+
+# Check to see if we can use lgamma_r() function in custom Math::betaincreg()
+# The function is defined under _REENTRANT on some systems (e.g. MacOS)
+list(APPEND CMAKE_REQUIRED_DEFINITIONS -D_REENTRANT)
+check_symbol_exists(lgamma_r "math.h" MRTRIX_HAVE_LGAMMA_R)
+list(REMOVE_AT CMAKE_REQUIRED_DEFINITIONS -1)
+
+if(NOT MRTRIX_HAVE_LGAMMA_R)
+    message(STATUS "No lgamma_r() function found; statistical inference may have poorer multi-threading performance")
+endif()
+
 file(GLOB_RECURSE HEADLESS_SOURCES *.h *.cpp)
 list(FILTER HEADLESS_SOURCES EXCLUDE REGEX "gui/.*")
 
@@ -6,10 +26,10 @@ file(GLOB_RECURSE GUI_SOURCES gui/*.h gui/*.cpp)
 if(MRTRIX_BUILD_GUI)
     if(MRTRIX_USE_QT5)
         find_package(Qt5 COMPONENTS Core Gui Widgets OpenGL Network REQUIRED)
-        qt5_add_resources(RCC_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../icons/icons.qrc)
+        qt5_add_resources(RCC_SOURCES ${PROJECT_SOURCE_DIR}/icons/icons.qrc)
     else()
         find_package(Qt6 COMPONENTS Core Gui Widgets OpenGL Network OpenGLWidgets REQUIRED)
-        qt6_add_resources(RCC_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../icons/icons.qrc)
+        qt6_add_resources(RCC_SOURCES ${PROJECT_SOURCE_DIR}/icons/icons.qrc)
     endif()
     # Explicitly log Qt's location since it's not done automatically by the FindQt module
     message(STATUS "Qt${QT_MAJOR_VERSION}_DIR is set to: ${Qt${QT_MAJOR_VERSION}_DIR}")
@@ -21,24 +41,44 @@ endif()
 find_package(Git QUIET)
 
 # Create version target and library
-set(EXEC_VERSION_CPP ${CMAKE_CURRENT_BINARY_DIR}/exec_version.cpp)
+set(MRTRIX_VERSION_CPP ${CMAKE_CURRENT_BINARY_DIR}/mrtrix_version.cpp)
+set(CMD_VERSION_CPP ${CMAKE_CURRENT_BINARY_DIR}/cmd_version.cpp)
+
+add_custom_target(cmd-version-target ALL
+    COMMAND ${CMAKE_COMMAND}
+        -D GIT_EXECUTABLE=${GIT_EXECUTABLE}
+        -D MRTRIX_BASE_VERSION=${MRTRIX_BASE_VERSION}
+        -D DST=${CMD_VERSION_CPP}
+        -D SRC=${CMAKE_CURRENT_SOURCE_DIR}/cmd_version.cpp.in
+        -P ${PROJECT_SOURCE_DIR}/cmake/FindVersion.cmake
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    COMMENT "Generating cmd_version.cpp"
+    BYPRODUCTS ${CMD_VERSION_CPP}
+    VERBATIM
+)
 
-add_custom_target(exec-version-target ALL
+add_custom_target(mrtrix-version-target ALL
     COMMAND ${CMAKE_COMMAND}
         -D GIT_EXECUTABLE=${GIT_EXECUTABLE}
         -D MRTRIX_BASE_VERSION=${MRTRIX_BASE_VERSION}
-        -D DST=${EXEC_VERSION_CPP}
-        -D SRC=${CMAKE_CURRENT_SOURCE_DIR}/exec_version.cpp.in
-        -P ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/FindVersion.cmake
+        -D DST=${MRTRIX_VERSION_CPP}
+        -D SRC=${CMAKE_CURRENT_SOURCE_DIR}/mrtrix_version.cpp.in
+        -P ${PROJECT_SOURCE_DIR}/cmake/FindVersion.cmake
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    COMMENT "Generating exec_version.cpp for executables"
-    BYPRODUCTS ${EXEC_VERSION_CPP}
+    COMMENT "Generating mrtrix_version.cpp"
+    BYPRODUCTS ${MRTRIX_VERSION_CPP}
     VERBATIM
 )
 
-add_library(mrtrix-exec-version-lib STATIC ${EXEC_VERSION_CPP})
-add_library(mrtrix::exec-version-lib ALIAS mrtrix-exec-version-lib)
-add_dependencies(mrtrix-exec-version-lib exec-version-target)
+add_library(mrtrix-version-lib STATIC ${MRTRIX_VERSION_CPP})
+add_library(mrtrix::version-lib ALIAS mrtrix-version-lib)
+add_dependencies(mrtrix-version-lib mrtrix-version-target)
+
+add_library(mrtrix-cmd-version-lib STATIC ${CMD_VERSION_CPP})
+add_library(mrtrix::cmd-version-lib ALIAS mrtrix-cmd-version-lib)
+target_include_directories(mrtrix-cmd-version-lib PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+add_dependencies(mrtrix-cmd-version-lib cmd-version-target)
+
 
 if(MRTRIX_BUILD_NON_CORE_STATIC)
     set(MRTRIX_LIBRARY_TYPE STATIC)
@@ -50,12 +90,13 @@ add_library(mrtrix-headless ${MRTRIX_LIBRARY_TYPE} ${HEADLESS_SOURCES})
 add_library(mrtrix::headless ALIAS mrtrix-headless)
 
 
-target_include_directories(mrtrix-exec-version-lib PUBLIC
+target_include_directories(mrtrix-version-lib PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 target_include_directories(mrtrix-headless PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/core
 )
 
 if(MRTRIX_USE_PCH)
@@ -66,8 +107,31 @@ if(MRTRIX_USE_PCH)
     )
 endif()
 
+target_compile_definitions(mrtrix-headless PUBLIC
+    MRTRIX_BASE_VERSION="${MRTRIX_BASE_VERSION}"
+    $<$<BOOL:${MRTRIX_HAVE_LGAMMA_R}>:MRTRIX_HAVE_LGAMMA_R>
+)
+
+if(APPLE AND MRTRIX_HAVE_LGAMMA_R)
+    target_compile_definitions(mrtrix-headless PRIVATE _REENTRANT)
+endif()
+
+if(PNG_FOUND)
+    target_compile_definitions(mrtrix-headless PUBLIC MRTRIX_PNG_SUPPORT)
+    target_link_libraries(mrtrix-headless PUBLIC PNG::PNG)
+else()
+    message(WARNING "libpng not found, disabling PNG support")
+endif()
+
 target_link_libraries(mrtrix-headless PUBLIC
-    mrtrix::core
+    Eigen3::Eigen
+    ZLIB::ZLIB
+    ${FFTW_LIBRARIES}
+    mrtrix::common
+    Threads::Threads
+    nlohmann_json::nlohmann_json
+    nifti::nifti
+    half::half
 )
 
 if(MRTRIX_BUILD_GUI)

diff --git a/src/exec_version.cpp.in → cpp/lib/cmd_version.cpp.in b/src/exec_version.cpp.in → cpp/lib/cmd_version.cpp.in
@@ -1,8 +1,8 @@
-#include "exec_version.h"
+#include "cmd_version.h"
 
 namespace MR {
   namespace App {
     extern const char* executable_uses_mrtrix_version;
     void set_executable_uses_mrtrix_version () { executable_uses_mrtrix_version = "@MRTRIX_VERSION@"; }
   }
-}
+}
diff --git a/src/exec_version.h → cpp/lib/cmd_version.h b/src/exec_version.h → cpp/lib/cmd_version.h
diff --git a/src/colourmap.cpp → cpp/lib/colourmap.cpp b/src/colourmap.cpp → cpp/lib/colourmap.cpp
diff --git a/src/colourmap.h → cpp/lib/colourmap.h b/src/colourmap.h → cpp/lib/colourmap.h
diff --git a/src/connectome/connectome.cpp → cpp/lib/connectome/connectome.cpp b/src/connectome/connectome.cpp → cpp/lib/connectome/connectome.cpp
diff --git a/src/connectome/connectome.h → cpp/lib/connectome/connectome.h b/src/connectome/connectome.h → cpp/lib/connectome/connectome.h
diff --git a/src/connectome/enhance.cpp → cpp/lib/connectome/enhance.cpp b/src/connectome/enhance.cpp → cpp/lib/connectome/enhance.cpp
diff --git a/src/connectome/enhance.h → cpp/lib/connectome/enhance.h b/src/connectome/enhance.h → cpp/lib/connectome/enhance.h
diff --git a/src/connectome/lut.cpp → cpp/lib/connectome/lut.cpp b/src/connectome/lut.cpp → cpp/lib/connectome/lut.cpp
diff --git a/src/connectome/lut.h → cpp/lib/connectome/lut.h b/src/connectome/lut.h → cpp/lib/connectome/lut.h
diff --git a/src/connectome/mat2vec.h → cpp/lib/connectome/mat2vec.h b/src/connectome/mat2vec.h → cpp/lib/connectome/mat2vec.h
diff --git a/core/CMakeLists.txt → cpp/lib/core/CMakeLists.txt b/core/CMakeLists.txt → cpp/lib/core/CMakeLists.txt
diff --git a/core/adapter/base.h → cpp/lib/core/adapter/base.h b/core/adapter/base.h → cpp/lib/core/adapter/base.h
diff --git a/core/adapter/extract.h → cpp/lib/core/adapter/extract.h b/core/adapter/extract.h → cpp/lib/core/adapter/extract.h
diff --git a/core/adapter/gaussian1D.h → cpp/lib/core/adapter/gaussian1D.h b/core/adapter/gaussian1D.h → cpp/lib/core/adapter/gaussian1D.h
diff --git a/core/adapter/gradient1D.h → cpp/lib/core/adapter/gradient1D.h b/core/adapter/gradient1D.h → cpp/lib/core/adapter/gradient1D.h
diff --git a/core/adapter/gradient3D.h → cpp/lib/core/adapter/gradient3D.h b/core/adapter/gradient3D.h → cpp/lib/core/adapter/gradient3D.h
diff --git a/core/adapter/jacobian.h → cpp/lib/core/adapter/jacobian.h b/core/adapter/jacobian.h → cpp/lib/core/adapter/jacobian.h
diff --git a/core/adapter/median.h → cpp/lib/core/adapter/median.h b/core/adapter/median.h → cpp/lib/core/adapter/median.h
diff --git a/core/adapter/neighbourhood3D.h → cpp/lib/core/adapter/neighbourhood3D.h b/core/adapter/neighbourhood3D.h → cpp/lib/core/adapter/neighbourhood3D.h
diff --git a/core/adapter/normalise3D.h → cpp/lib/core/adapter/normalise3D.h b/core/adapter/normalise3D.h → cpp/lib/core/adapter/normalise3D.h
diff --git a/core/adapter/permute_axes.h → cpp/lib/core/adapter/permute_axes.h b/core/adapter/permute_axes.h → cpp/lib/core/adapter/permute_axes.h
diff --git a/core/adapter/regrid.h → cpp/lib/core/adapter/regrid.h b/core/adapter/regrid.h → cpp/lib/core/adapter/regrid.h
diff --git a/core/adapter/replicate.h → cpp/lib/core/adapter/replicate.h b/core/adapter/replicate.h → cpp/lib/core/adapter/replicate.h
diff --git a/core/adapter/reslice.cpp → cpp/lib/core/adapter/reslice.cpp b/core/adapter/reslice.cpp → cpp/lib/core/adapter/reslice.cpp
diff --git a/core/adapter/reslice.h → cpp/lib/core/adapter/reslice.h b/core/adapter/reslice.h → cpp/lib/core/adapter/reslice.h
diff --git a/core/adapter/subset.h → cpp/lib/core/adapter/subset.h b/core/adapter/subset.h → cpp/lib/core/adapter/subset.h
diff --git a/core/adapter/warp.h → cpp/lib/core/adapter/warp.h b/core/adapter/warp.h → cpp/lib/core/adapter/warp.h
diff --git a/core/algo/copy.h → cpp/lib/core/algo/copy.h b/core/algo/copy.h → cpp/lib/core/algo/copy.h
diff --git a/core/algo/histogram.cpp → cpp/lib/core/algo/histogram.cpp b/core/algo/histogram.cpp → cpp/lib/core/algo/histogram.cpp
diff --git a/core/algo/histogram.h → cpp/lib/core/algo/histogram.h b/core/algo/histogram.h → cpp/lib/core/algo/histogram.h
diff --git a/core/algo/iterator.h → cpp/lib/core/algo/iterator.h b/core/algo/iterator.h → cpp/lib/core/algo/iterator.h
diff --git a/core/algo/loop.h → cpp/lib/core/algo/loop.h b/core/algo/loop.h → cpp/lib/core/algo/loop.h
diff --git a/core/algo/min_max.h → cpp/lib/core/algo/min_max.h b/core/algo/min_max.h → cpp/lib/core/algo/min_max.h
diff --git a/core/algo/neighbourhooditerator.h → cpp/lib/core/algo/neighbourhooditerator.h b/core/algo/neighbourhooditerator.h → cpp/lib/core/algo/neighbourhooditerator.h
diff --git a/core/algo/random_loop.h → cpp/lib/core/algo/random_loop.h b/core/algo/random_loop.h → cpp/lib/core/algo/random_loop.h
diff --git a/core/algo/random_threaded_loop.h → cpp/lib/core/algo/random_threaded_loop.h b/core/algo/random_threaded_loop.h → cpp/lib/core/algo/random_threaded_loop.h
diff --git a/core/algo/stochastic_threaded_loop.h → cpp/lib/core/algo/stochastic_threaded_loop.h b/core/algo/stochastic_threaded_loop.h → cpp/lib/core/algo/stochastic_threaded_loop.h
diff --git a/core/algo/threaded_copy.h → cpp/lib/core/algo/threaded_copy.h b/core/algo/threaded_copy.h → cpp/lib/core/algo/threaded_copy.h
diff --git a/core/algo/threaded_loop.h → cpp/lib/core/algo/threaded_loop.h b/core/algo/threaded_loop.h → cpp/lib/core/algo/threaded_loop.h
diff --git a/core/app.cpp → cpp/lib/core/app.cpp b/core/app.cpp → cpp/lib/core/app.cpp
diff --git a/core/app.h → cpp/lib/core/app.h b/core/app.h → cpp/lib/core/app.h
diff --git a/core/apply.h → cpp/lib/core/apply.h b/core/apply.h → cpp/lib/core/apply.h
diff --git a/core/axes.cpp → cpp/lib/core/axes.cpp b/core/axes.cpp → cpp/lib/core/axes.cpp
diff --git a/core/axes.h → cpp/lib/core/axes.h b/core/axes.h → cpp/lib/core/axes.h
diff --git a/core/cmdline_option.h → cpp/lib/core/cmdline_option.h b/core/cmdline_option.h → cpp/lib/core/cmdline_option.h
diff --git a/core/command.h → cpp/lib/core/command.h b/core/command.h → cpp/lib/core/command.h
@@ -21,7 +21,7 @@
 #endif
 
 #include "app.h"
-#include "exec_version.h"
+#include "cmd_version.h"
 #include "mrtrix.h"
 #ifdef MRTRIX_PROJECT
 namespace MR {

diff --git a/core/datatype.cpp → cpp/lib/core/datatype.cpp b/core/datatype.cpp → cpp/lib/core/datatype.cpp
diff --git a/core/datatype.h → cpp/lib/core/datatype.h b/core/datatype.h → cpp/lib/core/datatype.h
diff --git a/core/debug.h → cpp/lib/core/debug.h b/core/debug.h → cpp/lib/core/debug.h
diff --git a/core/dwi/gradient.cpp → cpp/lib/core/dwi/gradient.cpp b/core/dwi/gradient.cpp → cpp/lib/core/dwi/gradient.cpp
diff --git a/core/dwi/gradient.h → cpp/lib/core/dwi/gradient.h b/core/dwi/gradient.h → cpp/lib/core/dwi/gradient.h
diff --git a/core/dwi/shells.cpp → cpp/lib/core/dwi/shells.cpp b/core/dwi/shells.cpp → cpp/lib/core/dwi/shells.cpp
diff --git a/core/dwi/shells.h → cpp/lib/core/dwi/shells.h b/core/dwi/shells.h → cpp/lib/core/dwi/shells.h
diff --git a/core/eigen_plugins/array.h → cpp/lib/core/eigen_plugins/array.h b/core/eigen_plugins/array.h → cpp/lib/core/eigen_plugins/array.h
diff --git a/core/eigen_plugins/dense_base.h → cpp/lib/core/eigen_plugins/dense_base.h b/core/eigen_plugins/dense_base.h → cpp/lib/core/eigen_plugins/dense_base.h
diff --git a/core/eigen_plugins/matrix.h → cpp/lib/core/eigen_plugins/matrix.h b/core/eigen_plugins/matrix.h → cpp/lib/core/eigen_plugins/matrix.h
diff --git a/core/exception.cpp → cpp/lib/core/exception.cpp b/core/exception.cpp → cpp/lib/core/exception.cpp
diff --git a/core/exception.h → cpp/lib/core/exception.h b/core/exception.h → cpp/lib/core/exception.h
diff --git a/core/fetch_store.cpp → cpp/lib/core/fetch_store.cpp b/core/fetch_store.cpp → cpp/lib/core/fetch_store.cpp
diff --git a/core/fetch_store.h → cpp/lib/core/fetch_store.h b/core/fetch_store.h → cpp/lib/core/fetch_store.h
diff --git a/core/file/config.cpp → cpp/lib/core/file/config.cpp b/core/file/config.cpp → cpp/lib/core/file/config.cpp
diff --git a/core/file/config.h → cpp/lib/core/file/config.h b/core/file/config.h → cpp/lib/core/file/config.h
diff --git a/core/file/copy.h → cpp/lib/core/file/copy.h b/core/file/copy.h → cpp/lib/core/file/copy.h
diff --git a/core/file/dicom/csa_entry.h → cpp/lib/core/file/dicom/csa_entry.h b/core/file/dicom/csa_entry.h → cpp/lib/core/file/dicom/csa_entry.h
diff --git a/core/file/dicom/definitions.h → cpp/lib/core/file/dicom/definitions.h b/core/file/dicom/definitions.h → cpp/lib/core/file/dicom/definitions.h
diff --git a/core/file/dicom/dict.cpp → cpp/lib/core/file/dicom/dict.cpp b/core/file/dicom/dict.cpp → cpp/lib/core/file/dicom/dict.cpp
diff --git a/core/file/dicom/element.cpp → cpp/lib/core/file/dicom/element.cpp b/core/file/dicom/element.cpp → cpp/lib/core/file/dicom/element.cpp
diff --git a/core/file/dicom/element.h → cpp/lib/core/file/dicom/element.h b/core/file/dicom/element.h → cpp/lib/core/file/dicom/element.h
diff --git a/core/file/dicom/image.cpp → cpp/lib/core/file/dicom/image.cpp b/core/file/dicom/image.cpp → cpp/lib/core/file/dicom/image.cpp
diff --git a/core/file/dicom/image.h → cpp/lib/core/file/dicom/image.h b/core/file/dicom/image.h → cpp/lib/core/file/dicom/image.h
diff --git a/core/file/dicom/mapper.cpp → cpp/lib/core/file/dicom/mapper.cpp b/core/file/dicom/mapper.cpp → cpp/lib/core/file/dicom/mapper.cpp
diff --git a/core/file/dicom/mapper.h → cpp/lib/core/file/dicom/mapper.h b/core/file/dicom/mapper.h → cpp/lib/core/file/dicom/mapper.h
diff --git a/core/file/dicom/patient.cpp → cpp/lib/core/file/dicom/patient.cpp b/core/file/dicom/patient.cpp → cpp/lib/core/file/dicom/patient.cpp
diff --git a/core/file/dicom/patient.h → cpp/lib/core/file/dicom/patient.h b/core/file/dicom/patient.h → cpp/lib/core/file/dicom/patient.h
diff --git a/core/file/dicom/quick_scan.cpp → cpp/lib/core/file/dicom/quick_scan.cpp b/core/file/dicom/quick_scan.cpp → cpp/lib/core/file/dicom/quick_scan.cpp
diff --git a/core/file/dicom/quick_scan.h → cpp/lib/core/file/dicom/quick_scan.h b/core/file/dicom/quick_scan.h → cpp/lib/core/file/dicom/quick_scan.h
diff --git a/core/file/dicom/select_cmdline.cpp → cpp/lib/core/file/dicom/select_cmdline.cpp b/core/file/dicom/select_cmdline.cpp → cpp/lib/core/file/dicom/select_cmdline.cpp
diff --git a/core/file/dicom/series.cpp → cpp/lib/core/file/dicom/series.cpp b/core/file/dicom/series.cpp → cpp/lib/core/file/dicom/series.cpp
diff --git a/core/file/dicom/series.h → cpp/lib/core/file/dicom/series.h b/core/file/dicom/series.h → cpp/lib/core/file/dicom/series.h
diff --git a/core/file/dicom/study.cpp → cpp/lib/core/file/dicom/study.cpp b/core/file/dicom/study.cpp → cpp/lib/core/file/dicom/study.cpp
diff --git a/core/file/dicom/study.h → cpp/lib/core/file/dicom/study.h b/core/file/dicom/study.h → cpp/lib/core/file/dicom/study.h
diff --git a/core/file/dicom/tree.cpp → cpp/lib/core/file/dicom/tree.cpp b/core/file/dicom/tree.cpp → cpp/lib/core/file/dicom/tree.cpp
diff --git a/core/file/dicom/tree.h → cpp/lib/core/file/dicom/tree.h b/core/file/dicom/tree.h → cpp/lib/core/file/dicom/tree.h
diff --git a/core/file/entry.h → cpp/lib/core/file/entry.h b/core/file/entry.h → cpp/lib/core/file/entry.h
diff --git a/core/file/gz.h → cpp/lib/core/file/gz.h b/core/file/gz.h → cpp/lib/core/file/gz.h
diff --git a/core/file/json_utils.cpp → cpp/lib/core/file/json_utils.cpp b/core/file/json_utils.cpp → cpp/lib/core/file/json_utils.cpp
diff --git a/core/file/json_utils.h → cpp/lib/core/file/json_utils.h b/core/file/json_utils.h → cpp/lib/core/file/json_utils.h
diff --git a/core/file/key_value.cpp → cpp/lib/core/file/key_value.cpp b/core/file/key_value.cpp → cpp/lib/core/file/key_value.cpp
diff --git a/core/file/key_value.h → cpp/lib/core/file/key_value.h b/core/file/key_value.h → cpp/lib/core/file/key_value.h
diff --git a/core/file/matrix.h → cpp/lib/core/file/matrix.h b/core/file/matrix.h → cpp/lib/core/file/matrix.h
diff --git a/core/file/mgh.cpp → cpp/lib/core/file/mgh.cpp b/core/file/mgh.cpp → cpp/lib/core/file/mgh.cpp
diff --git a/core/file/mgh.h → cpp/lib/core/file/mgh.h b/core/file/mgh.h → cpp/lib/core/file/mgh.h
diff --git a/core/file/mmap.cpp → cpp/lib/core/file/mmap.cpp b/core/file/mmap.cpp → cpp/lib/core/file/mmap.cpp
diff --git a/core/file/mmap.h → cpp/lib/core/file/mmap.h b/core/file/mmap.h → cpp/lib/core/file/mmap.h
diff --git a/core/file/name_parser.cpp → cpp/lib/core/file/name_parser.cpp b/core/file/name_parser.cpp → cpp/lib/core/file/name_parser.cpp
diff --git a/core/file/name_parser.h → cpp/lib/core/file/name_parser.h b/core/file/name_parser.h → cpp/lib/core/file/name_parser.h
diff --git a/core/file/nifti_utils.cpp → cpp/lib/core/file/nifti_utils.cpp b/core/file/nifti_utils.cpp → cpp/lib/core/file/nifti_utils.cpp
diff --git a/core/file/nifti_utils.h → cpp/lib/core/file/nifti_utils.h b/core/file/nifti_utils.h → cpp/lib/core/file/nifti_utils.h
diff --git a/core/file/npy.cpp → cpp/lib/core/file/npy.cpp b/core/file/npy.cpp → cpp/lib/core/file/npy.cpp
diff --git a/core/file/npy.h → cpp/lib/core/file/npy.h b/core/file/npy.h → cpp/lib/core/file/npy.h
diff --git a/core/file/ofstream.cpp → cpp/lib/core/file/ofstream.cpp b/core/file/ofstream.cpp → cpp/lib/core/file/ofstream.cpp
diff --git a/core/file/ofstream.h → cpp/lib/core/file/ofstream.h b/core/file/ofstream.h → cpp/lib/core/file/ofstream.h
diff --git a/core/file/path.h → cpp/lib/core/file/path.h b/core/file/path.h → cpp/lib/core/file/path.h
diff --git a/core/file/png.cpp → cpp/lib/core/file/png.cpp b/core/file/png.cpp → cpp/lib/core/file/png.cpp
diff --git a/core/file/png.h → cpp/lib/core/file/png.h b/core/file/png.h → cpp/lib/core/file/png.h
diff --git a/core/file/pyconfig.h → cpp/lib/core/file/pyconfig.h b/core/file/pyconfig.h → cpp/lib/core/file/pyconfig.h
diff --git a/core/file/utils.cpp → cpp/lib/core/file/utils.cpp b/core/file/utils.cpp → cpp/lib/core/file/utils.cpp
diff --git a/core/file/utils.h → cpp/lib/core/file/utils.h b/core/file/utils.h → cpp/lib/core/file/utils.h
diff --git a/core/filter/base.h → cpp/lib/core/filter/base.h b/core/filter/base.h → cpp/lib/core/filter/base.h
diff --git a/core/filter/connected_components.cpp → cpp/lib/core/filter/connected_components.cpp b/core/filter/connected_components.cpp → cpp/lib/core/filter/connected_components.cpp
diff --git a/core/filter/connected_components.h → cpp/lib/core/filter/connected_components.h b/core/filter/connected_components.h → cpp/lib/core/filter/connected_components.h
diff --git a/core/filter/dilate.h → cpp/lib/core/filter/dilate.h b/core/filter/dilate.h → cpp/lib/core/filter/dilate.h
diff --git a/core/filter/erode.h → cpp/lib/core/filter/erode.h b/core/filter/erode.h → cpp/lib/core/filter/erode.h
diff --git a/core/filter/fill.h → cpp/lib/core/filter/fill.h b/core/filter/fill.h → cpp/lib/core/filter/fill.h
diff --git a/core/filter/gradient.h → cpp/lib/core/filter/gradient.h b/core/filter/gradient.h → cpp/lib/core/filter/gradient.h
diff --git a/core/filter/mask_clean.h → cpp/lib/core/filter/mask_clean.h b/core/filter/mask_clean.h → cpp/lib/core/filter/mask_clean.h
diff --git a/core/filter/median.h → cpp/lib/core/filter/median.h b/core/filter/median.h → cpp/lib/core/filter/median.h
diff --git a/core/filter/normalise.h → cpp/lib/core/filter/normalise.h b/core/filter/normalise.h → cpp/lib/core/filter/normalise.h
diff --git a/core/filter/optimal_threshold.h → cpp/lib/core/filter/optimal_threshold.h b/core/filter/optimal_threshold.h → cpp/lib/core/filter/optimal_threshold.h
diff --git a/core/filter/resize.h → cpp/lib/core/filter/resize.h b/core/filter/resize.h → cpp/lib/core/filter/resize.h
diff --git a/core/filter/reslice.h → cpp/lib/core/filter/reslice.h b/core/filter/reslice.h → cpp/lib/core/filter/reslice.h
diff --git a/core/filter/smooth.h → cpp/lib/core/filter/smooth.h b/core/filter/smooth.h → cpp/lib/core/filter/smooth.h
diff --git a/core/filter/warp.h → cpp/lib/core/filter/warp.h b/core/filter/warp.h → cpp/lib/core/filter/warp.h
diff --git a/core/filter/zclean.h → cpp/lib/core/filter/zclean.h b/core/filter/zclean.h → cpp/lib/core/filter/zclean.h
diff --git a/core/fixel/fixel.cpp → cpp/lib/core/fixel/fixel.cpp b/core/fixel/fixel.cpp → cpp/lib/core/fixel/fixel.cpp
@@ -15,7 +15,7 @@
  */
 
 #include "fixel/fixel.h"
-#include "version.h"
+#include "mrtrix_version.h"
 
 namespace MR::Fixel {
 

diff --git a/core/fixel/fixel.h → cpp/lib/core/fixel/fixel.h b/core/fixel/fixel.h → cpp/lib/core/fixel/fixel.h
diff --git a/core/fixel/helpers.h → cpp/lib/core/fixel/helpers.h b/core/fixel/helpers.h → cpp/lib/core/fixel/helpers.h
diff --git a/core/fixel/legacy/fixel_metric.h → cpp/lib/core/fixel/legacy/fixel_metric.h b/core/fixel/legacy/fixel_metric.h → cpp/lib/core/fixel/legacy/fixel_metric.h
diff --git a/core/fixel/legacy/image.h → cpp/lib/core/fixel/legacy/image.h b/core/fixel/legacy/image.h → cpp/lib/core/fixel/legacy/image.h
diff --git a/core/fixel/legacy/keys.h → cpp/lib/core/fixel/legacy/keys.h b/core/fixel/legacy/keys.h → cpp/lib/core/fixel/legacy/keys.h
diff --git a/core/fixel/loop.h → cpp/lib/core/fixel/loop.h b/core/fixel/loop.h → cpp/lib/core/fixel/loop.h
diff --git a/core/formats/dicom.cpp → cpp/lib/core/formats/dicom.cpp b/core/formats/dicom.cpp → cpp/lib/core/formats/dicom.cpp
diff --git a/core/formats/list.cpp → cpp/lib/core/formats/list.cpp b/core/formats/list.cpp → cpp/lib/core/formats/list.cpp
diff --git a/core/formats/list.h → cpp/lib/core/formats/list.h b/core/formats/list.h → cpp/lib/core/formats/list.h
diff --git a/core/formats/mgh.cpp → cpp/lib/core/formats/mgh.cpp b/core/formats/mgh.cpp → cpp/lib/core/formats/mgh.cpp
diff --git a/core/formats/mgz.cpp → cpp/lib/core/formats/mgz.cpp b/core/formats/mgz.cpp → cpp/lib/core/formats/mgz.cpp
diff --git a/core/formats/mri.cpp → cpp/lib/core/formats/mri.cpp b/core/formats/mri.cpp → cpp/lib/core/formats/mri.cpp
diff --git a/core/formats/mrtrix.cpp → cpp/lib/core/formats/mrtrix.cpp b/core/formats/mrtrix.cpp → cpp/lib/core/formats/mrtrix.cpp
diff --git a/core/formats/mrtrix_gz.cpp → cpp/lib/core/formats/mrtrix_gz.cpp b/core/formats/mrtrix_gz.cpp → cpp/lib/core/formats/mrtrix_gz.cpp
diff --git a/core/formats/mrtrix_sparse_legacy.cpp → ...lib/core/formats/mrtrix_sparse_legacy.cpp b/core/formats/mrtrix_sparse_legacy.cpp → ...lib/core/formats/mrtrix_sparse_legacy.cpp
diff --git a/core/formats/mrtrix_utils.cpp → cpp/lib/core/formats/mrtrix_utils.cpp b/core/formats/mrtrix_utils.cpp → cpp/lib/core/formats/mrtrix_utils.cpp
diff --git a/core/formats/mrtrix_utils.h → cpp/lib/core/formats/mrtrix_utils.h b/core/formats/mrtrix_utils.h → cpp/lib/core/formats/mrtrix_utils.h
diff --git a/core/formats/nifti1.cpp → cpp/lib/core/formats/nifti1.cpp b/core/formats/nifti1.cpp → cpp/lib/core/formats/nifti1.cpp
diff --git a/core/formats/nifti1_gz.cpp → cpp/lib/core/formats/nifti1_gz.cpp b/core/formats/nifti1_gz.cpp → cpp/lib/core/formats/nifti1_gz.cpp
diff --git a/core/formats/nifti2.cpp → cpp/lib/core/formats/nifti2.cpp b/core/formats/nifti2.cpp → cpp/lib/core/formats/nifti2.cpp
diff --git a/core/formats/nifti2_gz.cpp → cpp/lib/core/formats/nifti2_gz.cpp b/core/formats/nifti2_gz.cpp → cpp/lib/core/formats/nifti2_gz.cpp
diff --git a/core/formats/par.cpp → cpp/lib/core/formats/par.cpp b/core/formats/par.cpp → cpp/lib/core/formats/par.cpp
diff --git a/core/formats/pipe.cpp → cpp/lib/core/formats/pipe.cpp b/core/formats/pipe.cpp → cpp/lib/core/formats/pipe.cpp
diff --git a/core/formats/png.cpp → cpp/lib/core/formats/png.cpp b/core/formats/png.cpp → cpp/lib/core/formats/png.cpp
diff --git a/core/formats/ram.cpp → cpp/lib/core/formats/ram.cpp b/core/formats/ram.cpp → cpp/lib/core/formats/ram.cpp
diff --git a/core/formats/xds.cpp → cpp/lib/core/formats/xds.cpp b/core/formats/xds.cpp → cpp/lib/core/formats/xds.cpp
diff --git a/core/half.h → cpp/lib/core/half.h b/core/half.h → cpp/lib/core/half.h
diff --git a/core/header.cpp → cpp/lib/core/header.cpp b/core/header.cpp → cpp/lib/core/header.cpp
diff --git a/core/header.h → cpp/lib/core/header.h b/core/header.h → cpp/lib/core/header.h
diff --git a/core/image.cpp → cpp/lib/core/image.cpp b/core/image.cpp → cpp/lib/core/image.cpp
diff --git a/core/image.h → cpp/lib/core/image.h b/core/image.h → cpp/lib/core/image.h
diff --git a/core/image_diff.h → cpp/lib/core/image_diff.h b/core/image_diff.h → cpp/lib/core/image_diff.h
diff --git a/core/image_helpers.h → cpp/lib/core/image_helpers.h b/core/image_helpers.h → cpp/lib/core/image_helpers.h
diff --git a/core/image_io/base.cpp → cpp/lib/core/image_io/base.cpp b/core/image_io/base.cpp → cpp/lib/core/image_io/base.cpp
diff --git a/core/image_io/base.h → cpp/lib/core/image_io/base.h b/core/image_io/base.h → cpp/lib/core/image_io/base.h
diff --git a/core/image_io/default.cpp → cpp/lib/core/image_io/default.cpp b/core/image_io/default.cpp → cpp/lib/core/image_io/default.cpp
diff --git a/core/image_io/default.h → cpp/lib/core/image_io/default.h b/core/image_io/default.h → cpp/lib/core/image_io/default.h
diff --git a/core/image_io/gz.cpp → cpp/lib/core/image_io/gz.cpp b/core/image_io/gz.cpp → cpp/lib/core/image_io/gz.cpp
diff --git a/core/image_io/gz.h → cpp/lib/core/image_io/gz.h b/core/image_io/gz.h → cpp/lib/core/image_io/gz.h
diff --git a/core/image_io/mosaic.cpp → cpp/lib/core/image_io/mosaic.cpp b/core/image_io/mosaic.cpp → cpp/lib/core/image_io/mosaic.cpp
diff --git a/core/image_io/mosaic.h → cpp/lib/core/image_io/mosaic.h b/core/image_io/mosaic.h → cpp/lib/core/image_io/mosaic.h
diff --git a/core/image_io/pipe.cpp → cpp/lib/core/image_io/pipe.cpp b/core/image_io/pipe.cpp → cpp/lib/core/image_io/pipe.cpp
diff --git a/core/image_io/pipe.h → cpp/lib/core/image_io/pipe.h b/core/image_io/pipe.h → cpp/lib/core/image_io/pipe.h
diff --git a/core/image_io/png.cpp → cpp/lib/core/image_io/png.cpp b/core/image_io/png.cpp → cpp/lib/core/image_io/png.cpp
diff --git a/core/image_io/png.h → cpp/lib/core/image_io/png.h b/core/image_io/png.h → cpp/lib/core/image_io/png.h
diff --git a/core/image_io/ram.cpp → cpp/lib/core/image_io/ram.cpp b/core/image_io/ram.cpp → cpp/lib/core/image_io/ram.cpp
diff --git a/core/image_io/ram.h → cpp/lib/core/image_io/ram.h b/core/image_io/ram.h → cpp/lib/core/image_io/ram.h
diff --git a/core/image_io/scratch.cpp → cpp/lib/core/image_io/scratch.cpp b/core/image_io/scratch.cpp → cpp/lib/core/image_io/scratch.cpp
diff --git a/core/image_io/scratch.h → cpp/lib/core/image_io/scratch.h b/core/image_io/scratch.h → cpp/lib/core/image_io/scratch.h
diff --git a/core/image_io/sparse.cpp → cpp/lib/core/image_io/sparse.cpp b/core/image_io/sparse.cpp → cpp/lib/core/image_io/sparse.cpp
diff --git a/core/image_io/sparse.h → cpp/lib/core/image_io/sparse.h b/core/image_io/sparse.h → cpp/lib/core/image_io/sparse.h
diff --git a/core/image_io/variable_scaling.cpp → cpp/lib/core/image_io/variable_scaling.cpp b/core/image_io/variable_scaling.cpp → cpp/lib/core/image_io/variable_scaling.cpp
diff --git a/core/image_io/variable_scaling.h → cpp/lib/core/image_io/variable_scaling.h b/core/image_io/variable_scaling.h → cpp/lib/core/image_io/variable_scaling.h
diff --git a/core/interp/base.h → cpp/lib/core/interp/base.h b/core/interp/base.h → cpp/lib/core/interp/base.h
diff --git a/core/interp/cubic.h → cpp/lib/core/interp/cubic.h b/core/interp/cubic.h → cpp/lib/core/interp/cubic.h
diff --git a/core/interp/linear.h → cpp/lib/core/interp/linear.h b/core/interp/linear.h → cpp/lib/core/interp/linear.h
diff --git a/core/interp/masked.h → cpp/lib/core/interp/masked.h b/core/interp/masked.h → cpp/lib/core/interp/masked.h