Rework the plan structure