Convert 'dir' setting to 'src and make 'dir' obsolete.
Updating documentation and refactoring
Merge branch 'feature/scr'

* feature/scr:
  Updating documentation and refactoring
  Convert 'dir' setting to 'src and make 'dir' obsolete.