Updated to recommended groupId and artifactId forms. Minor refactoring of build files