Breaking up into more targeted namespaces.