diff --git a/commerce.links.menu.yml b/commerce.links.menu.yml
index b661e55..05119c4 100644
--- a/commerce.links.menu.yml
+++ b/commerce.links.menu.yml
@@ -2,12 +2,18 @@ commerce.admin_commerce:
   title: 'Commerce'
   route_name: 'commerce.admin_commerce'
   parent: 'system.admin'
-  description: 'Administer your commerce data and configuration.'
+  description: 'Administer your Commerce data and configuration.'
   weight: -9
 
 commerce.configuration:
   title: 'Configuration'
   route_name: 'commerce.configuration'
   parent: 'commerce.admin_commerce'
-  description: 'Configure your store and Commerce module settings.'
+  description: 'Configure Commerce and related modules.'
   weight: 10
+
+commerce.store_configuration:
+  title: 'Store'
+  route_name: 'commerce.store_configuration'
+  parent: 'commerce.configuration'
+  weight: -20
diff --git a/commerce.routing.yml b/commerce.routing.yml
index 1bb2356..12f0c3b 100644
--- a/commerce.routing.yml
+++ b/commerce.routing.yml
@@ -9,7 +9,16 @@ commerce.admin_commerce:
 commerce.configuration:
   path: '/admin/commerce/config'
   defaults:
-    _controller: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage'
+    _controller: '\Drupal\system\Controller\SystemController::overview'
+    link_id: 'commerce.configuration'
     _title: 'Configuration'
   requirements:
     _permission: 'access commerce administration pages'
+
+commerce.store_configuration:
+  path: '/admin/commerce/config/store'
+  defaults:
+    _controller: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage'
+    _title: 'Store'
+  requirements:
+    _permission: 'access commerce administration pages'
diff --git a/modules/checkout/commerce_checkout.links.menu.yml b/modules/checkout/commerce_checkout.links.menu.yml
index ab97bd5..5ca2e32 100644
--- a/modules/checkout/commerce_checkout.links.menu.yml
+++ b/modules/checkout/commerce_checkout.links.menu.yml
@@ -1,5 +1,5 @@
 entity.commerce_checkout_flow.collection:
   title: 'Checkout flows'
   route_name: 'entity.commerce_checkout_flow.collection'
-  parent: 'commerce.configuration'
+  parent: 'commerce_order.configuration'
   description: 'Manage your checkout flows.'
diff --git a/modules/order/commerce_order.links.menu.yml b/modules/order/commerce_order.links.menu.yml
index 58b1f57..a20a0e7 100644
--- a/modules/order/commerce_order.links.menu.yml
+++ b/modules/order/commerce_order.links.menu.yml
@@ -1,17 +1,25 @@
+commerce_order.configuration:
+  title: 'Orders'
+  route_name: 'commerce_order.configuration'
+  parent: 'commerce.configuration'
+  weight: -5
+
 entity.commerce_order.collection:
-  title: Orders
-  route_name: entity.commerce_order.collection
-  parent: commerce.admin_commerce
+  title: 'Orders'
+  route_name: 'entity.commerce_order.collection'
+  parent: 'commerce.admin_commerce'
   description: 'Manage your orders.'
 
 entity.commerce_order_type.collection:
-  title: Order types
-  route_name: entity.commerce_order_type.collection
-  parent: commerce.configuration
+  title: 'Order types'
+  route_name: 'entity.commerce_order_type.collection'
+  parent: 'commerce_order.configuration'
   description: 'Manage your order types.'
+  weight: -10
 
 entity.commerce_order_item_type.collection:
-  title: Order item types
-  route_name: entity.commerce_order_item_type.collection
-  parent: commerce.configuration
+  title: 'Order item types'
+  route_name: 'entity.commerce_order_item_type.collection'
+  parent: 'commerce_order.configuration'
   description: 'Manage your order item types.'
+  weight: -5
diff --git a/modules/order/commerce_order.routing.yml b/modules/order/commerce_order.routing.yml
index cac5563..8509a04 100644
--- a/modules/order/commerce_order.routing.yml
+++ b/modules/order/commerce_order.routing.yml
@@ -1,3 +1,11 @@
+commerce_order.configuration:
+  path: '/admin/commerce/config/orders'
+  defaults:
+    _controller: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage'
+    _title: 'Orders'
+  requirements:
+    _permission: 'access commerce administration pages'
+
 entity.commerce_order.add_page:
   path: '/admin/commerce/orders/add'
   defaults:
diff --git a/modules/payment/commerce_payment.links.menu.yml b/modules/payment/commerce_payment.links.menu.yml
index d1fd162..89b97cb 100644
--- a/modules/payment/commerce_payment.links.menu.yml
+++ b/modules/payment/commerce_payment.links.menu.yml
@@ -1,5 +1,11 @@
+commerce_payment.configuration:
+  title: 'Payments'
+  route_name: 'commerce_payment.configuration'
+  parent: 'commerce.configuration'
+  weight: -10
+
 entity.commerce_payment_gateway.collection:
   title: 'Payment gateways'
   route_name: 'entity.commerce_payment_gateway.collection'
-  parent: 'commerce.configuration'
+  parent: 'commerce_payment.configuration'
   description: 'Manage your payment gateways.'
