file move only refactoring

@umop