Update composer.json and .lock
Refactor configs