adjust the file structure
Merge branch 'zsh'