Package renaming and restructuring.