Improved Chapter2 project structure.