Reorganize vim stuff