Reorg some xmonad stuff