broke the files into a number of new classes