Structure changes and composer.json to make is compatible with Composer.