All namespaces updated for reorganization. Should all work now.