refactor name space
Merge pull request #1 from yij/feature/refactoring-codes

refactor name space