diff --git a/addons/base_setup/__init__.py b/addons/base_setup/__init__.py
index cd41cc34b93..81fc81d29c9 100644
--- a/addons/base_setup/__init__.py
+++ b/addons/base_setup/__init__.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import base_setup
-import res_config
+import models
diff --git a/addons/base_setup/__openerp__.py b/addons/base_setup/__openerp__.py
index 00bc120edc2..44da3a6ea90 100644
--- a/addons/base_setup/__openerp__.py
+++ b/addons/base_setup/__openerp__.py
@@ -13,10 +13,9 @@ Shows you a list of applications features to install from.
     """,
     'depends': ['base', 'web_kanban'],
     'data': [
-        'security/ir.model.access.csv',
-        'base_setup_views.xml',
-        'res_config_view.xml',
-        'res_partner_view.xml',
+        'views/base_setup_views.xml',
+        'views/res_config_views.xml',
+        'views/res_partner_views.xml',
     ],
     'demo': [],
     'installable': True,
diff --git a/addons/base_setup/models/__init__.py b/addons/base_setup/models/__init__.py
new file mode 100644
index 00000000000..3bb90a89312
--- /dev/null
+++ b/addons/base_setup/models/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+
+import base_setup
+import res_config
+
diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/models/base_setup.py
similarity index 100%
rename from addons/base_setup/base_setup.py
rename to addons/base_setup/models/base_setup.py
diff --git a/addons/base_setup/res_config.py b/addons/base_setup/models/res_config.py
similarity index 100%
rename from addons/base_setup/res_config.py
rename to addons/base_setup/models/res_config.py
diff --git a/addons/base_setup/security/ir.model.access.csv b/addons/base_setup/security/ir.model.access.csv
deleted file mode 100644
index 4a08a4aa60d..00000000000
--- a/addons/base_setup/security/ir.model.access.csv
+++ /dev/null
@@ -1 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/views/base_setup_views.xml
similarity index 100%
rename from addons/base_setup/base_setup_views.xml
rename to addons/base_setup/views/base_setup_views.xml
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/views/res_config_views.xml
similarity index 100%
rename from addons/base_setup/res_config_view.xml
rename to addons/base_setup/views/res_config_views.xml
diff --git a/addons/base_setup/res_partner_view.xml b/addons/base_setup/views/res_partner_views.xml
similarity index 100%
rename from addons/base_setup/res_partner_view.xml
rename to addons/base_setup/views/res_partner_views.xml