Tidy up
Separer scheduler et manager
Rewriting job