Major package reshuffle. Needed to rename package for sonatype publishing.