diff --git a/src/FrontOffice.Main/FrontOffice/Main/Shared/OrganizationChartLevel.cs b/src/FrontOffice.Main/FrontOffice/Main/Shared/OrganizationChartLevel.cs
new file mode 100644
index 0000000..6d22c14
--- /dev/null
+++ b/src/FrontOffice.Main/FrontOffice/Main/Shared/OrganizationChartLevel.cs
@@ -0,0 +1,5 @@
+namespace FrontOffice.Main.Shared;
+
+internal class OrganizationChartLevel
+{
+}
\ No newline at end of file
diff --git a/src/FrontOffice.Main/Shared/OrganizationChart.razor b/src/FrontOffice.Main/Pages/Profile/Components/OrganizationChart.razor
similarity index 96%
rename from src/FrontOffice.Main/Shared/OrganizationChart.razor
rename to src/FrontOffice.Main/Pages/Profile/Components/OrganizationChart.razor
index bfdd5e1..3d135f9 100644
--- a/src/FrontOffice.Main/Shared/OrganizationChart.razor
+++ b/src/FrontOffice.Main/Pages/Profile/Components/OrganizationChart.razor
@@ -1,6 +1,4 @@
-@inject IJSRuntime JSRuntime
-
-<div class="org-chart-container">
+<div class="org-chart-container">
     <div class="org-tree">
         <div class="org-node root-node" id="root-node">
             <div class="node-card">
@@ -41,6 +39,3 @@
         }
     </div>
 </div>
-
-
-
diff --git a/src/FrontOffice.Main/Shared/OrganizationChart.razor.cs b/src/FrontOffice.Main/Pages/Profile/Components/OrganizationChart.razor.cs
similarity index 97%
rename from src/FrontOffice.Main/Shared/OrganizationChart.razor.cs
rename to src/FrontOffice.Main/Pages/Profile/Components/OrganizationChart.razor.cs
index e9ca1ed..d6600c4 100644
--- a/src/FrontOffice.Main/Shared/OrganizationChart.razor.cs
+++ b/src/FrontOffice.Main/Pages/Profile/Components/OrganizationChart.razor.cs
@@ -1,6 +1,6 @@
-using static FrontOffice.Main.Shared.OrganizationChartLevel;
+using static FrontOffice.Main.Pages.Profile.Components.OrganizationChartLevel;
 
