diff --git a/.ci/Makefile b/.ci/Makefile
index ebe534f..4ca14d6 100644
--- a/.ci/Makefile
+++ b/.ci/Makefile
@@ -37,6 +37,8 @@
     drm/DrmProperty.cpp:COARSE                          \
     drm/UEventListener.cpp:COARSE                       \
     drm/VSyncWorker.cpp:COARSE                          \
+    hwc2_device/DrmHwcTwo.cpp:COARSE                    \
+    hwc2_device/DrmHwcTwo.h:COARSE                      \
     hwc2_device/HwcDisplay.cpp:COARSE                   \
     hwc2_device/HwcDisplay.h:COARSE                     \
     tests/worker_test.cpp:COARSE                        \
@@ -44,8 +46,6 @@
     utils/UniqueFd.h:FINE                               \
     utils/log.h:FINE                                    \
     utils/properties.h:FINE                             \
-    DrmHwcTwo.cpp:COARSE                                \
-    DrmHwcTwo.h:COARSE                                  \
 
 TIDY_CHECKS_FINE := *                                   \
     -llvmlibc* -fuchsia-* -altera-*                     \
diff --git a/Android.bp b/Android.bp
index d72e13a..59aa05f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -81,8 +81,6 @@
 filegroup {
     name: "drm_hwcomposer_common",
     srcs: [
-        "DrmHwcTwo.cpp",
-
         "bufferinfo/BufferInfoGetter.cpp",
         "bufferinfo/BufferInfoMapperMetadata.cpp",
 
@@ -110,6 +108,7 @@
         "backend/BackendManager.cpp",
         "backend/BackendRCarDu.cpp",
 
+        "hwc2_device/DrmHwcTwo.cpp",
         "hwc2_device/HwcDisplay.cpp",
         "hwc2_device/HwcLayer.cpp",
         "hwc2_device/hwc2_device.cpp",
diff --git a/backend/Backend.h b/backend/Backend.h
index 1a4833e..82b8fca 100644
--- a/backend/Backend.h
+++ b/backend/Backend.h
@@ -17,7 +17,7 @@
 #ifndef ANDROID_BACKEND_H
 #define ANDROID_BACKEND_H
 
-#include "DrmHwcTwo.h"
+#include "hwc2_device/DrmHwcTwo.h"
 
 namespace android {
 
diff --git a/DrmHwcTwo.cpp b/hwc2_device/DrmHwcTwo.cpp
similarity index 100%
rename from DrmHwcTwo.cpp
rename to hwc2_device/DrmHwcTwo.cpp
diff --git a/DrmHwcTwo.h b/hwc2_device/DrmHwcTwo.h
similarity index 100%
rename from DrmHwcTwo.h
rename to hwc2_device/DrmHwcTwo.h