Restructuring directory and make for Chapter 2