Refactor Keymapping, relocating  to their rightful owner