Google provider refactored

* Also unnecessary namespaces fixed