Change to use composer autoloading