Re-organized deliverables