diff --git a/addons/multi_company/__init__.py b/addons/multi_company/__init__.py
index 0469067664e..e69de29bb2d 100644
--- a/addons/multi_company/__init__.py
+++ b/addons/multi_company/__init__.py
@@ -1,2 +0,0 @@
-import project
-import hr
diff --git a/addons/multi_company/__terp__.py b/addons/multi_company/__terp__.py
index a62edaa31cb..c65f6d573dd 100644
--- a/addons/multi_company/__terp__.py
+++ b/addons/multi_company/__terp__.py
@@ -2,11 +2,11 @@
 	"name" : "Multi company base module",
 	"version" : "0.1",
 	"author" : "Tiny",
-	"depends" : ["project", "hr_timesheet_sheet"],
+	"depends" : ["base",],
 	"category" : "Generic Modules/Base",
 	"init_xml" : [],
 	"demo_xml" : ["multi_company_demo.xml",],
-	"update_xml" : ["project_view.xml","hr_view.xml"],
+	"update_xml" : [],
 	"active": False,
 	"installable": True
 }
diff --git a/addons/multi_company_hr_timesheet_sheet/__init__.py b/addons/multi_company_hr_timesheet_sheet/__init__.py
new file mode 100644
index 00000000000..5ac72900e94
--- /dev/null
+++ b/addons/multi_company_hr_timesheet_sheet/__init__.py
@@ -0,0 +1 @@
+import multi_company_hr_timesheet_sheet
diff --git a/addons/multi_company_hr_timesheet_sheet/__terp__.py b/addons/multi_company_hr_timesheet_sheet/__terp__.py
new file mode 100644
index 00000000000..74ca416e991
--- /dev/null
+++ b/addons/multi_company_hr_timesheet_sheet/__terp__.py
@@ -0,0 +1,12 @@
+{
+	"name" : "Multi company Human Resources (Timesheet groups)",
+	"version" : "0.1",
+	"author" : "Tiny",
+	"category" : "Generic Modules/Human Resources",
+	"depends" : ["hr_timesheet_sheet","base", 'multi_company',],
+	"init_xml" : [],
+	"demo_xml" : [],
+	"update_xml" : ["multi_company_hr_timesheet_sheet_view.xml",],
+	"active": False,
+	"installable": True
+}
diff --git a/addons/multi_company/hr.py b/addons/multi_company_hr_timesheet_sheet/multi_company_hr_timesheet_sheet.py
similarity index 100%
rename from addons/multi_company/hr.py
rename to addons/multi_company_hr_timesheet_sheet/multi_company_hr_timesheet_sheet.py
diff --git a/addons/multi_company/hr_view.xml b/addons/multi_company_hr_timesheet_sheet/multi_company_hr_timesheet_sheet_view.xml
similarity index 100%
rename from addons/multi_company/hr_view.xml
rename to addons/multi_company_hr_timesheet_sheet/multi_company_hr_timesheet_sheet_view.xml
diff --git a/addons/multi_company_project/__init__.py b/addons/multi_company_project/__init__.py
new file mode 100644
index 00000000000..a355a1361f3
--- /dev/null
+++ b/addons/multi_company_project/__init__.py
@@ -0,0 +1 @@
+import multi_company_project
diff --git a/addons/multi_company_project/__terp__.py b/addons/multi_company_project/__terp__.py
new file mode 100644
index 00000000000..2766d608091
--- /dev/null
+++ b/addons/multi_company_project/__terp__.py
@@ -0,0 +1,12 @@
+{
+	"name" : "Multi company Project Management",
+	"version": "0.1",
+	"author" : "Tiny",
+	"category" : "Generic Modules/Projects & Services",
+	"depends" : ['project', 'base', 'multi_company',],
+	"init_xml" : [],
+	"demo_xml" : [],
+	"update_xml": ['multi_company_project_view.xml',],
+	"active": False,
+	"installable": True
+}
diff --git a/addons/multi_company/project.py b/addons/multi_company_project/multi_company_project.py
similarity index 100%
rename from addons/multi_company/project.py
rename to addons/multi_company_project/multi_company_project.py
diff --git a/addons/multi_company/project_view.xml b/addons/multi_company_project/multi_company_project_view.xml
similarity index 100%
rename from addons/multi_company/project_view.xml
rename to addons/multi_company_project/multi_company_project_view.xml