Refactor move files