Finilization of Project 1
Renames
Some modifications to Ch1 and 2