rework build process