Reorganize more files