Refactored utils, rename module.