[FIX] Directory structure
Merge branch 'dev'