changed some file names and finished up to exercise 17.