-namespace FrontOffice.Main.Shared;
+namespace FrontOffice.Main.Pages.Profile.Components;
 public partial class OrganizationChart
 {
     private UserNode? _currentUser;
diff --git a/src/FrontOffice.Main/Shared/OrganizationChart.razor.css b/src/FrontOffice.Main/Pages/Profile/Components/OrganizationChart.razor.css
similarity index 99%
rename from src/FrontOffice.Main/Shared/OrganizationChart.razor.css
rename to src/FrontOffice.Main/Pages/Profile/Components/OrganizationChart.razor.css
index 68f1dea..578cf07 100644
--- a/src/FrontOffice.Main/Shared/OrganizationChart.razor.css
+++ b/src/FrontOffice.Main/Pages/Profile/Components/OrganizationChart.razor.css
@@ -1,4 +1,4 @@
-.org-chart-container {
+.org-chart-container {
     width: 100%;
     height: 600px;
     overflow: auto;
diff --git a/src/FrontOffice.Main/Shared/OrganizationChartLevel.razor b/src/FrontOffice.Main/Pages/Profile/Components/OrganizationChartLevel.razor
similarity index 99%
rename from src/FrontOffice.Main/Shared/OrganizationChartLevel.razor
rename to src/FrontOffice.Main/Pages/Profile/Components/OrganizationChartLevel.razor
index 54ead03..d6e2731 100644
--- a/src/FrontOffice.Main/Shared/OrganizationChartLevel.razor
+++ b/src/FrontOffice.Main/Pages/Profile/Components/OrganizationChartLevel.razor
@@ -1,4 +1,4 @@
-
+
 <div class="org-level" id="level-@Level">
     @foreach (var node in Nodes)
     {
diff --git a/src/FrontOffice.Main/Shared/OrganizationChartLevel.razor.cs b/src/FrontOffice.Main/Pages/Profile/Components/OrganizationChartLevel.razor.cs
similarity index 95%
rename from src/FrontOffice.Main/Shared/OrganizationChartLevel.razor.cs
rename to src/FrontOffice.Main/Pages/Profile/Components/OrganizationChartLevel.razor.cs
index 21b12ac..b643b2b 100644
--- a/src/FrontOffice.Main/Shared/OrganizationChartLevel.razor.cs
+++ b/src/FrontOffice.Main/Pages/Profile/Components/OrganizationChartLevel.razor.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Components;
 using MudBlazor;
 
-namespace FrontOffice.Main.Shared;
+namespace FrontOffice.Main.Pages.Profile.Components;
 public partial class OrganizationChartLevel
 {
     [Parameter] public List<UserNode>? Nodes { get; set; }
diff --git a/src/FrontOffice.Main/Shared/OrganizationChartLevel.razor.css b/src/FrontOffice.Main/Pages/Profile/Components/OrganizationChartLevel.razor.css
similarity index 75%
rename from src/FrontOffice.Main/Shared/OrganizationChartLevel.razor.css
rename to src/FrontOffice.Main/Pages/Profile/Components/OrganizationChartLevel.razor.css
index 9628942..2cdb067 100644
--- a/src/FrontOffice.Main/Shared/OrganizationChartLevel.razor.css
+++ b/src/FrontOffice.Main/Pages/Profile/Components/OrganizationChartLevel.razor.css
@@ -1,4 +1,4 @@
-/* Organization Chart Level Styles */
+/* Organization Chart Level Styles */
 .org-level {
     display: flex;
     justify-content: center;
@@ -10,27 +10,27 @@
     margin-right: auto;
 }
 
-.org-level::before {
-    content: '';
-    position: absolute;
-    top: -80px;
-    left: 50%;
-    transform: translateX(-50%);
-    width: 2px;
-    height: 40px;
-    background: #ddd;
-}
+    .org-level::before {
+        content: '';
+        position: absolute;
+        top: -80px;
+        left: 50%;
+        transform: translateX(-50%);
+        width: 2px;
+        height: 40px;
+        background: #ddd;
+    }
 
-.org-level::after {
-    content: '';
-    position: absolute;
-    top: -40px;
-    left: 0;
-    right: 0;
-    height: 2px;
-    background: #ddd;
-    z-index: 1;
-}
+    .org-level::after {
+        content: '';
+        position: absolute;
+        top: -40px;
+        left: 0;
+        right: 0;
+        height: 2px;
+        background: #ddd;
+        z-index: 1;
+    }
 
 /* Node styles for levels */
 .org-node {
@@ -63,10 +63,10 @@
     transition: all 0.3s ease;
 }
 
-.node-card:hover {
-    box-shadow: 0 4px 16px rgba(0, 0, 0, 0.15);
-    border-color: #e0e0e0;
-}
+    .node-card:hover {
+        box-shadow: 0 4px 16px rgba(0, 0, 0, 0.15);
+        border-color: #e0e0e0;
+    }
 
 .node-avatar {
     position: relative;
@@ -93,10 +93,10 @@
     box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
 }
 
-.expand-btn:hover {
-    background: #026a9e;
-    transform: translateX(-50%) scale(1.1);
-}
+    .expand-btn:hover {
+        background: #026a9e;
+        transform: translateX(-50%) scale(1.1);
+    }
 
 .node-info {
     text-align: center;
@@ -113,9 +113,9 @@
     font-size: 12px;
 }
 
-.node-amounts > div {
-    margin-bottom: 4px;
-}
+    .node-amounts > div {
+        margin-bottom: 4px;
+    }
 
 .personal-amount {
     color: #0380C0;
@@ -171,8 +171,9 @@
         opacity: 0;
         transform: translateY(-10px);
     }
+
     to {
         opacity: 1;
         transform: translateY(0);
     }
-}
\ No newline at end of file
+}
diff --git a/src/FrontOffice.Main/_Imports.razor b/src/FrontOffice.Main/_Imports.razor
index 6a6ef6c..f17cec2 100644
--- a/src/FrontOffice.Main/_Imports.razor
+++ b/src/FrontOffice.Main/_Imports.razor
@@ -8,6 +8,7 @@
 @using Microsoft.JSInterop
 @using FrontOffice.Main
 @using FrontOffice.Main.Shared
+@using FrontOffice.Main.Pages.Profile.Components
 @using MudBlazor
 @using FrontOffice.Main.Utilities
 @using DateTimeConverterCL
diff --git a/src/FrontOffice.sln b/src/FrontOffice.sln
index 03dd620..60f6562 100644
--- a/src/FrontOffice.sln
+++ b/src/FrontOffice.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FrontOffice.Main", "FrontOffice.Main\FrontOffice.Main.csproj", "{D9407E46-027D-4D44-B9FB-1F8DECB14270}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FrontOffice.Main", "FrontOffice.Main\FrontOffice.Main.csproj", "{D9407E46-027D-4D44-B9FB-1F8DECB14270}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,4 +19,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {1181A173-0937-4AB5-981F-593546434A02}
+	EndGlobalSection
 EndGlobal