diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 48d30a44..c5188011 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -420,7 +420,7 @@ BOARD_SYSTEM_KERNEL_MODULES := $(addprefix $(KERNEL_MODULE_DIR)/, $(notdir $(BOA
 # Using BUILD_COPY_HEADERS
 BUILD_BROKEN_USES_BUILD_COPY_HEADERS := true
 
-include device/google/gs201-sepolicy/gs201-sepolicy.mk
+include device/google/gs201/sepolicy/gs201-sepolicy.mk
 
 # Battery options
 BOARD_KERNEL_CMDLINE += at24.write_timeout=100
diff --git a/sepolicy/gs201-sepolicy.mk b/sepolicy/gs201-sepolicy.mk
index 2c5da1fc..cad5cc77 100644
--- a/sepolicy/gs201-sepolicy.mk
+++ b/sepolicy/gs201-sepolicy.mk
@@ -1,24 +1,24 @@
 # sepolicy that are shared among devices using whitechapel
-BOARD_SEPOLICY_DIRS += device/google/gs201-sepolicy/whitechapel_pro
+BOARD_SEPOLICY_DIRS += device/google/gs201/sepolicy/whitechapel_pro
 
 # unresolved SELinux error log with bug tracking
-BOARD_SEPOLICY_DIRS += device/google/gs201-sepolicy/tracking_denials
+BOARD_SEPOLICY_DIRS += device/google/gs201/sepolicy/tracking_denials
 
-PRODUCT_PUBLIC_SEPOLICY_DIRS += device/google/gs201-sepolicy/public
-PRODUCT_PRIVATE_SEPOLICY_DIRS += device/google/gs201-sepolicy/private
+PRODUCT_PUBLIC_SEPOLICY_DIRS += device/google/gs201/sepolicy/public
+PRODUCT_PRIVATE_SEPOLICY_DIRS += device/google/gs201/sepolicy/private
 
 # system_ext
-SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += device/google/gs201-sepolicy/system_ext/public
-SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += device/google/gs201-sepolicy/system_ext/private
+SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += device/google/gs201/sepolicy/system_ext/public
+SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += device/google/gs201/sepolicy/system_ext/private
 
 #
 # Pixel-wide
 #
 # Dauntless sepolicy (b/199685763)
-BOARD_SEPOLICY_DIRS += device/google/gs201-sepolicy/dauntless
+BOARD_SEPOLICY_DIRS += device/google/gs201/sepolicy/dauntless
 
 #   PowerStats HAL
 BOARD_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/powerstats
 
 # Health HAL
-BOARD_SEPOLICY_DIRS += device/google/gs201-sepolicy/health
+BOARD_SEPOLICY_DIRS += device/google/gs201/sepolicy/health
diff --git a/sepolicy/system_ext/private/keys.conf b/sepolicy/system_ext/private/keys.conf
index c2228db6..8c8c9a8d 100644
--- a/sepolicy/system_ext/private/keys.conf
+++ b/sepolicy/system_ext/private/keys.conf
@@ -1,3 +1,3 @@
 [@UWB]
-ALL : device/google/gs201-sepolicy/system_ext/private/certs/com_qorvo_uwb.x509.pem
+ALL : device/google/gs201/sepolicy/system_ext/private/certs/com_qorvo_uwb.x509.pem
 
diff --git a/sepolicy/whitechapel_pro/keys.conf b/sepolicy/whitechapel_pro/keys.conf
index 8890aff4..972a9fa5 100644
--- a/sepolicy/whitechapel_pro/keys.conf
+++ b/sepolicy/whitechapel_pro/keys.conf
@@ -1,17 +1,17 @@
 [@GOOGLE]
-ALL : device/google/gs201-sepolicy/whitechapel_pro/certs/app.x509.pem
+ALL : device/google/gs201/sepolicy/whitechapel_pro/certs/app.x509.pem
 
 [@MDS]
-ALL : device/google/gs201-sepolicy/whitechapel_pro/certs/com_google_mds.x509.pem
+ALL : device/google/gs201/sepolicy/whitechapel_pro/certs/com_google_mds.x509.pem
 
 [@EUICCSUPPORTPIXEL]
-ALL : device/google/gs201-sepolicy/whitechapel_pro/certs/EuiccSupportPixel.x509.pem
+ALL : device/google/gs201/sepolicy/whitechapel_pro/certs/EuiccSupportPixel.x509.pem
 
 [@CAMERAENG]
-ALL : device/google/gs201-sepolicy/whitechapel_pro/certs/camera_eng.x509.pem
+ALL : device/google/gs201/sepolicy/whitechapel_pro/certs/camera_eng.x509.pem
 
 [@CAMERAFISHFOOD]
-ALL : device/google/gs201-sepolicy/whitechapel_pro/certs/camera_fishfood.x509.pem
+ALL : device/google/gs201/sepolicy/whitechapel_pro/certs/camera_fishfood.x509.pem
 
 [@CAMERASERVICES]
-ALL : device/google/gs201-sepolicy/whitechapel_pro/certs/com_google_android_apps_camera_services.x509.pem
+ALL : device/google/gs201/sepolicy/whitechapel_pro/certs/com_google_android_apps_camera_services.x509.pem
diff --git a/widevine/device.mk b/widevine/device.mk
index c711f6f7..7e66070b 100644
--- a/widevine/device.mk
+++ b/widevine/device.mk
@@ -1 +1 @@
-BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs201-sepolicy/widevine
\ No newline at end of file
+BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs201/sepolicy/widevine