Renaming and reorganizing packages