Refactoring package names, tidying up POM.