Rename and move stuff around.