Renaming done, and getting organized