module refactoring and Traversable changes