Taking over authorship
Rename a few more files