Too many files, reduced the number of files