diff --git a/sensors/v1/Android.bp b/sensors/v1/Android.bp
new file mode 100644
index 0000000..c897399
--- /dev/null
+++ b/sensors/v1/Android.bp
@@ -0,0 +1,22 @@
+//
+// Copyright (C) 2022 The LineageOS Project
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+cc_library_shared {
+    name: "sensors.udfps",
+    defaults: ["hidl_defaults"],
+    srcs: [
+        "udfps_hal.cpp",
+    ],
+    shared_libs: [
+        "libcutils",
+        "liblog",
+        "libutils",
+    ],
+    header_libs: [
+        "libhardware_headers",
+    ],
+    vendor: true,
+}
diff --git a/sensors/udfps_hal.cpp b/sensors/v1/udfps_hal.cpp
similarity index 100%
rename from sensors/udfps_hal.cpp
rename to sensors/v1/udfps_hal.cpp
diff --git a/sensors/Android.bp b/sensors/v2/Android.bp
similarity index 73%
rename from sensors/Android.bp
rename to sensors/v2/Android.bp
index affecf4..eb6dcc7 100644
--- a/sensors/Android.bp
+++ b/sensors/v2/Android.bp
@@ -33,20 +33,3 @@ cc_library_shared {
     ],
     vendor: true,
 }
-
-cc_library_shared {
-    name: "sensors.udfps",
-    defaults: ["hidl_defaults"],
-    srcs: [
-        "udfps_hal.cpp",
-    ],
-    shared_libs: [
-        "libcutils",
-        "liblog",
-        "libutils",
-    ],
-    header_libs: [
-        "libhardware_headers",
-    ],
-    vendor: true,
-}
diff --git a/sensors/Sensor.cpp b/sensors/v2/Sensor.cpp
similarity index 100%
rename from sensors/Sensor.cpp
rename to sensors/v2/Sensor.cpp
diff --git a/sensors/Sensor.h b/sensors/v2/Sensor.h
similarity index 100%
rename from sensors/Sensor.h
rename to sensors/v2/Sensor.h
diff --git a/sensors/SensorsSubHal.cpp b/sensors/v2/SensorsSubHal.cpp
similarity index 100%
rename from sensors/SensorsSubHal.cpp
rename to sensors/v2/SensorsSubHal.cpp
diff --git a/sensors/SensorsSubHal.h b/sensors/v2/SensorsSubHal.h
similarity index 100%
rename from sensors/SensorsSubHal.h
rename to sensors/v2/SensorsSubHal.h