diff --git a/base_usability/__init__.py b/base_usability/__init__.py
index d522841..0650744 100644
--- a/base_usability/__init__.py
+++ b/base_usability/__init__.py
@@ -1,6 +1 @@
-from . import users
-from . import partner
-from . import company
-from . import mail
-from . import misc
-from . import report_sxw
+from . import models
diff --git a/base_usability/__manifest__.py b/base_usability/__manifest__.py
index fef0193..06efa3e 100644
--- a/base_usability/__manifest__.py
+++ b/base_usability/__manifest__.py
@@ -29,11 +29,11 @@ _display_full_address on res.partner which are useful for reporting.
     'depends': ['base'],
     'data': [
         'security/group.xml',
-        'partner_view.xml',
-        'partner_bank_view.xml',
-        'users_view.xml',
-        'country_view.xml',
-        'module_view.xml',
+        'views/partner_view.xml',
+        'views/partner_bank_view.xml',
+        'views/users_view.xml',
+        'views/country_view.xml',
+        'views/module_view.xml',
         ],
     'installable': True,
 }
diff --git a/base_usability/models/__init__.py b/base_usability/models/__init__.py
new file mode 100644
index 0000000..d522841
--- /dev/null
+++ b/base_usability/models/__init__.py
@@ -0,0 +1,6 @@
+from . import users
+from . import partner
+from . import company
+from . import mail
+from . import misc
+from . import report_sxw
diff --git a/base_usability/company.py b/base_usability/models/company.py
similarity index 100%
rename from base_usability/company.py
rename to base_usability/models/company.py
diff --git a/base_usability/mail.py b/base_usability/models/mail.py
similarity index 100%
rename from base_usability/mail.py
rename to base_usability/models/mail.py
diff --git a/base_usability/misc.py b/base_usability/models/misc.py
similarity index 100%
rename from base_usability/misc.py
rename to base_usability/models/misc.py
diff --git a/base_usability/partner.py b/base_usability/models/partner.py
similarity index 100%
rename from base_usability/partner.py
rename to base_usability/models/partner.py
diff --git a/base_usability/report_sxw.py b/base_usability/models/report_sxw.py
similarity index 100%
rename from base_usability/report_sxw.py
rename to base_usability/models/report_sxw.py
diff --git a/base_usability/users.py b/base_usability/models/users.py
similarity index 100%
rename from base_usability/users.py
rename to base_usability/models/users.py
diff --git a/base_usability/country_view.xml b/base_usability/views/country_view.xml
similarity index 100%
rename from base_usability/country_view.xml
rename to base_usability/views/country_view.xml
diff --git a/base_usability/module_view.xml b/base_usability/views/module_view.xml
similarity index 100%
rename from base_usability/module_view.xml
rename to base_usability/views/module_view.xml
diff --git a/base_usability/partner_bank_view.xml b/base_usability/views/partner_bank_view.xml
similarity index 100%
rename from base_usability/partner_bank_view.xml
rename to base_usability/views/partner_bank_view.xml
diff --git a/base_usability/partner_view.xml b/base_usability/views/partner_view.xml
similarity index 100%
rename from base_usability/partner_view.xml
rename to base_usability/views/partner_view.xml
diff --git a/base_usability/users_view.xml b/base_usability/views/users_view.xml
similarity index 100%
rename from base_usability/users_view.xml
rename to base_usability/views/users_view.xml