Re-organized final deliverables