Refactoring and few updates in composer.json