Complete Chapter 3.
Rationalize folder structure
Complete Chapter 4