Reorganize some vim mappings
Reorganize some vim mappings