This would often cause the keyboard to crash when restarting the computer.
Also moved them to correct places