diff --git a/atom/browser/native_window_views.cc b/atom/browser/native_window_views.cc
index e0221fbde5..018f294b8d 100644
--- a/atom/browser/native_window_views.cc
+++ b/atom/browser/native_window_views.cc
@@ -45,8 +45,8 @@
 #include "ui/gfx/x/x11_types.h"
 #include "ui/views/window/native_frame_view.h"
 #elif defined(OS_WIN)
-#include "atom/browser/atom_desktop_window_tree_host_win.h"
 #include "atom/browser/ui/views/win_frame_view.h"
+#include "atom/browser/ui/win/atom_desktop_window_tree_host_win.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/windows_version.h"
 #include "ui/base/win/shell.h"
diff --git a/atom/browser/atom_desktop_window_tree_host_win.cc b/atom/browser/ui/win/atom_desktop_window_tree_host_win.cc
similarity index 95%
rename from atom/browser/atom_desktop_window_tree_host_win.cc
rename to atom/browser/ui/win/atom_desktop_window_tree_host_win.cc
index 9c5ebf0f42..55912612eb 100644
--- a/atom/browser/atom_desktop_window_tree_host_win.cc
+++ b/atom/browser/ui/win/atom_desktop_window_tree_host_win.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/atom_desktop_window_tree_host_win.h"
+#include "atom/browser/ui/win/atom_desktop_window_tree_host_win.h"
 #include "atom/browser/ui/win/thumbar_host.h"
 
 namespace atom {
diff --git a/atom/browser/atom_desktop_window_tree_host_win.h b/atom/browser/ui/win/atom_desktop_window_tree_host_win.h
similarity index 83%
rename from atom/browser/atom_desktop_window_tree_host_win.h
rename to atom/browser/ui/win/atom_desktop_window_tree_host_win.h
index 0271d06e6a..7f2abf801a 100644
--- a/atom/browser/atom_desktop_window_tree_host_win.h
+++ b/atom/browser/ui/win/atom_desktop_window_tree_host_win.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_ATOM_DESKTOP_WINDOW_TREE_HOST_WIN_H_
-#define ATOM_BROWSER_ATOM_DESKTOP_WINDOW_TREE_HOST_WIN_H_
+#ifndef ATOM_BROWSER_UI_WIN_ATOM_DESKTOP_WINDOW_TREE_HOST_WIN_H_
+#define ATOM_BROWSER_UI_WIN_ATOM_DESKTOP_WINDOW_TREE_HOST_WIN_H_
 
 #include <windows.h>
 
@@ -38,4 +38,4 @@ class AtomDesktopWindowTreeHostWin : public views::DesktopWindowTreeHostWin {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_ATOM_DESKTOP_WINDOW_TREE_HOST_WIN_H_
+#endif  // ATOM_BROWSER_UI_WIN_ATOM_DESKTOP_WINDOW_TREE_HOST_WIN_H_