Refactoring done with factories
Merge branch 'feature-global-hook-and-watcher' of https://github.com/jerome-breton/captain-jas into feature-global-hook-and-watcher
Refactoring done with factories