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