Yet another reorg of the package and class structure.