Move cmd into its own dir
Add commands