diff --git a/src/Entity/Browser/Header.php b/src/Entity/Browser/Header.php
index 2e4dfeca..0d8c56d4 100644
--- a/src/Entity/Browser/Header.php
+++ b/src/Entity/Browser/Header.php
@@ -42,7 +42,7 @@ class Header
             $this->_subtitle
         );
 
-        // Init navigation element
+        // Init navigation
         $this->navigation = new Navigation(
             $this
         );
diff --git a/src/Entity/Browser/Header/Navigation.php b/src/Entity/Browser/Header/Navigation.php
index 67390e60..0818c50e 100644
--- a/src/Entity/Browser/Header/Navigation.php
+++ b/src/Entity/Browser/Header/Navigation.php
@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace Yggverse\Yoda\Entity\Browser\Header;
 
-use \Yggverse\Yoda\Entity\Browser\Header\Navigation\Menu;
+use \Yggverse\Yoda\Entity\Browser\Menu;
 
 class Navigation
 {
@@ -14,7 +14,7 @@ class Navigation
     public \Yggverse\Yoda\Entity\Browser\Header $header;
 
     // Requirements
-    public \Yggverse\Yoda\Entity\Browser\Header\Navigation\Menu $menu;
+    public \Yggverse\Yoda\Entity\Browser\Menu $menu;
 
     public function __construct(
         \Yggverse\Yoda\Entity\Browser\Header $header
@@ -27,7 +27,7 @@ class Navigation
 
         // Init menu
         $this->menu = new Menu(
-            $this
+            $this->header->browser
         );
 
         $this->gtk->set_popup(
diff --git a/src/Entity/Browser/Header/Navigation/Menu.php b/src/Entity/Browser/Menu.php
similarity index 54%
rename from src/Entity/Browser/Header/Navigation/Menu.php
rename to src/Entity/Browser/Menu.php
index 94ca913c..93070893 100644
--- a/src/Entity/Browser/Header/Navigation/Menu.php
+++ b/src/Entity/Browser/Menu.php
@@ -2,27 +2,27 @@
 
 declare(strict_types=1);
 
-namespace Yggverse\Yoda\Entity\Browser\Header\Navigation;
+namespace Yggverse\Yoda\Entity\Browser;
 
-use \Yggverse\Yoda\Entity\Browser\Header\Navigation\Menu\History;
-use \Yggverse\Yoda\Entity\Browser\Header\Navigation\Menu\Quit;
+use \Yggverse\Yoda\Entity\Browser\Menu\History;
+use \Yggverse\Yoda\Entity\Browser\Menu\Quit;
 
 class Menu
 {
     public \GtkMenu $gtk;
 
     // Dependencies
-    public \Yggverse\Yoda\Entity\Browser\Header\Navigation $navigation;
+    public \Yggverse\Yoda\Entity\Browser $browser;
 
     // Requirements
-    public \Yggverse\Yoda\Entity\Browser\Header\Navigation\Menu\History $history;
-    public \Yggverse\Yoda\Entity\Browser\Header\Navigation\Menu\Quit $quit;
+    public \Yggverse\Yoda\Entity\Browser\Menu\History $history;
+    public \Yggverse\Yoda\Entity\Browser\Menu\Quit $quit;
 
     public function __construct(
-        \Yggverse\Yoda\Entity\Browser\Header\Navigation $navigation
+        \Yggverse\Yoda\Entity\Browser $browser
     ) {
         // Init dependencies
-        $this->navigation = $navigation;
+        $this->browser = $browser;
 
         // Init menu
         $this->gtk = new \GtkMenu;
diff --git a/src/Entity/Browser/Header/Navigation/Menu/History.php b/src/Entity/Browser/Menu/History.php
similarity index 71%
rename from src/Entity/Browser/Header/Navigation/Menu/History.php
rename to src/Entity/Browser/Menu/History.php
index 63f3ba20..395b2a05 100644
--- a/src/Entity/Browser/Header/Navigation/Menu/History.php
+++ b/src/Entity/Browser/Menu/History.php
@@ -2,20 +2,20 @@
 
 declare(strict_types=1);
 
-namespace Yggverse\Yoda\Entity\Browser\Header\Navigation\Menu;
+namespace Yggverse\Yoda\Entity\Browser\Menu;
 
 class History
 {
     public \GtkMenuItem $gtk;
 
     // Dependencies
-    public \Yggverse\Yoda\Entity\Browser\Header\Navigation\Menu $menu;
+    public \Yggverse\Yoda\Entity\Browser\Menu $menu;
 
     // Defaults
     private string $_label = 'History';
 
     public function __construct(
-        \Yggverse\Yoda\Entity\Browser\Header\Navigation\Menu $menu
+        \Yggverse\Yoda\Entity\Browser\Menu $menu
     ) {
         // Init dependencies
         $this->menu = $menu;
@@ -31,7 +31,7 @@ class History
             function()
             {
                 $history = new \Yggverse\Yoda\Entity\Browser\History(
-                    $this->menu->navigation->header->browser
+                    $this->menu->browser
                 );
 
                 $history->gtk->show_all();
diff --git a/src/Entity/Browser/Header/Navigation/Menu/Quit.php b/src/Entity/Browser/Menu/Quit.php
similarity index 73%
rename from src/Entity/Browser/Header/Navigation/Menu/Quit.php
rename to src/Entity/Browser/Menu/Quit.php
index c1db1c6b..3a6d7431 100644
--- a/src/Entity/Browser/Header/Navigation/Menu/Quit.php
+++ b/src/Entity/Browser/Menu/Quit.php
@@ -2,20 +2,20 @@
 
 declare(strict_types=1);
 
-namespace Yggverse\Yoda\Entity\Browser\Header\Navigation\Menu;
+namespace Yggverse\Yoda\Entity\Browser\Menu;
 
 class Quit
 {
     public \GtkMenuItem $gtk;
 
     // Dependencies
-    public \Yggverse\Yoda\Entity\Browser\Header\Navigation\Menu $menu;
+    public \Yggverse\Yoda\Entity\Browser\Menu $menu;
 
     // Defaults
     private string $_label = 'Quit';
 
     public function __construct(
-        \Yggverse\Yoda\Entity\Browser\Header\Navigation\Menu $menu
+        \Yggverse\Yoda\Entity\Browser\Menu $menu
     ) {
         // Init dependencies
         $this->menu = $menu;