diff --git a/golem_member_skills/__init__.py b/golem_member_skills/__init__.py
index 8d28962..643d893 100644
--- a/golem_member_skills/__init__.py
+++ b/golem_member_skills/__init__.py
@@ -14,5 +14,3 @@
 #
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-from . import golem_member
diff --git a/golem_member_skills/__openerp__.py b/golem_member_skills/__openerp__.py
index 4ea1ace..614869c 100644
--- a/golem_member_skills/__openerp__.py
+++ b/golem_member_skills/__openerp__.py
@@ -26,5 +26,5 @@
     'application': False,
     'installable': True,
     'depends': ['golem_member'],
-    'data': ['golem_member_view.xml', 'res_partner_view.xml']
+    'data': ['views/golem_member_view.xml', 'views/res_partner_view.xml']
 }
diff --git a/golem_member_skills/models/__init__.py b/golem_member_skills/models/__init__.py
new file mode 100644
index 0000000..8d28962
--- /dev/null
+++ b/golem_member_skills/models/__init__.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+#    Copyright 2016 Fabien Bourgeois <fabien@yaltik.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from . import golem_member
diff --git a/golem_member_skills/golem_member.py b/golem_member_skills/models/golem_member.py
similarity index 100%
rename from golem_member_skills/golem_member.py
rename to golem_member_skills/models/golem_member.py
diff --git a/golem_member_skills/golem_member_view.xml b/golem_member_skills/views/golem_member_view.xml
similarity index 100%
rename from golem_member_skills/golem_member_view.xml
rename to golem_member_skills/views/golem_member_view.xml
diff --git a/golem_member_skills/res_partner_view.xml b/golem_member_skills/views/res_partner_view.xml
similarity index 100%
rename from golem_member_skills/res_partner_view.xml
rename to golem_member_skills/views/res_partner_view.xml