Reorganise/rename.