keeping modifying the build system for a less monolithic build