Reorder things in setup-env