Restructured namespaces and classes