Move stuff around for composer / packagist