minor renaming and moving files