Reorganized files, started ch. 5 exercises