Moved files into their own classes and got project 2 part 1 code working again.