Package renaming and reorganization