Rearranged and split many files.