More reorganization (renamed packages)