diff --git a/device.mk b/device.mk
index 8670d01..536550e 100644
--- a/device.mk
+++ b/device.mk
@@ -107,8 +107,7 @@ PRODUCT_COPY_FILES += \
 
 PRODUCT_PACKAGES += \
     nx_cec.rc \
-    cec_disable.xml \
-    RC_for_stdp2550_cec
+    cec_disable.xml
 
 # Device Settings
 PRODUCT_PACKAGES += \
@@ -124,6 +123,10 @@ ifeq ($(WITH_GMS),true)
 WITH_GMS_COMMS_SUITE := false
 endif
 
+# Input
+PRODUCT_PACKAGES += \
+    excluded-input-devices.xml
+
 # Joycons
 PRODUCT_PACKAGES += \
     joycond \
diff --git a/idc/Android.mk b/idc/Android.mk
deleted file mode 100644
index 808c8d9..0000000
--- a/idc/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (C) 2023 The LineageOS Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH := $(call my-dir)
-
-# idc for disabling CEC RC device
-include $(CLEAR_VARS)
-LOCAL_MODULE               := RC_for_stdp2550_cec
-LOCAL_SRC_FILES            := RC_for_stdp2550_cec.idc
-LOCAL_MODULE_SUFFIX        := .idc
-LOCAL_MODULE_CLASS         := ETC
-LOCAL_MODULE_PATH          := $(TARGET_OUT_VENDOR)/usr/idc
-LOCAL_MODULE_TAGS          := optional
-include $(BUILD_PREBUILT)
diff --git a/idc/RC_for_stdp2550_cec.idc b/idc/RC_for_stdp2550_cec.idc
deleted file mode 100644
index 6140bde..0000000
--- a/idc/RC_for_stdp2550_cec.idc
+++ /dev/null
@@ -1 +0,0 @@
-device.disabled=1
diff --git a/keylayout/Android.mk b/input/Android.mk
similarity index 70%
rename from keylayout/Android.mk
rename to input/Android.mk
index 5584262..5181d82 100644
--- a/keylayout/Android.mk
+++ b/input/Android.mk
@@ -1,5 +1,4 @@
-#
-# Copyright (C) 2021 The LineageOS Project
+# Copyright (C) 2021-2024 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,8 +11,17 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#
-LOCAL_PATH:= $(call my-dir)
+
+LOCAL_PATH := $(call my-dir)
+
+# Excluded input devices
+include $(CLEAR_VARS)
+LOCAL_MODULE        := excluded-input-devices.xml
+LOCAL_SRC_FILES     := excluded-input-devices.xml
+LOCAL_MODULE_TAGS   := optional
+LOCAL_MODULE_CLASS  := ETC
+LOCAL_VENDOR_MODULE := true
+include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE        := gpio-keys.kl
diff --git a/input/excluded-input-devices.xml b/input/excluded-input-devices.xml
new file mode 100644
index 0000000..d5a4909
--- /dev/null
+++ b/input/excluded-input-devices.xml
@@ -0,0 +1,20 @@
+<!--
+    Nintendo excluded devices list
+
+    Copyright (C) 2024 The LineageOS Project
+ -->
+
+<devices>
+    <!-- Handled by joycond, prevent multiple controllers -->
+    <device name="Nintendo Switch Right Joy-Con Serial" />
+    <device name="Nintendo Switch Left Joy-Con Serial" />
+    <device name="Nintendo Switch Right Joy-Con" />
+    <device name="Nintendo Switch Left Joy-Con" />
+    <device name="Nintendo Switch Lite Gamepad" />
+    <device name="Nintendo Switch Right Joy-Con IMU" />
+    <device name="Nintendo Switch Left Joy-Con IMU" />
+    <device name="Nintendo Switch Lite Gamepad IMU" />
+
+    <!-- Handled by CEC HAL, prevent double input -->
+    <device name="RC for stdp2550_cec" />
+</devices>
diff --git a/keylayout/gpio-keys.kl b/input/gpio-keys.kl
similarity index 100%
rename from keylayout/gpio-keys.kl
rename to input/gpio-keys.kl