<!--- Provide a general summary of the issue in the Title above --> ## Description <!--- Provide a more detailed introduction to the issue itself, and why you consider it to be a bug --> 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.