rearrange the directory tree
Merge branch 'plain-file-structure'