diff --git a/erpnext/config/accounts.py b/erpnext/config/accounts.py
index 64508b8a31..f32aeed022 100644
--- a/erpnext/config/accounts.py
+++ b/erpnext/config/accounts.py
@@ -73,6 +73,11 @@ def get_data():
 			"label": _("Setup"),
 			"icon": "icon-cog",
 			"items": [
+				{
+					"type": "doctype",
+					"name": "Company",
+					"description": _("Company (not Customer or Supplier) master.")
+				},
 				{
 					"type": "doctype",
 					"name": "Fiscal Year",
diff --git a/erpnext/config/setup.py b/erpnext/config/setup.py
index 961e4f7d79..a660942f87 100644
--- a/erpnext/config/setup.py
+++ b/erpnext/config/setup.py
@@ -110,43 +110,7 @@ def get_data():
 					"description": _("Setup SMS gateway settings")
 				},
 			]
-		},
-		{
-			"label": _("Masters"),
-			"icon": "icon-star",
-			"items": [
-				{
-					"type": "doctype",
-					"name": "Company",
-					"description": _("Company (not Customer or Supplier) master.")
-				},
-				{
-					"type": "doctype",
-					"name": "Item",
-					"description": _("Item master.")
-				},
-				{
-					"type": "doctype",
-					"name": "Customer",
-					"description": _("Customer master.")
-				},
-				{
-					"type": "doctype",
-					"name": "Supplier",
-					"description": _("Supplier master.")
-				},
-				{
-					"type": "doctype",
-					"name": "Contact",
-					"description": _("Contact master.")
-				},
-				{
-					"type": "doctype",
-					"name": "Address",
-					"description": _("Address master.")
-				},
-			]
-		},
+		}
 	]
 
 	for module, label, icon in (