unit 2 and 3 folder reorganization

to match the syllabus