Add new Vim snippet, reorganize