split files by class and update includes