Moved around the Namespace stuff.