- refactor namespace
- fix bugs