[Sprint 3] [14-03-13] Deliverable 3 Tasks added. Some folders renamed.