Separate module from unit
Refactoring