refactoring: remove extraneous module name space
refactoring