diff --git a/src/Monambike.Web/Pages/Home/AboutMe.razor b/src/Monambike.Web/Components/Home/AboutMe.razor
similarity index 100%
rename from src/Monambike.Web/Pages/Home/AboutMe.razor
rename to src/Monambike.Web/Components/Home/AboutMe.razor
diff --git a/src/Monambike.Web/Pages/Home/Contact.razor b/src/Monambike.Web/Components/Home/Contact.razor
similarity index 100%
rename from src/Monambike.Web/Pages/Home/Contact.razor
rename to src/Monambike.Web/Components/Home/Contact.razor
diff --git a/src/Monambike.Web/Pages/Home/Instagram.razor b/src/Monambike.Web/Components/Home/Instagram.razor
similarity index 100%
rename from src/Monambike.Web/Pages/Home/Instagram.razor
rename to src/Monambike.Web/Components/Home/Instagram.razor
diff --git a/src/Monambike.Web/Pages/Home/MyProjects.razor b/src/Monambike.Web/Components/Home/MyProjects.razor
similarity index 100%
rename from src/Monambike.Web/Pages/Home/MyProjects.razor
rename to src/Monambike.Web/Components/Home/MyProjects.razor
diff --git a/src/Monambike.Web/Pages/Home/Presentation.razor b/src/Monambike.Web/Components/Home/Presentation.razor
similarity index 100%
rename from src/Monambike.Web/Pages/Home/Presentation.razor
rename to src/Monambike.Web/Components/Home/Presentation.razor
diff --git a/src/Monambike.Web/Pages/Home/SocialMedia.razor b/src/Monambike.Web/Components/Home/SocialMedia.razor
similarity index 100%
rename from src/Monambike.Web/Pages/Home/SocialMedia.razor
rename to src/Monambike.Web/Components/Home/SocialMedia.razor
diff --git a/src/Monambike.Web/Pages/Home/Tour.razor b/src/Monambike.Web/Components/Home/Tour.razor
similarity index 100%
rename from src/Monambike.Web/Pages/Home/Tour.razor
rename to src/Monambike.Web/Components/Home/Tour.razor
diff --git a/src/Monambike.Web/Pages/Home/Warning.razor b/src/Monambike.Web/Components/Home/Warning.razor
similarity index 100%
rename from src/Monambike.Web/Pages/Home/Warning.razor
rename to src/Monambike.Web/Components/Home/Warning.razor
diff --git a/src/Monambike.Web/Pages/Media/MyAnimations.razor b/src/Monambike.Web/Components/Media/MyAnimations.razor
similarity index 100%
rename from src/Monambike.Web/Pages/Media/MyAnimations.razor
rename to src/Monambike.Web/Components/Media/MyAnimations.razor
diff --git a/src/Monambike.Web/Pages/Media/MyAnimes.razor b/src/Monambike.Web/Components/Media/MyAnimes.razor
similarity index 100%
rename from src/Monambike.Web/Pages/Media/MyAnimes.razor
rename to src/Monambike.Web/Components/Media/MyAnimes.razor
diff --git a/src/Monambike.Web/Pages/Media/MyBooks.razor b/src/Monambike.Web/Components/Media/MyBooks.razor
similarity index 100%
rename from src/Monambike.Web/Pages/Media/MyBooks.razor
rename to src/Monambike.Web/Components/Media/MyBooks.razor
diff --git a/src/Monambike.Web/Pages/Media/MyGames.razor b/src/Monambike.Web/Components/Media/MyGames.razor
similarity index 100%
rename from src/Monambike.Web/Pages/Media/MyGames.razor
rename to src/Monambike.Web/Components/Media/MyGames.razor
diff --git a/src/Monambike.Web/Pages/Media/MyMovies.razor b/src/Monambike.Web/Components/Media/MyMovies.razor
similarity index 100%
rename from src/Monambike.Web/Pages/Media/MyMovies.razor
rename to src/Monambike.Web/Components/Media/MyMovies.razor
diff --git a/src/Monambike.Web/Pages/Media/MySeries.razor b/src/Monambike.Web/Components/Media/MySeries.razor
similarity index 100%
rename from src/Monambike.Web/Pages/Media/MySeries.razor
rename to src/Monambike.Web/Components/Media/MySeries.razor
diff --git a/src/Monambike.Web/Pages/Media/MySongs.razor b/src/Monambike.Web/Components/Media/MySongs.razor
similarity index 100%
rename from src/Monambike.Web/Pages/Media/MySongs.razor
rename to src/Monambike.Web/Components/Media/MySongs.razor
diff --git a/src/Monambike.Web/Monambike.Web.csproj b/src/Monambike.Web/Monambike.Web.csproj
index 6ffbc5bb..357173d9 100644
--- a/src/Monambike.Web/Monambike.Web.csproj
+++ b/src/Monambike.Web/Monambike.Web.csproj
@@ -15,6 +15,21 @@
     <WarningLevel>9999</WarningLevel>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Remove="Data\**" />
