Reverted to standard composer.json

Preparing for merge