Moved module from package google to root of module.
Removed unnecessary module wrappers.