Reorg of package structure.