renaming and organizing