diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/avatar-section/avatar-section.ejs b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/avatar-section/avatar-section.ejs
new file mode 100644
index 00000000..364bd0d1
--- /dev/null
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/avatar-section/avatar-section.ejs
@@ -0,0 +1,3 @@
+<%_ if (profile.avatar) { -%>
+  <img src="<%= profile?.avatar%>" alt="photo cv">
+<%_ } -%>
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/header-section/header-section.part.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/avatar-section/avatar-section.part.ts
similarity index 54%
rename from packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/header-section/header-section.part.ts
rename to packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/avatar-section/avatar-section.part.ts
index 8f6b362a..14f49aa5 100644
--- a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/header-section/header-section.part.ts
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/avatar-section/avatar-section.part.ts
@@ -1,16 +1,16 @@
 import { ManfredAwesomicCV } from '@/model';
 import { ProfileSectionVm, mapFromMacCvToProfileSectionVm } from '@lemoncode/manfred-common/profile-section';
-import headerSection from './header-section.ejs?raw';
+import avatarSection from './avatar-section.ejs?raw';
 import ejs from 'ejs';
 
-export const generateHeaderSection = (cv: ManfredAwesomicCV): string => {
+export const generateAvatarSection = (cv: ManfredAwesomicCV): string => {
   const profileSectionVm = mapFromMacCvToProfileSectionVm(cv);
-  return generateHeaderSectionInner(profileSectionVm);
+  return generateAvatarSectionInner(profileSectionVm);
 };
 
-const generateHeaderSectionInner = (profileSectionVm: ProfileSectionVm): string => {
+const generateAvatarSectionInner = (profileSectionVm: ProfileSectionVm): string => {
   const rootObject = {
     profile: profileSectionVm,
   };
-  return ejs.render(headerSection, rootObject);
+  return ejs.render(avatarSection, rootObject);
 };
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/avatar-section/index.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/avatar-section/index.ts
new file mode 100644
index 00000000..658abfc8
--- /dev/null
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/avatar-section/index.ts
@@ -0,0 +1 @@
+export * from './avatar-section.part';
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/header-section-end/header-section-end.ejs b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/header-section-end/header-section-end.ejs
new file mode 100644
index 00000000..5eee65a1
--- /dev/null
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/header-section-end/header-section-end.ejs
@@ -0,0 +1 @@
+</section>
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/header-section-end/header-section-end.part.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/header-section-end/header-section-end.part.ts
new file mode 100644
index 00000000..9cb9d222
--- /dev/null
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/header-section-end/header-section-end.part.ts
@@ -0,0 +1,4 @@
+import ejs from 'ejs';
+import HeaderSectionEndTemplate from './header-section-end.ejs?raw';
+
+export const generateHeaderSectionEnd = (): string => ejs.render(HeaderSectionEndTemplate);
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/header-section-end/index.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/header-section-end/index.ts
new file mode 100644
index 00000000..1b131094
--- /dev/null
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/header-section-end/index.ts
@@ -0,0 +1 @@
+export * from './header-section-end.part';
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/header-section-start/header-section-start.ejs b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/header-section-start/header-section-start.ejs
new file mode 100644
index 00000000..96d889e2
--- /dev/null
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/header-section-start/header-section-start.ejs
@@ -0,0 +1,3 @@
+<section class="header__content">
+
+
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/header-section-start/header-section-start.part.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/header-section-start/header-section-start.part.ts
new file mode 100644
index 00000000..e6d589a5
--- /dev/null
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/header-section-start/header-section-start.part.ts
@@ -0,0 +1,4 @@
+import ejs from 'ejs';
+import HeaderSectionStartTemplate from './header-section-start.ejs?raw';
+
+export const generateHeaderSectionStart = (): string => ejs.render(HeaderSectionStartTemplate);
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/header-section-start/index.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/header-section-start/index.ts
new file mode 100644
index 00000000..9637b3c6
--- /dev/null
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/header-section-start/index.ts
@@ -0,0 +1 @@
+export * from './header-section-start.part';
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/header-section/header-section.ejs b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/header-section/header-section.ejs
deleted file mode 100644
index 42e037ab..00000000
--- a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/header-section/header-section.ejs
+++ /dev/null
@@ -1,36 +0,0 @@
-<%_ if (profile && profile !== 'undefined') { -%>
-  <%_ if (profile.avatar) { -%>
-    <img src="<%= profile?.avatar%>" alt="photo cv">
-  <%_ } -%>
-  <section class="header__content">
-    <div class="header__content__name">
-      <svg xmlns="http://www.w3.org/2000/svg" width="64" height="10" viewBox="0 0 64 10" fill="none">
-        <path d="M1.10269e-06 5L64 5" stroke="#3BA0B7" stroke-width="9" />
-      </svg>
-      <h1><%= profile.name %> </h1>
-      <h2 class="surname"><%= profile?.surnames %></h2>
-      <p class="job-title"><%= profile?.title %></p>
-    </div>
-    <%_ if (profile.regionLocation) { -%>
-      <div class="header__content__address">
-        <svg xmlns="http://www.w3.org/2000/svg" width="18" height="24" viewBox="0 0 18 24" fill="none">
-          <g clip-path="url(#clip0_1762_1661)">
-            <path
-              d="M10.1109 23.4C12.5156 20.3906 18 13.0969 18 9C18 4.03125 13.9688 0 9 0C4.03125 0 0 4.03125 0 9C0 13.0969 5.48438 20.3906 7.88906 23.4C8.46562 24.1172 9.53438 24.1172 10.1109 23.4ZM14.2969 6.79688L8.29688 12.7969C7.85625 13.2375 7.14375 13.2375 6.70781 12.7969L3.70312 9.79688C3.2625 9.35625 3.2625 8.64375 3.70312 8.20781C4.14375 7.77188 4.85625 7.76719 5.29219 8.20781L7.49531 10.4109L12.7031 5.20312C13.1438 4.7625 13.8562 4.7625 14.2922 5.20312C14.7281 5.64375 14.7328 6.35625 14.2922 6.79219L14.2969 6.79688Z"
-              fill="#3BA0B7"
-            />
-          </g>
-          <defs>
-            <clipPath id="clip0_1762_1661">
-              <rect width="18" height="24" fill="white" />
-            </clipPath>
-          </defs>
-        </svg>
-        <p><%= profile?.regionLocation %>, <%= profile?.countryLocation %></p>
-      </div>
-    <%_ } -%>
-<%_ } -%>
-
-
-
-
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/header-section/index.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/header-section/index.ts
deleted file mode 100644
index af70765e..00000000
--- a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/header-section/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './header-section.part';
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/index.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/index.ts
index 212f493b..151abd9f 100644
--- a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/index.ts
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/index.ts
@@ -1,8 +1,11 @@
 export * from './html-document-start';
 export * from './html-document-end';
 export * from './header-element-start';
+export * from './avatar-section';
 export * from './header-element-end';
-export * from './header-section';
+export * from './header-section-start';
+export * from './header-section-end';
+export * from './userInfo-section';
 export * from './main-element-start';
 export * from './main-element-end';
 export * from './about-me-section';
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevants-links-section/relevants-links-section.ejs b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevants-links-section/relevants-links-section.ejs
index 9f912fcf..5a72ea55 100644
--- a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevants-links-section/relevants-links-section.ejs
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevants-links-section/relevants-links-section.ejs
@@ -66,6 +66,5 @@
         </a>
       <%_ } -%>
     <%_ } -%>
