Finishing the refactor... #991

Job	Run time
ubuntu-24.04-clang-16 Release (native+py)	41m 32s
ubuntu-24.04-gcc-14 Debug (no-native C++-only)	21m 9s
ubuntu-24.04-gcc-14 Release (native+py)	26m 19s
ubuntu-24.04-clang-16 Debug (no-native C++-only)	23m 17s
	1h 52m 17s

Provide feedback