Refactoring
Move hydrator to Infrastructure