diff --git a/modules/payment/commerce_payment.routing.yml b/modules/payment/commerce_payment.routing.yml
index da9e622..8aba635 100644
--- a/modules/payment/commerce_payment.routing.yml
+++ b/modules/payment/commerce_payment.routing.yml
@@ -1,3 +1,11 @@
+commerce_payment.configuration:
+  path: '/admin/commerce/config/payments'
+  defaults:
+    _controller: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage'
+    _title: 'Payments'
+  requirements:
+    _permission: 'access commerce administration pages'
+
 entity.commerce_payment.add_form:
   path: '/admin/commerce/orders/{commerce_order}/payments/add'
   defaults:
diff --git a/modules/price/commerce_price.links.menu.yml b/modules/price/commerce_price.links.menu.yml
index 1e16de6..f7885b0 100644
--- a/modules/price/commerce_price.links.menu.yml
+++ b/modules/price/commerce_price.links.menu.yml
@@ -1,5 +1,5 @@
 entity.commerce_currency.collection:
   title: Currencies
   route_name: entity.commerce_currency.collection
-  parent: commerce.configuration
+  parent: 'commerce.store_configuration'
   description: 'Manage your currencies.'
diff --git a/modules/price/commerce_price.routing.yml b/modules/price/commerce_price.routing.yml
index 9b2c38d..3a3c46d 100644
--- a/modules/price/commerce_price.routing.yml
+++ b/modules/price/commerce_price.routing.yml
@@ -1,5 +1,5 @@
 entity.commerce_currency.import:
-  path: '/admin/commerce/config/currency/import'
+  path: '/admin/commerce/config/currencies/import'
   defaults:
     _form: '\Drupal\commerce_price\Form\CurrencyImportForm'
     _title: 'Import currencies'
diff --git a/modules/price/src/Entity/Currency.php b/modules/price/src/Entity/Currency.php
index 7baf208..db586b8 100644
--- a/modules/price/src/Entity/Currency.php
+++ b/modules/price/src/Entity/Currency.php
@@ -43,10 +43,10 @@ use Drupal\Core\Config\Entity\ConfigEntityBase;
  *     "fractionDigits"
  *   },
  *   links = {
- *     "add-form" = "/admin/commerce/config/currency/add",
- *     "edit-form" = "/admin/commerce/config/currency/{commerce_currency}",
- *     "delete-form" = "/admin/commerce/config/currency/{commerce_currency}/delete",
- *     "collection" = "/admin/commerce/config/currency"
+ *     "add-form" = "/admin/commerce/config/currencies/add",
+ *     "edit-form" = "/admin/commerce/config/currencies/{commerce_currency}",
+ *     "delete-form" = "/admin/commerce/config/currencies/{commerce_currency}/delete",
+ *     "collection" = "/admin/commerce/config/currencies"
  *   }
  * )
  */
diff --git a/modules/product/commerce_product.links.menu.yml b/modules/product/commerce_product.links.menu.yml
index 2b3ec8b..1ad1989 100644
--- a/modules/product/commerce_product.links.menu.yml
+++ b/modules/product/commerce_product.links.menu.yml
@@ -1,3 +1,9 @@
+commerce_product.configuration:
+  title: 'Products'
+  route_name: 'commerce_product.configuration'
+  parent: 'commerce.configuration'
+  weight: -15
+
 entity.commerce_product.collection:
   title: 'Products'
   route_name: 'entity.commerce_product.collection'
@@ -13,11 +19,11 @@ entity.commerce_product_attribute.collection:
 entity.commerce_product_type.collection:
   title: 'Product types'
   route_name: 'entity.commerce_product_type.collection'
-  parent: 'commerce.configuration'
+  parent: 'commerce_product.configuration'
   description: 'Manage your product types.'
 
 entity.commerce_product_variation_type.collection:
   title: 'Product variation types'
   route_name: 'entity.commerce_product_variation_type.collection'
-  parent: 'commerce.configuration'
+  parent: 'commerce_product.configuration'
   description: 'Manage your product variation types.'
diff --git a/modules/product/commerce_product.routing.yml b/modules/product/commerce_product.routing.yml
new file mode 100644
index 0000000..d5e4dab
--- /dev/null
+++ b/modules/product/commerce_product.routing.yml
@@ -0,0 +1,7 @@
+commerce_product.configuration:
+  path: '/admin/commerce/config/products'
+  defaults:
+    _controller: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage'
+    _title: 'Products'
+  requirements:
+    _permission: 'access commerce administration pages'
diff --git a/modules/store/commerce_store.links.menu.yml b/modules/store/commerce_store.links.menu.yml
index c4d8e89..e787b0f 100644
--- a/modules/store/commerce_store.links.menu.yml
+++ b/modules/store/commerce_store.links.menu.yml
@@ -7,5 +7,5 @@ entity.commerce_store.collection:
 entity.commerce_store_type.collection:
   title: 'Store types'
   route_name: 'entity.commerce_store_type.collection'
-  parent: 'commerce.configuration'
+  parent: 'commerce.store_configuration'
   description: 'Manage your store types.'
diff --git a/modules/tax/commerce_tax.links.menu.yml b/modules/tax/commerce_tax.links.menu.yml
index c566f7c..f7844ae 100644
--- a/modules/tax/commerce_tax.links.menu.yml
+++ b/modules/tax/commerce_tax.links.menu.yml
@@ -1,5 +1,5 @@
 entity.commerce_tax_type.collection:
   title: 'Tax types'
   route_name: 'entity.commerce_tax_type.collection'
-  parent: 'commerce.configuration'
+  parent: 'commerce.store_configuration'
   description: 'Manage your tax types.'