chnage the structure of files and directories
Merge branch 'hotfix/chg_files'