Now with the correct number of files for classes