Rearrange the whole thing for new build script.