diff --git a/addons/google_calendar/__init__.py b/addons/google_calendar/__init__.py
index addb295d7c1..65221e1f916 100644
--- a/addons/google_calendar/__init__.py
+++ b/addons/google_calendar/__init__.py
@@ -1,3 +1,2 @@
-import res_config
-import google_calendar
 import controllers
+import models
\ No newline at end of file
diff --git a/addons/google_calendar/__openerp__.py b/addons/google_calendar/__openerp__.py
index 4e6d5e9d593..3a722b9d923 100644
--- a/addons/google_calendar/__openerp__.py
+++ b/addons/google_calendar/__openerp__.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-
 {
     'name': 'Google Calendar',
     'version': '1.0',
@@ -14,11 +13,12 @@ The module adds the possibility to synchronize Google Calendar with Odoo
     'depends': ['google_account', 'calendar'],
     'qweb': ['static/src/xml/*.xml'],
     'data': [
-        'res_config_view.xml',
+        'data/google_calendar_data.xml',
+        'data/google_calendar_data.xml',
         'security/ir.model.access.csv',
-        'views/google_calendar.xml',
-        'views/res_users.xml',
-        'google_calendar.xml',
+        'views/res_config_views.xml',
+        'views/res_users_views.xml',
+        'views/google_calendar_templates.xml',
     ],
     'demo': [],
     'installable': True,
diff --git a/addons/google_calendar/google_calendar.xml b/addons/google_calendar/data/google_calendar_data.xml
similarity index 100%
rename from addons/google_calendar/google_calendar.xml
rename to addons/google_calendar/data/google_calendar_data.xml
diff --git a/addons/google_calendar/models/__init__.py b/addons/google_calendar/models/__init__.py
new file mode 100644
index 00000000000..6f6303b3f0a
--- /dev/null
+++ b/addons/google_calendar/models/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import google_calendar
+import res_config
diff --git a/addons/google_calendar/google_calendar.py b/addons/google_calendar/models/google_calendar.py
similarity index 100%
rename from addons/google_calendar/google_calendar.py
rename to addons/google_calendar/models/google_calendar.py
diff --git a/addons/google_calendar/res_config.py b/addons/google_calendar/models/res_config.py
similarity index 100%
rename from addons/google_calendar/res_config.py
rename to addons/google_calendar/models/res_config.py
diff --git a/addons/google_calendar/static/src/js/calendar_sync.js b/addons/google_calendar/static/src/js/google_calendar.js
similarity index 100%
rename from addons/google_calendar/static/src/js/calendar_sync.js
rename to addons/google_calendar/static/src/js/google_calendar.js
diff --git a/addons/google_calendar/views/google_calendar.xml b/addons/google_calendar/views/google_calendar_templates.xml
similarity index 89%
rename from addons/google_calendar/views/google_calendar.xml
rename to addons/google_calendar/views/google_calendar_templates.xml
index f258b8f0c5c..6f8924e4af8 100644
--- a/addons/google_calendar/views/google_calendar.xml
+++ b/addons/google_calendar/views/google_calendar_templates.xml
@@ -3,7 +3,7 @@
     <template id="assets_backend" name="google_calendar assets" inherit_id="web.assets_backend">
         <xpath expr="." position="inside">
             <link rel="stylesheet" href="/google_calendar/static/src/less/google_calendar.less"/>
-            <script type="text/javascript" src="/google_calendar/static/src/js/calendar_sync.js"></script>
+            <script type="text/javascript" src="/google_calendar/static/src/js/google_calendar.js"></script>
         </xpath>
     </template>
 </odoo>
diff --git a/addons/google_calendar/res_config_view.xml b/addons/google_calendar/views/res_config_views.xml
similarity index 100%
rename from addons/google_calendar/res_config_view.xml
rename to addons/google_calendar/views/res_config_views.xml
diff --git a/addons/google_calendar/views/res_users.xml b/addons/google_calendar/views/res_users_views.xml
similarity index 100%
rename from addons/google_calendar/views/res_users.xml
rename to addons/google_calendar/views/res_users_views.xml