Removed extra dirs.
Merge branch 'develop'
Final final.  Merging 'develop' to master branch.