+    <Compile Remove="Enitities\**" />
+    <Compile Remove="Utilities\**" />
+    <Content Remove="Data\**" />
+    <Content Remove="Enitities\**" />
+    <Content Remove="Utilities\**" />
+    <EmbeddedResource Remove="Data\**" />
+    <EmbeddedResource Remove="Enitities\**" />
+    <EmbeddedResource Remove="Utilities\**" />
+    <None Remove="Data\**" />
+    <None Remove="Enitities\**" />
+    <None Remove="Utilities\**" />
+  </ItemGroup>
+
   <ItemGroup>
     <Content Remove="C:\Users\vinic\.nuget\packages\monambike.core\1.2.0\contentFiles\any\net8.0\Resources\Phrases.txt" />
     <Content Remove="wwwroot\fonts\LICENSE.txt" />
@@ -56,10 +71,4 @@
     </EmbeddedResource>
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Data\" />
-    <Folder Include="Enitities\" />
-    <Folder Include="Utilities\" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/Monambike.Web/Pages/About/About.razor b/src/Monambike.Web/Pages/About.razor
similarity index 100%
rename from src/Monambike.Web/Pages/About/About.razor
rename to src/Monambike.Web/Pages/About.razor
diff --git a/src/Monambike.Web/Pages/Gallery/Gallery.razor b/src/Monambike.Web/Pages/Gallery.razor
similarity index 100%
rename from src/Monambike.Web/Pages/Gallery/Gallery.razor
rename to src/Monambike.Web/Pages/Gallery.razor
diff --git a/src/Monambike.Web/Pages/Home/Home.razor b/src/Monambike.Web/Pages/Home.razor
similarity index 65%
rename from src/Monambike.Web/Pages/Home/Home.razor
rename to src/Monambike.Web/Pages/Home.razor
index 9f6e4e1a..46314f46 100644
--- a/src/Monambike.Web/Pages/Home/Home.razor
+++ b/src/Monambike.Web/Pages/Home.razor
@@ -1,6 +1,6 @@
-@inherits LayoutComponentBase
-
-@page "/"
+@page "/"
+@inherits LayoutComponentBase
+@using Monambike.Web.Components.Home
 
 <div id="div-display">
     <Presentation/>
diff --git a/src/Monambike.Web/Pages/MyInnerMe/MyInnerMe.razor b/src/Monambike.Web/Pages/MyInnerMe.razor
similarity index 100%
rename from src/Monambike.Web/Pages/MyInnerMe/MyInnerMe.razor
rename to src/Monambike.Web/Pages/MyInnerMe.razor
diff --git a/src/Monambike.Web/Pages/Portfolio/MyProjects.razor b/src/Monambike.Web/Pages/MyProjects.razor
similarity index 95%
rename from src/Monambike.Web/Pages/Portfolio/MyProjects.razor
rename to src/Monambike.Web/Pages/MyProjects.razor
index eb9563a1..cfe2aa50 100644
--- a/src/Monambike.Web/Pages/Portfolio/MyProjects.razor
+++ b/src/Monambike.Web/Pages/MyProjects.razor
@@ -1,7 +1,4 @@
-@* @using Monambike.Web.Models
-@using Monambike.Web.Utilities
-
-@page "/projects"
+@* @page "/projects"
 
 <!-- MY PROJECTS -->
 <section class="site-section site-section--presentation">
diff --git a/src/Monambike.Web/Resources/Translation/Home/Home.pt-BR.resx b/src/Monambike.Web/Resources/Translation/Home.pt-BR.resx
similarity index 98%
rename from src/Monambike.Web/Resources/Translation/Home/Home.pt-BR.resx
rename to src/Monambike.Web/Resources/Translation/Home.pt-BR.resx
index a9990611..1af7de15 100644
--- a/src/Monambike.Web/Resources/Translation/Home/Home.pt-BR.resx
+++ b/src/Monambike.Web/Resources/Translation/Home.pt-BR.resx
@@ -117,7 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="MyName" xml:space="preserve">
-    <value>Vinícius\u00A0Gabriel</value>
-  </data>
 </root>
\ No newline at end of file