diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc
index 79851030fa1e..392f52d4d37b 100644
--- a/atom/browser/api/atom_api_web_contents.cc
+++ b/atom/browser/api/atom_api_web_contents.cc
@@ -17,6 +17,8 @@
 #include "atom/browser/lib/bluetooth_chooser.h"
 #include "atom/browser/native_window.h"
 #include "atom/browser/net/atom_network_delegate.h"
+#include "atom/browser/osr/osr_web_contents_view.h"
+#include "atom/browser/osr/osr_render_widget_host_view.h"
 #include "atom/browser/ui/drag_util.h"
 #include "atom/browser/web_contents_permission_helper.h"
 #include "atom/browser/web_contents_preferences.h"
@@ -42,6 +44,7 @@
 #include "chrome/browser/printing/print_view_manager_basic.h"
 #include "chrome/browser/printing/print_preview_message_handler.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
+#include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/native_web_keyboard_event.h"
@@ -68,10 +71,6 @@
 #include "third_party/WebKit/public/web/WebFindOptions.h"
 #include "ui/display/screen.h"
 
-#include "content/browser/web_contents/web_contents_impl.h"
-#include "atom/browser/osr_web_contents_view.h"
-#include "atom/browser/osr_render_widget_host_view.h"
-
 #include "atom/common/node_includes.h"
 
 namespace {
diff --git a/atom/browser/api/atom_api_web_contents.h b/atom/browser/api/atom_api_web_contents.h
index ba571cf02a06..a05602aab44c 100644
--- a/atom/browser/api/atom_api_web_contents.h
+++ b/atom/browser/api/atom_api_web_contents.h
@@ -12,14 +12,13 @@
 #include "atom/browser/api/save_page_handler.h"
 #include "atom/browser/api/trackable_object.h"
 #include "atom/browser/common_web_contents_delegate.h"
+#include "atom/browser/osr/osr_output_device.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/favicon_url.h"
 #include "content/common/cursors/webcursor.h"
 #include "native_mate/handle.h"
 #include "ui/gfx/image/image.h"
 
-#include "atom/browser/osr_output_device.h"
-
 namespace blink {
 struct WebDeviceEmulationParams;
 }
diff --git a/atom/browser/osr_output_device.cc b/atom/browser/osr/osr_output_device.cc
similarity index 97%
rename from atom/browser/osr_output_device.cc
rename to atom/browser/osr/osr_output_device.cc
index 972f8f2a4f44..897748ad8b23 100644
--- a/atom/browser/osr_output_device.cc
+++ b/atom/browser/osr/osr_output_device.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/osr_output_device.h"
+#include "atom/browser/osr/osr_output_device.h"
 
 #include "third_party/skia/include/core/SkDevice.h"
 #include "ui/gfx/skia_util.h"
diff --git a/atom/browser/osr_output_device.h b/atom/browser/osr/osr_output_device.h
similarity index 88%
rename from atom/browser/osr_output_device.h
rename to atom/browser/osr/osr_output_device.h
index 8730cf2ad10e..34402e17c051 100644
--- a/atom/browser/osr_output_device.h
+++ b/atom/browser/osr/osr_output_device.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_OSR_OUTPUT_DEVICE_H_
-#define ATOM_BROWSER_OSR_OUTPUT_DEVICE_H_
+#ifndef ATOM_BROWSER_OSR_OSR_OUTPUT_DEVICE_H_
+#define ATOM_BROWSER_OSR_OSR_OUTPUT_DEVICE_H_
 
 #include "base/callback.h"
 #include "cc/output/software_output_device.h"
@@ -44,4 +44,4 @@ class OffScreenOutputDevice : public cc::SoftwareOutputDevice {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_OSR_OUTPUT_DEVICE_H_
+#endif  // ATOM_BROWSER_OSR_OSR_OUTPUT_DEVICE_H_
diff --git a/atom/browser/osr_render_widget_host_view.cc b/atom/browser/osr/osr_render_widget_host_view.cc
similarity index 99%
rename from atom/browser/osr_render_widget_host_view.cc
rename to atom/browser/osr/osr_render_widget_host_view.cc
index f3cee7af92c3..e7472ef236d3 100644
--- a/atom/browser/osr_render_widget_host_view.cc
+++ b/atom/browser/osr/osr_render_widget_host_view.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/osr_render_widget_host_view.h"
+#include "atom/browser/osr/osr_render_widget_host_view.h"
 
 #include <vector>
 
diff --git a/atom/browser/osr_render_widget_host_view.h b/atom/browser/osr/osr_render_widget_host_view.h
similarity index 97%
rename from atom/browser/osr_render_widget_host_view.h
rename to atom/browser/osr/osr_render_widget_host_view.h
index f3b578a2cc6a..f5d1b03d9db4 100644
--- a/atom/browser/osr_render_widget_host_view.h
+++ b/atom/browser/osr/osr_render_widget_host_view.h
@@ -2,34 +2,35 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_OSR_RENDER_WIDGET_HOST_VIEW_H_
-#define ATOM_BROWSER_OSR_RENDER_WIDGET_HOST_VIEW_H_
+#ifndef ATOM_BROWSER_OSR_OSR_RENDER_WIDGET_HOST_VIEW_H_
+#define ATOM_BROWSER_OSR_OSR_RENDER_WIDGET_HOST_VIEW_H_
 
 #include <string>
 #include <vector>
 
-#include "atom/browser/native_window.h"
+#if defined(OS_WIN)
+#include <windows.h>
+#endif
 
-#include "content/browser/renderer_host/render_widget_host_view_base.h"
-#include "content/browser/renderer_host/delegated_frame_host.h"
-#include "content/browser/renderer_host/resize_lock.h"
-#include "third_party/WebKit/public/platform/WebVector.h"
-#include "cc/scheduler/begin_frame_source.h"
-#include "content/browser/renderer_host/render_widget_host_impl.h"
-#include "cc/output/compositor_frame.h"
-#include "ui/gfx/geometry/point.h"
+#include "atom/browser/native_window.h"
+#include "atom/browser/osr/osr_output_device.h"
 #include "base/process/kill.h"
 #include "base/threading/thread.h"
 #include "base/time/time.h"
+#include "cc/scheduler/begin_frame_source.h"
+#include "cc/output/compositor_frame.h"
+#include "content/browser/renderer_host/delegated_frame_host.h"
+#include "content/browser/renderer_host/render_widget_host_impl.h"
+#include "content/browser/renderer_host/render_widget_host_view_base.h"
+#include "content/browser/renderer_host/resize_lock.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/layer_delegate.h"
 #include "ui/compositor/layer_owner.h"
 #include "ui/base/ime/text_input_client.h"
-
-#include "atom/browser/osr_output_device.h"
+#include "ui/gfx/geometry/point.h"
+#include "third_party/WebKit/public/platform/WebVector.h"
 
 #if defined(OS_WIN)
-#include <windows.h>
 #include "ui/gfx/win/window_impl.h"
 #endif
 
@@ -263,4 +264,4 @@ private:
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_OSR_RENDER_WIDGET_HOST_VIEW_H_
+#endif  // ATOM_BROWSER_OSR_OSR_RENDER_WIDGET_HOST_VIEW_H_
diff --git a/atom/browser/osr_render_widget_host_view_mac.mm b/atom/browser/osr/osr_render_widget_host_view_mac.mm
similarity index 98%
rename from atom/browser/osr_render_widget_host_view_mac.mm
rename to atom/browser/osr/osr_render_widget_host_view_mac.mm
index 605fc4bce34b..9aba2ee3d022 100644
--- a/atom/browser/osr_render_widget_host_view_mac.mm
+++ b/atom/browser/osr/osr_render_widget_host_view_mac.mm
@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/osr_render_widget_host_view.h"
+#include "atom/browser/osr/osr_render_widget_host_view.h"
 
 #import <Cocoa/Cocoa.h>
 
diff --git a/atom/browser/osr_web_contents_view.cc b/atom/browser/osr/osr_web_contents_view.cc
similarity index 98%
rename from atom/browser/osr_web_contents_view.cc
rename to atom/browser/osr/osr_web_contents_view.cc
index b6b52cb26cb9..6e0d10d2053c 100644
--- a/atom/browser/osr_web_contents_view.cc
+++ b/atom/browser/osr/osr_web_contents_view.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/osr_web_contents_view.h"
+#include "atom/browser/osr/osr_web_contents_view.h"
 
 namespace atom {
 
diff --git a/atom/browser/osr_web_contents_view.h b/atom/browser/osr/osr_web_contents_view.h
similarity index 92%
rename from atom/browser/osr_web_contents_view.h
rename to atom/browser/osr/osr_web_contents_view.h
index a2aa515e47f6..d3de42c3046b 100644
--- a/atom/browser/osr_web_contents_view.h
+++ b/atom/browser/osr/osr_web_contents_view.h
@@ -2,15 +2,14 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_OSR_WEB_CONTENTS_VIEW_H_
-#define ATOM_BROWSER_OSR_WEB_CONTENTS_VIEW_H_
+#ifndef ATOM_BROWSER_OSR_OSR_WEB_CONTENTS_VIEW_H_
+#define ATOM_BROWSER_OSR_OSR_WEB_CONTENTS_VIEW_H_
 
+#include "atom/browser/osr/osr_render_widget_host_view.h"
 #include "content/browser/renderer_host/render_view_host_delegate_view.h"
 #include "content/browser/web_contents/web_contents_view.h"
 #include "content/public/browser/web_contents.h"
 
-#include "atom/browser/osr_render_widget_host_view.h"
-
 namespace atom {
 
 class OffScreenWebContentsView : public content::WebContentsView,
@@ -70,4 +69,4 @@ class OffScreenWebContentsView : public content::WebContentsView,
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_OSR_WEB_CONTENTS_VIEW_H_
+#endif  // ATOM_BROWSER_OSR_OSR_WEB_CONTENTS_VIEW_H_
diff --git a/filenames.gypi b/filenames.gypi
index fe90c0129233..6d3dd48018b7 100644
--- a/filenames.gypi
+++ b/filenames.gypi
@@ -206,13 +206,13 @@
       'atom/browser/native_window_mac.h',
       'atom/browser/native_window_mac.mm',
       'atom/browser/native_window_observer.h',
-      'atom/browser/osr_web_contents_view.cc',
-      'atom/browser/osr_web_contents_view.h',
-      'atom/browser/osr_output_device.cc',
-      'atom/browser/osr_output_device.h',
-      'atom/browser/osr_render_widget_host_view.cc',
-      'atom/browser/osr_render_widget_host_view.h',
-      'atom/browser/osr_render_widget_host_view_mac.mm',
+      'atom/browser/osr/osr_web_contents_view.cc',
+      'atom/browser/osr/osr_web_contents_view.h',
+      'atom/browser/osr/osr_output_device.cc',
+      'atom/browser/osr/osr_output_device.h',
+      'atom/browser/osr/osr_render_widget_host_view.cc',
+      'atom/browser/osr/osr_render_widget_host_view.h',
+      'atom/browser/osr/osr_render_widget_host_view_mac.mm',
       'atom/browser/net/asar/asar_protocol_handler.cc',
       'atom/browser/net/asar/asar_protocol_handler.h',
       'atom/browser/net/asar/url_request_asar_job.cc',