Reorganized files to folders
Merge branch 'master' into develop