diff --git a/atom.gyp b/atom.gyp
index f418c43d9..f05d2cd53 100644
--- a/atom.gyp
+++ b/atom.gyp
@@ -91,12 +91,6 @@
       'browser/crash_reporter.h',
       'browser/crash_reporter_mac.mm',
       'browser/crash_reporter_win.cc',
-      'browser/file_dialog.h',
-      'browser/file_dialog_mac.mm',
-      'browser/file_dialog_win.cc',
-      'browser/message_box.h',
-      'browser/message_box_mac.mm',
-      'browser/message_box_win.cc',
       'browser/native_window.cc',
       'browser/native_window.h',
       'browser/native_window_mac.h',
@@ -106,6 +100,12 @@
       'browser/native_window_observer.h',
       'browser/nsalert_synchronous_sheet.h',
       'browser/nsalert_synchronous_sheet.mm',
+      'browser/ui/file_dialog.h',
+      'browser/ui/file_dialog_mac.mm',
+      'browser/ui/file_dialog_win.cc',
+      'browser/ui/message_box.h',
+      'browser/ui/message_box_mac.mm',
+      'browser/ui/message_box_win.cc',
       'browser/window_list.cc',
       'browser/window_list.h',
       'browser/window_list_observer.h',
diff --git a/browser/api/atom_api_dialog.cc b/browser/api/atom_api_dialog.cc
index 376338727..69b0135b2 100644
--- a/browser/api/atom_api_dialog.cc
+++ b/browser/api/atom_api_dialog.cc
@@ -9,9 +9,9 @@
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "browser/api/atom_api_window.h"
-#include "browser/file_dialog.h"
-#include "browser/message_box.h"
 #include "browser/native_window.h"
+#include "browser/ui/file_dialog.h"
+#include "browser/ui/message_box.h"
 
 namespace atom {
 
diff --git a/browser/file_dialog.h b/browser/ui/file_dialog.h
similarity index 89%
rename from browser/file_dialog.h
rename to browser/ui/file_dialog.h
index 6f60de119..67b526f78 100644
--- a/browser/file_dialog.h
+++ b/browser/ui/file_dialog.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BROWSER_FILE_DIALOG_H_
-#define BROWSER_FILE_DIALOG_H_
+#ifndef BROWSER_UI_FILE_DIALOG_H_
+#define BROWSER_UI_FILE_DIALOG_H_
 
 #include <string>
 #include <vector>
@@ -35,4 +35,4 @@ bool ShowSaveDialog(atom::NativeWindow* window,
 
 }  // namespace file_dialog
 
-#endif  // BROWSER_FILE_DIALOG_H_
+#endif  // BROWSER_UI_FILE_DIALOG_H_
diff --git a/browser/file_dialog_mac.mm b/browser/ui/file_dialog_mac.mm
similarity index 98%
rename from browser/file_dialog_mac.mm
rename to browser/ui/file_dialog_mac.mm
index 6e6cbb99c..d51be89a2 100644
--- a/browser/file_dialog_mac.mm
+++ b/browser/ui/file_dialog_mac.mm
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "browser/file_dialog.h"
+#include "browser/ui/file_dialog.h"
 
 #import <Cocoa/Cocoa.h>
 #include <CoreServices/CoreServices.h>
diff --git a/browser/file_dialog_win.cc b/browser/ui/file_dialog_win.cc
similarity index 99%
rename from browser/file_dialog_win.cc
rename to browser/ui/file_dialog_win.cc
index 4202f55b6..3a8776761 100644
--- a/browser/file_dialog_win.cc
+++ b/browser/ui/file_dialog_win.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "browser/file_dialog.h"
+#include "browser/ui/file_dialog.h"
 
 #include <windows.h>
 #include <commdlg.h>
diff --git a/browser/message_box.h b/browser/ui/message_box.h
similarity index 86%
rename from browser/message_box.h
rename to browser/ui/message_box.h
index 02094bedc..dfe7198ba 100644
--- a/browser/message_box.h
+++ b/browser/ui/message_box.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BROWSER_MESSAGE_BOX_H_
-#define BROWSER_MESSAGE_BOX_H_
+#ifndef BROWSER_UI_MESSAGE_BOX_H_
+#define BROWSER_UI_MESSAGE_BOX_H_
 
 #include <string>
 #include <vector>
@@ -27,4 +27,4 @@ int ShowMessageBox(NativeWindow* parent_window,
 
 }  // namespace atom
 
-#endif  // BROWSER_MESSAGE_BOX_H_
+#endif  // BROWSER_UI_MESSAGE_BOX_H_
diff --git a/browser/message_box_mac.mm b/browser/ui/message_box_mac.mm
similarity index 97%
rename from browser/message_box_mac.mm
rename to browser/ui/message_box_mac.mm
index 2272f8a58..f006ffb5e 100644
--- a/browser/message_box_mac.mm
+++ b/browser/ui/message_box_mac.mm
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "browser/message_box.h"
+#include "browser/ui/message_box.h"
 
 #import <Cocoa/Cocoa.h>
 
diff --git a/browser/message_box_win.cc b/browser/ui/message_box_win.cc
similarity index 99%
rename from browser/message_box_win.cc
rename to browser/ui/message_box_win.cc
index ccb6da5a9..49f84509b 100644
--- a/browser/message_box_win.cc
+++ b/browser/ui/message_box_win.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "browser/message_box.h"
+#include "browser/ui/message_box.h"
 
 #include "base/message_loop.h"
 #include "base/run_loop.h"