Reorganized build system