diff --git a/addons/survey_crm/__init__.py b/addons/survey_crm/__init__.py
index 0a274c37955..81fc81d29c9 100644
--- a/addons/survey_crm/__init__.py
+++ b/addons/survey_crm/__init__.py
@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import survey
+import models
diff --git a/addons/survey_crm/__openerp__.py b/addons/survey_crm/__openerp__.py
index 62938fd0e2e..845bb9e3c33 100644
--- a/addons/survey_crm/__openerp__.py
+++ b/addons/survey_crm/__openerp__.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-
 {
     'name': 'Survey CRM',
     'version': '2.0',
@@ -15,7 +13,7 @@ This module adds a Survey mass mailing button inside the more option of lead/cus
 """,
     'depends': ['crm', 'survey'],
     'data': [
-        'crm_view.xml',
+        'views/survey_crm_views.xml',
     ],
     'installable': True,
     'auto_install': True
diff --git a/addons/survey_crm/models/__init__.py b/addons/survey_crm/models/__init__.py
new file mode 100644
index 00000000000..0a274c37955
--- /dev/null
+++ b/addons/survey_crm/models/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import survey
diff --git a/addons/survey_crm/survey.py b/addons/survey_crm/models/survey.py
similarity index 100%
rename from addons/survey_crm/survey.py
rename to addons/survey_crm/models/survey.py
diff --git a/addons/survey_crm/crm_view.xml b/addons/survey_crm/views/survey_crm_views.xml
similarity index 100%
rename from addons/survey_crm/crm_view.xml
rename to addons/survey_crm/views/survey_crm_views.xml