moved files and changed autoloading