minor doc fixes
Merge remote-tracking branch 'origin/new-file-structure' into new-file-structure
Merge remote-tracking branch 'origin/new-file-structure' into new-file-structure