diff --git a/addons/mrp_account/__manifest__.py b/addons/mrp_account/__manifest__.py
index de72516401a..f16c781339f 100644
--- a/addons/mrp_account/__manifest__.py
+++ b/addons/mrp_account/__manifest__.py
@@ -11,9 +11,17 @@ Analytic Accounting in MRP
 ==========================
 
 * Cost structure report
+
+Also, allows to compute the cost of the product based on its BoM, using the costs of its components and work center operations.
+It adds a button on the product itself but also an action in the list view of the products.
+If the automated inventory valuation is active, the necessary accounting entries will be created.
+
 """,
     'website': 'https://www.odoo.com/page/manufacturing',
     'depends': ['mrp', 'stock_account'],
+    "init_xml" : [],
+    "demo_xml" : [],
+    "data": ["views/product_views.xml"],
     'installable': True,
     'auto_install': True,
 }
diff --git a/addons/mrp_bom_cost/i18n/af.po b/addons/mrp_account/i18n/af.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/af.po
rename to addons/mrp_account/i18n/af.po
diff --git a/addons/mrp_bom_cost/i18n/am.po b/addons/mrp_account/i18n/am.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/am.po
rename to addons/mrp_account/i18n/am.po
diff --git a/addons/mrp_bom_cost/i18n/ar.po b/addons/mrp_account/i18n/ar.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/ar.po
rename to addons/mrp_account/i18n/ar.po
diff --git a/addons/mrp_bom_cost/i18n/az.po b/addons/mrp_account/i18n/az.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/az.po
rename to addons/mrp_account/i18n/az.po
diff --git a/addons/mrp_bom_cost/i18n/bg.po b/addons/mrp_account/i18n/bg.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/bg.po
rename to addons/mrp_account/i18n/bg.po
diff --git a/addons/mrp_bom_cost/i18n/bs.po b/addons/mrp_account/i18n/bs.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/bs.po
rename to addons/mrp_account/i18n/bs.po
diff --git a/addons/mrp_bom_cost/i18n/ca.po b/addons/mrp_account/i18n/ca.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/ca.po
rename to addons/mrp_account/i18n/ca.po
diff --git a/addons/mrp_bom_cost/i18n/cs.po b/addons/mrp_account/i18n/cs.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/cs.po
rename to addons/mrp_account/i18n/cs.po
diff --git a/addons/mrp_bom_cost/i18n/da.po b/addons/mrp_account/i18n/da.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/da.po
rename to addons/mrp_account/i18n/da.po
diff --git a/addons/mrp_bom_cost/i18n/de.po b/addons/mrp_account/i18n/de.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/de.po
rename to addons/mrp_account/i18n/de.po
diff --git a/addons/mrp_bom_cost/i18n/el.po b/addons/mrp_account/i18n/el.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/el.po
rename to addons/mrp_account/i18n/el.po
diff --git a/addons/mrp_bom_cost/i18n/en_AU.po b/addons/mrp_account/i18n/en_AU.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/en_AU.po
rename to addons/mrp_account/i18n/en_AU.po
diff --git a/addons/mrp_bom_cost/i18n/en_GB.po b/addons/mrp_account/i18n/en_GB.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/en_GB.po
rename to addons/mrp_account/i18n/en_GB.po
diff --git a/addons/mrp_bom_cost/i18n/es.po b/addons/mrp_account/i18n/es.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/es.po
rename to addons/mrp_account/i18n/es.po
diff --git a/addons/mrp_bom_cost/i18n/es_AR.po b/addons/mrp_account/i18n/es_AR.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/es_AR.po
rename to addons/mrp_account/i18n/es_AR.po
diff --git a/addons/mrp_bom_cost/i18n/es_BO.po b/addons/mrp_account/i18n/es_BO.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/es_BO.po
rename to addons/mrp_account/i18n/es_BO.po
diff --git a/addons/mrp_bom_cost/i18n/es_CL.po b/addons/mrp_account/i18n/es_CL.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/es_CL.po
rename to addons/mrp_account/i18n/es_CL.po
diff --git a/addons/mrp_bom_cost/i18n/es_CO.po b/addons/mrp_account/i18n/es_CO.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/es_CO.po
rename to addons/mrp_account/i18n/es_CO.po
diff --git a/addons/mrp_bom_cost/i18n/es_CR.po b/addons/mrp_account/i18n/es_CR.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/es_CR.po
rename to addons/mrp_account/i18n/es_CR.po
diff --git a/addons/mrp_bom_cost/i18n/es_DO.po b/addons/mrp_account/i18n/es_DO.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/es_DO.po
rename to addons/mrp_account/i18n/es_DO.po
diff --git a/addons/mrp_bom_cost/i18n/es_EC.po b/addons/mrp_account/i18n/es_EC.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/es_EC.po
rename to addons/mrp_account/i18n/es_EC.po
diff --git a/addons/mrp_bom_cost/i18n/es_PA.po b/addons/mrp_account/i18n/es_PA.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/es_PA.po
rename to addons/mrp_account/i18n/es_PA.po
diff --git a/addons/mrp_bom_cost/i18n/es_PE.po b/addons/mrp_account/i18n/es_PE.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/es_PE.po
rename to addons/mrp_account/i18n/es_PE.po
diff --git a/addons/mrp_bom_cost/i18n/es_PY.po b/addons/mrp_account/i18n/es_PY.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/es_PY.po
rename to addons/mrp_account/i18n/es_PY.po
diff --git a/addons/mrp_bom_cost/i18n/es_VE.po b/addons/mrp_account/i18n/es_VE.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/es_VE.po
rename to addons/mrp_account/i18n/es_VE.po
diff --git a/addons/mrp_bom_cost/i18n/et.po b/addons/mrp_account/i18n/et.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/et.po
rename to addons/mrp_account/i18n/et.po
diff --git a/addons/mrp_bom_cost/i18n/eu.po b/addons/mrp_account/i18n/eu.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/eu.po
rename to addons/mrp_account/i18n/eu.po
diff --git a/addons/mrp_bom_cost/i18n/fa.po b/addons/mrp_account/i18n/fa.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/fa.po
rename to addons/mrp_account/i18n/fa.po
diff --git a/addons/mrp_bom_cost/i18n/fi.po b/addons/mrp_account/i18n/fi.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/fi.po
rename to addons/mrp_account/i18n/fi.po
diff --git a/addons/mrp_bom_cost/i18n/fo.po b/addons/mrp_account/i18n/fo.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/fo.po
rename to addons/mrp_account/i18n/fo.po
diff --git a/addons/mrp_bom_cost/i18n/fr.po b/addons/mrp_account/i18n/fr.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/fr.po
rename to addons/mrp_account/i18n/fr.po
diff --git a/addons/mrp_bom_cost/i18n/fr_BE.po b/addons/mrp_account/i18n/fr_BE.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/fr_BE.po
rename to addons/mrp_account/i18n/fr_BE.po
diff --git a/addons/mrp_bom_cost/i18n/fr_CA.po b/addons/mrp_account/i18n/fr_CA.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/fr_CA.po
rename to addons/mrp_account/i18n/fr_CA.po
diff --git a/addons/mrp_bom_cost/i18n/gl.po b/addons/mrp_account/i18n/gl.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/gl.po
rename to addons/mrp_account/i18n/gl.po
diff --git a/addons/mrp_bom_cost/i18n/gu.po b/addons/mrp_account/i18n/gu.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/gu.po
rename to addons/mrp_account/i18n/gu.po
diff --git a/addons/mrp_bom_cost/i18n/he.po b/addons/mrp_account/i18n/he.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/he.po
rename to addons/mrp_account/i18n/he.po
diff --git a/addons/mrp_bom_cost/i18n/hi.po b/addons/mrp_account/i18n/hi.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/hi.po
rename to addons/mrp_account/i18n/hi.po
diff --git a/addons/mrp_bom_cost/i18n/hr.po b/addons/mrp_account/i18n/hr.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/hr.po
rename to addons/mrp_account/i18n/hr.po
diff --git a/addons/mrp_bom_cost/i18n/hu.po b/addons/mrp_account/i18n/hu.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/hu.po
rename to addons/mrp_account/i18n/hu.po
diff --git a/addons/mrp_bom_cost/i18n/id.po b/addons/mrp_account/i18n/id.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/id.po
rename to addons/mrp_account/i18n/id.po
diff --git a/addons/mrp_bom_cost/i18n/is.po b/addons/mrp_account/i18n/is.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/is.po
rename to addons/mrp_account/i18n/is.po
diff --git a/addons/mrp_bom_cost/i18n/it.po b/addons/mrp_account/i18n/it.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/it.po
rename to addons/mrp_account/i18n/it.po
diff --git a/addons/mrp_bom_cost/i18n/ja.po b/addons/mrp_account/i18n/ja.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/ja.po
rename to addons/mrp_account/i18n/ja.po
diff --git a/addons/mrp_bom_cost/i18n/ka.po b/addons/mrp_account/i18n/ka.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/ka.po
rename to addons/mrp_account/i18n/ka.po
diff --git a/addons/mrp_bom_cost/i18n/kab.po b/addons/mrp_account/i18n/kab.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/kab.po
rename to addons/mrp_account/i18n/kab.po
diff --git a/addons/mrp_bom_cost/i18n/km.po b/addons/mrp_account/i18n/km.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/km.po
rename to addons/mrp_account/i18n/km.po
diff --git a/addons/mrp_bom_cost/i18n/ko.po b/addons/mrp_account/i18n/ko.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/ko.po
rename to addons/mrp_account/i18n/ko.po
diff --git a/addons/mrp_bom_cost/i18n/lt.po b/addons/mrp_account/i18n/lt.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/lt.po
rename to addons/mrp_account/i18n/lt.po
diff --git a/addons/mrp_bom_cost/i18n/lv.po b/addons/mrp_account/i18n/lv.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/lv.po
rename to addons/mrp_account/i18n/lv.po
diff --git a/addons/mrp_bom_cost/i18n/mk.po b/addons/mrp_account/i18n/mk.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/mk.po
rename to addons/mrp_account/i18n/mk.po
diff --git a/addons/mrp_bom_cost/i18n/ml_IN.po b/addons/mrp_account/i18n/ml_IN.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/ml_IN.po
rename to addons/mrp_account/i18n/ml_IN.po
diff --git a/addons/mrp_bom_cost/i18n/mn.po b/addons/mrp_account/i18n/mn.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/mn.po
rename to addons/mrp_account/i18n/mn.po
diff --git a/addons/mrp_bom_cost/i18n/mrp_bom_cost.pot b/addons/mrp_account/i18n/mrp_bom_cost.pot
similarity index 100%
rename from addons/mrp_bom_cost/i18n/mrp_bom_cost.pot
rename to addons/mrp_account/i18n/mrp_bom_cost.pot
diff --git a/addons/mrp_bom_cost/i18n/nb.po b/addons/mrp_account/i18n/nb.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/nb.po
rename to addons/mrp_account/i18n/nb.po
diff --git a/addons/mrp_bom_cost/i18n/nl.po b/addons/mrp_account/i18n/nl.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/nl.po
rename to addons/mrp_account/i18n/nl.po
diff --git a/addons/mrp_bom_cost/i18n/nl_BE.po b/addons/mrp_account/i18n/nl_BE.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/nl_BE.po
rename to addons/mrp_account/i18n/nl_BE.po
diff --git a/addons/mrp_bom_cost/i18n/pl.po b/addons/mrp_account/i18n/pl.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/pl.po
rename to addons/mrp_account/i18n/pl.po
diff --git a/addons/mrp_bom_cost/i18n/pt.po b/addons/mrp_account/i18n/pt.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/pt.po
rename to addons/mrp_account/i18n/pt.po
diff --git a/addons/mrp_bom_cost/i18n/pt_BR.po b/addons/mrp_account/i18n/pt_BR.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/pt_BR.po
rename to addons/mrp_account/i18n/pt_BR.po
diff --git a/addons/mrp_bom_cost/i18n/ro.po b/addons/mrp_account/i18n/ro.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/ro.po
rename to addons/mrp_account/i18n/ro.po
diff --git a/addons/mrp_bom_cost/i18n/ru.po b/addons/mrp_account/i18n/ru.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/ru.po
rename to addons/mrp_account/i18n/ru.po
diff --git a/addons/mrp_bom_cost/i18n/sk.po b/addons/mrp_account/i18n/sk.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/sk.po
rename to addons/mrp_account/i18n/sk.po
diff --git a/addons/mrp_bom_cost/i18n/sl.po b/addons/mrp_account/i18n/sl.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/sl.po
rename to addons/mrp_account/i18n/sl.po
diff --git a/addons/mrp_bom_cost/i18n/sq.po b/addons/mrp_account/i18n/sq.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/sq.po
rename to addons/mrp_account/i18n/sq.po
diff --git a/addons/mrp_bom_cost/i18n/sr.po b/addons/mrp_account/i18n/sr.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/sr.po
rename to addons/mrp_account/i18n/sr.po
diff --git a/addons/mrp_bom_cost/i18n/sr@latin.po b/addons/mrp_account/i18n/sr@latin.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/sr@latin.po
rename to addons/mrp_account/i18n/sr@latin.po
diff --git a/addons/mrp_bom_cost/i18n/sv.po b/addons/mrp_account/i18n/sv.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/sv.po
rename to addons/mrp_account/i18n/sv.po
diff --git a/addons/mrp_bom_cost/i18n/ta.po b/addons/mrp_account/i18n/ta.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/ta.po
rename to addons/mrp_account/i18n/ta.po
diff --git a/addons/mrp_bom_cost/i18n/th.po b/addons/mrp_account/i18n/th.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/th.po
rename to addons/mrp_account/i18n/th.po
diff --git a/addons/mrp_bom_cost/i18n/tr.po b/addons/mrp_account/i18n/tr.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/tr.po
rename to addons/mrp_account/i18n/tr.po
diff --git a/addons/mrp_bom_cost/i18n/uk.po b/addons/mrp_account/i18n/uk.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/uk.po
rename to addons/mrp_account/i18n/uk.po
diff --git a/addons/mrp_bom_cost/i18n/vi.po b/addons/mrp_account/i18n/vi.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/vi.po
rename to addons/mrp_account/i18n/vi.po
diff --git a/addons/mrp_bom_cost/i18n/zh_CN.po b/addons/mrp_account/i18n/zh_CN.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/zh_CN.po
rename to addons/mrp_account/i18n/zh_CN.po
diff --git a/addons/mrp_bom_cost/i18n/zh_TW.po b/addons/mrp_account/i18n/zh_TW.po
similarity index 100%
rename from addons/mrp_bom_cost/i18n/zh_TW.po
rename to addons/mrp_account/i18n/zh_TW.po
diff --git a/addons/mrp_account/models/__init__.py b/addons/mrp_account/models/__init__.py
index 872a43b7fff..348a288235b 100644
--- a/addons/mrp_account/models/__init__.py
+++ b/addons/mrp_account/models/__init__.py
@@ -2,3 +2,4 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 from . import mrp_workcenter
 from . import mrp_production
+from . import product
diff --git a/addons/mrp_bom_cost/models/product.py b/addons/mrp_account/models/product.py
similarity index 100%
rename from addons/mrp_bom_cost/models/product.py
rename to addons/mrp_account/models/product.py
diff --git a/addons/mrp_account/tests/__init__.py b/addons/mrp_account/tests/__init__.py
index 5b2f06a99ce..349bd9d4fed 100644
--- a/addons/mrp_account/tests/__init__.py
+++ b/addons/mrp_account/tests/__init__.py
@@ -1,3 +1,4 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 from . import test_mrp_account
+from . import test_bom_price
diff --git a/addons/mrp_bom_cost/tests/test_bom_price.py b/addons/mrp_account/tests/test_bom_price.py
similarity index 100%
rename from addons/mrp_bom_cost/tests/test_bom_price.py
rename to addons/mrp_account/tests/test_bom_price.py
diff --git a/addons/mrp_bom_cost/views/product_views.xml b/addons/mrp_account/views/product_views.xml
similarity index 100%
rename from addons/mrp_bom_cost/views/product_views.xml
rename to addons/mrp_account/views/product_views.xml
diff --git a/addons/mrp_bom_cost/__init__.py b/addons/mrp_bom_cost/__init__.py
deleted file mode 100644
index dc5e6b693d1..00000000000
--- a/addons/mrp_bom_cost/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from . import models
diff --git a/addons/mrp_bom_cost/__manifest__.py b/addons/mrp_bom_cost/__manifest__.py
deleted file mode 100644
index a8cec0d91b6..00000000000
--- a/addons/mrp_bom_cost/__manifest__.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-{
-    "name" : "Product Extension: Compute cost from BoM",
-    "version" : "1.0",
-    "depends" : ["mrp", "stock_account"],
-    "category" : "Manufacturing",
-    "description": """
-Allows to compute the cost of the product based on its BoM,
-using the costs of its components and work center operations.
-It adds a button on the product itself but also an action in the list view of the products.
-If the automated inventory valuation is active, the necessary accounting entries will be created.
-""",
-    "init_xml" : [],
-    "demo_xml" : [],
-    "data": ["views/product_views.xml"],
-    "active": False,
-    "installable": True
-}
diff --git a/addons/mrp_bom_cost/models/__init__.py b/addons/mrp_bom_cost/models/__init__.py
deleted file mode 100644
index 06ab2512b72..00000000000
--- a/addons/mrp_bom_cost/models/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from . import product
\ No newline at end of file
diff --git a/addons/mrp_bom_cost/tests/__init__.py b/addons/mrp_bom_cost/tests/__init__.py
deleted file mode 100644
index 43274d94946..00000000000
--- a/addons/mrp_bom_cost/tests/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-from . import test_bom_price