-    </div>
-  </section>
+  </div>
 <%_ } -%>
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/userInfo-section/index.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/userInfo-section/index.ts
new file mode 100644
index 00000000..c3808446
--- /dev/null
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/userInfo-section/index.ts
@@ -0,0 +1 @@
+export * from './userInfo-section.part';
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/userInfo-section/userInfo-section.ejs b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/userInfo-section/userInfo-section.ejs
new file mode 100644
index 00000000..5e9f25a3
--- /dev/null
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/userInfo-section/userInfo-section.ejs
@@ -0,0 +1,28 @@
+<%_ if (profile && profile !== undefined) { -%>
+  <div class="header__content__name">
+    <svg xmlns="http://www.w3.org/2000/svg" width="64" height="10" viewBox="0 0 64 10" fill="none">
+      <path d="M1.10269e-06 5L64 5" stroke="#3BA0B7" stroke-width="9" />
+    </svg>
+    <h1><%= profile.name %> </h1>
+    <h2 class="surname"><%= profile?.surnames %></h2>
+    <p class="job-title"><%= profile?.title %></p>
+  </div>
+  <%_ if (profile.regionLocation) { -%>
+    <div class="header__content__address">
+      <svg xmlns="http://www.w3.org/2000/svg" width="18" height="24" viewBox="0 0 18 24" fill="none">
+        <g clip-path="url(#clip0_1762_1661)">
+          <path
+            d="M10.1109 23.4C12.5156 20.3906 18 13.0969 18 9C18 4.03125 13.9688 0 9 0C4.03125 0 0 4.03125 0 9C0 13.0969 5.48438 20.3906 7.88906 23.4C8.46562 24.1172 9.53438 24.1172 10.1109 23.4ZM14.2969 6.79688L8.29688 12.7969C7.85625 13.2375 7.14375 13.2375 6.70781 12.7969L3.70312 9.79688C3.2625 9.35625 3.2625 8.64375 3.70312 8.20781C4.14375 7.77188 4.85625 7.76719 5.29219 8.20781L7.49531 10.4109L12.7031 5.20312C13.1438 4.7625 13.8562 4.7625 14.2922 5.20312C14.7281 5.64375 14.7328 6.35625 14.2922 6.79219L14.2969 6.79688Z"
+            fill="#3BA0B7"
+          />
+        </g>
+        <defs>
+          <clipPath id="clip0_1762_1661">
+            <rect width="18" height="24" fill="white" />
+          </clipPath>
+        </defs>
+      </svg>
+      <p><%= profile?.regionLocation %>, <%= profile?.countryLocation %></p>
+    </div>
+  <%_}-%>
+<%_}-%>
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/userInfo-section/userInfo-section.part.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/userInfo-section/userInfo-section.part.ts
new file mode 100644
index 00000000..bb38bcbc
--- /dev/null
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/userInfo-section/userInfo-section.part.ts
@@ -0,0 +1,16 @@
+import { ManfredAwesomicCV } from '@/model';
+import { ProfileSectionVm, mapFromMacCvToProfileSectionVm } from '@lemoncode/manfred-common/profile-section';
+import userInfoSection from './userInfo-section.ejs?raw';
+import ejs from 'ejs';
+
+export const generateUserInfoSection = (cv: ManfredAwesomicCV): string => {
+  const profileSectionVm = mapFromMacCvToProfileSectionVm(cv);
+  return generateUserInfoSectionInner(profileSectionVm);
+};
+
+const generateUserInfoSectionInner = (profileSectionVm: ProfileSectionVm): string => {
+  const rootObject = {
+    profile: profileSectionVm,
+  };
+  return ejs.render(userInfoSection, rootObject);
+};
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/index.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/index.ts
index a8776a0c..e3e91b0c 100644
--- a/packages/manfred2html/src/engine/cv-x-wing-squadron/index.ts
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/index.ts
@@ -4,7 +4,10 @@ import {
   generateHtmlDocumentEnd,
   generateHeaderElementEnd,
   generateHeaderElementStart,
-  generateHeaderSection,
+  generateHeaderSectionStart,
+  generateHeaderSectionEnd,
+  generateAvatarSection,
+  generateUserInfoSection,
   generateMainElementStart,
   generateAboutMeSection,
   generateMainElementEnd,
@@ -18,24 +21,30 @@ import {
 
 export const exportManfredJsonToCVXWingHTML = (manfredJsonContent: ManfredAwesomicCV, settings: Settings): string => {
   const htmlDocumentStart = generateHtmlDocumentStart();
-  const htmlDocumentEnd = generateHtmlDocumentEnd();
   const headerElementStart = generateHeaderElementStart();
+  const headerSectionStart = generateHeaderSectionStart();
+  const headerSectionEnd = generateHeaderSectionEnd();
+  const avatarSection = generateAvatarSection(manfredJsonContent);
+  const userInfoSection = generateUserInfoSection(manfredJsonContent);
+  const relevantLinksSection = generateRelevantLinksSection(manfredJsonContent);
   const headerElementEnd = generateHeaderElementEnd();
-  const headerSection = generateHeaderSection(manfredJsonContent);
   const mainElementStart = generateMainElementStart();
   const aboutMeSection = generateAboutMeSection(manfredJsonContent, settings);
-  const mainElementEnd = generateMainElementEnd();
-  const studiesSection = generateStudiesSection(manfredJsonContent, settings);
-  const experienceSection = generateExperienceSection(manfredJsonContent, settings);
-  const softSkillsSection = generateSoftSkillsSection(manfredJsonContent, settings);
-  const hardSkillsSection = generateHardSkillsSection(manfredJsonContent, settings);
   const languageSection = generateLanguageSection(manfredJsonContent, settings);
-  const relevantLinksSection = generateRelevantLinksSection(manfredJsonContent);
+  const hardSkillsSection = generateHardSkillsSection(manfredJsonContent, settings);
+  const softSkillsSection = generateSoftSkillsSection(manfredJsonContent, settings);
+  const experienceSection = generateExperienceSection(manfredJsonContent, settings);
+  const studiesSection = generateStudiesSection(manfredJsonContent, settings);
+  const mainElementEnd = generateMainElementEnd();
+  const htmlDocumentEnd = generateHtmlDocumentEnd();
   return `
     ${htmlDocumentStart}
       ${headerElementStart}
-      ${headerSection}
-        ${relevantLinksSection}
+        ${avatarSection}
+        ${headerSectionStart}
+          ${userInfoSection}
+          ${relevantLinksSection}
+        ${headerSectionEnd}
       ${headerElementEnd}
       ${mainElementStart}
         ${aboutMeSection}