Redo structure to lib/ost/job