updated composer.json and structure