diff --git a/addons/website_hr/__init__.py b/addons/website_hr/__init__.py
index db058b8b828..9f86759e32b 100644
--- a/addons/website_hr/__init__.py
+++ b/addons/website_hr/__init__.py
@@ -1,2 +1,2 @@
 import controllers
-import hr
\ No newline at end of file
+import models
diff --git a/addons/website_hr/__openerp__.py b/addons/website_hr/__openerp__.py
index 99eb0fbf549..bb30bbdeeb3 100644
--- a/addons/website_hr/__openerp__.py
+++ b/addons/website_hr/__openerp__.py
@@ -1,5 +1,5 @@
 {
-'name': 'Team Page',
+    'name': 'Team Page',
     'category': 'Website',
     'summary': 'Present Your Team',
     'version': '1.0',
@@ -11,10 +11,10 @@ Our Team Page
     'author': 'OpenERP SA',
     'depends': ['website', 'hr'],
     'demo': [
-        'website_hr_demo.xml',
+        'data/website_hr_demo.xml',
     ],
     'data': [
-        'website_hr_data.xml',
+        'data/website_hr_data.xml',
         'views/website_hr.xml',
         'security/ir.model.access.csv',
         'security/website_hr.xml',
diff --git a/addons/website_hr/website_hr_data.xml b/addons/website_hr/data/website_hr_data.xml
similarity index 100%
rename from addons/website_hr/website_hr_data.xml
rename to addons/website_hr/data/website_hr_data.xml
diff --git a/addons/website_hr/website_hr_demo.xml b/addons/website_hr/data/website_hr_demo.xml
similarity index 100%
rename from addons/website_hr/website_hr_demo.xml
rename to addons/website_hr/data/website_hr_demo.xml
diff --git a/addons/website_hr/models/__init__.py b/addons/website_hr/models/__init__.py
new file mode 100644
index 00000000000..89d0dfb41dc
--- /dev/null
+++ b/addons/website_hr/models/__init__.py
@@ -0,0 +1 @@
+import hr
diff --git a/addons/website_hr/hr.py b/addons/website_hr/models/hr.py
similarity index 100%
rename from addons/website_hr/hr.py
rename to addons/website_hr/models/hr.py