Better Autoload.php

Change-Id: I65f7aa86e87b4af2779c06d78ea64b4cca5f8f68