Moved namespaces around