diff --git a/components/atoms/a-add-to-cart.vue b/components/product/a-add-to-cart.vue
similarity index 100%
rename from components/atoms/a-add-to-cart.vue
rename to components/product/a-add-to-cart.vue
diff --git a/components/atoms/a-product-attribute.vue b/components/product/a-product-attribute.vue
similarity index 100%
rename from components/atoms/a-product-attribute.vue
rename to components/product/a-product-attribute.vue
diff --git a/components/atoms/a-product-price.vue b/components/product/a-product-price.vue
similarity index 100%
rename from components/atoms/a-product-price.vue
rename to components/product/a-product-price.vue
diff --git a/components/atoms/a-product-quantity.vue b/components/product/a-product-quantity.vue
similarity index 100%
rename from components/atoms/a-product-quantity.vue
rename to components/product/a-product-quantity.vue
diff --git a/components/atoms/a-product-rating.vue b/components/product/a-product-rating.vue
similarity index 100%
rename from components/atoms/a-product-rating.vue
rename to components/product/a-product-rating.vue
diff --git a/components/molecules/m-product-add-to-cart.vue b/components/product/m-product-add-to-cart.vue
similarity index 94%
rename from components/molecules/m-product-add-to-cart.vue
rename to components/product/m-product-add-to-cart.vue
index 7140b98c0..bcf5f52a9 100644
--- a/components/molecules/m-product-add-to-cart.vue
+++ b/components/product/m-product-add-to-cart.vue
@@ -34,8 +34,8 @@
 <script>
 import { onlineHelper } from '@vue-storefront/core/helpers';
 import { SfAddToCart, SfAlert } from '@storefront-ui/vue';
