xmodmap: Fix a few keys
Reorganize files into app specific directories