Reorg to support being a maven artifact.