Did some namespace refactoring