diff --git a/addons/marketing_campaign/__init__.py b/addons/marketing_campaign/__init__.py
index f5831dc54bd..a5f67aebd79 100644
--- a/addons/marketing_campaign/__init__.py
+++ b/addons/marketing_campaign/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import marketing_campaign
+import models
 import report
diff --git a/addons/marketing_campaign/__openerp__.py b/addons/marketing_campaign/__openerp__.py
index 1d3808fbb45..c60db8c24e2 100644
--- a/addons/marketing_campaign/__openerp__.py
+++ b/addons/marketing_campaign/__openerp__.py
@@ -38,12 +38,12 @@ input segments, workflow.
     'data': [
         'security/marketing_campaign_security.xml',
         'security/ir.model.access.csv',
-        'marketing_campaign_view.xml',
-        'marketing_campaign_data.xml',
-        'marketing_campaign_workflow.xml',
+        'views/marketing_campaign_views.xml',
+        'data/marketing_campaign_data.xml',
+        'data/marketing_campaign_workflow.xml',
         'report/campaign_analysis_view.xml',
     ],
-    'demo': ['marketing_campaign_demo.xml'],
+    'demo': ['data/marketing_campaign_demo.xml'],
     'test': ['test/marketing_campaign.yml'],
     'installable': True,
     'auto_install': False,
diff --git a/addons/marketing_campaign/marketing_campaign_data.xml b/addons/marketing_campaign/data/marketing_campaign_data.xml
similarity index 100%
rename from addons/marketing_campaign/marketing_campaign_data.xml
rename to addons/marketing_campaign/data/marketing_campaign_data.xml
diff --git a/addons/marketing_campaign/marketing_campaign_demo.xml b/addons/marketing_campaign/data/marketing_campaign_demo.xml
similarity index 100%
rename from addons/marketing_campaign/marketing_campaign_demo.xml
rename to addons/marketing_campaign/data/marketing_campaign_demo.xml
diff --git a/addons/marketing_campaign/marketing_campaign_workflow.xml b/addons/marketing_campaign/data/marketing_campaign_workflow.xml
similarity index 100%
rename from addons/marketing_campaign/marketing_campaign_workflow.xml
rename to addons/marketing_campaign/data/marketing_campaign_workflow.xml
diff --git a/addons/marketing_campaign/models/__init__.py b/addons/marketing_campaign/models/__init__.py
new file mode 100644
index 00000000000..d02bca25c43
--- /dev/null
+++ b/addons/marketing_campaign/models/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import marketing_campaign
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/models/marketing_campaign.py
similarity index 100%
rename from addons/marketing_campaign/marketing_campaign.py
rename to addons/marketing_campaign/models/marketing_campaign.py
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/views/marketing_campaign_views.xml
similarity index 100%
rename from addons/marketing_campaign/marketing_campaign_view.xml
rename to addons/marketing_campaign/views/marketing_campaign_views.xml