Moved files to 'autoload'