More re-org, adding some new commands