Change vendor structure and add composer.json