huge cleanup in namespaces (work still needed)