The FAQ only suggests you remove the xorg.conf file and allow the X server to automatically configure the keyboard, based the on wscons keymap, see
kbd(8).
It does not suggest you migrate to xorg.conf.d, you can use
setxkbmap(1) in your .xinitrc/.xsession file or continue using xorg.conf.