Refactoring Add command.

Refactoring and make Add command be able to select current directory.