rearranging and updating build scripts