diff --git a/addons/google_account/__init__.py b/addons/google_account/__init__.py
index f1fb5cfb388..46116ab32da 100644
--- a/addons/google_account/__init__.py
+++ b/addons/google_account/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
-import google_account
+import models
 import controllers
 
-from .google_account import TIMEOUT     # noqa
\ No newline at end of file
+from models.google_service import TIMEOUT     # noqa
diff --git a/addons/google_account/__openerp__.py b/addons/google_account/__openerp__.py
index c8b4519a10d..c45baf8e285 100644
--- a/addons/google_account/__openerp__.py
+++ b/addons/google_account/__openerp__.py
@@ -12,7 +12,7 @@ The module adds google user in res user.
 """,
     'depends': ['base_setup'],
     'data': [
-        'google_account_data.xml',
+        'data/google_account_data.xml',
     ],
     'demo': [],
     'installable': True,
diff --git a/addons/google_account/google_account_data.xml b/addons/google_account/data/google_account_data.xml
similarity index 100%
rename from addons/google_account/google_account_data.xml
rename to addons/google_account/data/google_account_data.xml
diff --git a/addons/google_account/models/__init__.py b/addons/google_account/models/__init__.py
new file mode 100644
index 00000000000..926b8d2841d
--- /dev/null
+++ b/addons/google_account/models/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import google_service
diff --git a/addons/google_account/google_account.py b/addons/google_account/models/google_service.py
similarity index 100%
rename from addons/google_account/google_account.py
rename to addons/google_account/models/google_service.py