changed poms and project structure
Merge branch 'master' into development