Moved to new package, fixed up pom reference.
Code cleanup