Updated structure, composer.json