diff --git a/legacy/aocd.te b/aoc/aocd.te
similarity index 100%
rename from legacy/aocd.te
rename to aoc/aocd.te
diff --git a/legacy/aocdump.te b/aoc/aocdump.te
similarity index 76%
rename from legacy/aocdump.te
rename to aoc/aocdump.te
index ca468a35..90911424 100644
--- a/legacy/aocdump.te
+++ b/aoc/aocdump.te
@@ -6,14 +6,11 @@ userdebug_or_eng(`
     # Permit communication with AoC
     allow aocdump aoc_device:chr_file rw_file_perms;
 
-    allow aocdump radio_vendor_data_file:dir rw_dir_perms;
-    allow aocdump radio_vendor_data_file:file create_file_perms;
     allow aocdump wifi_logging_data_file:dir create_dir_perms;
     allow aocdump wifi_logging_data_file:file create_file_perms;
     set_prop(aocdump, vendor_audio_prop);
     r_dir_file(aocdump, proc_asound)
 
     allow aocdump self:unix_stream_socket create_stream_socket_perms;
-    allow aocdump property_socket:sock_file { write };
     allow aocdump audio_vendor_data_file:sock_file { create unlink };
 ')
diff --git a/aoc/device.te b/aoc/device.te
new file mode 100644
index 00000000..fbd2b327
--- /dev/null
+++ b/aoc/device.te
@@ -0,0 +1,5 @@
+# AOC device
+type aoc_device, dev_type;
+
+# AMCS device
+type amcs_device, dev_type;
diff --git a/aoc/file.te b/aoc/file.te
new file mode 100644
index 00000000..fec17dcb
--- /dev/null
+++ b/aoc/file.te
@@ -0,0 +1,16 @@
+# sysfs
+type sysfs_aoc_boottime, sysfs_type, fs_type;
+type sysfs_aoc_firmware, sysfs_type, fs_type;
+type sysfs_aoc, sysfs_type, fs_type;
+type sysfs_aoc_reset, sysfs_type, fs_type;
+type sysfs_pixelstats, fs_type, sysfs_type;
+
+# persist
+type persist_aoc_file, file_type, vendor_persist_type;
+type persist_audio_file, file_type, vendor_persist_type;
+
+# vendor
+type aoc_audio_file, file_type, vendor_file_type;
+
+# data
+type audio_vendor_data_file, file_type, data_file_type;
diff --git a/aoc/file_contexts b/aoc/file_contexts
new file mode 100644
index 00000000..edd3ebb1
--- /dev/null
+++ b/aoc/file_contexts
@@ -0,0 +1,33 @@
+# AoC devices
+/dev/acd-audio_output_tuning        u:object_r:aoc_device:s0
+/dev/acd-audio_bulk_tx              u:object_r:aoc_device:s0
+/dev/acd-audio_bulk_rx              u:object_r:aoc_device:s0
+/dev/acd-audio_input_tuning         u:object_r:aoc_device:s0
+/dev/acd-audio_input_bulk_tx        u:object_r:aoc_device:s0
+/dev/acd-audio_input_bulk_rx        u:object_r:aoc_device:s0
+/dev/acd-sound_trigger              u:object_r:aoc_device:s0
+/dev/acd-hotword_notification       u:object_r:aoc_device:s0
+/dev/acd-hotword_pcm                u:object_r:aoc_device:s0
+/dev/acd-ambient_pcm                u:object_r:aoc_device:s0
+/dev/acd-model_data                 u:object_r:aoc_device:s0
+/dev/acd-debug                      u:object_r:aoc_device:s0
+/dev/acd-audio_tap[0-9]*            u:object_r:aoc_device:s0
+/dev/acd-audio_dcdoff_ref           u:object_r:aoc_device:s0
+/dev/acd-com.google.usf             u:object_r:aoc_device:s0
+/dev/acd-logging                    u:object_r:aoc_device:s0
+/dev/aoc                            u:object_r:aoc_device:s0
+/dev/amcs                           u:object_r:amcs_device:s0
+
+# AoC vendor binaries
+/vendor/bin/aocd                    u:object_r:aocd_exec:s0
+/vendor/bin/aocdump                 u:object_r:aocdump_exec:s0
+
+# AoC audio files
+/vendor/etc/aoc(/.*)?               u:object_r:aoc_audio_file:s0
+
+# Aoc persist files
+/mnt/vendor/persist/aoc(/.*)?       u:object_r:persist_aoc_file:s0
+/mnt/vendor/persist/audio(/.*)?     u:object_r:persist_audio_file:s0
+
+# Audio data files
+/data/vendor/audio(/.*)?            u:object_r:audio_vendor_data_file:s0
diff --git a/aoc/genfs_contexts b/aoc/genfs_contexts
new file mode 100644
index 00000000..4be738a6
--- /dev/null
+++ b/aoc/genfs_contexts
@@ -0,0 +1,16 @@
+# AOC
+genfscon sysfs /devices/platform/19000000.aoc/aoc_clock_and_kernel_boottime u:object_r:sysfs_aoc_boottime:s0
+genfscon sysfs /devices/platform/19000000.aoc/firmware                      u:object_r:sysfs_aoc_firmware:s0
+genfscon sysfs /devices/platform/19000000.aoc                               u:object_r:sysfs_aoc:s0
+genfscon sysfs /devices/platform/19000000.aoc/reset                         u:object_r:sysfs_aoc_reset:s0
+
+# pixelstat_vendor
+genfscon sysfs /devices/platform/audiometrics/codec_state                   u:object_r:sysfs_pixelstats:s0
+genfscon sysfs /devices/platform/audiometrics/hs_codec_state                u:object_r:sysfs_pixelstats:s0
+genfscon sysfs /devices/platform/audiometrics/speaker_impedance             u:object_r:sysfs_pixelstats:s0
+genfscon sysfs /devices/platform/audiometrics/speaker_excursion             u:object_r:sysfs_pixelstats:s0
+genfscon sysfs /devices/platform/audiometrics/speaker_heartbeat             u:object_r:sysfs_pixelstats:s0
+genfscon sysfs /devices/platform/audiometrics/speaker_temp                  u:object_r:sysfs_pixelstats:s0
+genfscon sysfs /devices/platform/audiometrics/mic_broken_degrade            u:object_r:sysfs_pixelstats:s0
+genfscon sysfs /devices/platform/audiometrics/codec_crashed_counter         u:object_r:sysfs_pixelstats:s0
+
diff --git a/legacy/hal_audio_default.te b/aoc/hal_audio_default.te
similarity index 100%
rename from legacy/hal_audio_default.te
rename to aoc/hal_audio_default.te
diff --git a/legacy/hal_audiometricext_default.te b/aoc/hal_audiometricext_default.te
similarity index 100%
rename from legacy/hal_audiometricext_default.te
rename to aoc/hal_audiometricext_default.te
diff --git a/aoc/hwservice.te b/aoc/hwservice.te
new file mode 100644
index 00000000..b7bf5d92
--- /dev/null
+++ b/aoc/hwservice.te
@@ -0,0 +1,6 @@
+# Audio
+type hal_audio_ext_hwservice, hwservice_manager_type;
+
+# AudioMetric
+type hal_audiometricext_hwservice, hwservice_manager_type;
+
diff --git a/aoc/hwservice_contexts b/aoc/hwservice_contexts
new file mode 100644
index 00000000..f06c8461
--- /dev/null
+++ b/aoc/hwservice_contexts
@@ -0,0 +1,4 @@
+# Audio
+vendor.google.whitechapel.audio.audioext::IAudioExt             u:object_r:hal_audio_ext_hwservice:s0
+vendor.google.audiometricext::IAudioMetricExt                   u:object_r:hal_audiometricext_hwservice:s0
+
diff --git a/aoc/property.te b/aoc/property.te
new file mode 100644
index 00000000..d38e3ec8
--- /dev/null
+++ b/aoc/property.te
@@ -0,0 +1,4 @@
+# AoC
+vendor_internal_prop(vendor_aoc_prop)
+# Audio
+vendor_internal_prop(vendor_audio_prop)
diff --git a/aoc/property_contexts b/aoc/property_contexts
new file mode 100644
index 00000000..cf460c23
--- /dev/null
+++ b/aoc/property_contexts
@@ -0,0 +1,10 @@
+# AoC
+vendor.aoc.firmware.version                     u:object_r:vendor_aoc_prop:s0
+
+# for audio
+vendor.audio_hal.period_multiplier              u:object_r:vendor_audio_prop:s0
+vendor.audiodump.enable                         u:object_r:vendor_audio_prop:s0
+persist.vendor.audio.                           u:object_r:vendor_audio_prop:s0
+vendor.audiodump.log.ondemand                   u:object_r:vendor_audio_prop:s0
+vendor.audiodump.log.config                     u:object_r:vendor_audio_prop:s0
+vendor.audiodump.output.dir                     u:object_r:vendor_audio_prop:s0
diff --git a/legacy/device.te b/legacy/device.te
index 55205990..a3af95f8 100644
--- a/legacy/device.te
+++ b/legacy/device.te
@@ -46,12 +46,6 @@ type vframe_heap_device, dmabuf_heap_device_type, dev_type;
 #vscaler-secure DMA-BUF heap
 type vscaler_heap_device, dmabuf_heap_device_type, dev_type;
 
-# AOC device
-type aoc_device, dev_type;
-
 # Fingerprint device
 type fingerprint_device, dev_type;
 
-# AMCS device
-type amcs_device, dev_type;
-
diff --git a/legacy/file.te b/legacy/file.te
index 17c8c0bb..4ef42471 100644
--- a/legacy/file.te
+++ b/legacy/file.te
@@ -83,18 +83,6 @@ type per_boot_file, file_type, data_file_type, core_data_file_type;
 type proc_touch, proc_type, fs_type, mlstrustedobject;
 type sysfs_touch, sysfs_type, fs_type;
 
-# AOC
-type sysfs_aoc_boottime, sysfs_type, fs_type;
-type sysfs_aoc_firmware, sysfs_type, fs_type;
-type sysfs_aoc, sysfs_type, fs_type;
-type sysfs_aoc_reset, sysfs_type, fs_type;
-
-# Audio
-type persist_audio_file, file_type, vendor_persist_type;
-type persist_aoc_file, file_type, vendor_persist_type;
-type audio_vendor_data_file, file_type, data_file_type;
-type aoc_audio_file, file_type, vendor_file_type;
-
 # RILD
 type rild_vendor_data_file, file_type, data_file_type;
 
@@ -171,9 +159,6 @@ type sysfs_lhbm, sysfs_type, fs_type, mlstrustedobject;
 # UWB vendor
 type uwb_vendor_data_file, file_type, data_file_type, app_data_file_type;
 
-# PixelStats_vendor
-type sysfs_pixelstats, fs_type, sysfs_type;
-
 # WLC FW
 type vendor_wlc_fwupdata_file, vendor_file_type, file_type;
 #
diff --git a/legacy/file_contexts b/legacy/file_contexts
index 5a853d0f..a36b57d7 100644
--- a/legacy/file_contexts
+++ b/legacy/file_contexts
@@ -216,9 +216,6 @@
 
 # Sensors
 /data/vendor/sensor(/.*)?              u:object_r:sensor_vendor_data_file:s0
-/dev/acd-com.google.usf                u:object_r:aoc_device:s0
-/dev/acd-logging                       u:object_r:aoc_device:s0
-/dev/aoc                               u:object_r:aoc_device:s0
 
 # Contexthub
 /vendor/bin/hw/android\.hardware\.contexthub@1\.2-service\.generic  u:object_r:hal_contexthub_default_exec:s0
@@ -229,9 +226,6 @@
 /vendor/bin/tcpdump_logger          u:object_r:tcpdump_logger_exec:s0
 /data/vendor/tcpdump_logger(/.*)?   u:object_r:tcpdump_vendor_data_file:s0
 
-# Audio logging
-/vendor/bin/aocdump                 u:object_r:aocdump_exec:s0
-
 # modem_svc_sit files
 /vendor/bin/modem_svc_sit           u:object_r:modem_svc_sit_exec:s0
 /data/vendor/modem_stat/debug\.txt  u:object_r:modem_stat_data_file:s0
@@ -266,27 +260,6 @@
 /dev/logbuffer_btlpm                  u:object_r:logbuffer_device:s0
 /dev/logbuffer_tty16                u:object_r:logbuffer_device:s0
 
-# Audio
-/mnt/vendor/persist/aoc(/.*)?       u:object_r:persist_aoc_file:s0
-/mnt/vendor/persist/audio(/.*)?     u:object_r:persist_audio_file:s0
-/data/vendor/audio(/.*)?            u:object_r:audio_vendor_data_file:s0
-/vendor/etc/aoc(/.*)?               u:object_r:aoc_audio_file:s0
-/dev/acd-audio_output_tuning        u:object_r:aoc_device:s0
-/dev/acd-audio_bulk_tx              u:object_r:aoc_device:s0
-/dev/acd-audio_bulk_rx              u:object_r:aoc_device:s0
-/dev/acd-audio_input_tuning         u:object_r:aoc_device:s0
-/dev/acd-audio_input_bulk_tx        u:object_r:aoc_device:s0
-/dev/acd-audio_input_bulk_rx        u:object_r:aoc_device:s0
-/dev/acd-sound_trigger              u:object_r:aoc_device:s0
-/dev/acd-hotword_notification       u:object_r:aoc_device:s0
-/dev/acd-hotword_pcm                u:object_r:aoc_device:s0
-/dev/acd-ambient_pcm                u:object_r:aoc_device:s0
-/dev/acd-model_data                 u:object_r:aoc_device:s0
-/dev/acd-debug                      u:object_r:aoc_device:s0
-/dev/acd-audio_tap[0-9]*            u:object_r:aoc_device:s0
-/dev/acd-audio_dcdoff_ref           u:object_r:aoc_device:s0
-/dev/amcs                           u:object_r:amcs_device:s0
-
 # AudioMetric
 /(vendor|system/vendor)/bin/hw/vendor\.google\.audiometricext@1\.0-service-vendor     u:object_r:hal_audiometricext_default_exec:s0
 
@@ -307,9 +280,6 @@
 # Battery
 /mnt/vendor/persist/battery(/.*)?    u:object_r:persist_battery_file:s0
 
-# AoC file contexts.
-/vendor/bin/aocd   u:object_r:aocd_exec:s0
-
 # NeuralNetworks file contexts
 /vendor/bin/hw/android\.hardware\.neuralnetworks@1\.3-service-armnn   u:object_r:hal_neuralnetworks_armnn_exec:s0
 
diff --git a/legacy/genfs_contexts b/legacy/genfs_contexts
index b15a6288..1991004c 100644
--- a/legacy/genfs_contexts
+++ b/legacy/genfs_contexts
@@ -1,9 +1,3 @@
-# AOC
-genfscon sysfs /devices/platform/19000000.aoc/aoc_clock_and_kernel_boottime u:object_r:sysfs_aoc_boottime:s0
-genfscon sysfs /devices/platform/19000000.aoc/firmware                      u:object_r:sysfs_aoc_firmware:s0
-genfscon sysfs /devices/platform/19000000.aoc                               u:object_r:sysfs_aoc:s0
-genfscon sysfs /devices/platform/19000000.aoc/reset                         u:object_r:sysfs_aoc_reset:s0
-
 # WiFi
 genfscon sysfs /wifi                                                        u:object_r:sysfs_wifi:s0
 # Battery
@@ -287,12 +281,3 @@ genfscon sysfs /devices/platform/wlan/sscoredump/sscd_wlan/report_count
 # mediacodec
 genfscon sysfs /devices/platform/mfc/video4linux/video                                                  u:object_r:sysfs_video:s0
 
-# pixelstat_vendor
-genfscon sysfs /devices/platform/audiometrics/codec_state              u:object_r:sysfs_pixelstats:s0
-genfscon sysfs /devices/platform/audiometrics/hs_codec_state           u:object_r:sysfs_pixelstats:s0
-genfscon sysfs /devices/platform/audiometrics/speaker_impedance        u:object_r:sysfs_pixelstats:s0
-genfscon sysfs /devices/platform/audiometrics/speaker_excursion        u:object_r:sysfs_pixelstats:s0
-genfscon sysfs /devices/platform/audiometrics/speaker_heartbeat        u:object_r:sysfs_pixelstats:s0
-genfscon sysfs /devices/platform/audiometrics/speaker_temp             u:object_r:sysfs_pixelstats:s0
-genfscon sysfs /devices/platform/audiometrics/mic_broken_degrade       u:object_r:sysfs_pixelstats:s0
-genfscon sysfs /devices/platform/audiometrics/codec_crashed_counter    u:object_r:sysfs_pixelstats:s0
diff --git a/legacy/hwservice.te b/legacy/hwservice.te
index 5d1d6a31..eb8e6211 100644
--- a/legacy/hwservice.te
+++ b/legacy/hwservice.te
@@ -7,9 +7,6 @@ type hal_exynos_rild_hwservice, hwservice_manager_type;
 # GRIL service
 type hal_radioext_hwservice, hwservice_manager_type;
 
-# Audio
-type hal_audio_ext_hwservice, hwservice_manager_type;
-
 # WLC
 type hal_wlc_hwservice, hwservice_manager_type;
 
@@ -19,6 +16,3 @@ type hal_bluetooth_coexistence_hwservice, hwservice_manager_type, vendor_hwservi
 # Fingerprint
 type hal_fingerprint_ext_hwservice, hwservice_manager_type;
 
-# AudioMetric
-type hal_audiometricext_hwservice, hwservice_manager_type;
-
diff --git a/legacy/hwservice_contexts b/legacy/hwservice_contexts
index 4f466bf0..9962c75d 100644
--- a/legacy/hwservice_contexts
+++ b/legacy/hwservice_contexts
@@ -14,9 +14,6 @@ android.hardware.media.c2::IConfigurable                        u:object_r:hal_c
 # GRIL HAL
 vendor.google.radioext::IRadioExt                               u:object_r:hal_radioext_hwservice:s0
 
-#Audio
-vendor.google.whitechapel.audio.audioext::IAudioExt             u:object_r:hal_audio_ext_hwservice:s0
-
 # Wireless charger hal
 vendor.google.wireless_charger::IWirelessCharger                u:object_r:hal_wlc_hwservice:s0
 
@@ -28,6 +25,3 @@ hardware.google.bluetooth.ccc::IBluetoothCcc                          u:object_r
 # Fingerprint
 vendor.goodix.hardware.biometrics.fingerprint::IGoodixFingerprintDaemon  u:object_r:hal_fingerprint_ext_hwservice:s0
 
-#Audio
-vendor.google.audiometricext::IAudioMetricExt             u:object_r:hal_audiometricext_hwservice:s0
-
diff --git a/legacy/property.te b/legacy/property.te
index 80976174..4a7c01c6 100644
--- a/legacy/property.te
+++ b/legacy/property.te
@@ -11,7 +11,6 @@ vendor_internal_prop(vendor_ro_config_default_prop)
 vendor_internal_prop(vendor_sys_default_prop)
 vendor_internal_prop(vendor_ro_sys_default_prop)
 vendor_internal_prop(vendor_persist_sys_default_prop)
-vendor_internal_prop(vendor_audio_prop)
 vendor_internal_prop(vendor_codec2_debug_prop)
 vendor_internal_prop(vendor_display_prop)
 vendor_internal_prop(vendor_camera_prop)
@@ -25,9 +24,6 @@ vendor_internal_prop(vendor_battery_defender_prop)
 # Battery profile for harness mode
 vendor_internal_prop(vendor_battery_profile_prop)
 
-# AoC
-vendor_internal_prop(vendor_aoc_prop)
-
 # Logger
 vendor_internal_prop(vendor_logger_prop)
 
diff --git a/legacy/property_contexts b/legacy/property_contexts
index 8db6f7d7..ba12f0ef 100644
--- a/legacy/property_contexts
+++ b/legacy/property_contexts
@@ -31,16 +31,6 @@ vendor.sys.                  u:object_r:vendor_sys_default_prop:s0
 ro.vendor.sys.               u:object_r:vendor_ro_sys_default_prop:s0
 persist.vendor.sys.          u:object_r:vendor_persist_sys_default_prop:s0
 
-
-# for audio
-vendor.audio_hal.period_multiplier      u:object_r:vendor_audio_prop:s0
-vendor.audiodump.enable                 u:object_r:vendor_audio_prop:s0
-persist.vendor.audio.                   u:object_r:vendor_audio_prop:s0
-vendor.audiodump.log.ondemand           u:object_r:vendor_audio_prop:s0
-vendor.audiodump.log.config             u:object_r:vendor_audio_prop:s0
-vendor.audiodump.output.dir             u:object_r:vendor_audio_prop:s0
-
-
 # for display
 ro.vendor.hwc.drm.device                u:object_r:vendor_display_prop:s0
 
@@ -65,9 +55,6 @@ vendor.battery.defender.                        u:object_r:vendor_battery_defend
 # test battery profile
 persist.vendor.testing_battery_profile          u:object_r:vendor_battery_profile_prop:s0
 
-# AoC
-vendor.aoc.firmware.version                     u:object_r:vendor_aoc_prop:s0
-
 # WiFi
 vendor.wlan.driver.version                      u:object_r:vendor_wifi_version:s0
 vendor.wlan.firmware.version                    u:object_r:vendor_wifi_version:s0