Better composer.json, update generators