Fix directory structure
Update composer.json