Completed changes to new job structure