Refactor move to ch4 and add stubs for future exercises.