Rename and move controllers