Re-organised plugins in .vimrc.