Refactor requires in client
Grunt for travis