Reorganize subcommand functions to be more semantic