Move all sources under atom/.

atom.gyp

@@ -4,225 +4,225 @@
     'product_name': 'Atom',
     'framework_name': 'Atom Framework',
     'app_sources': [
-      'app/atom_main.cc',
-      'app/atom_main.h',
+      'atom/app/atom_main.cc',
+      'atom/app/atom_main.h',
     ],
     'bundle_sources': [
-      'browser/resources/mac/atom.icns',
+      'atom/browser/resources/mac/atom.icns',
     ],
     'coffee_sources': [
-      'browser/api/lib/app.coffee',
-      'browser/api/lib/atom-delegate.coffee',
-      'browser/api/lib/auto-updater.coffee',
-      'browser/api/lib/browser-window.coffee',
-      'browser/api/lib/dialog.coffee',
-      'browser/api/lib/ipc.coffee',
-      'browser/api/lib/menu.coffee',
-      'browser/api/lib/menu-item.coffee',
-      'browser/api/lib/power-monitor.coffee',
-      'browser/api/lib/protocol.coffee',
-      'browser/lib/init.coffee',
-      'browser/lib/objects-registry.coffee',
-      'browser/lib/rpc-server.coffee',
-      'common/api/lib/callbacks-registry.coffee',
-      'common/api/lib/clipboard.coffee',
-      'common/api/lib/crash-reporter.coffee',
-      'common/api/lib/id-weak-map.coffee',
-      'common/api/lib/screen.coffee',
-      'common/api/lib/shell.coffee',
-      'common/lib/init.coffee',
-      'renderer/lib/init.coffee',
-      'renderer/lib/override.coffee',
-      'renderer/api/lib/ipc.coffee',
-      'renderer/api/lib/remote.coffee',
+      'atom/browser/api/lib/app.coffee',
+      'atom/browser/api/lib/atom-delegate.coffee',
+      'atom/browser/api/lib/auto-updater.coffee',
+      'atom/browser/api/lib/browser-window.coffee',
+      'atom/browser/api/lib/dialog.coffee',
+      'atom/browser/api/lib/ipc.coffee',
+      'atom/browser/api/lib/menu.coffee',
+      'atom/browser/api/lib/menu-item.coffee',
+      'atom/browser/api/lib/power-monitor.coffee',
+      'atom/browser/api/lib/protocol.coffee',
+      'atom/browser/lib/init.coffee',
+      'atom/browser/lib/objects-registry.coffee',
+      'atom/browser/lib/rpc-server.coffee',
+      'atom/common/api/lib/callbacks-registry.coffee',
+      'atom/common/api/lib/clipboard.coffee',
+      'atom/common/api/lib/crash-reporter.coffee',
+      'atom/common/api/lib/id-weak-map.coffee',
+      'atom/common/api/lib/screen.coffee',
+      'atom/common/api/lib/shell.coffee',
+      'atom/common/lib/init.coffee',
+      'atom/renderer/lib/init.coffee',
+      'atom/renderer/lib/override.coffee',
+      'atom/renderer/api/lib/ipc.coffee',
+      'atom/renderer/api/lib/remote.coffee',
     ],
     'lib_sources': [
-      'app/atom_main_delegate.cc',
-      'app/atom_main_delegate.h',
-      'app/atom_main_delegate_mac.mm',
-      'browser/api/atom_api_app.cc',
-      'browser/api/atom_api_app.h',
-      'browser/api/atom_api_auto_updater.cc',
-      'browser/api/atom_api_auto_updater.h',
-      'browser/api/atom_api_browser_ipc.cc',
-      'browser/api/atom_api_browser_ipc.h',
-      'browser/api/atom_api_dialog.cc',
-      'browser/api/atom_api_dialog.h',
-      'browser/api/atom_api_event.cc',
-      'browser/api/atom_api_event.h',
-      'browser/api/atom_api_menu.cc',
-      'browser/api/atom_api_menu.h',
-      'browser/api/atom_api_menu_gtk.cc',
-      'browser/api/atom_api_menu_gtk.h',
-      'browser/api/atom_api_menu_mac.h',
-      'browser/api/atom_api_menu_mac.mm',
-      'browser/api/atom_api_menu_win.cc',
-      'browser/api/atom_api_menu_win.h',
-      'browser/api/atom_api_power_monitor.cc',
-      'browser/api/atom_api_power_monitor.h',
-      'browser/api/atom_api_protocol.cc',
-      'browser/api/atom_api_protocol.h',
-      'browser/api/atom_api_window.cc',
-      'browser/api/atom_api_window.h',
-      'browser/api/atom_browser_bindings.cc',
-      'browser/api/atom_browser_bindings.h',
-      'browser/auto_updater.cc',
-      'browser/auto_updater.h',
-      'browser/auto_updater_delegate.h',
-      'browser/auto_updater_linux.cc',
-      'browser/auto_updater_mac.mm',
-      'browser/auto_updater_win.cc',
-      'browser/atom_application_mac.h',
-      'browser/atom_application_mac.mm',
-      'browser/atom_application_delegate_mac.h',
-      'browser/atom_application_delegate_mac.mm',
-      'browser/atom_browser_client.cc',
-      'browser/atom_browser_client.h',
-      'browser/atom_browser_context.cc',
-      'browser/atom_browser_context.h',
-      'browser/atom_browser_main_parts.cc',
-      'browser/atom_browser_main_parts.h',
-      'browser/atom_browser_main_parts_mac.mm',
-      'browser/atom_javascript_dialog_manager.cc',
-      'browser/atom_javascript_dialog_manager.h',
-      'browser/browser.cc',
-      'browser/browser.h',
-      'browser/browser_linux.cc',
-      'browser/browser_mac.mm',
-      'browser/browser_win.cc',
-      'browser/browser_observer.h',
-      'browser/devtools_delegate.cc',
-      'browser/devtools_delegate.h',
-      'browser/native_window.cc',
-      'browser/native_window.h',
-      'browser/native_window_gtk.cc',
-      'browser/native_window_gtk.h',
-      'browser/native_window_mac.h',
-      'browser/native_window_mac.mm',
-      'browser/native_window_win.cc',
-      'browser/native_window_win.h',
-      'browser/native_window_observer.h',
-      'browser/net/adapter_request_job.cc',
-      'browser/net/adapter_request_job.h',
-      'browser/net/atom_url_request_context_getter.cc',
-      'browser/net/atom_url_request_context_getter.h',
-      'browser/net/atom_url_request_job_factory.cc',
-      'browser/net/atom_url_request_job_factory.h',
-      'browser/net/url_request_string_job.cc',
-      'browser/net/url_request_string_job.h',
-      'browser/ui/accelerator_util.cc',
-      'browser/ui/accelerator_util.h',
-      'browser/ui/accelerator_util_gtk.cc',
-      'browser/ui/accelerator_util_mac.mm',
-      'browser/ui/accelerator_util_win.cc',
-      'browser/ui/cocoa/atom_menu_controller.h',
-      'browser/ui/cocoa/atom_menu_controller.mm',
-      'browser/ui/cocoa/event_processing_window.h',
-      'browser/ui/cocoa/event_processing_window.mm',
-      'browser/ui/file_dialog.h',
-      'browser/ui/file_dialog_gtk.cc',
-      'browser/ui/file_dialog_mac.mm',
-      'browser/ui/file_dialog_win.cc',
-      'browser/ui/gtk/gtk_custom_menu.cc',
-      'browser/ui/gtk/gtk_custom_menu.h',
-      'browser/ui/gtk/gtk_custom_menu_item.cc',
-      'browser/ui/gtk/gtk_custom_menu_item.h',
-      'browser/ui/gtk/gtk_util.cc',
-      'browser/ui/gtk/gtk_util.h',
-      'browser/ui/gtk/gtk_window_util.cc',
-      'browser/ui/gtk/gtk_window_util.h',
-      'browser/ui/gtk/event_utils.cc',
-      'browser/ui/gtk/event_utils.h',
-      'browser/ui/gtk/menu_gtk.cc',
-      'browser/ui/gtk/menu_gtk.h',
-      'browser/ui/message_box.h',
-      'browser/ui/message_box_gtk.cc',
-      'browser/ui/message_box_mac.mm',
-      'browser/ui/message_box_win.cc',
-      'browser/ui/win/menu_2.cc',
-      'browser/ui/win/menu_2.h',
-      'browser/ui/win/native_menu_win.cc',
-      'browser/ui/win/native_menu_win.h',
-      'browser/window_list.cc',
-      'browser/window_list.h',
-      'browser/window_list_observer.h',
-      'common/api/api_messages.cc',
-      'common/api/api_messages.h',
-      'common/api/atom_api_clipboard.cc',
-      'common/api/atom_api_clipboard.h',
-      'common/api/atom_api_crash_reporter.cc',
-      'common/api/atom_api_crash_reporter.h',
-      'common/api/atom_api_event_emitter.cc',
-      'common/api/atom_api_event_emitter.h',
-      'common/api/atom_api_id_weak_map.cc',
-      'common/api/atom_api_id_weak_map.h',
-      'common/api/atom_api_screen.cc',
-      'common/api/atom_api_screen.h',
-      'common/api/atom_api_shell.cc',
-      'common/api/atom_api_shell.h',
-      'common/api/atom_api_v8_util.cc',
-      'common/api/atom_bindings.cc',
-      'common/api/atom_bindings.h',
-      'common/api/atom_extensions.cc',
-      'common/api/atom_extensions.h',
-      'common/api/object_life_monitor.cc',
-      'common/api/object_life_monitor.h',
-      'common/crash_reporter/crash_reporter.cc',
-      'common/crash_reporter/crash_reporter.h',
-      'common/crash_reporter/crash_reporter_linux.cc',
-      'common/crash_reporter/crash_reporter_linux.h',
-      'common/crash_reporter/crash_reporter_mac.h',
-      'common/crash_reporter/crash_reporter_mac.mm',
-      'common/crash_reporter/crash_reporter_win.cc',
-      'common/crash_reporter/crash_reporter_win.h',
-      'common/crash_reporter/linux/crash_dump_handler.cc',
-      'common/crash_reporter/linux/crash_dump_handler.h',
-      'common/crash_reporter/win/crash_service.cc',
-      'common/crash_reporter/win/crash_service.h',
-      'common/crash_reporter/win/crash_service_main.cc',
-      'common/crash_reporter/win/crash_service_main.h',
-      'common/draggable_region.cc',
-      'common/draggable_region.h',
-      'common/linux/application_info.cc',
-      'common/node_bindings.cc',
-      'common/node_bindings.h',
-      'common/node_bindings_linux.cc',
-      'common/node_bindings_linux.h',
-      'common/node_bindings_mac.cc',
-      'common/node_bindings_mac.h',
-      'common/node_bindings_win.cc',
-      'common/node_bindings_win.h',
-      'common/options_switches.cc',
-      'common/options_switches.h',
-      'common/platform_util.h',
-      'common/platform_util_linux.cc',
-      'common/platform_util_mac.mm',
-      'common/platform_util_win.cc',
-      'common/swap_or_assign.h',
-      'common/v8/node_common.h',
-      'common/v8/scoped_persistent.h',
-      'common/v8/native_type_conversions.h',
-      'common/v8/v8_value_converter.cc',
-      'common/v8/v8_value_converter.h',
-      'renderer/api/atom_api_renderer_ipc.cc',
-      'renderer/api/atom_api_renderer_ipc.h',
-      'renderer/api/atom_renderer_bindings.cc',
-      'renderer/api/atom_renderer_bindings.h',
-      'renderer/atom_render_view_observer.cc',
-      'renderer/atom_render_view_observer.h',
-      'renderer/atom_renderer_client.cc',
-      'renderer/atom_renderer_client.h',
+      'atom/app/atom_main_delegate.cc',
+      'atom/app/atom_main_delegate.h',
+      'atom/app/atom_main_delegate_mac.mm',
+      'atom/browser/api/atom_api_app.cc',
+      'atom/browser/api/atom_api_app.h',
+      'atom/browser/api/atom_api_auto_updater.cc',
+      'atom/browser/api/atom_api_auto_updater.h',
+      'atom/browser/api/atom_api_browser_ipc.cc',
+      'atom/browser/api/atom_api_browser_ipc.h',
+      'atom/browser/api/atom_api_dialog.cc',
+      'atom/browser/api/atom_api_dialog.h',
+      'atom/browser/api/atom_api_event.cc',
+      'atom/browser/api/atom_api_event.h',
+      'atom/browser/api/atom_api_menu.cc',
+      'atom/browser/api/atom_api_menu.h',
+      'atom/browser/api/atom_api_menu_gtk.cc',
+      'atom/browser/api/atom_api_menu_gtk.h',
+      'atom/browser/api/atom_api_menu_mac.h',
+      'atom/browser/api/atom_api_menu_mac.mm',
+      'atom/browser/api/atom_api_menu_win.cc',
+      'atom/browser/api/atom_api_menu_win.h',
+      'atom/browser/api/atom_api_power_monitor.cc',
+      'atom/browser/api/atom_api_power_monitor.h',
+      'atom/browser/api/atom_api_protocol.cc',
+      'atom/browser/api/atom_api_protocol.h',
+      'atom/browser/api/atom_api_window.cc',
+      'atom/browser/api/atom_api_window.h',
+      'atom/browser/api/atom_browser_bindings.cc',
+      'atom/browser/api/atom_browser_bindings.h',
+      'atom/browser/auto_updater.cc',
+      'atom/browser/auto_updater.h',
+      'atom/browser/auto_updater_delegate.h',
+      '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',
+      'atom/browser/atom_browser_context.h',
+      'atom/browser/atom_browser_main_parts.cc',
+      'atom/browser/atom_browser_main_parts.h',
+      'atom/browser/atom_browser_main_parts_mac.mm',
+      'atom/browser/atom_javascript_dialog_manager.cc',
+      'atom/browser/atom_javascript_dialog_manager.h',
+      'atom/browser/browser.cc',
+      'atom/browser/browser.h',
+      'atom/browser/browser_linux.cc',
+      'atom/browser/browser_mac.mm',
+      'atom/browser/browser_win.cc',
+      'atom/browser/browser_observer.h',
+      'atom/browser/devtools_delegate.cc',
+      'atom/browser/devtools_delegate.h',
+      'atom/browser/native_window.cc',
+      'atom/browser/native_window.h',
+      'atom/browser/native_window_gtk.cc',
+      'atom/browser/native_window_gtk.h',
+      'atom/browser/native_window_mac.h',
+      'atom/browser/native_window_mac.mm',
+      'atom/browser/native_window_win.cc',
+      'atom/browser/native_window_win.h',
+      'atom/browser/native_window_observer.h',
+      'atom/browser/net/adapter_request_job.cc',
+      'atom/browser/net/adapter_request_job.h',
+      'atom/browser/net/atom_url_request_context_getter.cc',
+      'atom/browser/net/atom_url_request_context_getter.h',
+      'atom/browser/net/atom_url_request_job_factory.cc',
+      'atom/browser/net/atom_url_request_job_factory.h',
+      'atom/browser/net/url_request_string_job.cc',
+      'atom/browser/net/url_request_string_job.h',
+      'atom/browser/ui/accelerator_util.cc',
+      'atom/browser/ui/accelerator_util.h',
+      'atom/browser/ui/accelerator_util_gtk.cc',
+      'atom/browser/ui/accelerator_util_mac.mm',
+      'atom/browser/ui/accelerator_util_win.cc',
+      'atom/browser/ui/cocoa/atom_menu_controller.h',
+      'atom/browser/ui/cocoa/atom_menu_controller.mm',
+      'atom/browser/ui/cocoa/event_processing_window.h',
+      'atom/browser/ui/cocoa/event_processing_window.mm',
+      'atom/browser/ui/file_dialog.h',
+      'atom/browser/ui/file_dialog_gtk.cc',
+      'atom/browser/ui/file_dialog_mac.mm',
+      'atom/browser/ui/file_dialog_win.cc',
+      'atom/browser/ui/gtk/gtk_custom_menu.cc',
+      'atom/browser/ui/gtk/gtk_custom_menu.h',
+      'atom/browser/ui/gtk/gtk_custom_menu_item.cc',
+      'atom/browser/ui/gtk/gtk_custom_menu_item.h',
+      'atom/browser/ui/gtk/gtk_util.cc',
+      'atom/browser/ui/gtk/gtk_util.h',
+      'atom/browser/ui/gtk/gtk_window_util.cc',
+      'atom/browser/ui/gtk/gtk_window_util.h',
+      'atom/browser/ui/gtk/event_utils.cc',
+      'atom/browser/ui/gtk/event_utils.h',
+      'atom/browser/ui/gtk/menu_gtk.cc',
+      'atom/browser/ui/gtk/menu_gtk.h',
+      'atom/browser/ui/message_box.h',
+      'atom/browser/ui/message_box_gtk.cc',
+      'atom/browser/ui/message_box_mac.mm',
+      'atom/browser/ui/message_box_win.cc',
+      'atom/browser/ui/win/menu_2.cc',
+      'atom/browser/ui/win/menu_2.h',
+      'atom/browser/ui/win/native_menu_win.cc',
+      'atom/browser/ui/win/native_menu_win.h',
+      'atom/browser/window_list.cc',
+      'atom/browser/window_list.h',
+      'atom/browser/window_list_observer.h',
+      'atom/common/api/api_messages.cc',
+      'atom/common/api/api_messages.h',
+      'atom/common/api/atom_api_clipboard.cc',
+      'atom/common/api/atom_api_clipboard.h',
+      'atom/common/api/atom_api_crash_reporter.cc',
+      'atom/common/api/atom_api_crash_reporter.h',
+      'atom/common/api/atom_api_event_emitter.cc',
+      'atom/common/api/atom_api_event_emitter.h',
+      'atom/common/api/atom_api_id_weak_map.cc',
+      'atom/common/api/atom_api_id_weak_map.h',
+      'atom/common/api/atom_api_screen.cc',
+      'atom/common/api/atom_api_screen.h',
+      'atom/common/api/atom_api_shell.cc',
+      'atom/common/api/atom_api_shell.h',
+      'atom/common/api/atom_api_v8_util.cc',
+      'atom/common/api/atom_bindings.cc',
+      'atom/common/api/atom_bindings.h',
+      'atom/common/api/atom_extensions.cc',
+      'atom/common/api/atom_extensions.h',
+      'atom/common/api/object_life_monitor.cc',
+      'atom/common/api/object_life_monitor.h',
+      'atom/common/crash_reporter/crash_reporter.cc',
+      'atom/common/crash_reporter/crash_reporter.h',
+      'atom/common/crash_reporter/crash_reporter_linux.cc',
+      'atom/common/crash_reporter/crash_reporter_linux.h',
+      'atom/common/crash_reporter/crash_reporter_mac.h',
+      'atom/common/crash_reporter/crash_reporter_mac.mm',
+      'atom/common/crash_reporter/crash_reporter_win.cc',
+      'atom/common/crash_reporter/crash_reporter_win.h',
+      'atom/common/crash_reporter/linux/crash_dump_handler.cc',
+      'atom/common/crash_reporter/linux/crash_dump_handler.h',
+      'atom/common/crash_reporter/win/crash_service.cc',
+      'atom/common/crash_reporter/win/crash_service.h',
+      'atom/common/crash_reporter/win/crash_service_main.cc',
+      'atom/common/crash_reporter/win/crash_service_main.h',
+      'atom/common/draggable_region.cc',
+      'atom/common/draggable_region.h',
+      'atom/common/linux/application_info.cc',
+      'atom/common/node_bindings.cc',
+      'atom/common/node_bindings.h',
+      'atom/common/node_bindings_linux.cc',
+      'atom/common/node_bindings_linux.h',
+      'atom/common/node_bindings_mac.cc',
+      'atom/common/node_bindings_mac.h',
+      'atom/common/node_bindings_win.cc',
+      'atom/common/node_bindings_win.h',
+      'atom/common/options_switches.cc',
+      'atom/common/options_switches.h',
+      'atom/common/platform_util.h',
+      'atom/common/platform_util_linux.cc',
+      'atom/common/platform_util_mac.mm',
+      'atom/common/platform_util_win.cc',
+      'atom/common/swap_or_assign.h',
+      'atom/common/v8/node_common.h',
+      'atom/common/v8/scoped_persistent.h',
+      'atom/common/v8/native_type_conversions.h',
+      'atom/common/v8/v8_value_converter.cc',
+      'atom/common/v8/v8_value_converter.h',
+      'atom/renderer/api/atom_api_renderer_ipc.cc',
+      'atom/renderer/api/atom_api_renderer_ipc.h',
+      'atom/renderer/api/atom_renderer_bindings.cc',
+      'atom/renderer/api/atom_renderer_bindings.h',
+      'atom/renderer/atom_render_view_observer.cc',
+      'atom/renderer/atom_render_view_observer.h',
+      'atom/renderer/atom_renderer_client.cc',
+      'atom/renderer/atom_renderer_client.h',
     ],
     'framework_sources': [
-      'app/atom_library_main.cc',
-      'app/atom_library_main.h',
+      'atom/app/atom_library_main.cc',
+      'atom/app/atom_library_main.h',
     ],
     'conditions': [
       ['OS=="win"', {
         'app_sources': [
-          'browser/resources/win/resource.h',
-          'browser/resources/win/atom.ico',
-          'browser/resources/win/atom.rc',
+          'atom/browser/resources/win/resource.h',
+          'atom/browser/resources/win/atom.ico',
+          'atom/browser/resources/win/atom.rc',
           '<(libchromiumcontent_src_dir)/content/app/startup_helper_win.cc',
         ],
       }],  # OS=="win"
@@ -270,7 +270,7 @@
             '<(project_name)_helper',
           ],
           'xcode_settings': {
-            'INFOPLIST_FILE': 'browser/resources/mac/Info.plist',
+            'INFOPLIST_FILE': 'atom/browser/resources/mac/Info.plist',
             'LD_RUNPATH_SEARCH_PATHS': [
               '@executable_path/../Frameworks',
             ],
@@ -292,7 +292,7 @@
             {
               'destination': '<(PRODUCT_DIR)/<(product_name).app/Contents/Resources/browser',
               'files': [
-                'browser/default_app',
+                'atom/browser/default_app',
               ],
             },
           ],
