CMS-2211 Simplify our java module structure.