Revamping the build system (again...)