moved around some namespaces