Remove some 'require' calls and use autoload where appropriate