A few minor changes, mainly renaming files