diff --git a/addons/portal/__init__.py b/addons/portal/__init__.py
index aad4bac3af1..11529f98733 100644
--- a/addons/portal/__init__.py
+++ b/addons/portal/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import portal
+import models
 import wizard
diff --git a/addons/portal/__openerp__.py b/addons/portal/__openerp__.py
index 1ea62101981..c7d9640d291 100644
--- a/addons/portal/__openerp__.py
+++ b/addons/portal/__openerp__.py
@@ -22,12 +22,12 @@ the portal automatically adds it to the portal users, etc).  That feature is
 very handy when used in combination with the module 'share'.
     """,
     'data': [
-        'portal_data.xml',
-        'portal_view.xml',
-        'wizard/portal_wizard_view.xml',
+        'data/portal_data.xml',
+        'views/portal_views.xml',
+        'wizard/portal_wizard_views.xml',
         'security/ir.model.access.csv',
     ],
-    'demo': ['portal_demo.xml'],
+    'demo': ['data/portal_demo.xml'],
     'auto_install': True,
     'installable': True,
 }
diff --git a/addons/portal/portal_data.xml b/addons/portal/data/portal_data.xml
similarity index 100%
rename from addons/portal/portal_data.xml
rename to addons/portal/data/portal_data.xml
diff --git a/addons/portal/portal_demo.xml b/addons/portal/data/portal_demo.xml
similarity index 100%
rename from addons/portal/portal_demo.xml
rename to addons/portal/data/portal_demo.xml
diff --git a/addons/portal/models/__init__.py b/addons/portal/models/__init__.py
new file mode 100644
index 00000000000..f24d339393b
--- /dev/null
+++ b/addons/portal/models/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import res_groups
diff --git a/addons/portal/portal.py b/addons/portal/models/res_groups.py
similarity index 100%
rename from addons/portal/portal.py
rename to addons/portal/models/res_groups.py
diff --git a/addons/portal/portal_view.xml b/addons/portal/views/portal_views.xml
similarity index 100%
rename from addons/portal/portal_view.xml
rename to addons/portal/views/portal_views.xml
diff --git a/addons/portal/wizard/portal_wizard_view.xml b/addons/portal/wizard/portal_wizard_views.xml
similarity index 100%
rename from addons/portal/wizard/portal_wizard_view.xml
rename to addons/portal/wizard/portal_wizard_views.xml