Reorg of the packages, so that a user doesn't need to reference internal
packages.
Furthermore introduce the pattern that a package should only has classes
or subpackages.