diff --git a/src/Application.vala b/src/Application.vala
index ce030a6..9e7a72c 100644
--- a/src/Application.vala
+++ b/src/Application.vala
@@ -68,7 +68,7 @@ static int main (string[] args) {
         return app.run (args);
     } else {
         var app_info = Webpin.DesktopFile.get_app_by_url (args[1]);
-        var app = new Webpin.WebAppWindow(app_info.get_display_name (), args[1]);
+        var app = new Webpin.WebWindow(app_info.get_display_name (), args[1]);
         app.show_all ();
     }
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d1fa984..2ff5b19 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,15 +2,15 @@ vala_precompile(VALA_C ${CMAKE_PROJECT_NAME}
     Widgets/ApplicationIcon.vala
     Widgets/ApplicationsView.vala
     Widgets/Assistant.vala
-    Application.vala
-    MainWindow.vala
-    DesktopFile.vala
-    InfoDialog.vala
+    Widgets/WebApp.vala
+    Widgets/WebBar.vala
+    Objects/DesktopFile.vala
+    Dialogs/InfoDialog.vala
     Settings.vala
     UrlEntry.vala
-    WebApp.vala
-    WebBar.vala
-    WebAppWindow.vala
+    MainWindow.vala
+    WebWindow.vala
+    Application.vala
 PACKAGES
     gtk+-3.0
     granite
diff --git a/src/InfoDialog.vala b/src/Dialogs/InfoDialog.vala
similarity index 100%
rename from src/InfoDialog.vala
rename to src/Dialogs/InfoDialog.vala
diff --git a/src/DesktopFile.vala b/src/Objects/DesktopFile.vala
similarity index 100%
rename from src/DesktopFile.vala
rename to src/Objects/DesktopFile.vala
diff --git a/src/WebAppWindow.vala b/src/WebWindow.vala
similarity index 98%
rename from src/WebAppWindow.vala
rename to src/WebWindow.vala
index 322b54a..b99503d 100644
--- a/src/WebAppWindow.vala
+++ b/src/WebWindow.vala
@@ -27,7 +27,7 @@
  */
 
 namespace Webpin {
-    public class WebAppWindow : Gtk.ApplicationWindow {
+    public class WebWindow : Gtk.ApplicationWindow {
 
         private bool is_full_screen = false;
 
@@ -37,7 +37,7 @@ namespace Webpin {
         private WebApp web_app;
         private WebBar headerbar;
 
-        public WebAppWindow (string webapp_name, string webapp_uri) {
+        public WebWindow (string webapp_name, string webapp_uri) {
 
             set_wmclass(webapp_uri, webapp_uri);
             web_app = new WebApp(webapp_name, webapp_uri);
diff --git a/src/WebApp.vala b/src/Widgets/WebApp.vala
similarity index 100%
rename from src/WebApp.vala
rename to src/Widgets/WebApp.vala
diff --git a/src/WebBar.vala b/src/Widgets/WebBar.vala
similarity index 100%
rename from src/WebBar.vala
rename to src/Widgets/WebBar.vala