Add job id to the task
Implement new task structure in job

Refactor converters to use good paths