Modified the structure to encapsulate all google services in only one module