reorder build steps