refactor namespace