diff --git a/atom.gyp b/atom.gyp
index 28b53e826a2..9956f0096e1 100644
--- a/atom.gyp
+++ b/atom.gyp
@@ -8,7 +8,7 @@
       'app/atom_main.h',
     ],
     'bundle_sources': [
-      'browser/mac/atom.icns',
+      'browser/resources/mac/atom.icns',
     ],
     'coffee_sources': [
       'browser/api/lib/app.coffee',
@@ -191,9 +191,9 @@
     'conditions': [
       ['OS=="win"', {
         'app_sources': [
-          'app/win/resource.h',
-          'app/win/atom.ico',
-          'app/win/atom.rc',
+          'browser/resources/win/resource.h',
+          'browser/resources/win/atom.ico',
+          'browser/resources/win/atom.rc',
           '<(libchromiumcontent_src_dir)/content/app/startup_helper_win.cc',
         ],
       }],  # OS=="win"
@@ -249,7 +249,7 @@
             '<(project_name)_helper',
           ],
           'xcode_settings': {
-            'INFOPLIST_FILE': 'browser/mac/Info.plist',
+            'INFOPLIST_FILE': 'browser/resources/mac/Info.plist',
             'LD_RUNPATH_SEARCH_PATHS': [
               '@executable_path/../Frameworks',
             ],
@@ -499,11 +499,11 @@
           },
           'mac_bundle': 1,
           'mac_bundle_resources': [
-            'browser/mac/MainMenu.xib',
+            'common/resources/mac/MainMenu.xib',
             '<(libchromiumcontent_resources_dir)/content_shell.pak',
           ],
           'xcode_settings': {
-            'INFOPLIST_FILE': 'common/mac/Info.plist',
+            'INFOPLIST_FILE': 'common/resources/mac/Info.plist',
             'LIBRARY_SEARCH_PATHS': [
               '<(libchromiumcontent_library_dir)',
             ],
@@ -564,7 +564,7 @@
           ],
           'mac_bundle': 1,
           'xcode_settings': {
-            'INFOPLIST_FILE': 'renderer/mac/Info.plist',
+            'INFOPLIST_FILE': 'renderer/resources/mac/Info.plist',
             'LD_RUNPATH_SEARCH_PATHS': [
               '@executable_path/../../..',
             ],
diff --git a/browser/mac/Info.plist b/browser/resources/mac/Info.plist
similarity index 100%
rename from browser/mac/Info.plist
rename to browser/resources/mac/Info.plist
diff --git a/browser/mac/atom.icns b/browser/resources/mac/atom.icns
similarity index 100%
rename from browser/mac/atom.icns
rename to browser/resources/mac/atom.icns
diff --git a/app/win/atom.ico b/browser/resources/win/atom.ico
similarity index 100%
rename from app/win/atom.ico
rename to browser/resources/win/atom.ico
diff --git a/app/win/atom.rc b/browser/resources/win/atom.rc
similarity index 100%
rename from app/win/atom.rc
rename to browser/resources/win/atom.rc
diff --git a/app/win/resource.h b/browser/resources/win/resource.h
similarity index 100%
rename from app/win/resource.h
rename to browser/resources/win/resource.h
diff --git a/common/mac/Info.plist b/common/resources/mac/Info.plist
similarity index 100%
rename from common/mac/Info.plist
rename to common/resources/mac/Info.plist
diff --git a/browser/mac/MainMenu.xib b/common/resources/mac/MainMenu.xib
similarity index 100%
rename from browser/mac/MainMenu.xib
rename to common/resources/mac/MainMenu.xib
diff --git a/renderer/mac/Info.plist b/renderer/resources/mac/Info.plist
similarity index 100%
rename from renderer/mac/Info.plist
rename to renderer/resources/mac/Info.plist
diff --git a/script/bump-version.py b/script/bump-version.py
index 7d5f52f5d2d..1baaf355755 100755
--- a/script/bump-version.py
+++ b/script/bump-version.py
@@ -71,7 +71,7 @@ def update_win_rc(version, versions):
   pattern_fvs = re.compile(' *VALUE "FileVersion", "[0-9.]+"')
   pattern_pvs = re.compile(' *VALUE "ProductVersion", "[0-9.]+"')
 
-  win_rc = os.path.join('app', 'win', 'atom.rc')
+  win_rc = os.path.join('browser', 'resources', 'win', 'atom.rc')
   with open(win_rc, 'r') as f:
     lines = f.readlines()
 
@@ -109,7 +109,7 @@ def update_version_h(versions):
 
 
 def update_info_plist(version):
-  info_plist = os.path.join('browser', 'mac', 'Info.plist')
+  info_plist = os.path.join('browser', 'resources', 'mac', 'Info.plist')
   with open(info_plist, 'r') as f:
     lines = f.readlines()