Move stuff around to make chef happy