Moved stuff to different namespaces.