sort out namespace
refactoring