Reformat and update POM files
Merge pull request #50 from a5anka/refactoring

Reformat and update POM files