Simplified commands and improved info command
Merge branch 'refactoring/interface/rearrange-commands'