Minor changes to code structure and maven pom file.