Reorganize build script a little