rearranged namespaces