added more files, shuffled classes around