General refactoring and code improvements, getting ready for Sonatype OSS Maven hosting requirements.