Refactor namespace