more moving and renaming