Restructured the namespaces