Rework build system