Renaming some files. removing empty onError closures from query_service