Making package core.job and moving proper classes to it