Updated jobs structure, separated jobs resources from others.
Merge remote-tracking branch 'origin/master'