Refactor some files
Implements `Watson` command
Improve completion for file and dir