Simplify package namespaces