Fixing the structure of the bundle to work with composer
Fixing the structure of the bundle to work with composer (pt. 2)