Second round of restructruring of Deliverables and Artifacts.