Reorganizing code and adding new job and target for normal CG