Fixed the structure for composer install
Merge branch 'develop'