refactor all package steps using dsl