Make source directory configurable
Merge branch 'make-source-directory-configurable'