Refactor: Rename and move