Removed a few files, updated autoloader config.