Added more classes; changed some filenames