-import AProductQuantity from 'theme/components/atoms/a-product-quantity';
-import AAddToCart from 'theme/components/atoms/a-add-to-cart';
+import AProductQuantity from 'theme/components/product/a-product-quantity';
+import AAddToCart from 'theme/components/product/a-add-to-cart';
 export default {
   name: 'MProductAddToCart',
   components: {
diff --git a/components/molecules/m-product-additional-info.vue b/components/product/m-product-additional-info.vue
similarity index 93%
rename from components/molecules/m-product-additional-info.vue
rename to components/product/m-product-additional-info.vue
index a823ff055..d0b5bee1b 100644
--- a/components/molecules/m-product-additional-info.vue
+++ b/components/product/m-product-additional-info.vue
@@ -41,9 +41,9 @@
 import { ModalList } from 'theme/store/ui/modals';
 import { mapState, mapActions } from 'vuex';
 import { SfHeading, SfTabs, SfDivider } from '@storefront-ui/vue';
-import AProductRating from 'theme/components/atoms/a-product-rating';
-import AProductAttribute from 'theme/components/atoms/a-product-attribute';
-import MReviewList from 'theme/components/molecules/m-review-list';
+import AProductRating from 'theme/components/product/a-product-rating';
+import AProductAttribute from 'theme/components/product/a-product-attribute';
+import MReviewList from 'theme/components/product/m-review-list';
 
 export default {
   name: 'MProductAdditionalInfo',
diff --git a/components/molecules/m-product-gallery.vue b/components/product/m-product-gallery.vue
similarity index 100%
rename from components/molecules/m-product-gallery.vue
rename to components/product/m-product-gallery.vue
diff --git a/components/molecules/m-product-option-bundle.vue b/components/product/m-product-option-bundle.vue
similarity index 92%
rename from components/molecules/m-product-option-bundle.vue
rename to components/product/m-product-option-bundle.vue
index 5fc0fc6f9..22488ad60 100644
--- a/components/molecules/m-product-option-bundle.vue
+++ b/components/product/m-product-option-bundle.vue
@@ -38,8 +38,8 @@
 <script>
 import { ProductBundleOption } from '@vue-storefront/core/modules/catalog/components/ProductBundleOption';
 import { SfHeading, SfRadio, SfDivider, SfAlert } from '@storefront-ui/vue';
-import AProductPrice from 'theme/components/atoms/a-product-price'
-import AProductQuantity from 'theme/components/atoms/a-product-quantity'
+import AProductPrice from 'theme/components/product/a-product-price'
+import AProductQuantity from 'theme/components/product/a-product-quantity'
 
 export default {
   mixins: [ProductBundleOption],
diff --git a/components/molecules/m-product-options-bundle.vue b/components/product/m-product-options-bundle.vue
similarity index 86%
rename from components/molecules/m-product-options-bundle.vue
rename to components/product/m-product-options-bundle.vue
index 9b3a7632b..0dc51f266 100644
--- a/components/molecules/m-product-options-bundle.vue
+++ b/components/product/m-product-options-bundle.vue
@@ -12,7 +12,7 @@
 
 <script>
 import { ProductBundleOptions } from '@vue-storefront/core/modules/catalog/components/ProductBundleOptions'
-import MProductOptionBundle from 'theme/components/molecules/m-product-option-bundle'
+import MProductOptionBundle from 'theme/components/product/m-product-option-bundle'
 
 export default {
   mixins: [ProductBundleOptions],
diff --git a/components/molecules/m-product-options-configurable.vue b/components/product/m-product-options-configurable.vue
similarity index 100%
rename from components/molecules/m-product-options-configurable.vue
rename to components/product/m-product-options-configurable.vue
diff --git a/components/molecules/m-product-options-custom.vue b/components/product/m-product-options-custom.vue
similarity index 100%
rename from components/molecules/m-product-options-custom.vue
rename to components/product/m-product-options-custom.vue
diff --git a/components/molecules/m-product-options-group.vue b/components/product/m-product-options-group.vue
similarity index 96%
rename from components/molecules/m-product-options-group.vue
rename to components/product/m-product-options-group.vue
index f0d47856a..8939d507d 100644
--- a/components/molecules/m-product-options-group.vue
+++ b/components/product/m-product-options-group.vue
@@ -30,7 +30,7 @@
 <script>
 import config from 'config'
 import { SfGroupedProduct } from '@storefront-ui/vue';
-import AProductPrice from 'theme/components/atoms/a-product-price'
+import AProductPrice from 'theme/components/product/a-product-price'
 export default {
   name: 'MProductOptionsGroup',
   components: {
diff --git a/components/molecules/m-product-short-info.vue b/components/product/m-product-short-info.vue
similarity index 95%
rename from components/molecules/m-product-short-info.vue
rename to components/product/m-product-short-info.vue
index 613711087..da173424f 100644
--- a/components/molecules/m-product-short-info.vue
+++ b/components/product/m-product-short-info.vue
@@ -35,8 +35,8 @@
 
 <script>
 import { SfHeading, SfIcon, SfPrice, SfButton } from '@storefront-ui/vue';
-import AProductRating from 'theme/components/atoms/a-product-rating';
-import AProductPrice from 'theme/components/atoms/a-product-price';
+import AProductRating from 'theme/components/product/a-product-rating';
+import AProductPrice from 'theme/components/product/a-product-price';
 import { createSmoothscroll } from 'theme/helpers'
 export default {
   name: 'MProductShortInfo',
diff --git a/components/molecules/m-related-products.vue b/components/product/m-related-products.vue
similarity index 100%
rename from components/molecules/m-related-products.vue
rename to components/product/m-related-products.vue
diff --git a/components/molecules/m-review-list.vue b/components/product/m-review-list.vue
similarity index 100%
rename from components/molecules/m-review-list.vue
rename to components/product/m-review-list.vue
diff --git a/components/organisms/o-product-details.vue b/components/product/o-product-details.vue
similarity index 86%
rename from components/organisms/o-product-details.vue
rename to components/product/o-product-details.vue
index 95f6f4507..e77cb8e57 100644
--- a/components/organisms/o-product-details.vue
+++ b/components/product/o-product-details.vue
@@ -58,14 +58,14 @@ import get from 'lodash-es/get'
 import config from 'config';
 import { mapGetters, mapActions } from 'vuex';
 import { SfButton } from '@storefront-ui/vue';
-import MProductGallery from 'theme/components/molecules/m-product-gallery';
-import MProductShortInfo from 'theme/components/molecules/m-product-short-info';
-import MProductAddToCart from 'theme/components/molecules/m-product-add-to-cart';
-import MProductAdditionalInfo from 'theme/components/molecules/m-product-additional-info';
-import MProductOptionsConfigurable from 'theme/components/molecules/m-product-options-configurable';
-import MProductOptionsBundle from 'theme/components/molecules/m-product-options-bundle';
-import MProductOptionsCustom from 'theme/components/molecules/m-product-options-custom';
-import MProductOptionsGroup from 'theme/components/molecules/m-product-options-group';
+import MProductGallery from 'theme/components/product/m-product-gallery';
+import MProductShortInfo from 'theme/components/product/m-product-short-info';
+import MProductAddToCart from 'theme/components/product/m-product-add-to-cart';
+import MProductAdditionalInfo from 'theme/components/product/m-product-additional-info';
+import MProductOptionsConfigurable from 'theme/components/product/m-product-options-configurable';
+import MProductOptionsBundle from 'theme/components/product/m-product-options-bundle';
+import MProductOptionsCustom from 'theme/components/product/m-product-options-custom';
+import MProductOptionsGroup from 'theme/components/product/m-product-options-group';
 import { ModalList } from 'theme/store/ui/modals';
 
 export default {
diff --git a/pages/Product.vue b/pages/Product.vue
index ff5f60a85..823b3e288 100644
--- a/pages/Product.vue
+++ b/pages/Product.vue
@@ -61,8 +61,8 @@ import { ReviewModule } from '@vue-storefront/core/modules/review';
 import { registerModule } from '@vue-storefront/core/lib/modules';
 import { onlineHelper, isServer } from '@vue-storefront/core/helpers';
 import { catalogHooksExecutors } from '@vue-storefront/core/modules/catalog-next/hooks';
-import MRelatedProducts from 'theme/components/molecules/m-related-products';
-import OProductDetails from 'theme/components/organisms/o-product-details';
+import MRelatedProducts from 'theme/components/product/m-related-products';
+import OProductDetails from 'theme/components/product/o-product-details';
 import AImagesGrid from 'theme/components/atoms/a-images-grid';
 import { checkWebpSupport } from 'theme/helpers'
 import { SfSection, SfBanner, SfBreadcrumbs } from '@storefront-ui/vue';