reshuffle of cli to parent all aws commands under a aws subcommand