Moved shit to new namespaces.