Remove old files; rename some files