diff --git a/addons/google_spreadsheet/__init__.py b/addons/google_spreadsheet/__init__.py
index f57aaed7749..81fc81d29c9 100644
--- a/addons/google_spreadsheet/__init__.py
+++ b/addons/google_spreadsheet/__init__.py
@@ -1 +1,4 @@
-import google_spreadsheet
\ No newline at end of file
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import models
diff --git a/addons/google_spreadsheet/__openerp__.py b/addons/google_spreadsheet/__openerp__.py
index 1cc3ce11369..48744434b11 100644
--- a/addons/google_spreadsheet/__openerp__.py
+++ b/addons/google_spreadsheet/__openerp__.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-
 {
     'name': 'Google Spreadsheet',
     'version': '1.0',
@@ -11,10 +10,10 @@ The module adds the possibility to display data from Odoo in Google Spreadsheets
 =================================================================================================
 """,
     'depends': ['google_drive'],
-    'data' : [
-        'google_spreadsheet_view.xml',
-        'google_spreadsheet_data.xml',
-        'views/google_spreadsheet.xml',
+    'data': [
+        'data/google_spreadsheet_data.xml',
+        'views/google_spreadsheet_views.xml',
+        'views/google_spreadsheet_templates.xml',
     ],
     'qweb': ['static/src/xml/*.xml'],
     'demo': [],
diff --git a/addons/google_spreadsheet/google_spreadsheet_data.xml b/addons/google_spreadsheet/data/google_spreadsheet_data.xml
similarity index 100%
rename from addons/google_spreadsheet/google_spreadsheet_data.xml
rename to addons/google_spreadsheet/data/google_spreadsheet_data.xml
diff --git a/addons/google_spreadsheet/models/__init__.py b/addons/google_spreadsheet/models/__init__.py
new file mode 100644
index 00000000000..02eb472052a
--- /dev/null
+++ b/addons/google_spreadsheet/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_spreadsheet/google_spreadsheet.py b/addons/google_spreadsheet/models/google_drive.py
similarity index 100%
rename from addons/google_spreadsheet/google_spreadsheet.py
rename to addons/google_spreadsheet/models/google_drive.py
diff --git a/addons/google_spreadsheet/views/google_spreadsheet.xml b/addons/google_spreadsheet/views/google_spreadsheet_templates.xml
similarity index 100%
rename from addons/google_spreadsheet/views/google_spreadsheet.xml
rename to addons/google_spreadsheet/views/google_spreadsheet_templates.xml
diff --git a/addons/google_spreadsheet/google_spreadsheet_view.xml b/addons/google_spreadsheet/views/google_spreadsheet_views.xml
similarity index 100%
rename from addons/google_spreadsheet/google_spreadsheet_view.xml
rename to addons/google_spreadsheet/views/google_spreadsheet_views.xml