Slight restructuring of namespaces