clean up
Merge branch 'master' of https://github.com/gelus/Organize-to-Maven-standard