Some cleanup in structure
Merge branch 'dev'