Fix autoload, file names, file path