namespace refactoring and UI