GH-1 Code cleanup
GH-1 In order to fix build issues fixed artifacts names in pom files
GH-1 Code cleanup