renaming and reorganzing