Simplify directories hierarchy
Update files mode bits
Merge remote-tracking branch 'origin/master'