Namespaces refactor
Code Review