@@ -330,7 +330,7 @@
             {
               'destination': '<(PRODUCT_DIR)/resources/browser',
               'files': [
-                'browser/default_app',
+                'atom/browser/default_app',
               ]
             },
           ],
@@ -348,7 +348,7 @@
             {
               'destination': '<(PRODUCT_DIR)/resources/browser',
               'files': [
-                'browser/default_app',
+                'atom/browser/default_app',
               ]
             },
           ],
@@ -600,11 +600,11 @@
           },
           'mac_bundle': 1,
           'mac_bundle_resources': [
-            'common/resources/mac/MainMenu.xib',
+            'atom/common/resources/mac/MainMenu.xib',
             '<(libchromiumcontent_resources_dir)/content_shell.pak',
           ],
           'xcode_settings': {
-            'INFOPLIST_FILE': 'common/resources/mac/Info.plist',
+            'INFOPLIST_FILE': 'atom/common/resources/mac/Info.plist',
             'LIBRARY_SEARCH_PATHS': [
               '<(libchromiumcontent_library_dir)',
             ],
@@ -659,7 +659,7 @@
           ],
           'mac_bundle': 1,
           'xcode_settings': {
-            'INFOPLIST_FILE': 'renderer/resources/mac/Info.plist',
+            'INFOPLIST_FILE': 'atom/renderer/resources/mac/Info.plist',
             'LD_RUNPATH_SEARCH_PATHS': [
               '@executable_path/../../..',
             ],

app/atom_library_main.cc → atom/app/atom_library_main.cc

@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "app/atom_library_main.h"
+#include "atom/app/atom_library_main.h"
 
-#include "app/atom_main_delegate.h"
+#include "atom/app/atom_main_delegate.h"
 #include "content/public/app/content_main.h"
 
 #if defined(OS_MACOSX)

app/atom_main.cc → atom/app/atom_main.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 "app/atom_main.h"
+#include "atom/app/atom_main.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -15,16 +15,16 @@
 #include <windows.h>
 #include <shellapi.h>
 
-#include "app/atom_main_delegate.h"
+#include "atom/app/atom_main_delegate.h"
 #include "base/environment.h"
-#include "common/crash_reporter/win/crash_service_main.h"
+#include "atom/common/crash_reporter/win/crash_service_main.h"
 #include "content/public/app/startup_helper_win.h"
 #include "sandbox/win/src/sandbox_types.h"
 #elif defined(OS_LINUX)  // defined(OS_WIN)
-#include "app/atom_main_delegate.h"  // NOLINT
+#include "atom/app/atom_main_delegate.h"  // NOLINT
 #include "content/public/app/content_main.h"
 #else  // defined(OS_LINUX)
-#include "app/atom_library_main.h"
+#include "atom/app/atom_library_main.h"
 #endif  // defined(OS_MACOSX)
 
 // Declaration of node::Start.

app/atom_main_delegate.cc → atom/app/atom_main_delegate.cc

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "app/atom_main_delegate.h"
+#include "atom/app/atom_main_delegate.h"
 
 #include "base/command_line.h"
 #include "base/debug/stack_trace.h"
 #include "base/logging.h"
-#include "browser/atom_browser_client.h"
+#include "atom/browser/atom_browser_client.h"
 #include "content/public/common/content_switches.h"
-#include "renderer/atom_renderer_client.h"
+#include "atom/renderer/atom_renderer_client.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "base/path_service.h"
 

app/atom_main_delegate_mac.mm → atom/app/atom_main_delegate_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 "app/atom_main_delegate.h"
+#include "atom/app/atom_main_delegate.h"
 
 #import "base/mac/bundle_locations.h"
 #import "base/mac/foundation_util.h"

browser/api/atom_api_app.cc → atom/browser/api/atom_api_app.cc

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "browser/api/atom_api_app.h"
+#include "atom/browser/api/atom_api_app.h"
 
 #include "base/values.h"
 #include "base/command_line.h"
-#include "browser/browser.h"
-#include "common/v8/native_type_conversions.h"
+#include "atom/browser/browser.h"
+#include "atom/common/v8/native_type_conversions.h"
 
-#include "common/v8/node_common.h"
+#include "atom/common/v8/node_common.h"
 
 namespace atom {
 

browser/api/atom_api_app.h → atom/browser/api/atom_api_app.h

@@ -6,8 +6,8 @@
 #define ATOM_BROWSER_API_ATOM_API_APP_H_
 
 #include "base/compiler_specific.h"
-#include "browser/browser_observer.h"
-#include "common/api/atom_api_event_emitter.h"
+#include "atom/browser/browser_observer.h"
+#include "atom/common/api/atom_api_event_emitter.h"
 
 namespace atom {
 

browser/api/atom_api_auto_updater.cc → atom/browser/api/atom_api_auto_updater.cc

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "browser/api/atom_api_auto_updater.h"
+#include "atom/browser/api/atom_api_auto_updater.h"
 
 #include "base/time/time.h"
 #include "base/values.h"
-#include "browser/auto_updater.h"
-#include "common/v8/native_type_conversions.h"
+#include "atom/browser/auto_updater.h"
+#include "atom/common/v8/native_type_conversions.h"
 
-#include "common/v8/node_common.h"
+#include "atom/common/v8/node_common.h"
 
 namespace atom {
 

browser/api/atom_api_auto_updater.h → atom/browser/api/atom_api_auto_updater.h

@@ -7,8 +7,8 @@
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
-#include "browser/auto_updater_delegate.h"
-#include "common/api/atom_api_event_emitter.h"
+#include "atom/browser/auto_updater_delegate.h"
+#include "atom/common/api/atom_api_event_emitter.h"
 
 namespace atom {
 

browser/api/atom_api_browser_ipc.cc → atom/browser/api/atom_api_browser_ipc.cc

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "browser/api/atom_api_browser_ipc.h"
+#include "atom/browser/api/atom_api_browser_ipc.h"
 
-#include "common/api/api_messages.h"
-#include "common/v8/node_common.h"
-#include "common/v8/native_type_conversions.h"
+#include "atom/common/api/api_messages.h"
+#include "atom/common/v8/node_common.h"
+#include "atom/common/v8/native_type_conversions.h"
 #include "content/public/browser/render_view_host.h"
 
 using content::RenderViewHost;

browser/api/atom_api_dialog.cc → atom/browser/api/atom_api_dialog.cc

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "browser/api/atom_api_dialog.h"
+#include "atom/browser/api/atom_api_dialog.h"
 
 #include "base/bind.h"
-#include "browser/native_window.h"
-#include "browser/ui/file_dialog.h"
-#include "browser/ui/message_box.h"
-#include "common/v8/node_common.h"
-#include "common/v8/native_type_conversions.h"
+#include "atom/browser/native_window.h"
+#include "atom/browser/ui/file_dialog.h"
+#include "atom/browser/ui/message_box.h"
+#include "atom/common/v8/node_common.h"
+#include "atom/common/v8/native_type_conversions.h"
 
 namespace atom {
 

browser/api/atom_api_event.cc → atom/browser/api/atom_api_event.cc

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "browser/api/atom_api_event.h"
+#include "atom/browser/api/atom_api_event.h"
 
-#include "browser/native_window.h"
-#include "common/api/api_messages.h"
-#include "common/v8/node_common.h"
-#include "common/v8/native_type_conversions.h"
+#include "atom/browser/native_window.h"
+#include "atom/common/api/api_messages.h"
+#include "atom/common/v8/node_common.h"
+#include "atom/common/v8/native_type_conversions.h"
 
 namespace atom {
 

browser/api/atom_api_event.h → atom/browser/api/atom_api_event.h

@@ -8,8 +8,8 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/strings/string16.h"
-#include "browser/native_window_observer.h"
-#include "common/v8/scoped_persistent.h"
+#include "atom/browser/native_window_observer.h"
+#include "atom/common/v8/scoped_persistent.h"
 #include "vendor/node/src/node_object_wrap.h"
 
 namespace IPC {

browser/api/atom_api_menu.cc → atom/browser/api/atom_api_menu.cc

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "browser/api/atom_api_menu.h"
+#include "atom/browser/api/atom_api_menu.h"
 
-#include "browser/ui/accelerator_util.h"
-#include "common/v8/node_common.h"
-#include "common/v8/native_type_conversions.h"
+#include "atom/browser/ui/accelerator_util.h"
+#include "atom/common/v8/node_common.h"
+#include "atom/common/v8/native_type_conversions.h"
 
 #define UNWRAP_MEMNU_AND_CHECK \
   Menu* self = ObjectWrap::Unwrap<Menu>(args.This()); \

browser/api/atom_api_menu.h → atom/browser/api/atom_api_menu.h

@@ -6,7 +6,7 @@
 #define ATOM_BROWSER_API_ATOM_API_MENU_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "common/api/atom_api_event_emitter.h"
+#include "atom/common/api/atom_api_event_emitter.h"
 #include "ui/base/models/simple_menu_model.h"
 
 namespace atom {

browser/api/atom_api_menu_gtk.cc → atom/browser/api/atom_api_menu_gtk.cc

@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "browser/api/atom_api_menu_gtk.h"
+#include "atom/browser/api/atom_api_menu_gtk.h"
 
-#include "browser/native_window_gtk.h"
-#include "common/v8/native_type_conversions.h"
+#include "atom/browser/native_window_gtk.h"
+#include "atom/common/v8/native_type_conversions.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/screen.h"
 
-#include "common/v8/node_common.h"
+#include "atom/common/v8/node_common.h"
 
 namespace atom {
 

browser/api/atom_api_menu_gtk.h → atom/browser/api/atom_api_menu_gtk.h

@@ -5,8 +5,8 @@
 #ifndef ATOM_BROWSER_API_ATOM_API_MENU_GTK_H_
 #define ATOM_BROWSER_API_ATOM_API_MENU_GTK_H_
 
-#include "browser/api/atom_api_menu.h"
-#include "browser/ui/gtk/menu_gtk.h"
+#include "atom/browser/api/atom_api_menu.h"
+#include "atom/browser/ui/gtk/menu_gtk.h"
 
 namespace atom {
 

browser/api/atom_api_menu_mac.h → atom/browser/api/atom_api_menu_mac.h

@@ -5,9 +5,9 @@
 #ifndef ATOM_BROWSER_API_ATOM_API_MENU_MAC_H_
 #define ATOM_BROWSER_API_ATOM_API_MENU_MAC_H_
 
-#include "browser/api/atom_api_menu.h"
+#include "atom/browser/api/atom_api_menu.h"
 
-#import "browser/ui/cocoa/atom_menu_controller.h"
+#import "atom/browser/ui/cocoa/atom_menu_controller.h"
 
 namespace atom {
 

browser/api/atom_api_menu_mac.mm → atom/browser/api/atom_api_menu_mac.mm

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "browser/api/atom_api_menu_mac.h"
+#import "atom/browser/api/atom_api_menu_mac.h"
 
 #include "base/mac/scoped_sending_event.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/sys_string_conversions.h"
-#include "browser/native_window.h"
-#include "common/v8/node_common.h"
-#include "common/v8/native_type_conversions.h"
+#include "atom/browser/native_window.h"
+#include "atom/common/v8/node_common.h"
+#include "atom/common/v8/native_type_conversions.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 

browser/api/atom_api_menu_win.cc → atom/browser/api/atom_api_menu_win.cc

@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "browser/api/atom_api_menu_win.h"
+#include "atom/browser/api/atom_api_menu_win.h"
 
-#include "browser/native_window_win.h"
-#include "browser/ui/win/menu_2.h"
-#include "common/v8/native_type_conversions.h"
+#include "atom/browser/native_window_win.h"
+#include "atom/browser/ui/win/menu_2.h"
+#include "atom/common/v8/native_type_conversions.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/screen.h"
 
-#include "common/v8/node_common.h"
+#include "atom/common/v8/node_common.h"
 
 namespace atom {
 

browser/api/atom_api_menu_win.h → atom/browser/api/atom_api_menu_win.h

@@ -5,7 +5,7 @@
 #ifndef ATOM_BROWSER_API_ATOM_API_MENU_WIN_H_
 #define ATOM_BROWSER_API_ATOM_API_MENU_WIN_H_
 
-#include "browser/api/atom_api_menu.h"
+#include "atom/browser/api/atom_api_menu.h"
 
 namespace atom {
 

browser/api/atom_api_power_monitor.cc → atom/browser/api/atom_api_power_monitor.cc

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "browser/api/atom_api_power_monitor.h"
+#include "atom/browser/api/atom_api_power_monitor.h"
 
 #include "base/power_monitor/power_monitor.h"
 #include "base/power_monitor/power_monitor_device_source.h"
 
-#include "common/v8/node_common.h"
+#include "atom/common/v8/node_common.h"
 
 namespace atom {
 

browser/api/atom_api_power_monitor.h → atom/browser/api/atom_api_power_monitor.h

@@ -7,7 +7,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/power_monitor/power_observer.h"
-#include "common/api/atom_api_event_emitter.h"
+#include "atom/common/api/atom_api_event_emitter.h"
 
 namespace atom {
 

browser/api/atom_api_protocol.cc → atom/browser/api/atom_api_protocol.cc

@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "browser/api/atom_api_protocol.h"
+#include "atom/browser/api/atom_api_protocol.h"
 
 #include "base/stl_util.h"
-#include "browser/atom_browser_context.h"
-#include "browser/net/adapter_request_job.h"
-#include "browser/net/atom_url_request_context_getter.h"
-#include "browser/net/atom_url_request_job_factory.h"
-#include "common/v8/native_type_conversions.h"
+#include "atom/browser/atom_browser_context.h"
+#include "atom/browser/net/adapter_request_job.h"
+#include "atom/browser/net/atom_url_request_context_getter.h"
+#include "atom/browser/net/atom_url_request_job_factory.h"
+#include "atom/common/v8/native_type_conversions.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/url_request/url_request_context.h"
 
-#include "common/v8/node_common.h"
+#include "atom/common/v8/node_common.h"
 
 namespace atom {
 

browser/api/atom_api_window.cc → atom/browser/api/atom_api_window.cc

@@ -2,19 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "browser/api/atom_api_window.h"
+#include "atom/browser/api/atom_api_window.h"
 
 #include "base/bind.h"
 #include "base/process/kill.h"
-#include "browser/native_window.h"
-#include "common/v8/native_type_conversions.h"
+#include "atom/browser/native_window.h"
+#include "atom/common/v8/native_type_conversions.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/render_process_host.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/size.h"
 
-#include "common/v8/node_common.h"
+#include "atom/common/v8/node_common.h"
 #include "vendor/node/src/node_buffer.h"
 
 using content::NavigationController;

browser/api/atom_api_window.h → atom/browser/api/atom_api_window.h

@@ -8,9 +8,9 @@
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
-#include "browser/native_window_observer.h"
-#include "common/api/atom_api_event_emitter.h"
-#include "common/v8/scoped_persistent.h"
+#include "atom/browser/native_window_observer.h"
+#include "atom/common/api/atom_api_event_emitter.h"
+#include "atom/common/v8/scoped_persistent.h"
 
 namespace base {
 class DictionaryValue;

browser/api/atom_browser_bindings.cc → atom/browser/api/atom_browser_bindings.cc

@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "browser/api/atom_browser_bindings.h"
+#include "atom/browser/api/atom_browser_bindings.h"
 
 #include <vector>
 
 #include "base/logging.h"
-#include "browser/api/atom_api_event.h"
-#include "common/v8/native_type_conversions.h"
+#include "atom/browser/api/atom_api_event.h"
+#include "atom/common/v8/native_type_conversions.h"
 #include "content/public/browser/browser_thread.h"
 
-#include "common/v8/node_common.h"
+#include "atom/common/v8/node_common.h"
 
 namespace atom {
 

browser/api/atom_browser_bindings.h → atom/browser/api/atom_browser_bindings.h

@@ -6,8 +6,8 @@
 #define ATOM_BROWSER_API_ATOM_BROWSER_BINDINGS_
 
 #include "base/strings/string16.h"
-#include "common/api/atom_bindings.h"
-#include "common/v8/scoped_persistent.h"
+#include "atom/common/api/atom_bindings.h"
+#include "atom/common/v8/scoped_persistent.h"
 
 namespace base {
 class ListValue;

browser/atom_application_delegate_mac.mm → atom/browser/atom_application_delegate_mac.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 "browser/atom_application_delegate_mac.h"
+#import "atom/browser/atom_application_delegate_mac.h"
 
 #include "base/strings/sys_string_conversions.h"
-#import "browser/atom_application_mac.h"
-#include "browser/browser.h"
+#import "atom/browser/atom_application_mac.h"
+#include "atom/browser/browser.h"
 
 @implementation AtomApplicationDelegate
 

browser/atom_application_mac.mm → atom/browser/atom_application_mac.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 "browser/atom_application_mac.h"
+#import "atom/browser/atom_application_mac.h"
 
 #include "base/auto_reset.h"
 #include "base/strings/sys_string_conversions.h"
-#include "browser/browser.h"
+#include "atom/browser/browser.h"
 
 @implementation AtomApplication
 

browser/atom_browser_client.cc → atom/browser/atom_browser_client.cc

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "browser/atom_browser_client.h"
+#include "atom/browser/atom_browser_client.h"
 
-#include "browser/atom_browser_context.h"
-#include "browser/atom_browser_main_parts.h"
-#include "browser/native_window.h"
-#include "browser/net/atom_url_request_context_getter.h"
-#include "browser/window_list.h"
+#include "atom/browser/atom_browser_context.h"
+#include "atom/browser/atom_browser_main_parts.h"
+#include "atom/browser/native_window.h"
+#include "atom/browser/net/atom_url_request_context_getter.h"
+#include "atom/browser/window_list.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/site_instance.h"

browser/atom_browser_context.cc → atom/browser/atom_browser_context.cc

@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "browser/atom_browser_context.h"
+#include "atom/browser/atom_browser_context.h"
 
-#include "browser/atom_browser_main_parts.h"
-#include "browser/net/atom_url_request_context_getter.h"
+#include "atom/browser/atom_browser_main_parts.h"
+#include "atom/browser/net/atom_url_request_context_getter.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/resource_context.h"
 #include "vendor/brightray/browser/network_delegate.h"

browser/atom_browser_main_parts.cc → atom/browser/atom_browser_main_parts.cc

@@ -2,20 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "browser/atom_browser_main_parts.h"
+#include "atom/browser/atom_browser_main_parts.h"
 
-#include "browser/api/atom_browser_bindings.h"
-#include "browser/atom_browser_client.h"
-#include "browser/atom_browser_context.h"
-#include "browser/browser.h"
-#include "common/node_bindings.h"
+#include "atom/browser/api/atom_browser_bindings.h"
+#include "atom/browser/atom_browser_client.h"
+#include "atom/browser/atom_browser_context.h"
+#include "atom/browser/browser.h"
+#include "atom/common/node_bindings.h"
 #include "net/proxy/proxy_resolver_v8.h"
 
 #if defined(OS_WIN)
 #include "ui/gfx/win/dpi.h"
 #endif
 
-#include "common/v8/node_common.h"
+#include "atom/common/v8/node_common.h"
 
 namespace atom {
 

browser/atom_browser_main_parts_mac.mm → atom/browser/atom_browser_main_parts_mac.mm

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "browser/atom_browser_main_parts.h"
+#include "atom/browser/atom_browser_main_parts.h"
 
 #include "base/files/file_path.h"
 #import "base/mac/foundation_util.h"
-#import "browser/atom_application_mac.h"
-#import "browser/atom_application_delegate_mac.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 {

browser/atom_javascript_dialog_manager.cc → atom/browser/atom_javascript_dialog_manager.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/atom_javascript_dialog_manager.h"
+#include "atom/browser/atom_javascript_dialog_manager.h"
 
 #include "base/strings/utf_string_conversions.h"
 

browser/auto_updater.cc → atom/browser/auto_updater.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/auto_updater.h"
+#include "atom/browser/auto_updater.h"
 
 namespace auto_updater {
 

browser/auto_updater_linux.cc → atom/browser/auto_updater_linux.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/auto_updater.h"
+#include "atom/browser/auto_updater.h"
 
 namespace auto_updater {
 

browser/auto_updater_mac.mm → atom/browser/auto_updater_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/auto_updater.h"
+#include "atom/browser/auto_updater.h"
 
 #import <ReactiveCocoa/RACCommand.h>
 #import <ReactiveCocoa/RACSignal.h>
@@ -12,7 +12,7 @@
 #include "base/bind.h"
 #include "base/time/time.h"
 #include "base/strings/sys_string_conversions.h"
-#include "browser/auto_updater_delegate.h"
+#include "atom/browser/auto_updater_delegate.h"
 
 #include <iostream>
 

browser/auto_updater_win.cc → atom/browser/auto_updater_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/auto_updater.h"
+#include "atom/browser/auto_updater.h"
 
 namespace auto_updater {
 

browser/browser.cc → atom/browser/browser.cc

@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "browser/browser.h"
+#include "atom/browser/browser.h"
 
-#include "browser/atom_browser_main_parts.h"
-#include "browser/window_list.h"
+#include "atom/browser/atom_browser_main_parts.h"
+#include "atom/browser/window_list.h"
 
 namespace atom {
 

browser/browser.h → atom/browser/browser.h

@@ -8,8 +8,8 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/observer_list.h"
-#include "browser/browser_observer.h"
-#include "browser/window_list_observer.h"
+#include "atom/browser/browser_observer.h"
+#include "atom/browser/window_list_observer.h"
 
 namespace atom {
 

browser/browser_linux.cc → atom/browser/browser_linux.cc

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "browser/browser.h"
+#include "atom/browser/browser.h"
 
 #include <stdlib.h>
 
-#include "browser/native_window.h"
-#include "browser/window_list.h"
-#include "common/atom_version.h"
+#include "atom/browser/native_window.h"
+#include "atom/browser/window_list.h"
+#include "atom/common/atom_version.h"
 
 namespace atom {
 

browser/browser_mac.mm → atom/browser/browser_mac.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.
 
-#include "browser/browser.h"
+#include "atom/browser/browser.h"
 
 #import "base/mac/bundle_locations.h"
 #include "base/strings/sys_string_conversions.h"
-#import "browser/atom_application_mac.h"
+#import "atom/browser/atom_application_mac.h"
 
 namespace atom {
 

browser/browser_win.cc → atom/browser/browser_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/browser.h"
+#include "atom/browser/browser.h"
 
 #include <windows.h>
 
@@ -12,7 +12,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
-#include "common/atom_version.h"
+#include "atom/common/atom_version.h"
 
 namespace atom {
 

browser/devtools_delegate.cc → atom/browser/devtools_delegate.cc

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "browser/devtools_delegate.h"
+#include "atom/browser/devtools_delegate.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/values.h"
-#include "browser/native_window.h"
+#include "atom/browser/native_window.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/devtools_client_host.h"
 #include "content/public/browser/devtools_http_handler.h"

browser/devtools_delegate.h → atom/browser/devtools_delegate.h

@@ -6,7 +6,7 @@
 #define ATOM_BROWSER_DEVTOOLS_DELEGATE_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "browser/native_window_observer.h"
+#include "atom/browser/native_window_observer.h"
 #include "content/public/browser/devtools_frontend_host_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "vendor/brightray/browser/devtools_embedder_message_dispatcher.h"

browser/native_window.cc → atom/browser/native_window.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/native_window.h"
+#include "atom/browser/native_window.h"
 
 #include <string>
 
@@ -13,13 +13,13 @@
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
-#include "browser/api/atom_browser_bindings.h"
-#include "browser/atom_browser_context.h"
-#include "browser/atom_browser_main_parts.h"
-#include "browser/atom_javascript_dialog_manager.h"
-#include "browser/browser.h"
-#include "browser/devtools_delegate.h"
-#include "browser/window_list.h"
+#include "atom/browser/api/atom_browser_bindings.h"
+#include "atom/browser/atom_browser_context.h"
+#include "atom/browser/atom_browser_main_parts.h"
+#include "atom/browser/atom_javascript_dialog_manager.h"
+#include "atom/browser/browser.h"
+#include "atom/browser/devtools_delegate.h"
+#include "atom/browser/window_list.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/invalidate_type.h"
 #include "content/public/browser/navigation_entry.h"
@@ -31,9 +31,9 @@
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/common/renderer_preferences.h"
-#include "common/api/api_messages.h"
-#include "common/atom_version.h"
-#include "common/options_switches.h"
+#include "atom/common/api/api_messages.h"
+#include "atom/common/atom_version.h"
+#include "atom/common/options_switches.h"
 #include "ipc/ipc_message_macros.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/point.h"

browser/native_window.h → atom/browser/native_window.h

@@ -11,7 +11,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
-#include "browser/native_window_observer.h"
+#include "atom/browser/native_window_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_observer.h"
 #include "ui/gfx/image/image.h"

browser/native_window_gtk.cc → atom/browser/native_window_gtk.cc

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "browser/native_window_gtk.h"
+#include "atom/browser/native_window_gtk.h"
 
 #include "base/values.h"
-#include "browser/ui/gtk/gtk_window_util.h"
-#include "common/draggable_region.h"
-#include "common/options_switches.h"
+#include "atom/browser/ui/gtk/gtk_window_util.h"
+#include "atom/common/draggable_region.h"
+#include "atom/common/options_switches.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/common/renderer_preferences.h"

browser/native_window_gtk.h → atom/browser/native_window_gtk.h

@@ -7,9 +7,9 @@
 
 #include <gtk/gtk.h>
 
-#include "browser/native_window.h"
-#include "browser/ui/accelerator_util.h"
-#include "browser/ui/gtk/menu_gtk.h"
+#include "atom/browser/native_window.h"
+#include "atom/browser/ui/accelerator_util.h"
+#include "atom/browser/ui/gtk/menu_gtk.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/gtk/gtk_signal.h"

browser/native_window_mac.h → atom/browser/native_window_mac.h

@@ -8,7 +8,7 @@
 #import <Cocoa/Cocoa.h>
 
 #include "base/memory/scoped_ptr.h"
-#include "browser/native_window.h"
+#include "atom/browser/native_window.h"
 
 class SkRegion;
 

browser/native_window_mac.mm → atom/browser/native_window_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/native_window_mac.h"
+#include "atom/browser/native_window_mac.h"
 
 #include <string>
 
@@ -10,11 +10,11 @@
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/values.h"
-#import "browser/ui/cocoa/event_processing_window.h"
+#import "atom/browser/ui/cocoa/event_processing_window.h"
 #include "brightray/browser/inspectable_web_contents.h"
 #include "brightray/browser/inspectable_web_contents_view.h"
-#include "common/draggable_region.h"
-#include "common/options_switches.h"
+#include "atom/common/draggable_region.h"
+#include "atom/common/options_switches.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"

browser/native_window_win.cc → atom/browser/native_window_win.cc

@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "browser/native_window_win.h"
+#include "atom/browser/native_window_win.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
-#include "browser/api/atom_api_menu.h"
-#include "browser/ui/win/menu_2.h"
-#include "browser/ui/win/native_menu_win.h"
-#include "common/draggable_region.h"
-#include "common/options_switches.h"
+#include "atom/browser/api/atom_api_menu.h"
+#include "atom/browser/ui/win/menu_2.h"
+#include "atom/browser/ui/win/native_menu_win.h"
+#include "atom/common/draggable_region.h"
+#include "atom/common/options_switches.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"

browser/native_window_win.h → atom/browser/native_window_win.h

@@ -7,8 +7,8 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
-#include "browser/native_window.h"
-#include "browser/ui/accelerator_util.h"
+#include "atom/browser/native_window.h"
+#include "atom/browser/ui/accelerator_util.h"
 #include "ui/gfx/size.h"
 #include "ui/views/widget/widget_delegate.h"
 

browser/net/adapter_request_job.cc → atom/browser/net/adapter_request_job.cc

@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "browser/net/adapter_request_job.h"
+#include "atom/browser/net/adapter_request_job.h"
 
 #include "base/threading/sequenced_worker_pool.h"
-#include "browser/net/url_request_string_job.h"
+#include "atom/browser/net/url_request_string_job.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/net_errors.h"
 #include "net/url_request/url_request_error_job.h"

browser/net/atom_url_request_context_getter.cc → atom/browser/net/atom_url_request_context_getter.cc

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "browser/net/atom_url_request_context_getter.h"
+#include "atom/browser/net/atom_url_request_context_getter.h"
 
 #include "base/strings/string_util.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/threading/worker_pool.h"
-#include "browser/net/atom_url_request_job_factory.h"
+#include "atom/browser/net/atom_url_request_job_factory.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/cookie_store_factory.h"
 #include "content/public/common/url_constants.h"

browser/net/atom_url_request_job_factory.cc → atom/browser/net/atom_url_request_job_factory.cc

@@ -3,7 +3,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "browser/net/atom_url_request_job_factory.h"
+#include "atom/browser/net/atom_url_request_job_factory.h"
 
 #include "base/stl_util.h"
 #include "net/base/load_flags.h"

browser/net/url_request_string_job.cc → atom/browser/net/url_request_string_job.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/net/url_request_string_job.h"
+#include "atom/browser/net/url_request_string_job.h"
 
 #include "net/base/net_errors.h"