Composer fixes and updated the autoloading