diff --git a/ash/BUILD.gn b/ash/BUILD.gn
index d89e4846be902..7a5e1ea494a1e 100644
--- a/ash/BUILD.gn
+++ b/ash/BUILD.gn
@@ -1114,10 +1114,6 @@ component("ash") {
     "wm/always_on_top_controller.h",
     "wm/ash_focus_rules.cc",
     "wm/ash_focus_rules.h",
-    "wm/back_gesture_affordance.cc",
-    "wm/back_gesture_affordance.h",
-    "wm/back_gesture_metrics.cc",
-    "wm/back_gesture_metrics.h",
     "wm/base_state.cc",
     "wm/base_state.h",
     "wm/client_controlled_state.cc",
@@ -1167,6 +1163,10 @@ component("ash") {
     "wm/event_client_impl.h",
     "wm/fullscreen_window_finder.cc",
     "wm/fullscreen_window_finder.h",
+    "wm/gestures/back_gesture/back_gesture_affordance.cc",
+    "wm/gestures/back_gesture/back_gesture_affordance.h",
+    "wm/gestures/back_gesture/back_gesture_metrics.cc",
+    "wm/gestures/back_gesture/back_gesture_metrics.h",
     "wm/gestures/wm_gesture_handler.cc",
     "wm/gestures/wm_gesture_handler.h",
     "wm/immersive_context_ash.cc",
@@ -1940,7 +1940,6 @@ test("ash_unittests") {
     "window_user_data_unittest.cc",
     "wm/always_on_top_controller_unittest.cc",
     "wm/ash_focus_rules_unittest.cc",
-    "wm/back_gesture_affordance_unittest.cc",
     "wm/client_controlled_state_unittest.cc",
     "wm/collision_detection/collision_detection_utils_unittest.cc",
     "wm/container_finder_unittest.cc",
@@ -1949,6 +1948,7 @@ test("ash_unittests") {
     "wm/desks/desks_unittests.cc",
     "wm/drag_window_resizer_unittest.cc",
     "wm/fullscreen_window_finder_unittest.cc",
+    "wm/gestures/back_gesture/back_gesture_affordance_unittest.cc",
     "wm/gestures/wm_gesture_handler_unittest.cc",
     "wm/immersive_fullscreen_controller_unittest.cc",
     "wm/lock_action_handler_layout_manager_unittest.cc",
diff --git a/ash/wm/gestures/back_gesture/OWNERS b/ash/wm/gestures/back_gesture/OWNERS
new file mode 100644
index 0000000000000..fcd01e78c5700
--- /dev/null
+++ b/ash/wm/gestures/back_gesture/OWNERS
@@ -0,0 +1 @@
+minch@chromium.org
diff --git a/ash/wm/back_gesture_affordance.cc b/ash/wm/gestures/back_gesture/back_gesture_affordance.cc
similarity index 99%
rename from ash/wm/back_gesture_affordance.cc
rename to ash/wm/gestures/back_gesture/back_gesture_affordance.cc
index 3c661c83ac65c..a3bd0ea67d9d9 100644
--- a/ash/wm/back_gesture_affordance.cc
+++ b/ash/wm/gestures/back_gesture/back_gesture_affordance.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 "ash/wm/back_gesture_affordance.h"
+#include "ash/wm/gestures/back_gesture/back_gesture_affordance.h"
 
 #include "ash/display/screen_orientation_controller.h"
 #include "ash/public/cpp/shell_window_ids.h"
diff --git a/ash/wm/back_gesture_affordance.h b/ash/wm/gestures/back_gesture/back_gesture_affordance.h
similarity index 94%
rename from ash/wm/back_gesture_affordance.h
rename to ash/wm/gestures/back_gesture/back_gesture_affordance.h
index 3cf067eb8eebf..a258d5088c989 100644
--- a/ash/wm/back_gesture_affordance.h
+++ b/ash/wm/gestures/back_gesture/back_gesture_affordance.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_WM_BACK_GESTURE_AFFORDANCE_H_
-#define ASH_WM_BACK_GESTURE_AFFORDANCE_H_
+#ifndef ASH_WM_GESTURES_BACK_GESTURE_BACK_GESTURE_AFFORDANCE_H_
+#define ASH_WM_GESTURES_BACK_GESTURE_BACK_GESTURE_AFFORDANCE_H_
 
 #include <memory>
 
@@ -99,4 +99,4 @@ class ASH_EXPORT BackGestureAffordance : public gfx::AnimationDelegate {
 
 }  // namespace ash
 
-#endif  // ASH_WM_BACK_GESTURE_AFFORDANCE_H_
+#endif  // ASH_WM_GESTURES_BACK_GESTURE_BACK_GESTURE_AFFORDANCE_H_
diff --git a/ash/wm/back_gesture_affordance_unittest.cc b/ash/wm/gestures/back_gesture/back_gesture_affordance_unittest.cc
similarity index 98%
rename from ash/wm/back_gesture_affordance_unittest.cc
rename to ash/wm/gestures/back_gesture/back_gesture_affordance_unittest.cc
index af97dff189afa..79a4581142975 100644
--- a/ash/wm/back_gesture_affordance_unittest.cc
+++ b/ash/wm/gestures/back_gesture/back_gesture_affordance_unittest.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 "ash/wm/back_gesture_affordance.h"
+#include "ash/wm/gestures/back_gesture/back_gesture_affordance.h"
 
 #include "ash/display/screen_orientation_controller.h"
 #include "ash/display/screen_orientation_controller_test_api.h"
diff --git a/ash/wm/back_gesture_metrics.cc b/ash/wm/gestures/back_gesture/back_gesture_metrics.cc
similarity index 99%
rename from ash/wm/back_gesture_metrics.cc
rename to ash/wm/gestures/back_gesture/back_gesture_metrics.cc
index 6a77781dc208e..78668e8f3a213 100644
--- a/ash/wm/back_gesture_metrics.cc
+++ b/ash/wm/gestures/back_gesture/back_gesture_metrics.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 "ash/wm/back_gesture_metrics.h"
+#include "ash/wm/gestures/back_gesture/back_gesture_metrics.h"
 
 #include "ash/display/screen_orientation_controller.h"
 #include "ash/public/cpp/app_types.h"
diff --git a/ash/wm/back_gesture_metrics.h b/ash/wm/gestures/back_gesture/back_gesture_metrics.h
similarity index 92%
rename from ash/wm/back_gesture_metrics.h
rename to ash/wm/gestures/back_gesture/back_gesture_metrics.h
index d9c4570e688ee..f663972640d74 100644
--- a/ash/wm/back_gesture_metrics.h
+++ b/ash/wm/gestures/back_gesture/back_gesture_metrics.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_WM_BACK_GESTURE_METRICS_H_
-#define ASH_WM_BACK_GESTURE_METRICS_H_
+#ifndef ASH_WM_GESTURES_BACK_GESTURE_BACK_GESTURE_METRICS_H_
+#define ASH_WM_GESTURES_BACK_GESTURE_BACK_GESTURE_METRICS_H_
 
 #include "ui/gfx/geometry/point.h"
 
@@ -82,4 +82,4 @@ void RecordUnderneathWindowType(BackGestureUnderneathWindowType type);
 
 }  // namespace ash
 
-#endif  // ASH_WM_BACK_GESTURE_METRICS_H_
+#endif  // ASH_WM_GESTURES_BACK_GESTURE_BACK_GESTURE_METRICS_H_
diff --git a/ash/wm/toplevel_window_event_handler.cc b/ash/wm/toplevel_window_event_handler.cc
index 2d4fdfe011a9b..9ccf0c618cbb9 100644
--- a/ash/wm/toplevel_window_event_handler.cc
+++ b/ash/wm/toplevel_window_event_handler.cc
@@ -12,7 +12,7 @@
 #include "ash/public/cpp/ash_features.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/shell.h"
-#include "ash/wm/back_gesture_affordance.h"
+#include "ash/wm/gestures/back_gesture/back_gesture_affordance.h"
 #include "ash/wm/overview/overview_controller.h"
 #include "ash/wm/resize_shadow_controller.h"
 #include "ash/wm/splitview/split_view_divider.h"
diff --git a/ash/wm/toplevel_window_event_handler.h b/ash/wm/toplevel_window_event_handler.h
index f478b6a2874fd..d6508e4a83f80 100644
--- a/ash/wm/toplevel_window_event_handler.h
+++ b/ash/wm/toplevel_window_event_handler.h
@@ -9,7 +9,7 @@
 
 #include "ash/ash_export.h"
 #include "ash/display/window_tree_host_manager.h"
-#include "ash/wm/back_gesture_metrics.h"
+#include "ash/wm/gestures/back_gesture/back_gesture_metrics.h"
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"