Broke out QWERTY into a new header file, makefile reduction