Refactoring to only mv and utils