Some more file renaming and moving