Namespaces refactoring
Extension