Moving modules and types into more specific namespaces