diff --git a/src/Box/Menu.php b/src/Entity/Box/Menu.php
similarity index 70%
rename from src/Box/Menu.php
rename to src/Entity/Box/Menu.php
index 6fa3f8d3..66cbf9b3 100644
--- a/src/Box/Menu.php
+++ b/src/Entity/Box/Menu.php
@@ -2,13 +2,13 @@
 
 declare(strict_types=1);
 
-namespace Yggverse\Yoda\Box;
+namespace Yggverse\Yoda\Entity\Box;
 
 class Menu
 {
     public \GtkBox $box;
 
-    public \Yggverse\Yoda\Menu\Bar\Main $main;
+    public \Yggverse\Yoda\Entity\Menu\Bar\Main $main;
 
     public function __construct(
         string $name = 'boxMenu'
@@ -21,7 +21,7 @@ class Menu
             $name
         );
 
-        $this->main = new \Yggverse\Yoda\Menu\Bar\Main();
+        $this->main = new \Yggverse\Yoda\Entity\Menu\Bar\Main();
 
         $this->box->add(
             $this->main->bar
diff --git a/src/Box/Navigation.php b/src/Entity/Box/Navigation.php
similarity index 75%
rename from src/Box/Navigation.php
rename to src/Entity/Box/Navigation.php
index baf7e4f8..fcf6e948 100644
--- a/src/Box/Navigation.php
+++ b/src/Entity/Box/Navigation.php
@@ -2,19 +2,19 @@
 
 declare(strict_types=1);
 
-namespace Yggverse\Yoda\Box;
+namespace Yggverse\Yoda\Entity\Box;
 
 class Navigation
 {
     public \GtkBox $box;
 
-    public \Yggverse\Yoda\Entry\Address $address;
+    public \Yggverse\Yoda\Entity\Entry\Address $address;
 
-    public \Yggverse\Yoda\Button\Home $home;
-    public \Yggverse\Yoda\Button\Back $back;
-    public \Yggverse\Yoda\Button\Forward $forward;
-    public \Yggverse\Yoda\Button\Reload $reload;
-    public \Yggverse\Yoda\Button\Go $go;
+    public \Yggverse\Yoda\Entity\Button\Home $home;
+    public \Yggverse\Yoda\Entity\Button\Back $back;
+    public \Yggverse\Yoda\Entity\Button\Forward $forward;
+    public \Yggverse\Yoda\Entity\Button\Reload $reload;
+    public \Yggverse\Yoda\Entity\Button\Go $go;
 
     public object $config;
 
@@ -33,7 +33,7 @@ class Navigation
 
         if ($this->config->interface->window->navigation->button->home && $this->config->homepage)
         {
-            $this->home = new \Yggverse\Yoda\Button\Home();
+            $this->home = new \Yggverse\Yoda\Entity\Button\Home();
 
             $this->box->pack_start(
                 $this->home->button,
@@ -55,7 +55,7 @@ class Navigation
 
             if ($this->config->interface->window->navigation->button->back)
             {
-                $this->back = new \Yggverse\Yoda\Button\Back();
+                $this->back = new \Yggverse\Yoda\Entity\Button\Back();
 
                 $boxBackForward->pack_start(
                     $this->back->button,
@@ -67,7 +67,7 @@ class Navigation
 
             if ($this->config->interface->window->navigation->button->forward)
             {
-                $this->forward = new \Yggverse\Yoda\Button\Forward();
+                $this->forward = new \Yggverse\Yoda\Entity\Button\Forward();
 
                 $boxBackForward->pack_end(
                     $this->forward->button,
@@ -87,7 +87,7 @@ class Navigation
 
         if ($this->config->interface->window->navigation->button->reload)
         {
-            $this->reload = new \Yggverse\Yoda\Button\Reload();
+            $this->reload = new \Yggverse\Yoda\Entity\Button\Reload();
 
             $this->box->pack_start(
                 $this->reload->button,
@@ -97,7 +97,7 @@ class Navigation
             );
         }
 
-        $this->address = new \Yggverse\Yoda\Entry\Address(
+        $this->address = new \Yggverse\Yoda\Entity\Entry\Address(
             $this->config->homepage
         );
 
@@ -110,7 +110,7 @@ class Navigation
 
         if ($this->config->interface->window->navigation->button->go)
         {
-            $this->go = new \Yggverse\Yoda\Button\Go();
+            $this->go = new \Yggverse\Yoda\Entity\Button\Go();
 
             $this->box->pack_end(
                 $this->go->button,
diff --git a/src/Box/Tab.php b/src/Entity/Box/Tab.php
similarity index 90%
rename from src/Box/Tab.php
rename to src/Entity/Box/Tab.php
index 75965cba..c4fa155f 100644
--- a/src/Box/Tab.php
+++ b/src/Entity/Box/Tab.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yggverse\Yoda\Box;
+namespace Yggverse\Yoda\Entity\Box;
 
 class Tab
 {
@@ -10,10 +10,10 @@ class Tab
 
     public \GtkWindow $window;
 
-    public \Yggverse\Yoda\Box\Menu $menu;
-    public \Yggverse\Yoda\Box\Navigation $navigation;
-    public \Yggverse\Yoda\Label\Content $content;
-    public \Yggverse\Yoda\Label\Tray $tray;
+    public \Yggverse\Yoda\Entity\Box\Menu $menu;
+    public \Yggverse\Yoda\Entity\Box\Navigation $navigation;
+    public \Yggverse\Yoda\Entity\Label\Content $content;
+    public \Yggverse\Yoda\Entity\Label\Tray $tray;
 
     public \Yggverse\Yoda\Model\Memory $memory;
 
@@ -42,7 +42,7 @@ class Tab
         );
 
         // Init dependencies
-        $this->menu = new \Yggverse\Yoda\Box\Menu();
+        $this->menu = new \Yggverse\Yoda\Entity\Box\Menu();
 
         $this->box->pack_start(
             $this->menu->box,
@@ -51,7 +51,7 @@ class Tab
             0
         );
 
-        $this->navigation = new \Yggverse\Yoda\Box\Navigation();
+        $this->navigation = new \Yggverse\Yoda\Entity\Box\Navigation();
 
         $this->box->pack_start(
             $this->navigation->box,
@@ -60,7 +60,7 @@ class Tab
             8
         );
 
-        $this->content = new \Yggverse\Yoda\Label\Content();
+        $this->content = new \Yggverse\Yoda\Entity\Label\Content();
 
         $scroll = new \GtkScrolledWindow();
 
@@ -75,7 +75,7 @@ class Tab
             10
         );
 
-        $this->tray = new \Yggverse\Yoda\Label\Tray();
+        $this->tray = new \Yggverse\Yoda\Entity\Label\Tray();
 
         $this->box->pack_start(
             $this->tray->label,
diff --git a/src/Button/Back.php b/src/Entity/Button/Back.php
similarity index 85%
rename from src/Button/Back.php
rename to src/Entity/Button/Back.php
index acd131ae..e8b961f8 100644
--- a/src/Button/Back.php
+++ b/src/Entity/Button/Back.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yggverse\Yoda\Button;
+namespace Yggverse\Yoda\Entity\Button;
 
 class Back
 {
diff --git a/src/Button/Forward.php b/src/Entity/Button/Forward.php
similarity index 86%
rename from src/Button/Forward.php
rename to src/Entity/Button/Forward.php
index 6619b689..47416fd0 100644
--- a/src/Button/Forward.php
+++ b/src/Entity/Button/Forward.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yggverse\Yoda\Button;
+namespace Yggverse\Yoda\Entity\Button;
 
 class Forward
 {
diff --git a/src/Button/Go.php b/src/Entity/Button/Go.php
similarity index 85%
rename from src/Button/Go.php
rename to src/Entity/Button/Go.php
index 5c5fdc1c..da09c427 100644
--- a/src/Button/Go.php
+++ b/src/Entity/Button/Go.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yggverse\Yoda\Button;
+namespace Yggverse\Yoda\Entity\Button;
 
 class Go
 {
diff --git a/src/Button/Home.php b/src/Entity/Button/Home.php
similarity index 85%
rename from src/Button/Home.php
rename to src/Entity/Button/Home.php
index d4194079..1c94f1f9 100644
--- a/src/Button/Home.php
+++ b/src/Entity/Button/Home.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yggverse\Yoda\Button;
+namespace Yggverse\Yoda\Entity\Button;
 
 class Home
 {
diff --git a/src/Button/Reload.php b/src/Entity/Button/Reload.php
similarity index 85%
rename from src/Button/Reload.php
rename to src/Entity/Button/Reload.php
index 2f97768f..37b74b04 100644
--- a/src/Button/Reload.php
+++ b/src/Entity/Button/Reload.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yggverse\Yoda\Button;
+namespace Yggverse\Yoda\Entity\Button;
 
 class Reload
 {
diff --git a/src/Entry/Address.php b/src/Entity/Entry/Address.php
similarity index 92%
rename from src/Entry/Address.php
rename to src/Entity/Entry/Address.php
index 987f0b35..7d037643 100644
--- a/src/Entry/Address.php
+++ b/src/Entity/Entry/Address.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yggverse\Yoda\Entry;
+namespace Yggverse\Yoda\Entity\Entry;
 
 class Address
 {
diff --git a/src/Label/Content.php b/src/Entity/Label/Content.php
similarity index 92%
rename from src/Label/Content.php
rename to src/Entity/Label/Content.php
index 7fedccc8..4211dfe7 100644
--- a/src/Label/Content.php
+++ b/src/Entity/Label/Content.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yggverse\Yoda\Label;
+namespace Yggverse\Yoda\Entity\Label;
 
 class Content
 {
diff --git a/src/Label/Tray.php b/src/Entity/Label/Tray.php
similarity index 92%
rename from src/Label/Tray.php
rename to src/Entity/Label/Tray.php
index d659b756..824a8251 100644
--- a/src/Label/Tray.php
+++ b/src/Entity/Label/Tray.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yggverse\Yoda\Label;
+namespace Yggverse\Yoda\Entity\Label;
 
 class Tray
 {
diff --git a/src/Menu/Bar/Main.php b/src/Entity/Menu/Bar/Main.php
similarity index 59%
rename from src/Menu/Bar/Main.php
rename to src/Entity/Menu/Bar/Main.php
index ec7b0e8b..c4c56751 100644
--- a/src/Menu/Bar/Main.php
+++ b/src/Entity/Menu/Bar/Main.php
@@ -2,19 +2,19 @@
 
 declare(strict_types=1);
 
-namespace Yggverse\Yoda\Menu\Bar;
+namespace Yggverse\Yoda\Entity\Menu\Bar;
 
 class Main
 {
     public \GtkMenuBar $bar;
 
-    public \Yggverse\Yoda\Menu\Item\Yoda $yoda;
+    public \Yggverse\Yoda\Entity\Menu\Item\Yoda $yoda;
 
     public function __construct()
     {
         $this->bar = new \GtkMenuBar();
 
-        $this->yoda = new \Yggverse\Yoda\Menu\Item\Yoda();
+        $this->yoda = new \Yggverse\Yoda\Entity\Menu\Item\Yoda();
 
         $this->bar->append(
             $this->yoda->item
diff --git a/src/Menu/Item/Quit.php b/src/Entity/Menu/Item/Quit.php
similarity index 91%
rename from src/Menu/Item/Quit.php
rename to src/Entity/Menu/Item/Quit.php
index 9a89db32..58f25e38 100644
--- a/src/Menu/Item/Quit.php
+++ b/src/Entity/Menu/Item/Quit.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yggverse\Yoda\Menu\Item;
+namespace Yggverse\Yoda\Entity\Menu\Item;
 
 class Quit
 {
diff --git a/src/Menu/Item/Yoda.php b/src/Entity/Menu/Item/Yoda.php
similarity index 79%
rename from src/Menu/Item/Yoda.php
rename to src/Entity/Menu/Item/Yoda.php
index 62dec923..f51baaae 100644
--- a/src/Menu/Item/Yoda.php
+++ b/src/Entity/Menu/Item/Yoda.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yggverse\Yoda\Menu\Item;
+namespace Yggverse\Yoda\Entity\Menu\Item;
 
 class Yoda
 {
@@ -16,7 +16,7 @@ class Yoda
 
         $children = new \GtkMenu();
 
-        $quit = new \Yggverse\Yoda\Menu\Item\Quit();
+        $quit = new \Yggverse\Yoda\Entity\Menu\Item\Quit();
 
         $children->append(
             $quit->item
diff --git a/src/Yoda.php b/src/Yoda.php
index 8b92dc33..cb91f0c6 100644
--- a/src/Yoda.php
+++ b/src/Yoda.php
@@ -61,7 +61,7 @@ $window->connect(
     }
 );
 
-$tab = new \Yggverse\Yoda\Box\Tab(
+$tab = new \Yggverse\Yoda\Entity\Box\Tab(
     $window
 );