minor changes in directory names
Merge branch 'origin/master'