diff --git a/addons/google_drive/__init__.py b/addons/google_drive/__init__.py
index e1cf2d00f3c..81fc81d29c9 100644
--- a/addons/google_drive/__init__.py
+++ b/addons/google_drive/__init__.py
@@ -1 +1,4 @@
-import google_drive
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import models
diff --git a/addons/google_drive/__openerp__.py b/addons/google_drive/__openerp__.py
index d2daf81de05..b63812cb3ea 100644
--- a/addons/google_drive/__openerp__.py
+++ b/addons/google_drive/__openerp__.py
@@ -9,12 +9,12 @@
     'auto_install': False,
     'data': [
         'security/ir.model.access.csv',
-        'res_config_user_view.xml',
-        'google_drive_data.xml',
-        'views/google_drive.xml',
+        'data/google_drive_data.xml',
+        'views/google_drive_views.xml',
+        'views/google_drive_templates.xml',
     ],
     'demo': [
-        'google_drive_demo.xml'
+        'data/google_drive_demo.xml'
     ],
     'depends': ['base_setup', 'google_account'],
     'description': """
diff --git a/addons/google_drive/google_drive_data.xml b/addons/google_drive/data/google_drive_data.xml
similarity index 100%
rename from addons/google_drive/google_drive_data.xml
rename to addons/google_drive/data/google_drive_data.xml
diff --git a/addons/google_drive/google_drive_demo.xml b/addons/google_drive/data/google_drive_demo.xml
similarity index 100%
rename from addons/google_drive/google_drive_demo.xml
rename to addons/google_drive/data/google_drive_demo.xml
diff --git a/addons/google_drive/models/__init__.py b/addons/google_drive/models/__init__.py
new file mode 100644
index 00000000000..02eb472052a
--- /dev/null
+++ b/addons/google_drive/models/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import google_drive
diff --git a/addons/google_drive/google_drive.py b/addons/google_drive/models/google_drive.py
similarity index 100%
rename from addons/google_drive/google_drive.py
rename to addons/google_drive/models/google_drive.py
diff --git a/addons/google_drive/views/google_drive.xml b/addons/google_drive/views/google_drive_templates.xml
similarity index 100%
rename from addons/google_drive/views/google_drive.xml
rename to addons/google_drive/views/google_drive_templates.xml
diff --git a/addons/google_drive/res_config_user_view.xml b/addons/google_drive/views/google_drive_views.xml
similarity index 100%
rename from addons/google_drive/res_config_user_view.xml
rename to addons/google_drive/views/google_drive_views.xml