refactor context : move namespaces