diff --git a/Android.bp b/Android.bp
index cd28e41..5681cb7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -18,7 +18,9 @@
 cc_library_static {
     name: "libdrmhwc_utils",
 
-    srcs: ["worker.cpp"],
+    srcs: ["utils/worker.cpp"],
+
+    include_dirs: ["external/drm_hwcomposer/include"],
 
     cflags: [
         "-Wall",
@@ -45,6 +47,8 @@
         "libutils",
     ],
 
+    include_dirs: ["external/drm_hwcomposer/include"],
+
     static_libs: ["libdrmhwc_utils"],
 
     cflags: [
@@ -64,22 +68,26 @@
     name: "drm_hwcomposer",
     defaults: ["hwcomposer.drm_defaults"],
     srcs: [
-        "autolock.cpp",
-        "resourcemanager.cpp",
-        "drmdevice.cpp",
-        "drmconnector.cpp",
-        "drmcrtc.cpp",
-        "drmdisplaycomposition.cpp",
-        "drmdisplaycompositor.cpp",
-        "drmencoder.cpp",
-        "drmeventlistener.cpp",
         "drmhwctwo.cpp",
-        "drmmode.cpp",
-        "drmplane.cpp",
-        "drmproperty.cpp",
-        "hwcutils.cpp",
-        "platform.cpp",
-        "vsyncworker.cpp",
+
+        "compositor/drmdisplaycomposition.cpp",
+        "compositor/drmdisplaycompositor.cpp",
+
+        "drm/drmconnector.cpp",
+        "drm/drmcrtc.cpp",
+        "drm/drmdevice.cpp",
+        "drm/drmencoder.cpp",
+        "drm/drmeventlistener.cpp",
+        "drm/drmmode.cpp",
+        "drm/drmplane.cpp",
+        "drm/drmproperty.cpp",
+        "drm/resourcemanager.cpp",
+        "drm/vsyncworker.cpp",
+
+        "platform/platform.cpp",
+
+        "utils/autolock.cpp",
+        "utils/hwcutils.cpp",
     ],
 }
 
@@ -87,7 +95,7 @@
     name: "hwcomposer.drm",
     defaults: ["hwcomposer.drm_defaults"],
     whole_static_libs: ["drm_hwcomposer"],
-    srcs: ["platformdrmgeneric.cpp"],
+    srcs: ["platform/platformdrmgeneric.cpp"],
     cppflags: ["-DUSE_DRM_GENERIC_IMPORTER"],
 }
 
@@ -96,8 +104,8 @@
     defaults: ["hwcomposer.drm_defaults"],
     whole_static_libs: ["drm_hwcomposer"],
     srcs: [
-        "platformdrmgeneric.cpp",
-        "platformminigbm.cpp",
+        "platform/platformdrmgeneric.cpp",
+        "platform/platformminigbm.cpp",
     ],
     include_dirs: ["external/minigbm/cros_gralloc"],
 }
@@ -106,8 +114,8 @@
 filegroup {
     name: "drm_hwcomposer_platformhisi",
     srcs: [
-        "platformdrmgeneric.cpp",
-        "platformhisi.cpp",
+        "platform/platformdrmgeneric.cpp",
+        "platform/platformhisi.cpp",
     ],
 }
 
@@ -115,7 +123,7 @@
 filegroup {
     name: "drm_hwcomposer_platformmeson",
     srcs: [
-        "platformdrmgeneric.cpp",
-        "platformmeson.cpp",
+        "platform/platformdrmgeneric.cpp",
+        "platform/platformmeson.cpp",
     ],
 }
