Re-jig build system