Since we have quite a large amount of commands in the CLI by now, we should consider re-organizing them into subdirectories using the entities as classifiers.