Updated autoload and composer.json