Reorganize to comply with Packagist