Reorganize vim components