updated namespaces for new structure