diff --git a/Portfolio.WebUI.Server/Components/Component/Loading.razor b/Portfolio.WebUI.Server/Components/Component/Loading.razor
index 7e8f1c3..828d104 100644
--- a/Portfolio.WebUI.Server/Components/Component/Loading.razor
+++ b/Portfolio.WebUI.Server/Components/Component/Loading.razor
@@ -1,4 +1,7 @@
-<div id="load">
+<!--
+        https://codepen.io/dissimulate/pen/nmJyyg
+-->
+<div id="load">
     <div>G</div>
     <div>N</div>
     <div>I</div>
diff --git a/Portfolio.WebUI.Server/Components/Component/PokemonBackground.razor b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonBackground.razor
similarity index 100%
rename from Portfolio.WebUI.Server/Components/Component/PokemonBackground.razor
rename to Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonBackground.razor
diff --git a/Portfolio.WebUI.Server/Components/Component/PokemonBackground.razor.cs b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonBackground.razor.cs
similarity index 96%
rename from Portfolio.WebUI.Server/Components/Component/PokemonBackground.razor.cs
rename to Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonBackground.razor.cs
index 04b381e..ee1dec9 100644
--- a/Portfolio.WebUI.Server/Components/Component/PokemonBackground.razor.cs
+++ b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonBackground.razor.cs	
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Components;
 using Portfolio.Domain.Features.Pokemon;
 
-namespace Portfolio.WebUI.Server.Components.Component
+namespace Portfolio.WebUI.Server.Components.Component.Pokemon_Components
 {
     public partial class PokemonBackground
     {
diff --git a/Portfolio.WebUI.Server/Components/Component/PokemonBackground.razor.css b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonBackground.razor.css
similarity index 100%
rename from Portfolio.WebUI.Server/Components/Component/PokemonBackground.razor.css
rename to Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonBackground.razor.css
diff --git a/Portfolio.WebUI.Server/Components/Component/PokemonCard.razor b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonCard.razor
similarity index 100%
rename from Portfolio.WebUI.Server/Components/Component/PokemonCard.razor
rename to Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonCard.razor
diff --git a/Portfolio.WebUI.Server/Components/Component/PokemonCard.razor.cs b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonCard.razor.cs
similarity index 92%
rename from Portfolio.WebUI.Server/Components/Component/PokemonCard.razor.cs
rename to Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonCard.razor.cs
index 7548b0e..9526ce0 100644
--- a/Portfolio.WebUI.Server/Components/Component/PokemonCard.razor.cs
+++ b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonCard.razor.cs	
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Components;
 using Portfolio.Domain.Features.Pokemon;
 
-namespace Portfolio.WebUI.Server.Components.Component
+namespace Portfolio.WebUI.Server.Components.Component.Pokemon_Components
 {
     public partial class PokemonCard
     {
@@ -36,7 +36,5 @@ namespace Portfolio.WebUI.Server.Components.Component
 
             return $"https://www.serebii.net/pokemonsleep/pokemon/type/{pokemonType.ToLower()}.png";
         }
-
-
     }
 }
diff --git a/Portfolio.WebUI.Server/Components/Component/PokemonCard.razor.css b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonCard.razor.css
similarity index 99%
rename from Portfolio.WebUI.Server/Components/Component/PokemonCard.razor.css
rename to Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonCard.razor.css
index 2114fc6..34b1292 100644
--- a/Portfolio.WebUI.Server/Components/Component/PokemonCard.razor.css
+++ b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonCard.razor.css	
@@ -56,7 +56,6 @@
     padding-right: 0.5rem;
     margin-top: 3rem !important;
     transform: translateX(-50%) !important;
-
     display: flex; /* Centers text inside */
     align-items: start;
     justify-content: center; /* Horizontally centers text */
diff --git a/Portfolio.WebUI.Server/Components/Component/PokemonEditButton.razor b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonEditButton.razor
similarity index 100%
rename from Portfolio.WebUI.Server/Components/Component/PokemonEditButton.razor
rename to Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonEditButton.razor
diff --git a/Portfolio.WebUI.Server/Components/Component/PokemonEditButton.razor.cs b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonEditButton.razor.cs
similarity index 82%
rename from Portfolio.WebUI.Server/Components/Component/PokemonEditButton.razor.cs
rename to Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonEditButton.razor.cs
index 4f8b34b..5a3da64 100644
--- a/Portfolio.WebUI.Server/Components/Component/PokemonEditButton.razor.cs
+++ b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonEditButton.razor.cs	
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Components;
 using Microsoft.EntityFrameworkCore.Metadata.Internal;
 
-namespace Portfolio.WebUI.Server.Components.Component
+namespace Portfolio.WebUI.Server.Components.Component.Pokemon_Components
 {
     public partial class PokemonEditButton
     {
diff --git a/Portfolio.WebUI.Server/Components/Component/PokemonHeader.razor b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonHeader.razor
similarity index 100%
rename from Portfolio.WebUI.Server/Components/Component/PokemonHeader.razor
rename to Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonHeader.razor
diff --git a/Portfolio.WebUI.Server/Components/Component/PokemonTable.razor b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonTable.razor
similarity index 100%
rename from Portfolio.WebUI.Server/Components/Component/PokemonTable.razor
rename to Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonTable.razor
diff --git a/Portfolio.WebUI.Server/Components/Component/PokemonTable.razor.cs b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonTable.razor.cs
similarity index 96%
rename from Portfolio.WebUI.Server/Components/Component/PokemonTable.razor.cs
rename to Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonTable.razor.cs
index 07aba2f..6ffcf30 100644
--- a/Portfolio.WebUI.Server/Components/Component/PokemonTable.razor.cs
+++ b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonTable.razor.cs	
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using Microsoft.JSInterop;
 using Portfolio.Domain.Features.Pokemon;
 
-namespace Portfolio.WebUI.Server.Components.Component
+namespace Portfolio.WebUI.Server.Components.Component.Pokemon_Components
 {
     public partial class PokemonTable
     {
diff --git a/Portfolio.WebUI.Server/Components/Component/PokemonTable.razor.css b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonTable.razor.css
similarity index 100%
rename from Portfolio.WebUI.Server/Components/Component/PokemonTable.razor.css
rename to Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonTable.razor.css
diff --git a/Portfolio.WebUI.Server/Components/Pages/PokemonSleep.razor b/Portfolio.WebUI.Server/Components/Pages/PokemonSleep.razor
index 5ffde90..ec18d63 100644
--- a/Portfolio.WebUI.Server/Components/Pages/PokemonSleep.razor
+++ b/Portfolio.WebUI.Server/Components/Pages/PokemonSleep.razor
@@ -1,5 +1,6 @@
 @page "/pokemonsleep"
 
+
 @inject IPokemonService PokemonService
 
 @attribute [StreamRendering]
diff --git a/Portfolio.WebUI.Server/Components/_Imports.razor b/Portfolio.WebUI.Server/Components/_Imports.razor
index d534da2..68b22b0 100644
--- a/Portfolio.WebUI.Server/Components/_Imports.razor
+++ b/Portfolio.WebUI.Server/Components/_Imports.razor
@@ -9,6 +9,7 @@
 @using Portfolio.WebUI.Server
 @using Portfolio.WebUI.Server.Components
 @using Portfolio.WebUI.Server.Components.Component
+@using Portfolio.WebUI.Server.Components.Component.Pokemon_Components
 @using Portfolio.Domain.Features.Articles
 @using Portfolio.Domain.Features.Pokemon
 @using Portfolio.Domain.Features.Pokemon_Natures