re-org build steps