diff --git a/drmdisplaycomposition.cpp b/compositor/drmdisplaycomposition.cpp
similarity index 100%
rename from drmdisplaycomposition.cpp
rename to compositor/drmdisplaycomposition.cpp
diff --git a/drmdisplaycompositor.cpp b/compositor/drmdisplaycompositor.cpp
similarity index 100%
rename from drmdisplaycompositor.cpp
rename to compositor/drmdisplaycompositor.cpp
diff --git a/drmconnector.cpp b/drm/drmconnector.cpp
similarity index 100%
rename from drmconnector.cpp
rename to drm/drmconnector.cpp
diff --git a/drmcrtc.cpp b/drm/drmcrtc.cpp
similarity index 100%
rename from drmcrtc.cpp
rename to drm/drmcrtc.cpp
diff --git a/drmdevice.cpp b/drm/drmdevice.cpp
similarity index 100%
rename from drmdevice.cpp
rename to drm/drmdevice.cpp
diff --git a/drmencoder.cpp b/drm/drmencoder.cpp
similarity index 100%
rename from drmencoder.cpp
rename to drm/drmencoder.cpp
diff --git a/drmeventlistener.cpp b/drm/drmeventlistener.cpp
similarity index 100%
rename from drmeventlistener.cpp
rename to drm/drmeventlistener.cpp
diff --git a/drmmode.cpp b/drm/drmmode.cpp
similarity index 100%
rename from drmmode.cpp
rename to drm/drmmode.cpp
diff --git a/drmplane.cpp b/drm/drmplane.cpp
similarity index 100%
rename from drmplane.cpp
rename to drm/drmplane.cpp
diff --git a/drmproperty.cpp b/drm/drmproperty.cpp
similarity index 100%
rename from drmproperty.cpp
rename to drm/drmproperty.cpp
diff --git a/resourcemanager.cpp b/drm/resourcemanager.cpp
similarity index 100%
rename from resourcemanager.cpp
rename to drm/resourcemanager.cpp
diff --git a/vsyncworker.cpp b/drm/vsyncworker.cpp
similarity index 100%
rename from vsyncworker.cpp
rename to drm/vsyncworker.cpp
diff --git a/autofd.h b/include/autofd.h
similarity index 100%
rename from autofd.h
rename to include/autofd.h
diff --git a/autolock.h b/include/autolock.h
similarity index 100%
rename from autolock.h
rename to include/autolock.h
diff --git a/drmconnector.h b/include/drmconnector.h
similarity index 100%
rename from drmconnector.h
rename to include/drmconnector.h
diff --git a/drmcrtc.h b/include/drmcrtc.h
similarity index 100%
rename from drmcrtc.h
rename to include/drmcrtc.h
diff --git a/drmdevice.h b/include/drmdevice.h
similarity index 100%
rename from drmdevice.h
rename to include/drmdevice.h
diff --git a/drmdisplaycomposition.h b/include/drmdisplaycomposition.h
similarity index 100%
rename from drmdisplaycomposition.h
rename to include/drmdisplaycomposition.h
diff --git a/drmdisplaycompositor.h b/include/drmdisplaycompositor.h
similarity index 100%
rename from drmdisplaycompositor.h
rename to include/drmdisplaycompositor.h
diff --git a/drmencoder.h b/include/drmencoder.h
similarity index 100%
rename from drmencoder.h
rename to include/drmencoder.h
diff --git a/drmeventlistener.h b/include/drmeventlistener.h
similarity index 100%
rename from drmeventlistener.h
rename to include/drmeventlistener.h
diff --git a/drmframebuffer.h b/include/drmframebuffer.h
similarity index 100%
rename from drmframebuffer.h
rename to include/drmframebuffer.h
diff --git a/drmhwcgralloc.h b/include/drmhwcgralloc.h
similarity index 100%
rename from drmhwcgralloc.h
rename to include/drmhwcgralloc.h
diff --git a/drmhwcomposer.h b/include/drmhwcomposer.h
similarity index 100%
rename from drmhwcomposer.h
rename to include/drmhwcomposer.h
diff --git a/drmhwctwo.h b/include/drmhwctwo.h
similarity index 100%
rename from drmhwctwo.h
rename to include/drmhwctwo.h
diff --git a/drmmode.h b/include/drmmode.h
similarity index 100%
rename from drmmode.h
rename to include/drmmode.h
diff --git a/drmplane.h b/include/drmplane.h
similarity index 100%
rename from drmplane.h
rename to include/drmplane.h
diff --git a/drmproperty.h b/include/drmproperty.h
similarity index 100%
rename from drmproperty.h
rename to include/drmproperty.h
diff --git a/platform.h b/include/platform.h
similarity index 100%
rename from platform.h
rename to include/platform.h
diff --git a/resourcemanager.h b/include/resourcemanager.h
similarity index 100%
rename from resourcemanager.h
rename to include/resourcemanager.h
diff --git a/vsyncworker.h b/include/vsyncworker.h
similarity index 100%
rename from vsyncworker.h
rename to include/vsyncworker.h
diff --git a/worker.h b/include/worker.h
similarity index 100%
rename from worker.h
rename to include/worker.h
diff --git a/platform.cpp b/platform/platform.cpp
similarity index 100%
rename from platform.cpp
rename to platform/platform.cpp
diff --git a/platformdrmgeneric.cpp b/platform/platformdrmgeneric.cpp
similarity index 100%
rename from platformdrmgeneric.cpp
rename to platform/platformdrmgeneric.cpp
diff --git a/platformdrmgeneric.h b/platform/platformdrmgeneric.h
similarity index 100%
rename from platformdrmgeneric.h
rename to platform/platformdrmgeneric.h
diff --git a/platformhisi.cpp b/platform/platformhisi.cpp
similarity index 100%
rename from platformhisi.cpp
rename to platform/platformhisi.cpp
diff --git a/platformhisi.h b/platform/platformhisi.h
similarity index 100%
rename from platformhisi.h
rename to platform/platformhisi.h
diff --git a/platformmeson.cpp b/platform/platformmeson.cpp
similarity index 100%
rename from platformmeson.cpp
rename to platform/platformmeson.cpp
diff --git a/platformmeson.h b/platform/platformmeson.h
similarity index 100%
rename from platformmeson.h
rename to platform/platformmeson.h
diff --git a/platformminigbm.cpp b/platform/platformminigbm.cpp
similarity index 100%
rename from platformminigbm.cpp
rename to platform/platformminigbm.cpp
diff --git a/platformminigbm.h b/platform/platformminigbm.h
similarity index 100%
rename from platformminigbm.h
rename to platform/platformminigbm.h
diff --git a/tests/Android.bp b/tests/Android.bp
index 058faa0..7e550ff 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -9,5 +9,5 @@
     header_libs: ["libhardware_headers"],
     static_libs: ["libdrmhwc_utils"],
     shared_libs: ["hwcomposer.drm"],
-    include_dirs: ["external/drm_hwcomposer"],
+    include_dirs: ["external/drm_hwcomposer/include"],
 }
diff --git a/autolock.cpp b/utils/autolock.cpp
similarity index 100%
rename from autolock.cpp
rename to utils/autolock.cpp
diff --git a/hwcutils.cpp b/utils/hwcutils.cpp
similarity index 100%
rename from hwcutils.cpp
rename to utils/hwcutils.cpp
diff --git a/worker.cpp b/utils/worker.cpp
similarity index 100%
rename from worker.cpp
rename to utils/worker.cpp