more CLI organization