Some more command tree re-organization