Moved extra files to autoload.