Move to a non-recursive build system