Add suppoer for verb/noun commands
Add separate source file for commands