diff --git a/atom.gyp b/atom.gyp
index 3cf227dd9..f50255a4a 100644
--- a/atom.gyp
+++ b/atom.gyp
@@ -64,10 +64,10 @@
         'native/atom_cef_client.cpp',
         'native/atom_cef_client.h',
         'native/util.h',
-        'native/native_handler.mm',
-        'native/native_handler.h',
         'native/path_watcher.mm',
         'native/path_watcher.h',
+        'native/v8_extensions/native_handler.mm',
+        'native/v8_extensions/native_handler.h',
       ],
       'mac_bundle_resources': [
         'native/mac/atom.icns',
@@ -277,10 +277,10 @@
             'native/atom_cef_client.cpp',
             'native/atom_cef_client.h',
             'native/util.h',
-            'native/native_handler.mm',
-            'native/native_handler.h',
             'native/path_watcher.mm',
             'native/path_watcher.h',
+            'native/v8_extensions/native_handler.mm',
+            'native/v8_extensions/native_handler.h',
           ],
           # TODO(mark): For now, don't put any resources into this app.  Its
           # resources directory will be a symbolic link to the browser app's
diff --git a/native/atom_cef_app.mm b/native/atom_cef_app.mm
index f3cdc6acf..33582f1a8 100644
--- a/native/atom_cef_app.mm
+++ b/native/atom_cef_app.mm
@@ -1,7 +1,7 @@
 #include "atom_cef_app.h"
 
 #import <Cocoa/Cocoa.h>
-#import "native_handler.h"
+#import "native/v8_extensions/native_handler.h"
 
 
 void AtomCefApp::OnWebKitInitialized() {
diff --git a/native/native_handler.h b/native/v8_extensions/native_handler.h
similarity index 100%
rename from native/native_handler.h
rename to native/v8_extensions/native_handler.h
diff --git a/native/native_handler.mm b/native/v8_extensions/native_handler.mm
similarity index 100%
rename from native/native_handler.mm
rename to native/v8_extensions/native_handler.mm