reorganize more files