.vim reorganization