renaming to google apis
cleanup
moved aux functions to collapsed element