diff --git a/src/Yoda/Browser.cpp b/src/Yoda/Browser.cpp
index ce3de75d..eed81774 100644
--- a/src/Yoda/Browser.cpp
+++ b/src/Yoda/Browser.cpp
@@ -1,6 +1,6 @@
 #include "Browser.h"
 
-YodaBrowser::YodaBrowser(
+Yoda::Browser::Browser(
     GtkApplication *application
 ) {
     this->gtk = gtk_application_window_new(
@@ -13,15 +13,15 @@ YodaBrowser::YodaBrowser(
         GTK_WINDOW(
             this->gtk
         ),
-        YodaBrowser::TITLE
+        Browser::TITLE
     );
 
     gtk_window_set_default_size(
         GTK_WINDOW(
             this->gtk
         ),
-        YodaBrowser::WIDTH,
-        YodaBrowser::HEIGHT
+        Browser::WIDTH,
+        Browser::HEIGHT
     );
 
     GtkWidget *label = gtk_label_new(
diff --git a/src/Yoda/Browser.h b/src/Yoda/Browser.h
index aca04d83..5081342b 100644
--- a/src/Yoda/Browser.h
+++ b/src/Yoda/Browser.h
@@ -3,19 +3,22 @@
 
 #include "../main.h"
 
-class YodaBrowser
+namespace Yoda
 {
-    public:
+    class Browser
+    {
+        public:
 
-        GtkWidget *gtk;
+            GtkWidget *gtk;
 
-        const guint WIDTH = 640;
-        const guint HEIGHT = 480;
-        const gchar* TITLE = "Yoda";
+            const guint WIDTH = 640;
+            const guint HEIGHT = 480;
+            const gchar* TITLE = "Yoda";
 
-        YodaBrowser(
-            GtkApplication *application
-        );
+            Browser(
+                GtkApplication *application
+            );
+    };
 };
 
 #endif
\ No newline at end of file
diff --git a/src/main.cpp b/src/main.cpp
index 17db6133..4dcbc9a9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4,7 +4,7 @@ void activate(
     GtkApplication *application
 ) {
     // Init default component
-    new YodaBrowser(
+    new Yoda::Browser(
         application
     );
 }