Major updates to composer.json, and renaming