This reverts commit 8149924399cf3d31d80444a10477a29f53a4990e.
* fixes from tmk's repo * rename keyboard to keyboards