Reorder setup steps