refactor rename and move