diff --git a/X11/30-touchpad.conf b/X11/xorg.conf.d/30-touchpad.conf
similarity index 100%
rename from X11/30-touchpad.conf
rename to X11/xorg.conf.d/30-touchpad.conf
diff --git a/X11/95-mouse-accel.conf b/X11/xorg.conf.d/95-mouse-accel.conf
similarity index 100%
rename from X11/95-mouse-accel.conf
rename to X11/xorg.conf.d/95-mouse-accel.conf
diff --git a/scripts/setup/setup-x11-confs b/scripts/setup/setup-x11-confs
index a5ce769..4c366d1 100755
--- a/scripts/setup/setup-x11-confs
+++ b/scripts/setup/setup-x11-confs
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-sudo cp "$XDG_CONFIG_HOME"/X11/*.conf /etc/X11/xorg.conf.d/
+sudo cp "$XDG_CONFIG_HOME"/X11/xorg.conf.d/*.conf /etc/X11/xorg.conf.d/