Some reorg of packages to make stuff more portable