Follow maven directory structure
Merge branch 'dev'