Rename and reorgonize