Merge branch 'dev'
Autoloading is in composer.json + change dir structure
Updated dependencies