Refactoring various libraries into tighter namespaces.