Add xmonad (and try to change organization)