diff --git a/src/Resources/views/storefront/base.html.twig b/src/Resources/views/storefront/base.html.twig
index 3596f75..6496107 100644
--- a/src/Resources/views/storefront/base.html.twig
+++ b/src/Resources/views/storefront/base.html.twig
@@ -1,24 +1 @@
-{% sw_extends '@Storefront/storefront/base.html.twig' %}
-
-{% block base_esi_header %}
-    <div class="head-wrapper">
-        {{ parent() }}
-        <div class="head-hero">
-            <div class="head-base-logo">
-                <figure>
-                    <a class="head-base-logo-link"
-                       href="{{ path('frontend.home.page') }}"
-                       title="{{ "header.logoLink"|trans|striptags }}">
-                        <picture>
-                            {% if theme_config('sw-logo-desktop') %}
-                                <img src="{{ theme_config('sw-logo-desktop') |sw_encode_url }}"
-                                     alt="{{ "header.logoLink"|trans|striptags }}"
-                                     class="img-fluid head-base-logo-img"/>
-                            {% endif %}
-                        </picture>
-                    </a>
-                </figure>
-            </div>
-        </div>
-    </div>
-{% endblock %}
+{% sw_extends '@Storefront/storefront/base.html.twig' %}
\ No newline at end of file
diff --git a/src/Resources/views/storefront/layout/header.html.twig b/src/Resources/views/storefront/layout/header.html.twig
new file mode 100644
index 0000000..557f8a3
--- /dev/null
+++ b/src/Resources/views/storefront/layout/header.html.twig
@@ -0,0 +1,35 @@
+{% sw_extends '@Storefront/storefront/layout/header.html.twig' %}
+
+{% block header %}
+    <div class="head-wrapper">
+        {% block base_header %}
+            {{ parent() }}
+        {% endblock %}
+
+        <div class="head-hero">
+            <div class="head-base-logo">
+                <figure>
+                    <a class="head-base-logo-link"
+                       href="{{ path('frontend.home.page') }}"
+                       title="{{ "header.logoLink"|trans|striptags }}">
+                        <picture>
+                            {% if theme_config('sw-logo-desktop') %}
+                                <img src="{{ theme_config('sw-logo-desktop') |sw_encode_url }}"
+                                     alt="{{ "header.logoLink"|trans|striptags }}"
+                                     class="img-fluid head-base-logo-img"/>
+                            {% endif %}
+                        </picture>
+                    </a>
+                </figure>
+            </div>
+        </div>
+
+        {% block base_navigation %}
+            {{ parent() }}
+        {% endblock %}
+
+        {% block base_offcanvas_navigation %}
+            {{ parent() }}
+        {% endblock %}
+    </div>
+{% endblock %}