reduce level of directories by 1
Merge branch 'denestdirectory'