Restructed namespaces