Reorganize vim shortcuts