Renaming, and splitting into more files