diff --git a/atom.gyp b/atom.gyp
index dd634957e..9ceabcb93 100644
--- a/atom.gyp
+++ b/atom.gyp
@@ -73,10 +73,6 @@
       'atom/browser/auto_updater_linux.cc',
       'atom/browser/auto_updater_mac.mm',
       'atom/browser/auto_updater_win.cc',
-      'atom/browser/atom_application_mac.h',
-      'atom/browser/atom_application_mac.mm',
-      'atom/browser/atom_application_delegate_mac.h',
-      'atom/browser/atom_application_delegate_mac.mm',
       'atom/browser/atom_browser_client.cc',
       'atom/browser/atom_browser_client.h',
       'atom/browser/atom_browser_context.cc',
@@ -96,6 +92,10 @@
       'atom/browser/devtools_delegate.h',
       'atom/browser/devtools_web_contents_observer.cc',
       'atom/browser/devtools_web_contents_observer.h',
+      'atom/browser/mac/atom_application.h',
+      'atom/browser/mac/atom_application.mm',
+      'atom/browser/mac/atom_application_delegate.h',
+      'atom/browser/mac/atom_application_delegate.mm',
       'atom/browser/native_window.cc',
       'atom/browser/native_window.h',
       'atom/browser/native_window_gtk.cc',
diff --git a/atom/browser/atom_browser_main_parts_mac.mm b/atom/browser/atom_browser_main_parts_mac.mm
index 2f2614542..b32e74b43 100644
--- a/atom/browser/atom_browser_main_parts_mac.mm
+++ b/atom/browser/atom_browser_main_parts_mac.mm
@@ -4,10 +4,10 @@
 
 #include "atom/browser/atom_browser_main_parts.h"
 
+#import "atom/browser/mac/atom_application.h"
+#import "atom/browser/mac/atom_application_delegate.h"
 #include "base/files/file_path.h"
 #import "base/mac/foundation_util.h"
-#import "atom/browser/atom_application_mac.h"
-#import "atom/browser/atom_application_delegate_mac.h"
 #import "vendor/brightray/common/mac/main_application_bundle.h"
 
 namespace atom {
diff --git a/atom/browser/browser_mac.mm b/atom/browser/browser_mac.mm
index a0ee535fa..f193509cd 100644
--- a/atom/browser/browser_mac.mm
+++ b/atom/browser/browser_mac.mm
@@ -6,7 +6,7 @@
 
 #import "base/mac/bundle_locations.h"
 #include "base/strings/sys_string_conversions.h"
-#import "atom/browser/atom_application_mac.h"
+#import "atom/browser/mac/atom_application.h"
 
 namespace atom {
 
diff --git a/atom/browser/atom_application_mac.h b/atom/browser/mac/atom_application.h
similarity index 100%
rename from atom/browser/atom_application_mac.h
rename to atom/browser/mac/atom_application.h
diff --git a/atom/browser/atom_application_mac.mm b/atom/browser/mac/atom_application.mm
similarity index 96%
rename from atom/browser/atom_application_mac.mm
rename to atom/browser/mac/atom_application.mm
index 6a055b15a..cbcba3038 100644
--- a/atom/browser/atom_application_mac.mm
+++ b/atom/browser/mac/atom_application.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.
 
-#import "atom/browser/atom_application_mac.h"
+#import "atom/browser/mac/atom_application.h"
 
 #include "base/auto_reset.h"
 #include "base/strings/sys_string_conversions.h"
diff --git a/atom/browser/atom_application_delegate_mac.h b/atom/browser/mac/atom_application_delegate.h
similarity index 100%
rename from atom/browser/atom_application_delegate_mac.h
rename to atom/browser/mac/atom_application_delegate.h
diff --git a/atom/browser/atom_application_delegate_mac.mm b/atom/browser/mac/atom_application_delegate.mm
similarity index 92%
rename from atom/browser/atom_application_delegate_mac.mm
rename to atom/browser/mac/atom_application_delegate.mm
index 9dfb86565..be00b4473 100644
--- a/atom/browser/atom_application_delegate_mac.mm
+++ b/atom/browser/mac/atom_application_delegate.mm
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "atom/browser/atom_application_delegate_mac.h"
+#import "atom/browser/mac/atom_application_delegate.h"
 
-#include "base/strings/sys_string_conversions.h"
-#import "atom/browser/atom_application_mac.h"
+#import "atom/browser/mac/atom_application.h"
 #include "atom/browser/browser.h"
+#include "base/strings/sys_string_conversions.h"
 
 @implementation AtomApplicationDelegate