diff --git a/addons/website_event/__init__.py b/addons/website_event/__init__.py
index b4f256be0d9..708d6ce4669 100644
--- a/addons/website_event/__init__.py
+++ b/addons/website_event/__init__.py
@@ -20,4 +20,4 @@
 ##############################################################################
 
 import controllers
-import event
+import models
diff --git a/addons/website_event/__openerp__.py b/addons/website_event/__openerp__.py
index a5b034b0a8f..26a1e084564 100644
--- a/addons/website_event/__openerp__.py
+++ b/addons/website_event/__openerp__.py
@@ -13,13 +13,14 @@ Online Events
     'author': 'OpenERP SA',
     'depends': ['website', 'website_mail', 'event_sale', 'website_sale'],
     'data': [
-        'event_data.xml',
+        'data/event_data.xml',
         'views/website_event.xml',
         'security/ir.model.access.csv',
         'security/website_event.xml',
-        'event_demo.xml',
     ],
     'qweb': ['static/src/xml/*.xml'],
-    'demo': [],
+    'demo': [
+        'data/event_demo.xml'
+    ],
     'installable': True,
 }
diff --git a/addons/website_event/event_data.xml b/addons/website_event/data/event_data.xml
similarity index 100%
rename from addons/website_event/event_data.xml
rename to addons/website_event/data/event_data.xml
diff --git a/addons/website_event/event_demo.xml b/addons/website_event/data/event_demo.xml
similarity index 100%
rename from addons/website_event/event_demo.xml
rename to addons/website_event/data/event_demo.xml
diff --git a/addons/website_event/models/__init__.py b/addons/website_event/models/__init__.py
new file mode 100644
index 00000000000..e7c003730cf
--- /dev/null
+++ b/addons/website_event/models/__init__.py
@@ -0,0 +1 @@
+import event
diff --git a/addons/website_event/event.py b/addons/website_event/models/event.py
similarity index 100%
rename from addons/website_event/event.py
rename to addons/website_event/models/event.py
diff --git a/addons/website_event/tests/test_controllers.py b/addons/website_event/tests/test_controllers.py
index d1c28cab5af..33b37aede9d 100644
--- a/addons/website_event/tests/test_controllers.py
+++ b/addons/website_event/tests/test_controllers.py
@@ -19,11 +19,11 @@
 #
 ##############################################################################
 
-from openerp.addons.mail.tests.test_mail_base import TestMailBase
+from openerp.addons.mail.tests.common import TestMail
 from openerp.tools import mute_logger, email_split
 
 
-class TestControllers(TestMailBase):
+class TestControllers(TestMail):
 
     def test_00(self):
         cr, uid = self.cr, self.uid