Moved more files to subfolders and deleted old ones