Reorganized folder structure
Merge branch 'dev'