[elpa] master e64297e 51/51: * packages/yasnippet: Merge version 0.13.0 from upstream.

[Noam Postavsky]

branch: master
commit e64297ebd5ec628ff67d215cd00fc77aced627bd
Merge: 04889dc 5a29fe6
Author: Noam Postavsky <address@hidden>
Commit: Noam Postavsky <address@hidden>

    * packages/yasnippet: Merge version 0.13.0 from upstream.
    
    * packages/yasnippet/snippets: Move to...
    * packages/yasnippet-classic-snippets/snippets: ... here.
    * packages/yasnippet-classic-snippets/yasnippet-classic-snippets.el:
    New package.
---
 .../snippets/c++-mode/.yas-parents                 |   0
 .../snippets/c++-mode/beginend                     |   0
 .../snippets/c++-mode/class                        |   0
 .../snippets/c++-mode/ns                           |   0
 .../snippets/c++-mode/template                     |   0
 .../snippets/c++-mode/using                        |   0
 .../snippets/c-mode/.yas-parents                   |   0
 .../snippets/c-mode/fopen                          |   0
 .../snippets/c-mode/printf                         |   0
 .../snippets/cc-mode/.yas-parents                  |   0
 .../snippets/cc-mode/do                            |   0
 .../snippets/cc-mode/for                           |   0
 .../snippets/cc-mode/if                            |   0
 .../snippets/cc-mode/inc                           |   0
 .../snippets/cc-mode/inc.1                         |   0
 .../snippets/cc-mode/main                          |   0
 .../snippets/cc-mode/once                          |   0
 .../snippets/cc-mode/struct                        |   0
 .../snippets/cperl-mode/.yas-parents               |   0
 .../snippets/csharp-mode/.yas-parents              |   0
 .../snippets/csharp-mode/attrib                    |   0
 .../snippets/csharp-mode/attrib.1                  |   0
 .../snippets/csharp-mode/attrib.2                  |   0
 .../snippets/csharp-mode/class                     |   0
 .../snippets/csharp-mode/comment                   |   0
 .../snippets/csharp-mode/comment.1                 |   0
 .../snippets/csharp-mode/comment.2                 |   0
 .../snippets/csharp-mode/comment.3                 |   0
 .../snippets/csharp-mode/method                    |   0
 .../snippets/csharp-mode/namespace                 |   0
 .../snippets/csharp-mode/prop                      |   0
 .../snippets/csharp-mode/region                    |   0
 .../snippets/csharp-mode/using                     |   0
 .../snippets/csharp-mode/using.1                   |   0
 .../snippets/csharp-mode/using.2                   |   0
 .../snippets/css-mode/.yas-parents                 |   0
 .../snippets/css-mode/bg                           |   0
 .../snippets/css-mode/bg.1                         |   0
 .../snippets/css-mode/bor                          |   0
 .../snippets/css-mode/cl                           |   0
 .../snippets/css-mode/disp.block                   |   0
 .../snippets/css-mode/disp.inline                  |   0
 .../snippets/css-mode/disp.none                    |   0
 .../snippets/css-mode/ff                           |   0
 .../snippets/css-mode/fs                           |   0
 .../snippets/css-mode/mar.bottom                   |   0
 .../snippets/css-mode/mar.left                     |   0
 .../snippets/css-mode/mar.mar                      |   0
 .../snippets/css-mode/mar.margin                   |   0
 .../snippets/css-mode/mar.right                    |   0
 .../snippets/css-mode/mar.top                      |   0
 .../snippets/css-mode/pad.bottom                   |   0
 .../snippets/css-mode/pad.left                     |   0
 .../snippets/css-mode/pad.pad                      |   0
 .../snippets/css-mode/pad.padding                  |   0
 .../snippets/css-mode/pad.right                    |   0
 .../snippets/css-mode/pad.top                      |   0
 .../snippets/emacs-lisp-mode/.read_me              |   0
 .../snippets/emacs-lisp-mode/.yas-parents          |   0
 .../snippets/emacs-lisp-mode/add-hook.yasnippet    |   0
 .../snippets/emacs-lisp-mode/and.yasnippet         |   0
 .../snippets/emacs-lisp-mode/append.yasnippet      |   0
 .../snippets/emacs-lisp-mode/apply.yasnippet       |   0
 .../snippets/emacs-lisp-mode/aref.yasnippet        |   0
 .../snippets/emacs-lisp-mode/aset.yasnippet        |   0
 .../snippets/emacs-lisp-mode/assq.yasnippet        |   0
 .../snippets/emacs-lisp-mode/autoload.yasnippet    |   0
 .../emacs-lisp-mode/backward-char.yasnippet        |   0
 .../emacs-lisp-mode/beginning-of-line.yasnippet    |   0
 .../bounds-of-thing-at-point.yasnippet             |   0
 .../emacs-lisp-mode/buffer-file-name.yasnippet     |   0
 .../emacs-lisp-mode/buffer-modified-p.yasnippet    |   0
 .../buffer-substring-no-properties.yasnippet       |   0
 .../emacs-lisp-mode/buffer-substring.yasnippet     |   0
 .../snippets/emacs-lisp-mode/car.yasnippet         |   0
 .../snippets/emacs-lisp-mode/cdr.yasnippet         |   0
 .../snippets/emacs-lisp-mode/concat.yasnippet      |   0
 .../snippets/emacs-lisp-mode/cond.yasnippet        |   0
 .../emacs-lisp-mode/condition-case.yasnippet       |   0
 .../snippets/emacs-lisp-mode/cons.yasnippet        |   0
 .../snippets/emacs-lisp-mode/consp.yasnippet       |   0
 .../emacs-lisp-mode/copy-directory.yasnippet       |   0
 .../snippets/emacs-lisp-mode/copy-file.yasnippet   |   0
 .../emacs-lisp-mode/current-buffer.yasnippet       |   0
 .../emacs-lisp-mode/custom-autoload.yasnippet      |   0
 .../snippets/emacs-lisp-mode/defalias.yasnippet    |   0
 .../snippets/emacs-lisp-mode/defcustom.yasnippet   |   0
 .../snippets/emacs-lisp-mode/define-key.yasnippet  |   0
 .../snippets/emacs-lisp-mode/defsubst.yasnippet    |   0
 .../snippets/emacs-lisp-mode/defun.yasnippet       |   0
 .../snippets/emacs-lisp-mode/defvar.yasnippet      |   0
 .../snippets/emacs-lisp-mode/delete-char.yasnippet |   0
 .../emacs-lisp-mode/delete-directory.yasnippet     |   0
 .../snippets/emacs-lisp-mode/delete-file.yasnippet |   0
 .../emacs-lisp-mode/delete-region.yasnippet        |   0
 .../emacs-lisp-mode/directory-files.yasnippet      |   0
 .../snippets/emacs-lisp-mode/dolist.yasnippet      |   0
 .../snippets/emacs-lisp-mode/end-of-line.yasnippet |   0
 .../snippets/emacs-lisp-mode/eq.yasnippet          |   0
 .../snippets/emacs-lisp-mode/equal.yasnippet       |   0
 .../snippets/emacs-lisp-mode/error.yasnippet       |   0
 .../emacs-lisp-mode/expand-file-name.yasnippet     |   0
 .../snippets/emacs-lisp-mode/f.yasnippet           |   0
 .../snippets/emacs-lisp-mode/fboundp.yasnippet     |   0
 .../emacs-lisp-mode/file-name-directory.yasnippet  |   0
 .../emacs-lisp-mode/file-name-extension.yasnippet  |   0
 .../file-name-nondirectory.yasnippet               |   0
 .../file-name-sans-extension.yasnippet             |   0
 .../emacs-lisp-mode/file-relative-name.yasnippet   |   0
 .../snippets/emacs-lisp-mode/find-file.yasnippet   |   0
 .../snippets/emacs-lisp-mode/format.yasnippet      |   0
 .../emacs-lisp-mode/forward-char.yasnippet         |   0
 .../emacs-lisp-mode/forward-line.yasnippet         |   0
 .../snippets/emacs-lisp-mode/funcall.yasnippet     |   0
 .../snippets/emacs-lisp-mode/function.yasnippet    |   0
 .../snippets/emacs-lisp-mode/get.yasnippet         |   0
 .../emacs-lisp-mode/global-set-key.yasnippet       |   0
 .../snippets/emacs-lisp-mode/goto-char.yasnippet   |   0
 .../snippets/emacs-lisp-mode/if.yasnippet          |   0
 .../emacs-lisp-mode/insert-file-contents.yasnippet |   0
 .../snippets/emacs-lisp-mode/insert.yasnippet      |   0
 .../snippets/emacs-lisp-mode/interactive.yasnippet |   0
 .../snippets/emacs-lisp-mode/kbd.yasnippet         |   0
 .../snippets/emacs-lisp-mode/kill-buffer.yasnippet |   0
 .../snippets/emacs-lisp-mode/lambda.yasnippet      |   0
 .../snippets/emacs-lisp-mode/length.yasnippet      |   0
 .../snippets/emacs-lisp-mode/let.yasnippet         |   0
 .../line-beginning-position.yasnippet              |   0
 .../emacs-lisp-mode/line-end-position.yasnippet    |   0
 .../snippets/emacs-lisp-mode/list.yasnippet        |   0
 .../snippets/emacs-lisp-mode/looking-at.yasnippet  |   0
 .../emacs-lisp-mode/make-directory.yasnippet       |   0
 .../emacs-lisp-mode/make-local-variable.yasnippet  |   0
 .../snippets/emacs-lisp-mode/mapc.yasnippet        |   0
 .../snippets/emacs-lisp-mode/mapcar.yasnippet      |   0
 .../emacs-lisp-mode/match-beginning.yasnippet      |   0
 .../snippets/emacs-lisp-mode/match-end.yasnippet   |   0
 .../emacs-lisp-mode/match-string.yasnippet         |   0
 .../snippets/emacs-lisp-mode/memq.yasnippet        |   0
 .../snippets/emacs-lisp-mode/message.yasnippet     |   0
 .../snippets/emacs-lisp-mode/not.yasnippet         |   0
 .../snippets/emacs-lisp-mode/nth.yasnippet         |   0
 .../snippets/emacs-lisp-mode/null.yasnippet        |   0
 .../emacs-lisp-mode/number-to-string.yasnippet     |   0
 .../snippets/emacs-lisp-mode/or.yasnippet          |   0
 .../snippets/emacs-lisp-mode/point-max.yasnippet   |   0
 .../snippets/emacs-lisp-mode/point-min.yasnippet   |   0
 .../snippets/emacs-lisp-mode/point.yasnippet       |   0
 .../snippets/emacs-lisp-mode/princ.yasnippet       |   0
 .../snippets/emacs-lisp-mode/print.yasnippet       |   0
 .../snippets/emacs-lisp-mode/progn.yasnippet       |   0
 .../snippets/emacs-lisp-mode/push.yasnippet        |   0
 .../snippets/emacs-lisp-mode/put.yasnippet         |   0
 .../emacs-lisp-mode/re-search-backward.yasnippet   |   0
 .../emacs-lisp-mode/re-search-forward.yasnippet    |   0
 .../emacs-lisp-mode/region-active-p.yasnippet      |   0
 .../emacs-lisp-mode/region-beginning.yasnippet     |   0
 .../snippets/emacs-lisp-mode/region-end.yasnippet  |   0
 .../snippets/emacs-lisp-mode/rename-file.yasnippet |   0
 .../snippets/emacs-lisp-mode/repeat.yasnippet      |   0
 .../replace-regexp-in-string.yasnippet             |   0
 .../emacs-lisp-mode/replace-regexp.yasnippet       |   0
 .../snippets/emacs-lisp-mode/require.yasnippet     |   0
 .../snippets/emacs-lisp-mode/save-buffer.yasnippet |   0
 .../emacs-lisp-mode/save-excursion.yasnippet       |   0
 .../search-backward-regexp.yasnippet               |   0
 .../emacs-lisp-mode/search-backward.yasnippet      |   0
 .../search-forward-regexp.yasnippet                |   0
 .../emacs-lisp-mode/search-forward.yasnippet       |   0
 .../snippets/emacs-lisp-mode/set-buffer.yasnippet  |   0
 .../emacs-lisp-mode/set-file-modes.yasnippet       |   0
 .../snippets/emacs-lisp-mode/set-mark.yasnippet    |   0
 .../snippets/emacs-lisp-mode/set.yasnippet         |   0
 .../snippets/emacs-lisp-mode/setq.yasnippet        |   0
 .../emacs-lisp-mode/skip-chars-backward.yasnippet  |   0
 .../emacs-lisp-mode/skip-chars-forward.yasnippet   |   0
 .../emacs-lisp-mode/split-string.yasnippet         |   0
 .../emacs-lisp-mode/string-match.yasnippet         |   0
 .../emacs-lisp-mode/string-to-number.yasnippet     |   0
 .../snippets/emacs-lisp-mode/string.yasnippet      |   0
 .../snippets/emacs-lisp-mode/string=.yasnippet     |   0
 .../snippets/emacs-lisp-mode/stringp.yasnippet     |   0
 .../snippets/emacs-lisp-mode/substring.yasnippet   |   0
 .../emacs-lisp-mode/thing-at-point.yasnippet       |   0
 .../snippets/emacs-lisp-mode/unless.yasnippet      |   0
 .../snippets/emacs-lisp-mode/vector.yasnippet      |   0
 .../snippets/emacs-lisp-mode/when.yasnippet        |   0
 .../snippets/emacs-lisp-mode/while.yasnippet       |   0
 .../snippets/emacs-lisp-mode/widget-get.yasnippet  |   0
 .../emacs-lisp-mode/with-current-buffer.yasnippet  |   0
 .../x-dired.process_marked.yasnippet               |   0
 .../emacs-lisp-mode/x-file.process.yasnippet       |   0
 .../emacs-lisp-mode/x-file.read-lines.yasnippet    |   0
 .../emacs-lisp-mode/x-find-replace.yasnippet       |   0
 .../emacs-lisp-mode/x-grabstring.yasnippet         |   0
 .../snippets/emacs-lisp-mode/x-grabthing.yasnippet |   0
 .../emacs-lisp-mode/x-traverse_dir.yasnippet       |   0
 .../emacs-lisp-mode/x-word-or-region.yasnippet     |   0
 .../snippets/emacs-lisp-mode/y-or-n-p.yasnippet    |   0
 .../snippets/emacs-lisp-mode/yes-or-no-p.yasnippet |   0
 .../snippets/erlang-mode/.yas-parents              |   0
 .../snippets/erlang-mode/after                     |   0
 .../snippets/erlang-mode/begin                     |   0
 .../snippets/erlang-mode/beh                       |   0
 .../snippets/erlang-mode/case                      |   0
 .../snippets/erlang-mode/compile                   |   0
 .../snippets/erlang-mode/def                       |   0
 .../snippets/erlang-mode/exp                       |   0
 .../snippets/erlang-mode/fun                       |   0
 .../snippets/erlang-mode/if                        |   0
 .../snippets/erlang-mode/ifdef                     |   0
 .../snippets/erlang-mode/ifndef                    |   0
 .../snippets/erlang-mode/imp                       |   0
 .../snippets/erlang-mode/inc                       |   0
 .../snippets/erlang-mode/inc.lib                   |   0
 .../snippets/erlang-mode/loop                      |   0
 .../snippets/erlang-mode/mod                       |   0
 .../snippets/erlang-mode/rcv                       |   0
 .../snippets/erlang-mode/rcv.after                 |   0
 .../snippets/erlang-mode/rec                       |   0
 .../snippets/erlang-mode/try                       |   0
 .../snippets/erlang-mode/undef                     |   0
 .../snippets/f90-mode/.yas-parents                 |   0
 .../snippets/f90-mode/au                           |   0
 .../snippets/f90-mode/bd                           |   0
 .../snippets/f90-mode/c                            |   0
 .../snippets/f90-mode/ch                           |   0
 .../snippets/f90-mode/cx                           |   0
 .../snippets/f90-mode/dc                           |   0
 .../snippets/f90-mode/do                           |   0
 .../snippets/f90-mode/dp                           |   0
 .../snippets/f90-mode/eq                           |   0
 .../snippets/f90-mode/ib                           |   0
 .../snippets/f90-mode/ic                           |   0
 .../snippets/f90-mode/ich                          |   0
 .../snippets/f90-mode/if                           |   0
 .../snippets/f90-mode/ii                           |   0
 .../snippets/f90-mode/il                           |   0
 .../snippets/f90-mode/in                           |   0
 .../snippets/f90-mode/inc                          |   0
 .../snippets/f90-mode/intr                         |   0
 .../snippets/f90-mode/ir                           |   0
 .../snippets/f90-mode/l                            |   0
 .../snippets/f90-mode/pa                           |   0
 .../snippets/f90-mode/pr                           |   0
 .../snippets/f90-mode/re                           |   0
 .../snippets/f90-mode/st                           |   0
 .../snippets/f90-mode/su                           |   0
 .../snippets/f90-mode/wr                           |   0
 .../snippets/html-mode/.yas-make-groups            |   0
 .../snippets/html-mode/.yas-parents                |   0
 .../snippets/html-mode/b.yasnippet                 |   0
 .../snippets/html-mode/body                        |   0
 .../snippets/html-mode/br                          |   0
 .../snippets/html-mode/code                        |   0
 .../snippets/html-mode/code.class                  |   0
 .../snippets/html-mode/div                         |   0
 .../snippets/html-mode/div.class                   |   0
 .../snippets/html-mode/div.id                      |   0
 .../snippets/html-mode/div.id-class                |   0
 .../snippets/html-mode/dov                         |   0
 .../snippets/html-mode/form                        |   0
 .../snippets/html-mode/head                        |   0
 .../snippets/html-mode/header/h1                   |   0
 .../snippets/html-mode/header/h2                   |   0
 .../snippets/html-mode/header/h3                   |   0
 .../snippets/html-mode/header/h4                   |   0
 .../snippets/html-mode/header/h5                   |   0
 .../snippets/html-mode/header/h6                   |   0
 .../snippets/html-mode/hr                          |   0
 .../snippets/html-mode/href                        |   0
 .../snippets/html-mode/html                        |   0
 .../snippets/html-mode/html.xmlns                  |   0
 .../snippets/html-mode/i.yasnippet                 |   0
 .../snippets/html-mode/img                         |   0
 .../snippets/html-mode/input                       |   0
 .../snippets/html-mode/link.stylesheet             |   0
 .../snippets/html-mode/link.stylesheet-ie          |   0
 .../snippets/html-mode/list/dd                     |   0
 .../snippets/html-mode/list/dl                     |   0
 .../snippets/html-mode/list/dl.id                  |   0
 .../snippets/html-mode/list/dt                     |   0
 .../snippets/html-mode/list/li                     |   0
 .../snippets/html-mode/list/li.class               |   0
 .../snippets/html-mode/list/ol                     |   0
 .../snippets/html-mode/list/ol.class               |   0
 .../snippets/html-mode/list/ol.id                  |   0
 .../snippets/html-mode/list/ul                     |   0
 .../snippets/html-mode/list/ul.class               |   0
 .../snippets/html-mode/list/ul.id                  |   0
 .../snippets/html-mode/mailto                      |   0
 .../snippets/html-mode/meta/doctype                |   0
 .../snippets/html-mode/meta/doctype.xhml1          |   0
 .../snippets/html-mode/meta/doctype.xhtml1_1       |   0
 .../snippets/html-mode/meta/doctype.xhtml1_strict  |   0
 .../html-mode/meta/doctype.xhtml1_transitional     |   0
 .../snippets/html-mode/meta/meta                   |   0
 .../snippets/html-mode/meta/meta.http-equiv        |   0
 .../snippets/html-mode/p                           |   0
 .../snippets/html-mode/pre                         |   0
 .../snippets/html-mode/q.yasnippet                 |   0
 .../snippets/html-mode/quote                       |   0
 .../snippets/html-mode/script.javascript           |   0
 .../snippets/html-mode/script.javascript-src       |   0
 .../snippets/html-mode/span                        |   0
 .../snippets/html-mode/span.class                  |   0
 .../snippets/html-mode/span.id                     |   0
 .../snippets/html-mode/style                       |   0
 .../snippets/html-mode/table/table                 |   0
 .../snippets/html-mode/table/td                    |   0
 .../snippets/html-mode/table/th                    |   0
 .../snippets/html-mode/table/tr                    |   0
 .../snippets/html-mode/textarea                    |   0
 .../snippets/html-mode/title                       |   0
 .../snippets/js-mode/assert.yasnippet              |   0
 .../snippets/js-mode/cb.yasnippet                  |   0
 .../snippets/js-mode/com.yasnippet                 |   0
 .../snippets/js-mode/describe.yasnippet            |   0
 .../snippets/js-mode/err.snippet                   |   0
 .../snippets/js-mode/error.snippet                 |   0
 .../snippets/js-mode/expect.yasnippet              |   0
 .../snippets/js-mode/exports.yasnippet             |   0
 .../snippets/js-mode/fn.yasnippet                  |   0
 .../snippets/js-mode/for.yasnippet                 |   0
 .../snippets/js-mode/id.yasnippet                  |   0
 .../snippets/js-mode/if.yasnippet                  |   0
 .../snippets/js-mode/invoc.yasnippet               |   0
 .../snippets/js-mode/it.yasnippet                  |   0
 .../snippets/js-mode/log.yasnippet                 |   0
 .../snippets/js-mode/method.yasnippet              |   0
 .../snippets/js-mode/mod.yasnippet                 |   0
 .../snippets/js-mode/prop.yasnippet                |   0
 .../snippets/js-mode/proto.yasnippet               |   0
 .../snippets/js-mode/rq.yasnippet                  |   0
 .../snippets/js-mode/rt.yasnippet                  |   0
 .../snippets/js-mode/slice.yasnippet               |   0
 .../snippets/js-mode/super.yasnippet               |   0
 .../snippets/js-mode/switch.yasnippet              |   0
 .../snippets/js-mode/throw.yasnippet               |   0
 .../snippets/js-mode/try.yasnippet                 |   0
 .../snippets/js-mode/var.yasnippet                 |   0
 .../snippets/js-mode/wh.yasnippet                  |   0
 .../snippets/js-mode/while.yasnippet               |   0
 .../snippets/latex-mode/.yas-parents               |   0
 .../snippets/latex-mode/begin                      |   0
 .../snippets/markdown-mode/+                       |   0
 .../snippets/markdown-mode/-                       |   0
 .../snippets/markdown-mode/.yas-parents            |   0
 .../snippets/markdown-mode/_                       |   0
 .../snippets/markdown-mode/__                      |   0
 .../snippets/markdown-mode/`                       |   0
 .../snippets/markdown-mode/h1.1                    |   0
 .../snippets/markdown-mode/h1.2                    |   0
 .../snippets/markdown-mode/h2.1                    |   0
 .../snippets/markdown-mode/h2.2                    |   0
 .../snippets/markdown-mode/h3                      |   0
 .../snippets/markdown-mode/h4                      |   0
 .../snippets/markdown-mode/h5                      |   0
 .../snippets/markdown-mode/h6                      |   0
 .../snippets/markdown-mode/hr.1                    |   0
 .../snippets/markdown-mode/hr.2                    |   0
 .../snippets/markdown-mode/img                     |   0
 .../snippets/markdown-mode/link                    |   0
 .../snippets/markdown-mode/ol                      |   0
 .../snippets/markdown-mode/rimg                    |   0
 .../snippets/markdown-mode/rlb                     |   0
 .../snippets/markdown-mode/rlink                   |   0
 .../snippets/nxml-mode/.yas-make-groups            |   0
 .../snippets/nxml-mode/.yas-parents                |   0
 .../snippets/nxml-mode/body                        |   0
 .../snippets/nxml-mode/br                          |   0
 .../snippets/nxml-mode/code                        |   0
 .../snippets/nxml-mode/div                         |   0
 .../snippets/nxml-mode/form                        |   0
 .../snippets/nxml-mode/head                        |   0
 .../snippets/nxml-mode/header/h1                   |   0
 .../snippets/nxml-mode/header/h2                   |   0
 .../snippets/nxml-mode/header/h3                   |   0
 .../snippets/nxml-mode/header/h4                   |   0
 .../snippets/nxml-mode/header/h5                   |   0
 .../snippets/nxml-mode/header/h6                   |   0
 .../snippets/nxml-mode/hr                          |   0
 .../snippets/nxml-mode/href                        |   0
 .../snippets/nxml-mode/html                        |   0
 .../snippets/nxml-mode/img                         |   0
 .../snippets/nxml-mode/input                       |   0
 .../snippets/nxml-mode/li                          |   0
 .../snippets/nxml-mode/link                        |   0
 .../snippets/nxml-mode/meta/doctype                |   0
 .../snippets/nxml-mode/meta/doctype.xhtml1_strict  |   0
 .../nxml-mode/meta/doctype.xhtml1_transitional     |   0
 .../snippets/nxml-mode/meta/meta                   |   0
 .../snippets/nxml-mode/name                        |   0
 .../snippets/nxml-mode/ol                          |   0
 .../snippets/nxml-mode/p                           |   0
 .../snippets/nxml-mode/pre                         |   0
 .../snippets/nxml-mode/quote                       |   0
 .../snippets/nxml-mode/span                        |   0
 .../snippets/nxml-mode/style                       |   0
 .../snippets/nxml-mode/table                       |   0
 .../snippets/nxml-mode/tag.1l                      |   0
 .../snippets/nxml-mode/tag.2l                      |   0
 .../snippets/nxml-mode/td                          |   0
 .../snippets/nxml-mode/th                          |   0
 .../snippets/nxml-mode/title                       |   0
 .../snippets/nxml-mode/tr                          |   0
 .../snippets/nxml-mode/ul                          |   0
 .../snippets/objc-mode/.yas-parents                |   0
 .../snippets/objc-mode/prop                        |   0
 .../snippets/perl-mode/.yas-parents                |   0
 .../snippets/perl-mode/eval                        |   0
 .../snippets/perl-mode/for                         |   0
 .../snippets/perl-mode/fore                        |   0
 .../snippets/perl-mode/if                          |   0
 .../snippets/perl-mode/ife                         |   0
 .../snippets/perl-mode/ifee                        |   0
 .../snippets/perl-mode/sub                         |   0
 .../snippets/perl-mode/unless                      |   0
 .../snippets/perl-mode/while                       |   0
 .../snippets/perl-mode/xfore                       |   0
 .../snippets/perl-mode/xif                         |   0
 .../snippets/perl-mode/xunless                     |   0
 .../snippets/perl-mode/xwhile                      |   0
 .../snippets/python-mode/.yas-parents              |   0
 .../snippets/python-mode/__                        |   0
 .../snippets/python-mode/class                     |   0
 .../snippets/python-mode/def                       |   0
 .../snippets/python-mode/defm                      |   0
 .../snippets/python-mode/for                       |   0
 .../snippets/python-mode/ifmain                    |   0
 .../snippets/python-mode/prop                      |   0
 .../snippets/python-mode/propg                     |   0
 .../snippets/python-mode/propsg                    |   0
 .../snippets/python-mode/while                     |   0
 .../snippets/rst-mode/.yas-parents                 |   0
 .../snippets/rst-mode/chap                         |   0
 .../snippets/rst-mode/sec                          |   0
 .../snippets/rst-mode/tit                          |   0
 .../snippets/ruby-mode/.yas-make-groups            |   0
 .../snippets/ruby-mode/.yas-parents                |   0
 .../snippets/ruby-mode/collections/all             |   0
 .../snippets/ruby-mode/collections/any             |   0
 .../snippets/ruby-mode/collections/classify        |   0
 .../snippets/ruby-mode/collections/collect         |   0
 .../snippets/ruby-mode/collections/deli            |   0
 .../snippets/ruby-mode/collections/det             |   0
 .../snippets/ruby-mode/collections/ea              |   0
 .../snippets/ruby-mode/collections/eac             |   0
 .../snippets/ruby-mode/collections/eai             |   0
 .../snippets/ruby-mode/collections/eav             |   0
 .../snippets/ruby-mode/collections/eawi            |   0
 .../snippets/ruby-mode/collections/inject          |   0
 .../snippets/ruby-mode/collections/reject          |   0
 .../snippets/ruby-mode/collections/select          |   0
 .../snippets/ruby-mode/collections/zip             |   0
 .../snippets/ruby-mode/control structure/forin     |   0
 .../snippets/ruby-mode/control structure/if        |   0
 .../snippets/ruby-mode/control structure/ife       |   0
 .../snippets/ruby-mode/control structure/tim       |   0
 .../snippets/ruby-mode/control structure/until     |   0
 .../snippets/ruby-mode/control structure/upt       |   0
 .../snippets/ruby-mode/control structure/when      |   0
 .../snippets/ruby-mode/control structure/while     |   0
 .../snippets/ruby-mode/definitions/Comp            |   0
 .../snippets/ruby-mode/definitions/am              |   0
 .../snippets/ruby-mode/definitions/cla             |   0
 .../snippets/ruby-mode/definitions/cls             |   0
 .../snippets/ruby-mode/definitions/mm              |   0
 .../snippets/ruby-mode/definitions/mod             |   0
 .../snippets/ruby-mode/definitions/r               |   0
 .../snippets/ruby-mode/definitions/rw              |   0
 .../snippets/ruby-mode/definitions/w               |   0
 .../snippets/ruby-mode/general/#                   |   0
 .../snippets/ruby-mode/general/=b                  |   0
 .../snippets/ruby-mode/general/app                 |   0
 .../snippets/ruby-mode/general/bm                  |   0
 .../snippets/ruby-mode/general/case                |   0
 .../snippets/ruby-mode/general/dee                 |   0
 .../snippets/ruby-mode/general/rb                  |   0
 .../snippets/ruby-mode/general/req                 |   0
 .../snippets/ruby-mode/general/rreq                |   0
 .../snippets/ruby-mode/general/y                   |   0
 .../snippets/scala-mode/.yas-parents               |   0
 .../snippets/scala-mode/act                        |   0
 .../snippets/scala-mode/act.arg                    |   0
 .../snippets/scala-mode/actor                      |   0
 .../snippets/scala-mode/ano                        |   0
 .../snippets/scala-mode/app                        |   0
 .../snippets/scala-mode/arr.new                    |   0
 .../snippets/scala-mode/arr.val-new                |   0
 .../snippets/scala-mode/asof                       |   0
 .../snippets/scala-mode/ass                        |   0
 .../snippets/scala-mode/ass.true                   |   0
 .../snippets/scala-mode/at.author                  |   0
 .../snippets/scala-mode/at.param                   |   0
 .../snippets/scala-mode/at.return                  |   0
 .../snippets/scala-mode/at.version                 |   0
 .../snippets/scala-mode/bang                       |   0
 .../snippets/scala-mode/case                       |   0
 .../snippets/scala-mode/case.match-all             |   0
 .../snippets/scala-mode/cast                       |   0
 .../snippets/scala-mode/cc                         |   0
 .../snippets/scala-mode/cl                         |   0
 .../snippets/scala-mode/cl.abs                     |   0
 .../snippets/scala-mode/cl.abs-arg                 |   0
 .../snippets/scala-mode/cl.arg                     |   0
 .../snippets/scala-mode/clof                       |   0
 .../snippets/scala-mode/co                         |   0
 .../snippets/scala-mode/cons                       |   0
 .../snippets/scala-mode/cons.nil                   |   0
 .../snippets/scala-mode/def.arg                    |   0
 .../snippets/scala-mode/def.arg-body               |   0
 .../snippets/scala-mode/def.arg-ret                |   0
 .../snippets/scala-mode/def.arg-ret-body           |   0
 .../snippets/scala-mode/def.body                   |   0
 .../snippets/scala-mode/def.ret                    |   0
 .../snippets/scala-mode/def.ret-body               |   0
 .../snippets/scala-mode/def.simple                 |   0
 .../snippets/scala-mode/doc.class                  |   0
 .../snippets/scala-mode/doc.def                    |   0
 .../snippets/scala-mode/doc.file                   |   0
 .../snippets/scala-mode/doc.file-scala             |   0
 .../snippets/scala-mode/doc.file-scala-api         |   0
 .../snippets/scala-mode/doc.scaladoc               |   0
 .../snippets/scala-mode/expect                     |   0
 .../snippets/scala-mode/ext                        |   0
 .../snippets/scala-mode/for.extract                |   0
 .../snippets/scala-mode/for.if                     |   0
 .../snippets/scala-mode/for.loop                   |   0
 .../snippets/scala-mode/for.multi                  |   0
 .../snippets/scala-mode/foreach                    |   0
 .../snippets/scala-mode/hmap.new                   |   0
 .../snippets/scala-mode/hmap.val-new               |   0
 .../snippets/scala-mode/hset.new                   |   0
 .../snippets/scala-mode/hset.val-new               |   0
 .../snippets/scala-mode/if                         |   0
 .../snippets/scala-mode/if.else                    |   0
 .../snippets/scala-mode/imp                        |   0
 .../snippets/scala-mode/intercept                  |   0
 .../snippets/scala-mode/isof                       |   0
 .../snippets/scala-mode/ls.new                     |   0
 .../snippets/scala-mode/ls.val-new                 |   0
 .../snippets/scala-mode/main                       |   0
 .../snippets/scala-mode/map                        |   0
 .../snippets/scala-mode/map.new                    |   0
 .../snippets/scala-mode/match                      |   0
 .../snippets/scala-mode/match.can                  |   0
 .../snippets/scala-mode/match.option               |   0
 .../snippets/scala-mode/mix                        |   0
 .../snippets/scala-mode/ob                         |   0
 .../snippets/scala-mode/pac                        |   0
 .../snippets/scala-mode/pr.newline                 |   0
 .../snippets/scala-mode/pr.simple                  |   0
 .../snippets/scala-mode/pr.string                  |   0
 .../snippets/scala-mode/pr.trace                   |   0
 .../snippets/scala-mode/pri                        |   0
 .../snippets/scala-mode/pri.param                  |   0
 .../snippets/scala-mode/pro                        |   0
 .../snippets/scala-mode/pro.param                  |   0
 .../snippets/scala-mode/suite                      |   0
 .../snippets/scala-mode/test                       |   0
 .../snippets/scala-mode/throw                      |   0
 .../snippets/scala-mode/tr                         |   0
 .../snippets/scala-mode/tr.ext                     |   0
 .../snippets/scala-mode/tr.ext-with                |   0
 .../snippets/scala-mode/tr.with                    |   0
 .../snippets/scala-mode/try                        |   0
 .../snippets/scala-mode/try.catch-finally          |   0
 .../snippets/scala-mode/try.finally                |   0
 .../snippets/scala-mode/tup.arrow                  |   0
 .../snippets/scala-mode/tup.paren                  |   0
 .../snippets/scala-mode/val                        |   0
 .../snippets/scala-mode/val.new                    |   0
 .../snippets/scala-mode/val.ret                    |   0
 .../snippets/scala-mode/var                        |   0
 .../snippets/scala-mode/var.new                    |   0
 .../snippets/scala-mode/var.ret                    |   0
 .../snippets/scala-mode/whi                        |   0
 .../snippets/scala-mode/with                       |   0
 .../snippets/snippet-mode/.yas-parents             |   0
 .../snippets/snippet-mode/field                    |   0
 .../snippets/snippet-mode/mirror                   |   0
 .../snippets/snippet-mode/vars                     |   0
 .../snippets/sql-mode/.yas-parents                 |   0
 .../snippets/sql-mode/column                       |   0
 .../snippets/sql-mode/constraint                   |   0
 .../snippets/sql-mode/constraint.1                 |   0
 .../snippets/sql-mode/create                       |   0
 .../snippets/sql-mode/create.1                     |   0
 .../snippets/sql-mode/references                   |   0
 .../snippets/text-mode/email                       |   0
 .../snippets/text-mode/time                        |   0
 .../yasnippet-classic-snippets.el                  |  46 ++
 packages/yasnippet/.gitmodules                     |   7 -
 packages/yasnippet/.travis.yml                     |   3 +-
 packages/yasnippet/NEWS                            |  76 ++-
 packages/yasnippet/README.mdown                    |  44 +-
 packages/yasnippet/Rakefile                        |   4 +
 packages/yasnippet/doc/faq.org                     |   7 +-
 packages/yasnippet/doc/nav-menu.html.inc           |   4 +-
 packages/yasnippet/doc/snippet-development.org     |  36 +-
 packages/yasnippet/doc/snippet-expansion.org       |   8 +-
 packages/yasnippet/doc/snippet-menu.org            |   2 +-
 packages/yasnippet/doc/snippet-organization.org    |   7 +-
 packages/yasnippet/doc/stylesheets/manual.css      |  33 +-
 packages/yasnippet/doc/stylesheets/styles.css      |  93 ---
 packages/yasnippet/doc/yas-doc-helper.el           |  78 ++-
 packages/yasnippet/yasnippet-debug.el              |  72 ++-
 packages/yasnippet/yasnippet-tests.el              | 244 ++++++--
 packages/yasnippet/yasnippet.el                    | 683 +++++++++++++--------
 610 files changed, 952 insertions(+), 495 deletions(-)

diff --git a/packages/yasnippet/snippets/c++-mode/.yas-parents 
b/packages/yasnippet-classic-snippets/snippets/c++-mode/.yas-parents
similarity index 100%
rename from packages/yasnippet/snippets/c++-mode/.yas-parents
rename to packages/yasnippet-classic-snippets/snippets/c++-mode/.yas-parents
diff --git a/packages/yasnippet/snippets/c++-mode/beginend 
b/packages/yasnippet-classic-snippets/snippets/c++-mode/beginend
similarity index 100%
rename from packages/yasnippet/snippets/c++-mode/beginend
rename to packages/yasnippet-classic-snippets/snippets/c++-mode/beginend
diff --git a/packages/yasnippet/snippets/c++-mode/class 
b/packages/yasnippet-classic-snippets/snippets/c++-mode/class
similarity index 100%
rename from packages/yasnippet/snippets/c++-mode/class
rename to packages/yasnippet-classic-snippets/snippets/c++-mode/class
diff --git a/packages/yasnippet/snippets/c++-mode/ns 
b/packages/yasnippet-classic-snippets/snippets/c++-mode/ns
similarity index 100%
rename from packages/yasnippet/snippets/c++-mode/ns
rename to packages/yasnippet-classic-snippets/snippets/c++-mode/ns
diff --git a/packages/yasnippet/snippets/c++-mode/template 
b/packages/yasnippet-classic-snippets/snippets/c++-mode/template
similarity index 100%
rename from packages/yasnippet/snippets/c++-mode/template
rename to packages/yasnippet-classic-snippets/snippets/c++-mode/template
diff --git a/packages/yasnippet/snippets/c++-mode/using 
b/packages/yasnippet-classic-snippets/snippets/c++-mode/using
similarity index 100%
rename from packages/yasnippet/snippets/c++-mode/using
rename to packages/yasnippet-classic-snippets/snippets/c++-mode/using
diff --git a/packages/yasnippet/snippets/c-mode/.yas-parents 
b/packages/yasnippet-classic-snippets/snippets/c-mode/.yas-parents
similarity index 100%
rename from packages/yasnippet/snippets/c-mode/.yas-parents
rename to packages/yasnippet-classic-snippets/snippets/c-mode/.yas-parents
diff --git a/packages/yasnippet/snippets/c-mode/fopen 
b/packages/yasnippet-classic-snippets/snippets/c-mode/fopen
similarity index 100%
rename from packages/yasnippet/snippets/c-mode/fopen
rename to packages/yasnippet-classic-snippets/snippets/c-mode/fopen
diff --git a/packages/yasnippet/snippets/c-mode/printf 
b/packages/yasnippet-classic-snippets/snippets/c-mode/printf
similarity index 100%
rename from packages/yasnippet/snippets/c-mode/printf
rename to packages/yasnippet-classic-snippets/snippets/c-mode/printf
diff --git a/packages/yasnippet/snippets/cc-mode/.yas-parents 
b/packages/yasnippet-classic-snippets/snippets/cc-mode/.yas-parents
similarity index 100%
rename from packages/yasnippet/snippets/cc-mode/.yas-parents
rename to packages/yasnippet-classic-snippets/snippets/cc-mode/.yas-parents
diff --git a/packages/yasnippet/snippets/cc-mode/do 
b/packages/yasnippet-classic-snippets/snippets/cc-mode/do
similarity index 100%
rename from packages/yasnippet/snippets/cc-mode/do
rename to packages/yasnippet-classic-snippets/snippets/cc-mode/do
diff --git a/packages/yasnippet/snippets/cc-mode/for 
b/packages/yasnippet-classic-snippets/snippets/cc-mode/for
similarity index 100%
rename from packages/yasnippet/snippets/cc-mode/for
rename to packages/yasnippet-classic-snippets/snippets/cc-mode/for
diff --git a/packages/yasnippet/snippets/cc-mode/if 
b/packages/yasnippet-classic-snippets/snippets/cc-mode/if
similarity index 100%
rename from packages/yasnippet/snippets/cc-mode/if
rename to packages/yasnippet-classic-snippets/snippets/cc-mode/if
diff --git a/packages/yasnippet/snippets/cc-mode/inc 
b/packages/yasnippet-classic-snippets/snippets/cc-mode/inc
similarity index 100%
rename from packages/yasnippet/snippets/cc-mode/inc
rename to packages/yasnippet-classic-snippets/snippets/cc-mode/inc
diff --git a/packages/yasnippet/snippets/cc-mode/inc.1 
b/packages/yasnippet-classic-snippets/snippets/cc-mode/inc.1
similarity index 100%
rename from packages/yasnippet/snippets/cc-mode/inc.1
rename to packages/yasnippet-classic-snippets/snippets/cc-mode/inc.1
diff --git a/packages/yasnippet/snippets/cc-mode/main 
b/packages/yasnippet-classic-snippets/snippets/cc-mode/main
similarity index 100%
rename from packages/yasnippet/snippets/cc-mode/main
rename to packages/yasnippet-classic-snippets/snippets/cc-mode/main
diff --git a/packages/yasnippet/snippets/cc-mode/once 
b/packages/yasnippet-classic-snippets/snippets/cc-mode/once
similarity index 100%
rename from packages/yasnippet/snippets/cc-mode/once
rename to packages/yasnippet-classic-snippets/snippets/cc-mode/once
diff --git a/packages/yasnippet/snippets/cc-mode/struct 
b/packages/yasnippet-classic-snippets/snippets/cc-mode/struct
similarity index 100%
rename from packages/yasnippet/snippets/cc-mode/struct
rename to packages/yasnippet-classic-snippets/snippets/cc-mode/struct
diff --git a/packages/yasnippet/snippets/cperl-mode/.yas-parents 
b/packages/yasnippet-classic-snippets/snippets/cperl-mode/.yas-parents
similarity index 100%
rename from packages/yasnippet/snippets/cperl-mode/.yas-parents
rename to packages/yasnippet-classic-snippets/snippets/cperl-mode/.yas-parents
diff --git a/packages/yasnippet/snippets/csharp-mode/.yas-parents 
b/packages/yasnippet-classic-snippets/snippets/csharp-mode/.yas-parents
similarity index 100%
rename from packages/yasnippet/snippets/csharp-mode/.yas-parents
rename to packages/yasnippet-classic-snippets/snippets/csharp-mode/.yas-parents
diff --git a/packages/yasnippet/snippets/csharp-mode/attrib 
b/packages/yasnippet-classic-snippets/snippets/csharp-mode/attrib
similarity index 100%
rename from packages/yasnippet/snippets/csharp-mode/attrib
rename to packages/yasnippet-classic-snippets/snippets/csharp-mode/attrib
diff --git a/packages/yasnippet/snippets/csharp-mode/attrib.1 
b/packages/yasnippet-classic-snippets/snippets/csharp-mode/attrib.1
similarity index 100%
rename from packages/yasnippet/snippets/csharp-mode/attrib.1
rename to packages/yasnippet-classic-snippets/snippets/csharp-mode/attrib.1
diff --git a/packages/yasnippet/snippets/csharp-mode/attrib.2 
b/packages/yasnippet-classic-snippets/snippets/csharp-mode/attrib.2
similarity index 100%
rename from packages/yasnippet/snippets/csharp-mode/attrib.2
rename to packages/yasnippet-classic-snippets/snippets/csharp-mode/attrib.2
diff --git a/packages/yasnippet/snippets/csharp-mode/class 
b/packages/yasnippet-classic-snippets/snippets/csharp-mode/class
similarity index 100%
rename from packages/yasnippet/snippets/csharp-mode/class
rename to packages/yasnippet-classic-snippets/snippets/csharp-mode/class
diff --git a/packages/yasnippet/snippets/csharp-mode/comment 
b/packages/yasnippet-classic-snippets/snippets/csharp-mode/comment
similarity index 100%
rename from packages/yasnippet/snippets/csharp-mode/comment
rename to packages/yasnippet-classic-snippets/snippets/csharp-mode/comment
diff --git a/packages/yasnippet/snippets/csharp-mode/comment.1 
b/packages/yasnippet-classic-snippets/snippets/csharp-mode/comment.1
similarity index 100%
rename from packages/yasnippet/snippets/csharp-mode/comment.1
rename to packages/yasnippet-classic-snippets/snippets/csharp-mode/comment.1
diff --git a/packages/yasnippet/snippets/csharp-mode/comment.2 
b/packages/yasnippet-classic-snippets/snippets/csharp-mode/comment.2
similarity index 100%
rename from packages/yasnippet/snippets/csharp-mode/comment.2
rename to packages/yasnippet-classic-snippets/snippets/csharp-mode/comment.2
diff --git a/packages/yasnippet/snippets/csharp-mode/comment.3 
b/packages/yasnippet-classic-snippets/snippets/csharp-mode/comment.3
similarity index 100%
rename from packages/yasnippet/snippets/csharp-mode/comment.3
rename to packages/yasnippet-classic-snippets/snippets/csharp-mode/comment.3
diff --git a/packages/yasnippet/snippets/csharp-mode/method 
b/packages/yasnippet-classic-snippets/snippets/csharp-mode/method
similarity index 100%
rename from packages/yasnippet/snippets/csharp-mode/method
rename to packages/yasnippet-classic-snippets/snippets/csharp-mode/method
diff --git a/packages/yasnippet/snippets/csharp-mode/namespace 
b/packages/yasnippet-classic-snippets/snippets/csharp-mode/namespace
similarity index 100%
rename from packages/yasnippet/snippets/csharp-mode/namespace
rename to packages/yasnippet-classic-snippets/snippets/csharp-mode/namespace
diff --git a/packages/yasnippet/snippets/csharp-mode/prop 
b/packages/yasnippet-classic-snippets/snippets/csharp-mode/prop
similarity index 100%
rename from packages/yasnippet/snippets/csharp-mode/prop
rename to packages/yasnippet-classic-snippets/snippets/csharp-mode/prop
diff --git a/packages/yasnippet/snippets/csharp-mode/region 
b/packages/yasnippet-classic-snippets/snippets/csharp-mode/region
similarity index 100%
rename from packages/yasnippet/snippets/csharp-mode/region
rename to packages/yasnippet-classic-snippets/snippets/csharp-mode/region
diff --git a/packages/yasnippet/snippets/csharp-mode/using 
b/packages/yasnippet-classic-snippets/snippets/csharp-mode/using
similarity index 100%
rename from packages/yasnippet/snippets/csharp-mode/using
rename to packages/yasnippet-classic-snippets/snippets/csharp-mode/using
diff --git a/packages/yasnippet/snippets/csharp-mode/using.1 
b/packages/yasnippet-classic-snippets/snippets/csharp-mode/using.1
similarity index 100%
rename from packages/yasnippet/snippets/csharp-mode/using.1
rename to packages/yasnippet-classic-snippets/snippets/csharp-mode/using.1
diff --git a/packages/yasnippet/snippets/csharp-mode/using.2 
b/packages/yasnippet-classic-snippets/snippets/csharp-mode/using.2
similarity index 100%
rename from packages/yasnippet/snippets/csharp-mode/using.2
rename to packages/yasnippet-classic-snippets/snippets/csharp-mode/using.2
diff --git a/packages/yasnippet/snippets/css-mode/.yas-parents 
b/packages/yasnippet-classic-snippets/snippets/css-mode/.yas-parents
similarity index 100%
rename from packages/yasnippet/snippets/css-mode/.yas-parents
rename to packages/yasnippet-classic-snippets/snippets/css-mode/.yas-parents
diff --git a/packages/yasnippet/snippets/css-mode/bg 
b/packages/yasnippet-classic-snippets/snippets/css-mode/bg
similarity index 100%
rename from packages/yasnippet/snippets/css-mode/bg
rename to packages/yasnippet-classic-snippets/snippets/css-mode/bg
diff --git a/packages/yasnippet/snippets/css-mode/bg.1 
b/packages/yasnippet-classic-snippets/snippets/css-mode/bg.1
similarity index 100%
rename from packages/yasnippet/snippets/css-mode/bg.1
rename to packages/yasnippet-classic-snippets/snippets/css-mode/bg.1
diff --git a/packages/yasnippet/snippets/css-mode/bor 
b/packages/yasnippet-classic-snippets/snippets/css-mode/bor
similarity index 100%
rename from packages/yasnippet/snippets/css-mode/bor
rename to packages/yasnippet-classic-snippets/snippets/css-mode/bor
diff --git a/packages/yasnippet/snippets/css-mode/cl 
b/packages/yasnippet-classic-snippets/snippets/css-mode/cl
similarity index 100%
rename from packages/yasnippet/snippets/css-mode/cl
rename to packages/yasnippet-classic-snippets/snippets/css-mode/cl
diff --git a/packages/yasnippet/snippets/css-mode/disp.block 
b/packages/yasnippet-classic-snippets/snippets/css-mode/disp.block
similarity index 100%
rename from packages/yasnippet/snippets/css-mode/disp.block
rename to packages/yasnippet-classic-snippets/snippets/css-mode/disp.block
diff --git a/packages/yasnippet/snippets/css-mode/disp.inline 
b/packages/yasnippet-classic-snippets/snippets/css-mode/disp.inline
similarity index 100%
rename from packages/yasnippet/snippets/css-mode/disp.inline
rename to packages/yasnippet-classic-snippets/snippets/css-mode/disp.inline
diff --git a/packages/yasnippet/snippets/css-mode/disp.none 
b/packages/yasnippet-classic-snippets/snippets/css-mode/disp.none
similarity index 100%
rename from packages/yasnippet/snippets/css-mode/disp.none
rename to packages/yasnippet-classic-snippets/snippets/css-mode/disp.none
diff --git a/packages/yasnippet/snippets/css-mode/ff 
b/packages/yasnippet-classic-snippets/snippets/css-mode/ff
similarity index 100%
rename from packages/yasnippet/snippets/css-mode/ff
rename to packages/yasnippet-classic-snippets/snippets/css-mode/ff
diff --git a/packages/yasnippet/snippets/css-mode/fs 
b/packages/yasnippet-classic-snippets/snippets/css-mode/fs
similarity index 100%
rename from packages/yasnippet/snippets/css-mode/fs
rename to packages/yasnippet-classic-snippets/snippets/css-mode/fs
diff --git a/packages/yasnippet/snippets/css-mode/mar.bottom 
b/packages/yasnippet-classic-snippets/snippets/css-mode/mar.bottom
similarity index 100%
rename from packages/yasnippet/snippets/css-mode/mar.bottom
rename to packages/yasnippet-classic-snippets/snippets/css-mode/mar.bottom
diff --git a/packages/yasnippet/snippets/css-mode/mar.left 
b/packages/yasnippet-classic-snippets/snippets/css-mode/mar.left
similarity index 100%
rename from packages/yasnippet/snippets/css-mode/mar.left
rename to packages/yasnippet-classic-snippets/snippets/css-mode/mar.left
diff --git a/packages/yasnippet/snippets/css-mode/mar.mar 
b/packages/yasnippet-classic-snippets/snippets/css-mode/mar.mar
similarity index 100%
rename from packages/yasnippet/snippets/css-mode/mar.mar
rename to packages/yasnippet-classic-snippets/snippets/css-mode/mar.mar
diff --git a/packages/yasnippet/snippets/css-mode/mar.margin 
b/packages/yasnippet-classic-snippets/snippets/css-mode/mar.margin
similarity index 100%
rename from packages/yasnippet/snippets/css-mode/mar.margin
rename to packages/yasnippet-classic-snippets/snippets/css-mode/mar.margin
diff --git a/packages/yasnippet/snippets/css-mode/mar.right 
b/packages/yasnippet-classic-snippets/snippets/css-mode/mar.right
similarity index 100%
rename from packages/yasnippet/snippets/css-mode/mar.right
rename to packages/yasnippet-classic-snippets/snippets/css-mode/mar.right
diff --git a/packages/yasnippet/snippets/css-mode/mar.top 
b/packages/yasnippet-classic-snippets/snippets/css-mode/mar.top
similarity index 100%
rename from packages/yasnippet/snippets/css-mode/mar.top
rename to packages/yasnippet-classic-snippets/snippets/css-mode/mar.top
diff --git a/packages/yasnippet/snippets/css-mode/pad.bottom 
b/packages/yasnippet-classic-snippets/snippets/css-mode/pad.bottom
similarity index 100%
rename from packages/yasnippet/snippets/css-mode/pad.bottom
rename to packages/yasnippet-classic-snippets/snippets/css-mode/pad.bottom
diff --git a/packages/yasnippet/snippets/css-mode/pad.left 
b/packages/yasnippet-classic-snippets/snippets/css-mode/pad.left
similarity index 100%
rename from packages/yasnippet/snippets/css-mode/pad.left
rename to packages/yasnippet-classic-snippets/snippets/css-mode/pad.left
diff --git a/packages/yasnippet/snippets/css-mode/pad.pad 
b/packages/yasnippet-classic-snippets/snippets/css-mode/pad.pad
similarity index 100%
rename from packages/yasnippet/snippets/css-mode/pad.pad
rename to packages/yasnippet-classic-snippets/snippets/css-mode/pad.pad
diff --git a/packages/yasnippet/snippets/css-mode/pad.padding 
b/packages/yasnippet-classic-snippets/snippets/css-mode/pad.padding
similarity index 100%
rename from packages/yasnippet/snippets/css-mode/pad.padding
rename to packages/yasnippet-classic-snippets/snippets/css-mode/pad.padding
diff --git a/packages/yasnippet/snippets/css-mode/pad.right 
b/packages/yasnippet-classic-snippets/snippets/css-mode/pad.right
similarity index 100%
rename from packages/yasnippet/snippets/css-mode/pad.right
rename to packages/yasnippet-classic-snippets/snippets/css-mode/pad.right
diff --git a/packages/yasnippet/snippets/css-mode/pad.top 
b/packages/yasnippet-classic-snippets/snippets/css-mode/pad.top
similarity index 100%
rename from packages/yasnippet/snippets/css-mode/pad.top
rename to packages/yasnippet-classic-snippets/snippets/css-mode/pad.top
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/.read_me 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/.read_me
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/.read_me
rename to packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/.read_me
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/.yas-parents 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/.yas-parents
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/.yas-parents
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/.yas-parents
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/add-hook.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/add-hook.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/add-hook.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/add-hook.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/and.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/and.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/and.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/and.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/append.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/append.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/append.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/append.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/apply.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/apply.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/apply.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/apply.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/aref.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/aref.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/aref.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/aref.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/aset.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/aset.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/aset.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/aset.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/assq.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/assq.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/assq.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/assq.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/autoload.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/autoload.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/autoload.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/autoload.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/backward-char.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/backward-char.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/backward-char.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/backward-char.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/beginning-of-line.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/beginning-of-line.yasnippet
similarity index 100%
rename from 
packages/yasnippet/snippets/emacs-lisp-mode/beginning-of-line.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/beginning-of-line.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/bounds-of-thing-at-point.yasnippet
 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/bounds-of-thing-at-point.yasnippet
similarity index 100%
rename from 
packages/yasnippet/snippets/emacs-lisp-mode/bounds-of-thing-at-point.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/bounds-of-thing-at-point.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/buffer-file-name.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/buffer-file-name.yasnippet
similarity index 100%
rename from 
packages/yasnippet/snippets/emacs-lisp-mode/buffer-file-name.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/buffer-file-name.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/buffer-modified-p.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/buffer-modified-p.yasnippet
similarity index 100%
rename from 
packages/yasnippet/snippets/emacs-lisp-mode/buffer-modified-p.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/buffer-modified-p.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/buffer-substring-no-properties.yasnippet
 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/buffer-substring-no-properties.yasnippet
similarity index 100%
rename from 
packages/yasnippet/snippets/emacs-lisp-mode/buffer-substring-no-properties.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/buffer-substring-no-properties.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/buffer-substring.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/buffer-substring.yasnippet
similarity index 100%
rename from 
packages/yasnippet/snippets/emacs-lisp-mode/buffer-substring.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/buffer-substring.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/car.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/car.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/car.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/car.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/cdr.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/cdr.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/cdr.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/cdr.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/concat.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/concat.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/concat.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/concat.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/cond.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/cond.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/cond.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/cond.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/condition-case.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/condition-case.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/condition-case.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/condition-case.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/cons.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/cons.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/cons.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/cons.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/consp.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/consp.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/consp.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/consp.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/copy-directory.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/copy-directory.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/copy-directory.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/copy-directory.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/copy-file.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/copy-file.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/copy-file.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/copy-file.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/current-buffer.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/current-buffer.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/current-buffer.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/current-buffer.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/custom-autoload.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/custom-autoload.yasnippet
similarity index 100%
rename from 
packages/yasnippet/snippets/emacs-lisp-mode/custom-autoload.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/custom-autoload.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/defalias.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/defalias.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/defalias.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/defalias.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/defcustom.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/defcustom.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/defcustom.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/defcustom.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/define-key.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/define-key.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/define-key.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/define-key.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/defsubst.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/defsubst.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/defsubst.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/defsubst.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/defun.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/defun.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/defun.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/defun.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/defvar.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/defvar.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/defvar.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/defvar.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/delete-char.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/delete-char.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/delete-char.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/delete-char.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/delete-directory.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/delete-directory.yasnippet
similarity index 100%
rename from 
packages/yasnippet/snippets/emacs-lisp-mode/delete-directory.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/delete-directory.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/delete-file.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/delete-file.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/delete-file.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/delete-file.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/delete-region.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/delete-region.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/delete-region.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/delete-region.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/directory-files.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/directory-files.yasnippet
similarity index 100%
rename from 
packages/yasnippet/snippets/emacs-lisp-mode/directory-files.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/directory-files.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/dolist.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/dolist.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/dolist.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/dolist.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/end-of-line.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/end-of-line.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/end-of-line.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/end-of-line.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/eq.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/eq.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/eq.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/eq.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/equal.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/equal.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/equal.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/equal.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/error.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/error.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/error.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/error.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/expand-file-name.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/expand-file-name.yasnippet
similarity index 100%
rename from 
packages/yasnippet/snippets/emacs-lisp-mode/expand-file-name.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/expand-file-name.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/f.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/f.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/f.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/f.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/fboundp.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/fboundp.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/fboundp.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/fboundp.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/file-name-directory.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/file-name-directory.yasnippet
similarity index 100%
rename from 
packages/yasnippet/snippets/emacs-lisp-mode/file-name-directory.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/file-name-directory.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/file-name-extension.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/file-name-extension.yasnippet
similarity index 100%
rename from 
packages/yasnippet/snippets/emacs-lisp-mode/file-name-extension.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/file-name-extension.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/file-name-nondirectory.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/file-name-nondirectory.yasnippet
similarity index 100%
rename from 
packages/yasnippet/snippets/emacs-lisp-mode/file-name-nondirectory.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/file-name-nondirectory.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/file-name-sans-extension.yasnippet
 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/file-name-sans-extension.yasnippet
similarity index 100%
rename from 
packages/yasnippet/snippets/emacs-lisp-mode/file-name-sans-extension.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/file-name-sans-extension.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/file-relative-name.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/file-relative-name.yasnippet
similarity index 100%
rename from 
packages/yasnippet/snippets/emacs-lisp-mode/file-relative-name.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/file-relative-name.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/find-file.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/find-file.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/find-file.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/find-file.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/format.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/format.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/format.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/format.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/forward-char.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/forward-char.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/forward-char.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/forward-char.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/forward-line.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/forward-line.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/forward-line.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/forward-line.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/funcall.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/funcall.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/funcall.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/funcall.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/function.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/function.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/function.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/function.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/get.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/get.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/get.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/get.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/global-set-key.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/global-set-key.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/global-set-key.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/global-set-key.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/goto-char.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/goto-char.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/goto-char.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/goto-char.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/if.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/if.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/if.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/if.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/insert-file-contents.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/insert-file-contents.yasnippet
similarity index 100%
rename from 
packages/yasnippet/snippets/emacs-lisp-mode/insert-file-contents.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/insert-file-contents.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/insert.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/insert.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/insert.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/insert.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/interactive.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/interactive.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/interactive.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/interactive.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/kbd.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/kbd.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/kbd.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/kbd.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/kill-buffer.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/kill-buffer.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/kill-buffer.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/kill-buffer.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/lambda.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/lambda.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/lambda.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/lambda.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/length.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/length.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/length.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/length.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/let.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/let.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/let.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/let.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/line-beginning-position.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/line-beginning-position.yasnippet
similarity index 100%
rename from 
packages/yasnippet/snippets/emacs-lisp-mode/line-beginning-position.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/line-beginning-position.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/line-end-position.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/line-end-position.yasnippet
similarity index 100%
rename from 
packages/yasnippet/snippets/emacs-lisp-mode/line-end-position.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/line-end-position.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/list.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/list.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/list.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/list.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/looking-at.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/looking-at.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/looking-at.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/looking-at.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/make-directory.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/make-directory.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/make-directory.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/make-directory.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/make-local-variable.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/make-local-variable.yasnippet
similarity index 100%
rename from 
packages/yasnippet/snippets/emacs-lisp-mode/make-local-variable.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/make-local-variable.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/mapc.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/mapc.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/mapc.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/mapc.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/mapcar.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/mapcar.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/mapcar.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/mapcar.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/match-beginning.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/match-beginning.yasnippet
similarity index 100%
rename from 
packages/yasnippet/snippets/emacs-lisp-mode/match-beginning.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/match-beginning.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/match-end.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/match-end.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/match-end.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/match-end.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/match-string.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/match-string.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/match-string.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/match-string.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/memq.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/memq.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/memq.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/memq.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/message.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/message.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/message.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/message.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/not.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/not.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/not.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/not.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/nth.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/nth.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/nth.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/nth.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/null.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/null.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/null.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/null.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/number-to-string.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/number-to-string.yasnippet
similarity index 100%
rename from 
packages/yasnippet/snippets/emacs-lisp-mode/number-to-string.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/number-to-string.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/or.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/or.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/or.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/or.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/point-max.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/point-max.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/point-max.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/point-max.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/point-min.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/point-min.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/point-min.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/point-min.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/point.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/point.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/point.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/point.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/princ.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/princ.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/princ.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/princ.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/print.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/print.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/print.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/print.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/progn.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/progn.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/progn.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/progn.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/push.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/push.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/push.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/push.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/put.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/put.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/put.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/put.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/re-search-backward.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/re-search-backward.yasnippet
similarity index 100%
rename from 
packages/yasnippet/snippets/emacs-lisp-mode/re-search-backward.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/re-search-backward.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/re-search-forward.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/re-search-forward.yasnippet
similarity index 100%
rename from 
packages/yasnippet/snippets/emacs-lisp-mode/re-search-forward.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/re-search-forward.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/region-active-p.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/region-active-p.yasnippet
similarity index 100%
rename from 
packages/yasnippet/snippets/emacs-lisp-mode/region-active-p.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/region-active-p.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/region-beginning.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/region-beginning.yasnippet
similarity index 100%
rename from 
packages/yasnippet/snippets/emacs-lisp-mode/region-beginning.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/region-beginning.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/region-end.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/region-end.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/region-end.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/region-end.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/rename-file.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/rename-file.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/rename-file.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/rename-file.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/repeat.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/repeat.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/repeat.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/repeat.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/replace-regexp-in-string.yasnippet
 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/replace-regexp-in-string.yasnippet
similarity index 100%
rename from 
packages/yasnippet/snippets/emacs-lisp-mode/replace-regexp-in-string.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/replace-regexp-in-string.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/replace-regexp.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/replace-regexp.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/replace-regexp.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/replace-regexp.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/require.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/require.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/require.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/require.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/save-buffer.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/save-buffer.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/save-buffer.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/save-buffer.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/save-excursion.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/save-excursion.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/save-excursion.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/save-excursion.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/search-backward-regexp.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/search-backward-regexp.yasnippet
similarity index 100%
rename from 
packages/yasnippet/snippets/emacs-lisp-mode/search-backward-regexp.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/search-backward-regexp.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/search-backward.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/search-backward.yasnippet
similarity index 100%
rename from 
packages/yasnippet/snippets/emacs-lisp-mode/search-backward.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/search-backward.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/search-forward-regexp.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/search-forward-regexp.yasnippet
similarity index 100%
rename from 
packages/yasnippet/snippets/emacs-lisp-mode/search-forward-regexp.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/search-forward-regexp.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/search-forward.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/search-forward.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/search-forward.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/search-forward.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/set-buffer.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/set-buffer.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/set-buffer.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/set-buffer.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/set-file-modes.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/set-file-modes.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/set-file-modes.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/set-file-modes.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/set-mark.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/set-mark.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/set-mark.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/set-mark.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/set.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/set.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/set.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/set.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/setq.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/setq.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/setq.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/setq.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/skip-chars-backward.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/skip-chars-backward.yasnippet
similarity index 100%
rename from 
packages/yasnippet/snippets/emacs-lisp-mode/skip-chars-backward.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/skip-chars-backward.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/skip-chars-forward.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/skip-chars-forward.yasnippet
similarity index 100%
rename from 
packages/yasnippet/snippets/emacs-lisp-mode/skip-chars-forward.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/skip-chars-forward.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/split-string.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/split-string.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/split-string.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/split-string.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/string-match.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/string-match.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/string-match.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/string-match.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/string-to-number.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/string-to-number.yasnippet
similarity index 100%
rename from 
packages/yasnippet/snippets/emacs-lisp-mode/string-to-number.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/string-to-number.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/string.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/string.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/string.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/string.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/string=.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/string=.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/string=.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/string=.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/stringp.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/stringp.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/stringp.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/stringp.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/substring.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/substring.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/substring.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/substring.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/thing-at-point.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/thing-at-point.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/thing-at-point.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/thing-at-point.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/unless.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/unless.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/unless.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/unless.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/vector.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/vector.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/vector.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/vector.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/when.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/when.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/when.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/when.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/while.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/while.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/while.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/while.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/widget-get.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/widget-get.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/widget-get.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/widget-get.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/with-current-buffer.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/with-current-buffer.yasnippet
similarity index 100%
rename from 
packages/yasnippet/snippets/emacs-lisp-mode/with-current-buffer.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/with-current-buffer.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/x-dired.process_marked.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/x-dired.process_marked.yasnippet
similarity index 100%
rename from 
packages/yasnippet/snippets/emacs-lisp-mode/x-dired.process_marked.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/x-dired.process_marked.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/x-file.process.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/x-file.process.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/x-file.process.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/x-file.process.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/x-file.read-lines.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/x-file.read-lines.yasnippet
similarity index 100%
rename from 
packages/yasnippet/snippets/emacs-lisp-mode/x-file.read-lines.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/x-file.read-lines.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/x-find-replace.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/x-find-replace.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/x-find-replace.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/x-find-replace.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/x-grabstring.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/x-grabstring.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/x-grabstring.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/x-grabstring.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/x-grabthing.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/x-grabthing.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/x-grabthing.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/x-grabthing.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/x-traverse_dir.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/x-traverse_dir.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/x-traverse_dir.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/x-traverse_dir.yasnippet
diff --git 
a/packages/yasnippet/snippets/emacs-lisp-mode/x-word-or-region.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/x-word-or-region.yasnippet
similarity index 100%
rename from 
packages/yasnippet/snippets/emacs-lisp-mode/x-word-or-region.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/x-word-or-region.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/y-or-n-p.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/y-or-n-p.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/y-or-n-p.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/y-or-n-p.yasnippet
diff --git a/packages/yasnippet/snippets/emacs-lisp-mode/yes-or-no-p.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/yes-or-no-p.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/emacs-lisp-mode/yes-or-no-p.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/emacs-lisp-mode/yes-or-no-p.yasnippet
diff --git a/packages/yasnippet/snippets/erlang-mode/.yas-parents 
b/packages/yasnippet-classic-snippets/snippets/erlang-mode/.yas-parents
similarity index 100%
rename from packages/yasnippet/snippets/erlang-mode/.yas-parents
rename to packages/yasnippet-classic-snippets/snippets/erlang-mode/.yas-parents
diff --git a/packages/yasnippet/snippets/erlang-mode/after 
b/packages/yasnippet-classic-snippets/snippets/erlang-mode/after
similarity index 100%
rename from packages/yasnippet/snippets/erlang-mode/after
rename to packages/yasnippet-classic-snippets/snippets/erlang-mode/after
diff --git a/packages/yasnippet/snippets/erlang-mode/begin 
b/packages/yasnippet-classic-snippets/snippets/erlang-mode/begin
similarity index 100%
rename from packages/yasnippet/snippets/erlang-mode/begin
rename to packages/yasnippet-classic-snippets/snippets/erlang-mode/begin
diff --git a/packages/yasnippet/snippets/erlang-mode/beh 
b/packages/yasnippet-classic-snippets/snippets/erlang-mode/beh
similarity index 100%
rename from packages/yasnippet/snippets/erlang-mode/beh
rename to packages/yasnippet-classic-snippets/snippets/erlang-mode/beh
diff --git a/packages/yasnippet/snippets/erlang-mode/case 
b/packages/yasnippet-classic-snippets/snippets/erlang-mode/case
similarity index 100%
rename from packages/yasnippet/snippets/erlang-mode/case
rename to packages/yasnippet-classic-snippets/snippets/erlang-mode/case
diff --git a/packages/yasnippet/snippets/erlang-mode/compile 
b/packages/yasnippet-classic-snippets/snippets/erlang-mode/compile
similarity index 100%
rename from packages/yasnippet/snippets/erlang-mode/compile
rename to packages/yasnippet-classic-snippets/snippets/erlang-mode/compile
diff --git a/packages/yasnippet/snippets/erlang-mode/def 
b/packages/yasnippet-classic-snippets/snippets/erlang-mode/def
similarity index 100%
rename from packages/yasnippet/snippets/erlang-mode/def
rename to packages/yasnippet-classic-snippets/snippets/erlang-mode/def
diff --git a/packages/yasnippet/snippets/erlang-mode/exp 
b/packages/yasnippet-classic-snippets/snippets/erlang-mode/exp
similarity index 100%
rename from packages/yasnippet/snippets/erlang-mode/exp
rename to packages/yasnippet-classic-snippets/snippets/erlang-mode/exp
diff --git a/packages/yasnippet/snippets/erlang-mode/fun 
b/packages/yasnippet-classic-snippets/snippets/erlang-mode/fun
similarity index 100%
rename from packages/yasnippet/snippets/erlang-mode/fun
rename to packages/yasnippet-classic-snippets/snippets/erlang-mode/fun
diff --git a/packages/yasnippet/snippets/erlang-mode/if 
b/packages/yasnippet-classic-snippets/snippets/erlang-mode/if
similarity index 100%
rename from packages/yasnippet/snippets/erlang-mode/if
rename to packages/yasnippet-classic-snippets/snippets/erlang-mode/if
diff --git a/packages/yasnippet/snippets/erlang-mode/ifdef 
b/packages/yasnippet-classic-snippets/snippets/erlang-mode/ifdef
similarity index 100%
rename from packages/yasnippet/snippets/erlang-mode/ifdef
rename to packages/yasnippet-classic-snippets/snippets/erlang-mode/ifdef
diff --git a/packages/yasnippet/snippets/erlang-mode/ifndef 
b/packages/yasnippet-classic-snippets/snippets/erlang-mode/ifndef
similarity index 100%
rename from packages/yasnippet/snippets/erlang-mode/ifndef
rename to packages/yasnippet-classic-snippets/snippets/erlang-mode/ifndef
diff --git a/packages/yasnippet/snippets/erlang-mode/imp 
b/packages/yasnippet-classic-snippets/snippets/erlang-mode/imp
similarity index 100%
rename from packages/yasnippet/snippets/erlang-mode/imp
rename to packages/yasnippet-classic-snippets/snippets/erlang-mode/imp
diff --git a/packages/yasnippet/snippets/erlang-mode/inc 
b/packages/yasnippet-classic-snippets/snippets/erlang-mode/inc
similarity index 100%
rename from packages/yasnippet/snippets/erlang-mode/inc
rename to packages/yasnippet-classic-snippets/snippets/erlang-mode/inc
diff --git a/packages/yasnippet/snippets/erlang-mode/inc.lib 
b/packages/yasnippet-classic-snippets/snippets/erlang-mode/inc.lib
similarity index 100%
rename from packages/yasnippet/snippets/erlang-mode/inc.lib
rename to packages/yasnippet-classic-snippets/snippets/erlang-mode/inc.lib
diff --git a/packages/yasnippet/snippets/erlang-mode/loop 
b/packages/yasnippet-classic-snippets/snippets/erlang-mode/loop
similarity index 100%
rename from packages/yasnippet/snippets/erlang-mode/loop
rename to packages/yasnippet-classic-snippets/snippets/erlang-mode/loop
diff --git a/packages/yasnippet/snippets/erlang-mode/mod 
b/packages/yasnippet-classic-snippets/snippets/erlang-mode/mod
similarity index 100%
rename from packages/yasnippet/snippets/erlang-mode/mod
rename to packages/yasnippet-classic-snippets/snippets/erlang-mode/mod
diff --git a/packages/yasnippet/snippets/erlang-mode/rcv 
b/packages/yasnippet-classic-snippets/snippets/erlang-mode/rcv
similarity index 100%
rename from packages/yasnippet/snippets/erlang-mode/rcv
rename to packages/yasnippet-classic-snippets/snippets/erlang-mode/rcv
diff --git a/packages/yasnippet/snippets/erlang-mode/rcv.after 
b/packages/yasnippet-classic-snippets/snippets/erlang-mode/rcv.after
similarity index 100%
rename from packages/yasnippet/snippets/erlang-mode/rcv.after
rename to packages/yasnippet-classic-snippets/snippets/erlang-mode/rcv.after
diff --git a/packages/yasnippet/snippets/erlang-mode/rec 
b/packages/yasnippet-classic-snippets/snippets/erlang-mode/rec
similarity index 100%
rename from packages/yasnippet/snippets/erlang-mode/rec
rename to packages/yasnippet-classic-snippets/snippets/erlang-mode/rec
diff --git a/packages/yasnippet/snippets/erlang-mode/try 
b/packages/yasnippet-classic-snippets/snippets/erlang-mode/try
similarity index 100%
rename from packages/yasnippet/snippets/erlang-mode/try
rename to packages/yasnippet-classic-snippets/snippets/erlang-mode/try
diff --git a/packages/yasnippet/snippets/erlang-mode/undef 
b/packages/yasnippet-classic-snippets/snippets/erlang-mode/undef
similarity index 100%
rename from packages/yasnippet/snippets/erlang-mode/undef
rename to packages/yasnippet-classic-snippets/snippets/erlang-mode/undef
diff --git a/packages/yasnippet/snippets/f90-mode/.yas-parents 
b/packages/yasnippet-classic-snippets/snippets/f90-mode/.yas-parents
similarity index 100%
rename from packages/yasnippet/snippets/f90-mode/.yas-parents
rename to packages/yasnippet-classic-snippets/snippets/f90-mode/.yas-parents
diff --git a/packages/yasnippet/snippets/f90-mode/au 
b/packages/yasnippet-classic-snippets/snippets/f90-mode/au
similarity index 100%
rename from packages/yasnippet/snippets/f90-mode/au
rename to packages/yasnippet-classic-snippets/snippets/f90-mode/au
diff --git a/packages/yasnippet/snippets/f90-mode/bd 
b/packages/yasnippet-classic-snippets/snippets/f90-mode/bd
similarity index 100%
rename from packages/yasnippet/snippets/f90-mode/bd
rename to packages/yasnippet-classic-snippets/snippets/f90-mode/bd
diff --git a/packages/yasnippet/snippets/f90-mode/c 
b/packages/yasnippet-classic-snippets/snippets/f90-mode/c
similarity index 100%
rename from packages/yasnippet/snippets/f90-mode/c
rename to packages/yasnippet-classic-snippets/snippets/f90-mode/c
diff --git a/packages/yasnippet/snippets/f90-mode/ch 
b/packages/yasnippet-classic-snippets/snippets/f90-mode/ch
similarity index 100%
rename from packages/yasnippet/snippets/f90-mode/ch
rename to packages/yasnippet-classic-snippets/snippets/f90-mode/ch
diff --git a/packages/yasnippet/snippets/f90-mode/cx 
b/packages/yasnippet-classic-snippets/snippets/f90-mode/cx
similarity index 100%
rename from packages/yasnippet/snippets/f90-mode/cx
rename to packages/yasnippet-classic-snippets/snippets/f90-mode/cx
diff --git a/packages/yasnippet/snippets/f90-mode/dc 
b/packages/yasnippet-classic-snippets/snippets/f90-mode/dc
similarity index 100%
rename from packages/yasnippet/snippets/f90-mode/dc
rename to packages/yasnippet-classic-snippets/snippets/f90-mode/dc
diff --git a/packages/yasnippet/snippets/f90-mode/do 
b/packages/yasnippet-classic-snippets/snippets/f90-mode/do
similarity index 100%
rename from packages/yasnippet/snippets/f90-mode/do
rename to packages/yasnippet-classic-snippets/snippets/f90-mode/do
diff --git a/packages/yasnippet/snippets/f90-mode/dp 
b/packages/yasnippet-classic-snippets/snippets/f90-mode/dp
similarity index 100%
rename from packages/yasnippet/snippets/f90-mode/dp
rename to packages/yasnippet-classic-snippets/snippets/f90-mode/dp
diff --git a/packages/yasnippet/snippets/f90-mode/eq 
b/packages/yasnippet-classic-snippets/snippets/f90-mode/eq
similarity index 100%
rename from packages/yasnippet/snippets/f90-mode/eq
rename to packages/yasnippet-classic-snippets/snippets/f90-mode/eq
diff --git a/packages/yasnippet/snippets/f90-mode/ib 
b/packages/yasnippet-classic-snippets/snippets/f90-mode/ib
similarity index 100%
rename from packages/yasnippet/snippets/f90-mode/ib
rename to packages/yasnippet-classic-snippets/snippets/f90-mode/ib
diff --git a/packages/yasnippet/snippets/f90-mode/ic 
b/packages/yasnippet-classic-snippets/snippets/f90-mode/ic
similarity index 100%
rename from packages/yasnippet/snippets/f90-mode/ic
rename to packages/yasnippet-classic-snippets/snippets/f90-mode/ic
diff --git a/packages/yasnippet/snippets/f90-mode/ich 
b/packages/yasnippet-classic-snippets/snippets/f90-mode/ich
similarity index 100%
rename from packages/yasnippet/snippets/f90-mode/ich
rename to packages/yasnippet-classic-snippets/snippets/f90-mode/ich
diff --git a/packages/yasnippet/snippets/f90-mode/if 
b/packages/yasnippet-classic-snippets/snippets/f90-mode/if
similarity index 100%
rename from packages/yasnippet/snippets/f90-mode/if
rename to packages/yasnippet-classic-snippets/snippets/f90-mode/if
diff --git a/packages/yasnippet/snippets/f90-mode/ii 
b/packages/yasnippet-classic-snippets/snippets/f90-mode/ii
similarity index 100%
rename from packages/yasnippet/snippets/f90-mode/ii
rename to packages/yasnippet-classic-snippets/snippets/f90-mode/ii
diff --git a/packages/yasnippet/snippets/f90-mode/il 
b/packages/yasnippet-classic-snippets/snippets/f90-mode/il
similarity index 100%
rename from packages/yasnippet/snippets/f90-mode/il
rename to packages/yasnippet-classic-snippets/snippets/f90-mode/il
diff --git a/packages/yasnippet/snippets/f90-mode/in 
b/packages/yasnippet-classic-snippets/snippets/f90-mode/in
similarity index 100%
rename from packages/yasnippet/snippets/f90-mode/in
rename to packages/yasnippet-classic-snippets/snippets/f90-mode/in
diff --git a/packages/yasnippet/snippets/f90-mode/inc 
b/packages/yasnippet-classic-snippets/snippets/f90-mode/inc
similarity index 100%
rename from packages/yasnippet/snippets/f90-mode/inc
rename to packages/yasnippet-classic-snippets/snippets/f90-mode/inc
diff --git a/packages/yasnippet/snippets/f90-mode/intr 
b/packages/yasnippet-classic-snippets/snippets/f90-mode/intr
similarity index 100%
rename from packages/yasnippet/snippets/f90-mode/intr
rename to packages/yasnippet-classic-snippets/snippets/f90-mode/intr
diff --git a/packages/yasnippet/snippets/f90-mode/ir 
b/packages/yasnippet-classic-snippets/snippets/f90-mode/ir
similarity index 100%
rename from packages/yasnippet/snippets/f90-mode/ir
rename to packages/yasnippet-classic-snippets/snippets/f90-mode/ir
diff --git a/packages/yasnippet/snippets/f90-mode/l 
b/packages/yasnippet-classic-snippets/snippets/f90-mode/l
similarity index 100%
rename from packages/yasnippet/snippets/f90-mode/l
rename to packages/yasnippet-classic-snippets/snippets/f90-mode/l
diff --git a/packages/yasnippet/snippets/f90-mode/pa 
b/packages/yasnippet-classic-snippets/snippets/f90-mode/pa
similarity index 100%
rename from packages/yasnippet/snippets/f90-mode/pa
rename to packages/yasnippet-classic-snippets/snippets/f90-mode/pa
diff --git a/packages/yasnippet/snippets/f90-mode/pr 
b/packages/yasnippet-classic-snippets/snippets/f90-mode/pr
similarity index 100%
rename from packages/yasnippet/snippets/f90-mode/pr
rename to packages/yasnippet-classic-snippets/snippets/f90-mode/pr
diff --git a/packages/yasnippet/snippets/f90-mode/re 
b/packages/yasnippet-classic-snippets/snippets/f90-mode/re
similarity index 100%
rename from packages/yasnippet/snippets/f90-mode/re
rename to packages/yasnippet-classic-snippets/snippets/f90-mode/re
diff --git a/packages/yasnippet/snippets/f90-mode/st 
b/packages/yasnippet-classic-snippets/snippets/f90-mode/st
similarity index 100%
rename from packages/yasnippet/snippets/f90-mode/st
rename to packages/yasnippet-classic-snippets/snippets/f90-mode/st
diff --git a/packages/yasnippet/snippets/f90-mode/su 
b/packages/yasnippet-classic-snippets/snippets/f90-mode/su
similarity index 100%
rename from packages/yasnippet/snippets/f90-mode/su
rename to packages/yasnippet-classic-snippets/snippets/f90-mode/su
diff --git a/packages/yasnippet/snippets/f90-mode/wr 
b/packages/yasnippet-classic-snippets/snippets/f90-mode/wr
similarity index 100%
rename from packages/yasnippet/snippets/f90-mode/wr
rename to packages/yasnippet-classic-snippets/snippets/f90-mode/wr
diff --git a/packages/yasnippet/snippets/html-mode/.yas-make-groups 
b/packages/yasnippet-classic-snippets/snippets/html-mode/.yas-make-groups
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/.yas-make-groups
rename to 
packages/yasnippet-classic-snippets/snippets/html-mode/.yas-make-groups
diff --git a/packages/yasnippet/snippets/html-mode/.yas-parents 
b/packages/yasnippet-classic-snippets/snippets/html-mode/.yas-parents
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/.yas-parents
rename to packages/yasnippet-classic-snippets/snippets/html-mode/.yas-parents
diff --git a/packages/yasnippet/snippets/html-mode/b.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/html-mode/b.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/b.yasnippet
rename to packages/yasnippet-classic-snippets/snippets/html-mode/b.yasnippet
diff --git a/packages/yasnippet/snippets/html-mode/body 
b/packages/yasnippet-classic-snippets/snippets/html-mode/body
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/body
rename to packages/yasnippet-classic-snippets/snippets/html-mode/body
diff --git a/packages/yasnippet/snippets/html-mode/br 
b/packages/yasnippet-classic-snippets/snippets/html-mode/br
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/br
rename to packages/yasnippet-classic-snippets/snippets/html-mode/br
diff --git a/packages/yasnippet/snippets/html-mode/code 
b/packages/yasnippet-classic-snippets/snippets/html-mode/code
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/code
rename to packages/yasnippet-classic-snippets/snippets/html-mode/code
diff --git a/packages/yasnippet/snippets/html-mode/code.class 
b/packages/yasnippet-classic-snippets/snippets/html-mode/code.class
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/code.class
rename to packages/yasnippet-classic-snippets/snippets/html-mode/code.class
diff --git a/packages/yasnippet/snippets/html-mode/div 
b/packages/yasnippet-classic-snippets/snippets/html-mode/div
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/div
rename to packages/yasnippet-classic-snippets/snippets/html-mode/div
diff --git a/packages/yasnippet/snippets/html-mode/div.class 
b/packages/yasnippet-classic-snippets/snippets/html-mode/div.class
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/div.class
rename to packages/yasnippet-classic-snippets/snippets/html-mode/div.class
diff --git a/packages/yasnippet/snippets/html-mode/div.id 
b/packages/yasnippet-classic-snippets/snippets/html-mode/div.id
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/div.id
rename to packages/yasnippet-classic-snippets/snippets/html-mode/div.id
diff --git a/packages/yasnippet/snippets/html-mode/div.id-class 
b/packages/yasnippet-classic-snippets/snippets/html-mode/div.id-class
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/div.id-class
rename to packages/yasnippet-classic-snippets/snippets/html-mode/div.id-class
diff --git a/packages/yasnippet/snippets/html-mode/dov 
b/packages/yasnippet-classic-snippets/snippets/html-mode/dov
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/dov
rename to packages/yasnippet-classic-snippets/snippets/html-mode/dov
diff --git a/packages/yasnippet/snippets/html-mode/form 
b/packages/yasnippet-classic-snippets/snippets/html-mode/form
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/form
rename to packages/yasnippet-classic-snippets/snippets/html-mode/form
diff --git a/packages/yasnippet/snippets/html-mode/head 
b/packages/yasnippet-classic-snippets/snippets/html-mode/head
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/head
rename to packages/yasnippet-classic-snippets/snippets/html-mode/head
diff --git a/packages/yasnippet/snippets/html-mode/header/h1 
b/packages/yasnippet-classic-snippets/snippets/html-mode/header/h1
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/header/h1
rename to packages/yasnippet-classic-snippets/snippets/html-mode/header/h1
diff --git a/packages/yasnippet/snippets/html-mode/header/h2 
b/packages/yasnippet-classic-snippets/snippets/html-mode/header/h2
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/header/h2
rename to packages/yasnippet-classic-snippets/snippets/html-mode/header/h2
diff --git a/packages/yasnippet/snippets/html-mode/header/h3 
b/packages/yasnippet-classic-snippets/snippets/html-mode/header/h3
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/header/h3
rename to packages/yasnippet-classic-snippets/snippets/html-mode/header/h3
diff --git a/packages/yasnippet/snippets/html-mode/header/h4 
b/packages/yasnippet-classic-snippets/snippets/html-mode/header/h4
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/header/h4
rename to packages/yasnippet-classic-snippets/snippets/html-mode/header/h4
diff --git a/packages/yasnippet/snippets/html-mode/header/h5 
b/packages/yasnippet-classic-snippets/snippets/html-mode/header/h5
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/header/h5
rename to packages/yasnippet-classic-snippets/snippets/html-mode/header/h5
diff --git a/packages/yasnippet/snippets/html-mode/header/h6 
b/packages/yasnippet-classic-snippets/snippets/html-mode/header/h6
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/header/h6
rename to packages/yasnippet-classic-snippets/snippets/html-mode/header/h6
diff --git a/packages/yasnippet/snippets/html-mode/hr 
b/packages/yasnippet-classic-snippets/snippets/html-mode/hr
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/hr
rename to packages/yasnippet-classic-snippets/snippets/html-mode/hr
diff --git a/packages/yasnippet/snippets/html-mode/href 
b/packages/yasnippet-classic-snippets/snippets/html-mode/href
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/href
rename to packages/yasnippet-classic-snippets/snippets/html-mode/href
diff --git a/packages/yasnippet/snippets/html-mode/html 
b/packages/yasnippet-classic-snippets/snippets/html-mode/html
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/html
rename to packages/yasnippet-classic-snippets/snippets/html-mode/html
diff --git a/packages/yasnippet/snippets/html-mode/html.xmlns 
b/packages/yasnippet-classic-snippets/snippets/html-mode/html.xmlns
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/html.xmlns
rename to packages/yasnippet-classic-snippets/snippets/html-mode/html.xmlns
diff --git a/packages/yasnippet/snippets/html-mode/i.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/html-mode/i.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/i.yasnippet
rename to packages/yasnippet-classic-snippets/snippets/html-mode/i.yasnippet
diff --git a/packages/yasnippet/snippets/html-mode/img 
b/packages/yasnippet-classic-snippets/snippets/html-mode/img
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/img
rename to packages/yasnippet-classic-snippets/snippets/html-mode/img
diff --git a/packages/yasnippet/snippets/html-mode/input 
b/packages/yasnippet-classic-snippets/snippets/html-mode/input
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/input
rename to packages/yasnippet-classic-snippets/snippets/html-mode/input
diff --git a/packages/yasnippet/snippets/html-mode/link.stylesheet 
b/packages/yasnippet-classic-snippets/snippets/html-mode/link.stylesheet
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/link.stylesheet
rename to packages/yasnippet-classic-snippets/snippets/html-mode/link.stylesheet
diff --git a/packages/yasnippet/snippets/html-mode/link.stylesheet-ie 
b/packages/yasnippet-classic-snippets/snippets/html-mode/link.stylesheet-ie
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/link.stylesheet-ie
rename to 
packages/yasnippet-classic-snippets/snippets/html-mode/link.stylesheet-ie
diff --git a/packages/yasnippet/snippets/html-mode/list/dd 
b/packages/yasnippet-classic-snippets/snippets/html-mode/list/dd
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/list/dd
rename to packages/yasnippet-classic-snippets/snippets/html-mode/list/dd
diff --git a/packages/yasnippet/snippets/html-mode/list/dl 
b/packages/yasnippet-classic-snippets/snippets/html-mode/list/dl
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/list/dl
rename to packages/yasnippet-classic-snippets/snippets/html-mode/list/dl
diff --git a/packages/yasnippet/snippets/html-mode/list/dl.id 
b/packages/yasnippet-classic-snippets/snippets/html-mode/list/dl.id
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/list/dl.id
rename to packages/yasnippet-classic-snippets/snippets/html-mode/list/dl.id
diff --git a/packages/yasnippet/snippets/html-mode/list/dt 
b/packages/yasnippet-classic-snippets/snippets/html-mode/list/dt
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/list/dt
rename to packages/yasnippet-classic-snippets/snippets/html-mode/list/dt
diff --git a/packages/yasnippet/snippets/html-mode/list/li 
b/packages/yasnippet-classic-snippets/snippets/html-mode/list/li
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/list/li
rename to packages/yasnippet-classic-snippets/snippets/html-mode/list/li
diff --git a/packages/yasnippet/snippets/html-mode/list/li.class 
b/packages/yasnippet-classic-snippets/snippets/html-mode/list/li.class
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/list/li.class
rename to packages/yasnippet-classic-snippets/snippets/html-mode/list/li.class
diff --git a/packages/yasnippet/snippets/html-mode/list/ol 
b/packages/yasnippet-classic-snippets/snippets/html-mode/list/ol
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/list/ol
rename to packages/yasnippet-classic-snippets/snippets/html-mode/list/ol
diff --git a/packages/yasnippet/snippets/html-mode/list/ol.class 
b/packages/yasnippet-classic-snippets/snippets/html-mode/list/ol.class
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/list/ol.class
rename to packages/yasnippet-classic-snippets/snippets/html-mode/list/ol.class
diff --git a/packages/yasnippet/snippets/html-mode/list/ol.id 
b/packages/yasnippet-classic-snippets/snippets/html-mode/list/ol.id
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/list/ol.id
rename to packages/yasnippet-classic-snippets/snippets/html-mode/list/ol.id
diff --git a/packages/yasnippet/snippets/html-mode/list/ul 
b/packages/yasnippet-classic-snippets/snippets/html-mode/list/ul
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/list/ul
rename to packages/yasnippet-classic-snippets/snippets/html-mode/list/ul
diff --git a/packages/yasnippet/snippets/html-mode/list/ul.class 
b/packages/yasnippet-classic-snippets/snippets/html-mode/list/ul.class
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/list/ul.class
rename to packages/yasnippet-classic-snippets/snippets/html-mode/list/ul.class
diff --git a/packages/yasnippet/snippets/html-mode/list/ul.id 
b/packages/yasnippet-classic-snippets/snippets/html-mode/list/ul.id
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/list/ul.id
rename to packages/yasnippet-classic-snippets/snippets/html-mode/list/ul.id
diff --git a/packages/yasnippet/snippets/html-mode/mailto 
b/packages/yasnippet-classic-snippets/snippets/html-mode/mailto
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/mailto
rename to packages/yasnippet-classic-snippets/snippets/html-mode/mailto
diff --git a/packages/yasnippet/snippets/html-mode/meta/doctype 
b/packages/yasnippet-classic-snippets/snippets/html-mode/meta/doctype
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/meta/doctype
rename to packages/yasnippet-classic-snippets/snippets/html-mode/meta/doctype
diff --git a/packages/yasnippet/snippets/html-mode/meta/doctype.xhml1 
b/packages/yasnippet-classic-snippets/snippets/html-mode/meta/doctype.xhml1
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/meta/doctype.xhml1
rename to 
packages/yasnippet-classic-snippets/snippets/html-mode/meta/doctype.xhml1
diff --git a/packages/yasnippet/snippets/html-mode/meta/doctype.xhtml1_1 
b/packages/yasnippet-classic-snippets/snippets/html-mode/meta/doctype.xhtml1_1
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/meta/doctype.xhtml1_1
rename to 
packages/yasnippet-classic-snippets/snippets/html-mode/meta/doctype.xhtml1_1
diff --git a/packages/yasnippet/snippets/html-mode/meta/doctype.xhtml1_strict 
b/packages/yasnippet-classic-snippets/snippets/html-mode/meta/doctype.xhtml1_strict
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/meta/doctype.xhtml1_strict
rename to 
packages/yasnippet-classic-snippets/snippets/html-mode/meta/doctype.xhtml1_strict
diff --git 
a/packages/yasnippet/snippets/html-mode/meta/doctype.xhtml1_transitional 
b/packages/yasnippet-classic-snippets/snippets/html-mode/meta/doctype.xhtml1_transitional
similarity index 100%
rename from 
packages/yasnippet/snippets/html-mode/meta/doctype.xhtml1_transitional
rename to 
packages/yasnippet-classic-snippets/snippets/html-mode/meta/doctype.xhtml1_transitional
diff --git a/packages/yasnippet/snippets/html-mode/meta/meta 
b/packages/yasnippet-classic-snippets/snippets/html-mode/meta/meta
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/meta/meta
rename to packages/yasnippet-classic-snippets/snippets/html-mode/meta/meta
diff --git a/packages/yasnippet/snippets/html-mode/meta/meta.http-equiv 
b/packages/yasnippet-classic-snippets/snippets/html-mode/meta/meta.http-equiv
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/meta/meta.http-equiv
rename to 
packages/yasnippet-classic-snippets/snippets/html-mode/meta/meta.http-equiv
diff --git a/packages/yasnippet/snippets/html-mode/p 
b/packages/yasnippet-classic-snippets/snippets/html-mode/p
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/p
rename to packages/yasnippet-classic-snippets/snippets/html-mode/p
diff --git a/packages/yasnippet/snippets/html-mode/pre 
b/packages/yasnippet-classic-snippets/snippets/html-mode/pre
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/pre
rename to packages/yasnippet-classic-snippets/snippets/html-mode/pre
diff --git a/packages/yasnippet/snippets/html-mode/q.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/html-mode/q.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/q.yasnippet
rename to packages/yasnippet-classic-snippets/snippets/html-mode/q.yasnippet
diff --git a/packages/yasnippet/snippets/html-mode/quote 
b/packages/yasnippet-classic-snippets/snippets/html-mode/quote
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/quote
rename to packages/yasnippet-classic-snippets/snippets/html-mode/quote
diff --git a/packages/yasnippet/snippets/html-mode/script.javascript 
b/packages/yasnippet-classic-snippets/snippets/html-mode/script.javascript
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/script.javascript
rename to 
packages/yasnippet-classic-snippets/snippets/html-mode/script.javascript
diff --git a/packages/yasnippet/snippets/html-mode/script.javascript-src 
b/packages/yasnippet-classic-snippets/snippets/html-mode/script.javascript-src
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/script.javascript-src
rename to 
packages/yasnippet-classic-snippets/snippets/html-mode/script.javascript-src
diff --git a/packages/yasnippet/snippets/html-mode/span 
b/packages/yasnippet-classic-snippets/snippets/html-mode/span
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/span
rename to packages/yasnippet-classic-snippets/snippets/html-mode/span
diff --git a/packages/yasnippet/snippets/html-mode/span.class 
b/packages/yasnippet-classic-snippets/snippets/html-mode/span.class
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/span.class
rename to packages/yasnippet-classic-snippets/snippets/html-mode/span.class
diff --git a/packages/yasnippet/snippets/html-mode/span.id 
b/packages/yasnippet-classic-snippets/snippets/html-mode/span.id
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/span.id
rename to packages/yasnippet-classic-snippets/snippets/html-mode/span.id
diff --git a/packages/yasnippet/snippets/html-mode/style 
b/packages/yasnippet-classic-snippets/snippets/html-mode/style
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/style
rename to packages/yasnippet-classic-snippets/snippets/html-mode/style
diff --git a/packages/yasnippet/snippets/html-mode/table/table 
b/packages/yasnippet-classic-snippets/snippets/html-mode/table/table
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/table/table
rename to packages/yasnippet-classic-snippets/snippets/html-mode/table/table
diff --git a/packages/yasnippet/snippets/html-mode/table/td 
b/packages/yasnippet-classic-snippets/snippets/html-mode/table/td
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/table/td
rename to packages/yasnippet-classic-snippets/snippets/html-mode/table/td
diff --git a/packages/yasnippet/snippets/html-mode/table/th 
b/packages/yasnippet-classic-snippets/snippets/html-mode/table/th
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/table/th
rename to packages/yasnippet-classic-snippets/snippets/html-mode/table/th
diff --git a/packages/yasnippet/snippets/html-mode/table/tr 
b/packages/yasnippet-classic-snippets/snippets/html-mode/table/tr
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/table/tr
rename to packages/yasnippet-classic-snippets/snippets/html-mode/table/tr
diff --git a/packages/yasnippet/snippets/html-mode/textarea 
b/packages/yasnippet-classic-snippets/snippets/html-mode/textarea
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/textarea
rename to packages/yasnippet-classic-snippets/snippets/html-mode/textarea
diff --git a/packages/yasnippet/snippets/html-mode/title 
b/packages/yasnippet-classic-snippets/snippets/html-mode/title
similarity index 100%
rename from packages/yasnippet/snippets/html-mode/title
rename to packages/yasnippet-classic-snippets/snippets/html-mode/title
diff --git a/packages/yasnippet/snippets/js-mode/assert.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/js-mode/assert.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/js-mode/assert.yasnippet
rename to packages/yasnippet-classic-snippets/snippets/js-mode/assert.yasnippet
diff --git a/packages/yasnippet/snippets/js-mode/cb.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/js-mode/cb.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/js-mode/cb.yasnippet
rename to packages/yasnippet-classic-snippets/snippets/js-mode/cb.yasnippet
diff --git a/packages/yasnippet/snippets/js-mode/com.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/js-mode/com.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/js-mode/com.yasnippet
rename to packages/yasnippet-classic-snippets/snippets/js-mode/com.yasnippet
diff --git a/packages/yasnippet/snippets/js-mode/describe.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/js-mode/describe.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/js-mode/describe.yasnippet
rename to 
packages/yasnippet-classic-snippets/snippets/js-mode/describe.yasnippet
diff --git a/packages/yasnippet/snippets/js-mode/err.snippet 
b/packages/yasnippet-classic-snippets/snippets/js-mode/err.snippet
similarity index 100%
rename from packages/yasnippet/snippets/js-mode/err.snippet
rename to packages/yasnippet-classic-snippets/snippets/js-mode/err.snippet
diff --git a/packages/yasnippet/snippets/js-mode/error.snippet 
b/packages/yasnippet-classic-snippets/snippets/js-mode/error.snippet
similarity index 100%
rename from packages/yasnippet/snippets/js-mode/error.snippet
rename to packages/yasnippet-classic-snippets/snippets/js-mode/error.snippet
diff --git a/packages/yasnippet/snippets/js-mode/expect.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/js-mode/expect.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/js-mode/expect.yasnippet
rename to packages/yasnippet-classic-snippets/snippets/js-mode/expect.yasnippet
diff --git a/packages/yasnippet/snippets/js-mode/exports.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/js-mode/exports.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/js-mode/exports.yasnippet
rename to packages/yasnippet-classic-snippets/snippets/js-mode/exports.yasnippet
diff --git a/packages/yasnippet/snippets/js-mode/fn.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/js-mode/fn.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/js-mode/fn.yasnippet
rename to packages/yasnippet-classic-snippets/snippets/js-mode/fn.yasnippet
diff --git a/packages/yasnippet/snippets/js-mode/for.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/js-mode/for.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/js-mode/for.yasnippet
rename to packages/yasnippet-classic-snippets/snippets/js-mode/for.yasnippet
diff --git a/packages/yasnippet/snippets/js-mode/id.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/js-mode/id.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/js-mode/id.yasnippet
rename to packages/yasnippet-classic-snippets/snippets/js-mode/id.yasnippet
diff --git a/packages/yasnippet/snippets/js-mode/if.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/js-mode/if.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/js-mode/if.yasnippet
rename to packages/yasnippet-classic-snippets/snippets/js-mode/if.yasnippet
diff --git a/packages/yasnippet/snippets/js-mode/invoc.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/js-mode/invoc.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/js-mode/invoc.yasnippet
rename to packages/yasnippet-classic-snippets/snippets/js-mode/invoc.yasnippet
diff --git a/packages/yasnippet/snippets/js-mode/it.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/js-mode/it.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/js-mode/it.yasnippet
rename to packages/yasnippet-classic-snippets/snippets/js-mode/it.yasnippet
diff --git a/packages/yasnippet/snippets/js-mode/log.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/js-mode/log.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/js-mode/log.yasnippet
rename to packages/yasnippet-classic-snippets/snippets/js-mode/log.yasnippet
diff --git a/packages/yasnippet/snippets/js-mode/method.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/js-mode/method.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/js-mode/method.yasnippet
rename to packages/yasnippet-classic-snippets/snippets/js-mode/method.yasnippet
diff --git a/packages/yasnippet/snippets/js-mode/mod.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/js-mode/mod.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/js-mode/mod.yasnippet
rename to packages/yasnippet-classic-snippets/snippets/js-mode/mod.yasnippet
diff --git a/packages/yasnippet/snippets/js-mode/prop.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/js-mode/prop.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/js-mode/prop.yasnippet
rename to packages/yasnippet-classic-snippets/snippets/js-mode/prop.yasnippet
diff --git a/packages/yasnippet/snippets/js-mode/proto.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/js-mode/proto.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/js-mode/proto.yasnippet
rename to packages/yasnippet-classic-snippets/snippets/js-mode/proto.yasnippet
diff --git a/packages/yasnippet/snippets/js-mode/rq.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/js-mode/rq.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/js-mode/rq.yasnippet
rename to packages/yasnippet-classic-snippets/snippets/js-mode/rq.yasnippet
diff --git a/packages/yasnippet/snippets/js-mode/rt.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/js-mode/rt.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/js-mode/rt.yasnippet
rename to packages/yasnippet-classic-snippets/snippets/js-mode/rt.yasnippet
diff --git a/packages/yasnippet/snippets/js-mode/slice.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/js-mode/slice.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/js-mode/slice.yasnippet
rename to packages/yasnippet-classic-snippets/snippets/js-mode/slice.yasnippet
diff --git a/packages/yasnippet/snippets/js-mode/super.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/js-mode/super.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/js-mode/super.yasnippet
rename to packages/yasnippet-classic-snippets/snippets/js-mode/super.yasnippet
diff --git a/packages/yasnippet/snippets/js-mode/switch.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/js-mode/switch.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/js-mode/switch.yasnippet
rename to packages/yasnippet-classic-snippets/snippets/js-mode/switch.yasnippet
diff --git a/packages/yasnippet/snippets/js-mode/throw.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/js-mode/throw.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/js-mode/throw.yasnippet
rename to packages/yasnippet-classic-snippets/snippets/js-mode/throw.yasnippet
diff --git a/packages/yasnippet/snippets/js-mode/try.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/js-mode/try.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/js-mode/try.yasnippet
rename to packages/yasnippet-classic-snippets/snippets/js-mode/try.yasnippet
diff --git a/packages/yasnippet/snippets/js-mode/var.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/js-mode/var.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/js-mode/var.yasnippet
rename to packages/yasnippet-classic-snippets/snippets/js-mode/var.yasnippet
diff --git a/packages/yasnippet/snippets/js-mode/wh.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/js-mode/wh.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/js-mode/wh.yasnippet
rename to packages/yasnippet-classic-snippets/snippets/js-mode/wh.yasnippet
diff --git a/packages/yasnippet/snippets/js-mode/while.yasnippet 
b/packages/yasnippet-classic-snippets/snippets/js-mode/while.yasnippet
similarity index 100%
rename from packages/yasnippet/snippets/js-mode/while.yasnippet
rename to packages/yasnippet-classic-snippets/snippets/js-mode/while.yasnippet
diff --git a/packages/yasnippet/snippets/latex-mode/.yas-parents 
b/packages/yasnippet-classic-snippets/snippets/latex-mode/.yas-parents
similarity index 100%
rename from packages/yasnippet/snippets/latex-mode/.yas-parents
rename to packages/yasnippet-classic-snippets/snippets/latex-mode/.yas-parents
diff --git a/packages/yasnippet/snippets/latex-mode/begin 
b/packages/yasnippet-classic-snippets/snippets/latex-mode/begin
similarity index 100%
rename from packages/yasnippet/snippets/latex-mode/begin
rename to packages/yasnippet-classic-snippets/snippets/latex-mode/begin
diff --git a/packages/yasnippet/snippets/markdown-mode/+ 
b/packages/yasnippet-classic-snippets/snippets/markdown-mode/+
similarity index 100%
rename from packages/yasnippet/snippets/markdown-mode/+
rename to packages/yasnippet-classic-snippets/snippets/markdown-mode/+
diff --git a/packages/yasnippet/snippets/markdown-mode/- 
b/packages/yasnippet-classic-snippets/snippets/markdown-mode/-
similarity index 100%
rename from packages/yasnippet/snippets/markdown-mode/-
rename to packages/yasnippet-classic-snippets/snippets/markdown-mode/-
diff --git a/packages/yasnippet/snippets/markdown-mode/.yas-parents 
b/packages/yasnippet-classic-snippets/snippets/markdown-mode/.yas-parents
similarity index 100%
rename from packages/yasnippet/snippets/markdown-mode/.yas-parents
rename to 
packages/yasnippet-classic-snippets/snippets/markdown-mode/.yas-parents
diff --git a/packages/yasnippet/snippets/markdown-mode/_ 
b/packages/yasnippet-classic-snippets/snippets/markdown-mode/_
similarity index 100%
rename from packages/yasnippet/snippets/markdown-mode/_
rename to packages/yasnippet-classic-snippets/snippets/markdown-mode/_
diff --git a/packages/yasnippet/snippets/markdown-mode/__ 
b/packages/yasnippet-classic-snippets/snippets/markdown-mode/__
similarity index 100%
rename from packages/yasnippet/snippets/markdown-mode/__
rename to packages/yasnippet-classic-snippets/snippets/markdown-mode/__
diff --git a/packages/yasnippet/snippets/markdown-mode/` 
b/packages/yasnippet-classic-snippets/snippets/markdown-mode/`
similarity index 100%
rename from packages/yasnippet/snippets/markdown-mode/`
rename to packages/yasnippet-classic-snippets/snippets/markdown-mode/`
diff --git a/packages/yasnippet/snippets/markdown-mode/h1.1 
b/packages/yasnippet-classic-snippets/snippets/markdown-mode/h1.1
similarity index 100%
rename from packages/yasnippet/snippets/markdown-mode/h1.1
rename to packages/yasnippet-classic-snippets/snippets/markdown-mode/h1.1
diff --git a/packages/yasnippet/snippets/markdown-mode/h1.2 
b/packages/yasnippet-classic-snippets/snippets/markdown-mode/h1.2
similarity index 100%
rename from packages/yasnippet/snippets/markdown-mode/h1.2
rename to packages/yasnippet-classic-snippets/snippets/markdown-mode/h1.2
diff --git a/packages/yasnippet/snippets/markdown-mode/h2.1 
b/packages/yasnippet-classic-snippets/snippets/markdown-mode/h2.1
similarity index 100%
rename from packages/yasnippet/snippets/markdown-mode/h2.1
rename to packages/yasnippet-classic-snippets/snippets/markdown-mode/h2.1
diff --git a/packages/yasnippet/snippets/markdown-mode/h2.2 
b/packages/yasnippet-classic-snippets/snippets/markdown-mode/h2.2
similarity index 100%
rename from packages/yasnippet/snippets/markdown-mode/h2.2
rename to packages/yasnippet-classic-snippets/snippets/markdown-mode/h2.2
diff --git a/packages/yasnippet/snippets/markdown-mode/h3 
b/packages/yasnippet-classic-snippets/snippets/markdown-mode/h3
similarity index 100%
rename from packages/yasnippet/snippets/markdown-mode/h3
rename to packages/yasnippet-classic-snippets/snippets/markdown-mode/h3
diff --git a/packages/yasnippet/snippets/markdown-mode/h4 
b/packages/yasnippet-classic-snippets/snippets/markdown-mode/h4
similarity index 100%
rename from packages/yasnippet/snippets/markdown-mode/h4
rename to packages/yasnippet-classic-snippets/snippets/markdown-mode/h4
diff --git a/packages/yasnippet/snippets/markdown-mode/h5 
b/packages/yasnippet-classic-snippets/snippets/markdown-mode/h5
similarity index 100%
rename from packages/yasnippet/snippets/markdown-mode/h5
rename to packages/yasnippet-classic-snippets/snippets/markdown-mode/h5
diff --git a/packages/yasnippet/snippets/markdown-mode/h6 
b/packages/yasnippet-classic-snippets/snippets/markdown-mode/h6
similarity index 100%
rename from packages/yasnippet/snippets/markdown-mode/h6
rename to packages/yasnippet-classic-snippets/snippets/markdown-mode/h6
diff --git a/packages/yasnippet/snippets/markdown-mode/hr.1 
b/packages/yasnippet-classic-snippets/snippets/markdown-mode/hr.1
similarity index 100%
rename from packages/yasnippet/snippets/markdown-mode/hr.1
rename to packages/yasnippet-classic-snippets/snippets/markdown-mode/hr.1
diff --git a/packages/yasnippet/snippets/markdown-mode/hr.2 
b/packages/yasnippet-classic-snippets/snippets/markdown-mode/hr.2
similarity index 100%
rename from packages/yasnippet/snippets/markdown-mode/hr.2
rename to packages/yasnippet-classic-snippets/snippets/markdown-mode/hr.2
diff --git a/packages/yasnippet/snippets/markdown-mode/img 
b/packages/yasnippet-classic-snippets/snippets/markdown-mode/img
similarity index 100%
rename from packages/yasnippet/snippets/markdown-mode/img
rename to packages/yasnippet-classic-snippets/snippets/markdown-mode/img
diff --git a/packages/yasnippet/snippets/markdown-mode/link 
b/packages/yasnippet-classic-snippets/snippets/markdown-mode/link
similarity index 100%
rename from packages/yasnippet/snippets/markdown-mode/link
rename to packages/yasnippet-classic-snippets/snippets/markdown-mode/link
diff --git a/packages/yasnippet/snippets/markdown-mode/ol 
b/packages/yasnippet-classic-snippets/snippets/markdown-mode/ol
similarity index 100%
rename from packages/yasnippet/snippets/markdown-mode/ol
rename to packages/yasnippet-classic-snippets/snippets/markdown-mode/ol
diff --git a/packages/yasnippet/snippets/markdown-mode/rimg 
b/packages/yasnippet-classic-snippets/snippets/markdown-mode/rimg
similarity index 100%
rename from packages/yasnippet/snippets/markdown-mode/rimg
rename to packages/yasnippet-classic-snippets/snippets/markdown-mode/rimg
diff --git a/packages/yasnippet/snippets/markdown-mode/rlb 
b/packages/yasnippet-classic-snippets/snippets/markdown-mode/rlb
similarity index 100%
rename from packages/yasnippet/snippets/markdown-mode/rlb
rename to packages/yasnippet-classic-snippets/snippets/markdown-mode/rlb
diff --git a/packages/yasnippet/snippets/markdown-mode/rlink 
b/packages/yasnippet-classic-snippets/snippets/markdown-mode/rlink
similarity index 100%
rename from packages/yasnippet/snippets/markdown-mode/rlink
rename to packages/yasnippet-classic-snippets/snippets/markdown-mode/rlink
diff --git a/packages/yasnippet/snippets/nxml-mode/.yas-make-groups 
b/packages/yasnippet-classic-snippets/snippets/nxml-mode/.yas-make-groups
similarity index 100%
rename from packages/yasnippet/snippets/nxml-mode/.yas-make-groups
rename to 
packages/yasnippet-classic-snippets/snippets/nxml-mode/.yas-make-groups
diff --git a/packages/yasnippet/snippets/nxml-mode/.yas-parents 
b/packages/yasnippet-classic-snippets/snippets/nxml-mode/.yas-parents
similarity index 100%
rename from packages/yasnippet/snippets/nxml-mode/.yas-parents
rename to packages/yasnippet-classic-snippets/snippets/nxml-mode/.yas-parents
diff --git a/packages/yasnippet/snippets/nxml-mode/body 
b/packages/yasnippet-classic-snippets/snippets/nxml-mode/body
similarity index 100%
rename from packages/yasnippet/snippets/nxml-mode/body
rename to packages/yasnippet-classic-snippets/snippets/nxml-mode/body
diff --git a/packages/yasnippet/snippets/nxml-mode/br 
b/packages/yasnippet-classic-snippets/snippets/nxml-mode/br
similarity index 100%
rename from packages/yasnippet/snippets/nxml-mode/br
rename to packages/yasnippet-classic-snippets/snippets/nxml-mode/br
diff --git a/packages/yasnippet/snippets/nxml-mode/code 
b/packages/yasnippet-classic-snippets/snippets/nxml-mode/code
similarity index 100%
rename from packages/yasnippet/snippets/nxml-mode/code
rename to packages/yasnippet-classic-snippets/snippets/nxml-mode/code
diff --git a/packages/yasnippet/snippets/nxml-mode/div 
b/packages/yasnippet-classic-snippets/snippets/nxml-mode/div
similarity index 100%
rename from packages/yasnippet/snippets/nxml-mode/div
rename to packages/yasnippet-classic-snippets/snippets/nxml-mode/div
diff --git a/packages/yasnippet/snippets/nxml-mode/form 
b/packages/yasnippet-classic-snippets/snippets/nxml-mode/form
similarity index 100%
rename from packages/yasnippet/snippets/nxml-mode/form
rename to packages/yasnippet-classic-snippets/snippets/nxml-mode/form
diff --git a/packages/yasnippet/snippets/nxml-mode/head 
b/packages/yasnippet-classic-snippets/snippets/nxml-mode/head
similarity index 100%
rename from packages/yasnippet/snippets/nxml-mode/head
rename to packages/yasnippet-classic-snippets/snippets/nxml-mode/head
diff --git a/packages/yasnippet/snippets/nxml-mode/header/h1 
b/packages/yasnippet-classic-snippets/snippets/nxml-mode/header/h1
similarity index 100%
rename from packages/yasnippet/snippets/nxml-mode/header/h1
rename to packages/yasnippet-classic-snippets/snippets/nxml-mode/header/h1
diff --git a/packages/yasnippet/snippets/nxml-mode/header/h2 
b/packages/yasnippet-classic-snippets/snippets/nxml-mode/header/h2
similarity index 100%
rename from packages/yasnippet/snippets/nxml-mode/header/h2
rename to packages/yasnippet-classic-snippets/snippets/nxml-mode/header/h2
diff --git a/packages/yasnippet/snippets/nxml-mode/header/h3 
b/packages/yasnippet-classic-snippets/snippets/nxml-mode/header/h3
similarity index 100%
rename from packages/yasnippet/snippets/nxml-mode/header/h3
rename to packages/yasnippet-classic-snippets/snippets/nxml-mode/header/h3
diff --git a/packages/yasnippet/snippets/nxml-mode/header/h4 
b/packages/yasnippet-classic-snippets/snippets/nxml-mode/header/h4
similarity index 100%
rename from packages/yasnippet/snippets/nxml-mode/header/h4
rename to packages/yasnippet-classic-snippets/snippets/nxml-mode/header/h4
diff --git a/packages/yasnippet/snippets/nxml-mode/header/h5 
b/packages/yasnippet-classic-snippets/snippets/nxml-mode/header/h5
similarity index 100%
rename from packages/yasnippet/snippets/nxml-mode/header/h5
rename to packages/yasnippet-classic-snippets/snippets/nxml-mode/header/h5
diff --git a/packages/yasnippet/snippets/nxml-mode/header/h6 
b/packages/yasnippet-classic-snippets/snippets/nxml-mode/header/h6
similarity index 100%
rename from packages/yasnippet/snippets/nxml-mode/header/h6
rename to packages/yasnippet-classic-snippets/snippets/nxml-mode/header/h6
diff --git a/packages/yasnippet/snippets/nxml-mode/hr 
b/packages/yasnippet-classic-snippets/snippets/nxml-mode/hr
similarity index 100%
rename from packages/yasnippet/snippets/nxml-mode/hr
rename to packages/yasnippet-classic-snippets/snippets/nxml-mode/hr
diff --git a/packages/yasnippet/snippets/nxml-mode/href 
b/packages/yasnippet-classic-snippets/snippets/nxml-mode/href
similarity index 100%
rename from packages/yasnippet/snippets/nxml-mode/href
rename to packages/yasnippet-classic-snippets/snippets/nxml-mode/href
diff --git a/packages/yasnippet/snippets/nxml-mode/html 
b/packages/yasnippet-classic-snippets/snippets/nxml-mode/html
similarity index 100%
rename from packages/yasnippet/snippets/nxml-mode/html
rename to packages/yasnippet-classic-snippets/snippets/nxml-mode/html
diff --git a/packages/yasnippet/snippets/nxml-mode/img 
b/packages/yasnippet-classic-snippets/snippets/nxml-mode/img
similarity index 100%
rename from packages/yasnippet/snippets/nxml-mode/img
rename to packages/yasnippet-classic-snippets/snippets/nxml-mode/img
diff --git a/packages/yasnippet/snippets/nxml-mode/input 
b/packages/yasnippet-classic-snippets/snippets/nxml-mode/input
similarity index 100%
rename from packages/yasnippet/snippets/nxml-mode/input
rename to packages/yasnippet-classic-snippets/snippets/nxml-mode/input
diff --git a/packages/yasnippet/snippets/nxml-mode/li 
b/packages/yasnippet-classic-snippets/snippets/nxml-mode/li
similarity index 100%
rename from packages/yasnippet/snippets/nxml-mode/li
rename to packages/yasnippet-classic-snippets/snippets/nxml-mode/li
diff --git a/packages/yasnippet/snippets/nxml-mode/link 
b/packages/yasnippet-classic-snippets/snippets/nxml-mode/link
similarity index 100%
rename from packages/yasnippet/snippets/nxml-mode/link
rename to packages/yasnippet-classic-snippets/snippets/nxml-mode/link
diff --git a/packages/yasnippet/snippets/nxml-mode/meta/doctype 
b/packages/yasnippet-classic-snippets/snippets/nxml-mode/meta/doctype
similarity index 100%
rename from packages/yasnippet/snippets/nxml-mode/meta/doctype
rename to packages/yasnippet-classic-snippets/snippets/nxml-mode/meta/doctype
diff --git a/packages/yasnippet/snippets/nxml-mode/meta/doctype.xhtml1_strict 
b/packages/yasnippet-classic-snippets/snippets/nxml-mode/meta/doctype.xhtml1_strict
similarity index 100%
rename from packages/yasnippet/snippets/nxml-mode/meta/doctype.xhtml1_strict
rename to 
packages/yasnippet-classic-snippets/snippets/nxml-mode/meta/doctype.xhtml1_strict
diff --git 
a/packages/yasnippet/snippets/nxml-mode/meta/doctype.xhtml1_transitional 
b/packages/yasnippet-classic-snippets/snippets/nxml-mode/meta/doctype.xhtml1_transitional
similarity index 100%
rename from 
packages/yasnippet/snippets/nxml-mode/meta/doctype.xhtml1_transitional
rename to 
packages/yasnippet-classic-snippets/snippets/nxml-mode/meta/doctype.xhtml1_transitional
diff --git a/packages/yasnippet/snippets/nxml-mode/meta/meta 
b/packages/yasnippet-classic-snippets/snippets/nxml-mode/meta/meta
similarity index 100%
rename from packages/yasnippet/snippets/nxml-mode/meta/meta
rename to packages/yasnippet-classic-snippets/snippets/nxml-mode/meta/meta
diff --git a/packages/yasnippet/snippets/nxml-mode/name 
b/packages/yasnippet-classic-snippets/snippets/nxml-mode/name
similarity index 100%
rename from packages/yasnippet/snippets/nxml-mode/name
rename to packages/yasnippet-classic-snippets/snippets/nxml-mode/name
diff --git a/packages/yasnippet/snippets/nxml-mode/ol 
b/packages/yasnippet-classic-snippets/snippets/nxml-mode/ol
similarity index 100%
rename from packages/yasnippet/snippets/nxml-mode/ol
rename to packages/yasnippet-classic-snippets/snippets/nxml-mode/ol
diff --git a/packages/yasnippet/snippets/nxml-mode/p 
b/packages/yasnippet-classic-snippets/snippets/nxml-mode/p
similarity index 100%
rename from packages/yasnippet/snippets/nxml-mode/p
rename to packages/yasnippet-classic-snippets/snippets/nxml-mode/p
diff --git a/packages/yasnippet/snippets/nxml-mode/pre 
b/packages/yasnippet-classic-snippets/snippets/nxml-mode/pre
similarity index 100%
rename from packages/yasnippet/snippets/nxml-mode/pre
rename to packages/yasnippet-classic-snippets/snippets/nxml-mode/pre
diff --git a/packages/yasnippet/snippets/nxml-mode/quote 
b/packages/yasnippet-classic-snippets/snippets/nxml-mode/quote
similarity index 100%
rename from packages/yasnippet/snippets/nxml-mode/quote
rename to packages/yasnippet-classic-snippets/snippets/nxml-mode/quote
diff --git a/packages/yasnippet/snippets/nxml-mode/span 
b/packages/yasnippet-classic-snippets/snippets/nxml-mode/span
similarity index 100%
rename from packages/yasnippet/snippets/nxml-mode/span
rename to packages/yasnippet-classic-snippets/snippets/nxml-mode/span
diff --git a/packages/yasnippet/snippets/nxml-mode/style 
b/packages/yasnippet-classic-snippets/snippets/nxml-mode/style
similarity index 100%
rename from packages/yasnippet/snippets/nxml-mode/style
rename to packages/yasnippet-classic-snippets/snippets/nxml-mode/style
diff --git a/packages/yasnippet/snippets/nxml-mode/table 
b/packages/yasnippet-classic-snippets/snippets/nxml-mode/table
similarity index 100%
rename from packages/yasnippet/snippets/nxml-mode/table
rename to packages/yasnippet-classic-snippets/snippets/nxml-mode/table
diff --git a/packages/yasnippet/snippets/nxml-mode/tag.1l 
b/packages/yasnippet-classic-snippets/snippets/nxml-mode/tag.1l
similarity index 100%
rename from packages/yasnippet/snippets/nxml-mode/tag.1l
rename to packages/yasnippet-classic-snippets/snippets/nxml-mode/tag.1l
diff --git a/packages/yasnippet/snippets/nxml-mode/tag.2l 
b/packages/yasnippet-classic-snippets/snippets/nxml-mode/tag.2l
similarity index 100%
rename from packages/yasnippet/snippets/nxml-mode/tag.2l
rename to packages/yasnippet-classic-snippets/snippets/nxml-mode/tag.2l
diff --git a/packages/yasnippet/snippets/nxml-mode/td 
b/packages/yasnippet-classic-snippets/snippets/nxml-mode/td
similarity index 100%
rename from packages/yasnippet/snippets/nxml-mode/td
rename to packages/yasnippet-classic-snippets/snippets/nxml-mode/td
diff --git a/packages/yasnippet/snippets/nxml-mode/th 
b/packages/yasnippet-classic-snippets/snippets/nxml-mode/th
similarity index 100%
rename from packages/yasnippet/snippets/nxml-mode/th
rename to packages/yasnippet-classic-snippets/snippets/nxml-mode/th
diff --git a/packages/yasnippet/snippets/nxml-mode/title 
b/packages/yasnippet-classic-snippets/snippets/nxml-mode/title
similarity index 100%
rename from packages/yasnippet/snippets/nxml-mode/title
rename to packages/yasnippet-classic-snippets/snippets/nxml-mode/title
diff --git a/packages/yasnippet/snippets/nxml-mode/tr 
b/packages/yasnippet-classic-snippets/snippets/nxml-mode/tr
similarity index 100%
rename from packages/yasnippet/snippets/nxml-mode/tr
rename to packages/yasnippet-classic-snippets/snippets/nxml-mode/tr
diff --git a/packages/yasnippet/snippets/nxml-mode/ul 
b/packages/yasnippet-classic-snippets/snippets/nxml-mode/ul
similarity index 100%
rename from packages/yasnippet/snippets/nxml-mode/ul
rename to packages/yasnippet-classic-snippets/snippets/nxml-mode/ul
diff --git a/packages/yasnippet/snippets/objc-mode/.yas-parents 
b/packages/yasnippet-classic-snippets/snippets/objc-mode/.yas-parents
similarity index 100%
rename from packages/yasnippet/snippets/objc-mode/.yas-parents
rename to packages/yasnippet-classic-snippets/snippets/objc-mode/.yas-parents
diff --git a/packages/yasnippet/snippets/objc-mode/prop 
b/packages/yasnippet-classic-snippets/snippets/objc-mode/prop
similarity index 100%
rename from packages/yasnippet/snippets/objc-mode/prop
rename to packages/yasnippet-classic-snippets/snippets/objc-mode/prop
diff --git a/packages/yasnippet/snippets/perl-mode/.yas-parents 
b/packages/yasnippet-classic-snippets/snippets/perl-mode/.yas-parents
similarity index 100%
rename from packages/yasnippet/snippets/perl-mode/.yas-parents
rename to packages/yasnippet-classic-snippets/snippets/perl-mode/.yas-parents
diff --git a/packages/yasnippet/snippets/perl-mode/eval 
b/packages/yasnippet-classic-snippets/snippets/perl-mode/eval
similarity index 100%
rename from packages/yasnippet/snippets/perl-mode/eval
rename to packages/yasnippet-classic-snippets/snippets/perl-mode/eval
diff --git a/packages/yasnippet/snippets/perl-mode/for 
b/packages/yasnippet-classic-snippets/snippets/perl-mode/for
similarity index 100%
rename from packages/yasnippet/snippets/perl-mode/for
rename to packages/yasnippet-classic-snippets/snippets/perl-mode/for
diff --git a/packages/yasnippet/snippets/perl-mode/fore 
b/packages/yasnippet-classic-snippets/snippets/perl-mode/fore
similarity index 100%
rename from packages/yasnippet/snippets/perl-mode/fore
rename to packages/yasnippet-classic-snippets/snippets/perl-mode/fore
diff --git a/packages/yasnippet/snippets/perl-mode/if 
b/packages/yasnippet-classic-snippets/snippets/perl-mode/if
similarity index 100%
rename from packages/yasnippet/snippets/perl-mode/if
rename to packages/yasnippet-classic-snippets/snippets/perl-mode/if
diff --git a/packages/yasnippet/snippets/perl-mode/ife 
b/packages/yasnippet-classic-snippets/snippets/perl-mode/ife
similarity index 100%
rename from packages/yasnippet/snippets/perl-mode/ife
rename to packages/yasnippet-classic-snippets/snippets/perl-mode/ife
diff --git a/packages/yasnippet/snippets/perl-mode/ifee 
b/packages/yasnippet-classic-snippets/snippets/perl-mode/ifee
similarity index 100%
rename from packages/yasnippet/snippets/perl-mode/ifee
rename to packages/yasnippet-classic-snippets/snippets/perl-mode/ifee
diff --git a/packages/yasnippet/snippets/perl-mode/sub 
b/packages/yasnippet-classic-snippets/snippets/perl-mode/sub
similarity index 100%
rename from packages/yasnippet/snippets/perl-mode/sub
rename to packages/yasnippet-classic-snippets/snippets/perl-mode/sub
diff --git a/packages/yasnippet/snippets/perl-mode/unless 
b/packages/yasnippet-classic-snippets/snippets/perl-mode/unless
similarity index 100%
rename from packages/yasnippet/snippets/perl-mode/unless
rename to packages/yasnippet-classic-snippets/snippets/perl-mode/unless
diff --git a/packages/yasnippet/snippets/perl-mode/while 
b/packages/yasnippet-classic-snippets/snippets/perl-mode/while
similarity index 100%
rename from packages/yasnippet/snippets/perl-mode/while
rename to packages/yasnippet-classic-snippets/snippets/perl-mode/while
diff --git a/packages/yasnippet/snippets/perl-mode/xfore 
b/packages/yasnippet-classic-snippets/snippets/perl-mode/xfore
similarity index 100%
rename from packages/yasnippet/snippets/perl-mode/xfore
rename to packages/yasnippet-classic-snippets/snippets/perl-mode/xfore
diff --git a/packages/yasnippet/snippets/perl-mode/xif 
b/packages/yasnippet-classic-snippets/snippets/perl-mode/xif
similarity index 100%
rename from packages/yasnippet/snippets/perl-mode/xif
rename to packages/yasnippet-classic-snippets/snippets/perl-mode/xif
diff --git a/packages/yasnippet/snippets/perl-mode/xunless 
b/packages/yasnippet-classic-snippets/snippets/perl-mode/xunless
similarity index 100%
rename from packages/yasnippet/snippets/perl-mode/xunless
rename to packages/yasnippet-classic-snippets/snippets/perl-mode/xunless
diff --git a/packages/yasnippet/snippets/perl-mode/xwhile 
b/packages/yasnippet-classic-snippets/snippets/perl-mode/xwhile
similarity index 100%
rename from packages/yasnippet/snippets/perl-mode/xwhile
rename to packages/yasnippet-classic-snippets/snippets/perl-mode/xwhile
diff --git a/packages/yasnippet/snippets/python-mode/.yas-parents 
b/packages/yasnippet-classic-snippets/snippets/python-mode/.yas-parents
similarity index 100%
rename from packages/yasnippet/snippets/python-mode/.yas-parents
rename to packages/yasnippet-classic-snippets/snippets/python-mode/.yas-parents
diff --git a/packages/yasnippet/snippets/python-mode/__ 
b/packages/yasnippet-classic-snippets/snippets/python-mode/__
similarity index 100%
rename from packages/yasnippet/snippets/python-mode/__
rename to packages/yasnippet-classic-snippets/snippets/python-mode/__
diff --git a/packages/yasnippet/snippets/python-mode/class 
b/packages/yasnippet-classic-snippets/snippets/python-mode/class
similarity index 100%
rename from packages/yasnippet/snippets/python-mode/class
rename to packages/yasnippet-classic-snippets/snippets/python-mode/class
diff --git a/packages/yasnippet/snippets/python-mode/def 
b/packages/yasnippet-classic-snippets/snippets/python-mode/def
similarity index 100%
rename from packages/yasnippet/snippets/python-mode/def
rename to packages/yasnippet-classic-snippets/snippets/python-mode/def
diff --git a/packages/yasnippet/snippets/python-mode/defm 
b/packages/yasnippet-classic-snippets/snippets/python-mode/defm
similarity index 100%
rename from packages/yasnippet/snippets/python-mode/defm
rename to packages/yasnippet-classic-snippets/snippets/python-mode/defm
diff --git a/packages/yasnippet/snippets/python-mode/for 
b/packages/yasnippet-classic-snippets/snippets/python-mode/for
similarity index 100%
rename from packages/yasnippet/snippets/python-mode/for
rename to packages/yasnippet-classic-snippets/snippets/python-mode/for
diff --git a/packages/yasnippet/snippets/python-mode/ifmain 
b/packages/yasnippet-classic-snippets/snippets/python-mode/ifmain
similarity index 100%
rename from packages/yasnippet/snippets/python-mode/ifmain
rename to packages/yasnippet-classic-snippets/snippets/python-mode/ifmain
diff --git a/packages/yasnippet/snippets/python-mode/prop 
b/packages/yasnippet-classic-snippets/snippets/python-mode/prop
similarity index 100%
rename from packages/yasnippet/snippets/python-mode/prop
rename to packages/yasnippet-classic-snippets/snippets/python-mode/prop
diff --git a/packages/yasnippet/snippets/python-mode/propg 
b/packages/yasnippet-classic-snippets/snippets/python-mode/propg
similarity index 100%
rename from packages/yasnippet/snippets/python-mode/propg
rename to packages/yasnippet-classic-snippets/snippets/python-mode/propg
diff --git a/packages/yasnippet/snippets/python-mode/propsg 
b/packages/yasnippet-classic-snippets/snippets/python-mode/propsg
similarity index 100%
rename from packages/yasnippet/snippets/python-mode/propsg
rename to packages/yasnippet-classic-snippets/snippets/python-mode/propsg
diff --git a/packages/yasnippet/snippets/python-mode/while 
b/packages/yasnippet-classic-snippets/snippets/python-mode/while
similarity index 100%
rename from packages/yasnippet/snippets/python-mode/while
rename to packages/yasnippet-classic-snippets/snippets/python-mode/while
diff --git a/packages/yasnippet/snippets/rst-mode/.yas-parents 
b/packages/yasnippet-classic-snippets/snippets/rst-mode/.yas-parents
similarity index 100%
rename from packages/yasnippet/snippets/rst-mode/.yas-parents
rename to packages/yasnippet-classic-snippets/snippets/rst-mode/.yas-parents
diff --git a/packages/yasnippet/snippets/rst-mode/chap 
b/packages/yasnippet-classic-snippets/snippets/rst-mode/chap
similarity index 100%
rename from packages/yasnippet/snippets/rst-mode/chap
rename to packages/yasnippet-classic-snippets/snippets/rst-mode/chap
diff --git a/packages/yasnippet/snippets/rst-mode/sec 
b/packages/yasnippet-classic-snippets/snippets/rst-mode/sec
similarity index 100%
rename from packages/yasnippet/snippets/rst-mode/sec
rename to packages/yasnippet-classic-snippets/snippets/rst-mode/sec
diff --git a/packages/yasnippet/snippets/rst-mode/tit 
b/packages/yasnippet-classic-snippets/snippets/rst-mode/tit
similarity index 100%
rename from packages/yasnippet/snippets/rst-mode/tit
rename to packages/yasnippet-classic-snippets/snippets/rst-mode/tit
diff --git a/packages/yasnippet/snippets/ruby-mode/.yas-make-groups 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/.yas-make-groups
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/.yas-make-groups
rename to 
packages/yasnippet-classic-snippets/snippets/ruby-mode/.yas-make-groups
diff --git a/packages/yasnippet/snippets/ruby-mode/.yas-parents 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/.yas-parents
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/.yas-parents
rename to packages/yasnippet-classic-snippets/snippets/ruby-mode/.yas-parents
diff --git a/packages/yasnippet/snippets/ruby-mode/collections/all 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/collections/all
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/collections/all
rename to packages/yasnippet-classic-snippets/snippets/ruby-mode/collections/all
diff --git a/packages/yasnippet/snippets/ruby-mode/collections/any 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/collections/any
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/collections/any
rename to packages/yasnippet-classic-snippets/snippets/ruby-mode/collections/any
diff --git a/packages/yasnippet/snippets/ruby-mode/collections/classify 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/collections/classify
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/collections/classify
rename to 
packages/yasnippet-classic-snippets/snippets/ruby-mode/collections/classify
diff --git a/packages/yasnippet/snippets/ruby-mode/collections/collect 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/collections/collect
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/collections/collect
rename to 
packages/yasnippet-classic-snippets/snippets/ruby-mode/collections/collect
diff --git a/packages/yasnippet/snippets/ruby-mode/collections/deli 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/collections/deli
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/collections/deli
rename to 
packages/yasnippet-classic-snippets/snippets/ruby-mode/collections/deli
diff --git a/packages/yasnippet/snippets/ruby-mode/collections/det 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/collections/det
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/collections/det
rename to packages/yasnippet-classic-snippets/snippets/ruby-mode/collections/det
diff --git a/packages/yasnippet/snippets/ruby-mode/collections/ea 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/collections/ea
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/collections/ea
rename to packages/yasnippet-classic-snippets/snippets/ruby-mode/collections/ea
diff --git a/packages/yasnippet/snippets/ruby-mode/collections/eac 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/collections/eac
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/collections/eac
rename to packages/yasnippet-classic-snippets/snippets/ruby-mode/collections/eac
diff --git a/packages/yasnippet/snippets/ruby-mode/collections/eai 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/collections/eai
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/collections/eai
rename to packages/yasnippet-classic-snippets/snippets/ruby-mode/collections/eai
diff --git a/packages/yasnippet/snippets/ruby-mode/collections/eav 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/collections/eav
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/collections/eav
rename to packages/yasnippet-classic-snippets/snippets/ruby-mode/collections/eav
diff --git a/packages/yasnippet/snippets/ruby-mode/collections/eawi 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/collections/eawi
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/collections/eawi
rename to 
packages/yasnippet-classic-snippets/snippets/ruby-mode/collections/eawi
diff --git a/packages/yasnippet/snippets/ruby-mode/collections/inject 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/collections/inject
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/collections/inject
rename to 
packages/yasnippet-classic-snippets/snippets/ruby-mode/collections/inject
diff --git a/packages/yasnippet/snippets/ruby-mode/collections/reject 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/collections/reject
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/collections/reject
rename to 
packages/yasnippet-classic-snippets/snippets/ruby-mode/collections/reject
diff --git a/packages/yasnippet/snippets/ruby-mode/collections/select 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/collections/select
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/collections/select
rename to 
packages/yasnippet-classic-snippets/snippets/ruby-mode/collections/select
diff --git a/packages/yasnippet/snippets/ruby-mode/collections/zip 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/collections/zip
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/collections/zip
rename to packages/yasnippet-classic-snippets/snippets/ruby-mode/collections/zip
diff --git a/packages/yasnippet/snippets/ruby-mode/control structure/forin 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/control structure/forin
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/control structure/forin
rename to packages/yasnippet-classic-snippets/snippets/ruby-mode/control 
structure/forin
diff --git a/packages/yasnippet/snippets/ruby-mode/control structure/if 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/control structure/if
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/control structure/if
rename to packages/yasnippet-classic-snippets/snippets/ruby-mode/control 
structure/if
diff --git a/packages/yasnippet/snippets/ruby-mode/control structure/ife 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/control structure/ife
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/control structure/ife
rename to packages/yasnippet-classic-snippets/snippets/ruby-mode/control 
structure/ife
diff --git a/packages/yasnippet/snippets/ruby-mode/control structure/tim 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/control structure/tim
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/control structure/tim
rename to packages/yasnippet-classic-snippets/snippets/ruby-mode/control 
structure/tim
diff --git a/packages/yasnippet/snippets/ruby-mode/control structure/until 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/control structure/until
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/control structure/until
rename to packages/yasnippet-classic-snippets/snippets/ruby-mode/control 
structure/until
diff --git a/packages/yasnippet/snippets/ruby-mode/control structure/upt 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/control structure/upt
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/control structure/upt
rename to packages/yasnippet-classic-snippets/snippets/ruby-mode/control 
structure/upt
diff --git a/packages/yasnippet/snippets/ruby-mode/control structure/when 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/control structure/when
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/control structure/when
rename to packages/yasnippet-classic-snippets/snippets/ruby-mode/control 
structure/when
diff --git a/packages/yasnippet/snippets/ruby-mode/control structure/while 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/control structure/while
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/control structure/while
rename to packages/yasnippet-classic-snippets/snippets/ruby-mode/control 
structure/while
diff --git a/packages/yasnippet/snippets/ruby-mode/definitions/Comp 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/definitions/Comp
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/definitions/Comp
rename to 
packages/yasnippet-classic-snippets/snippets/ruby-mode/definitions/Comp
diff --git a/packages/yasnippet/snippets/ruby-mode/definitions/am 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/definitions/am
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/definitions/am
rename to packages/yasnippet-classic-snippets/snippets/ruby-mode/definitions/am
diff --git a/packages/yasnippet/snippets/ruby-mode/definitions/cla 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/definitions/cla
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/definitions/cla
rename to packages/yasnippet-classic-snippets/snippets/ruby-mode/definitions/cla
diff --git a/packages/yasnippet/snippets/ruby-mode/definitions/cls 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/definitions/cls
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/definitions/cls
rename to packages/yasnippet-classic-snippets/snippets/ruby-mode/definitions/cls
diff --git a/packages/yasnippet/snippets/ruby-mode/definitions/mm 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/definitions/mm
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/definitions/mm
rename to packages/yasnippet-classic-snippets/snippets/ruby-mode/definitions/mm
diff --git a/packages/yasnippet/snippets/ruby-mode/definitions/mod 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/definitions/mod
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/definitions/mod
rename to packages/yasnippet-classic-snippets/snippets/ruby-mode/definitions/mod
diff --git a/packages/yasnippet/snippets/ruby-mode/definitions/r 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/definitions/r
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/definitions/r
rename to packages/yasnippet-classic-snippets/snippets/ruby-mode/definitions/r
diff --git a/packages/yasnippet/snippets/ruby-mode/definitions/rw 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/definitions/rw
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/definitions/rw
rename to packages/yasnippet-classic-snippets/snippets/ruby-mode/definitions/rw
diff --git a/packages/yasnippet/snippets/ruby-mode/definitions/w 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/definitions/w
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/definitions/w
rename to packages/yasnippet-classic-snippets/snippets/ruby-mode/definitions/w
diff --git a/packages/yasnippet/snippets/ruby-mode/general/# 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/general/#
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/general/#
rename to packages/yasnippet-classic-snippets/snippets/ruby-mode/general/#
diff --git a/packages/yasnippet/snippets/ruby-mode/general/=b 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/general/=b
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/general/=b
rename to packages/yasnippet-classic-snippets/snippets/ruby-mode/general/=b
diff --git a/packages/yasnippet/snippets/ruby-mode/general/app 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/general/app
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/general/app
rename to packages/yasnippet-classic-snippets/snippets/ruby-mode/general/app
diff --git a/packages/yasnippet/snippets/ruby-mode/general/bm 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/general/bm
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/general/bm
rename to packages/yasnippet-classic-snippets/snippets/ruby-mode/general/bm
diff --git a/packages/yasnippet/snippets/ruby-mode/general/case 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/general/case
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/general/case
rename to packages/yasnippet-classic-snippets/snippets/ruby-mode/general/case
diff --git a/packages/yasnippet/snippets/ruby-mode/general/dee 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/general/dee
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/general/dee
rename to packages/yasnippet-classic-snippets/snippets/ruby-mode/general/dee
diff --git a/packages/yasnippet/snippets/ruby-mode/general/rb 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/general/rb
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/general/rb
rename to packages/yasnippet-classic-snippets/snippets/ruby-mode/general/rb
diff --git a/packages/yasnippet/snippets/ruby-mode/general/req 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/general/req
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/general/req
rename to packages/yasnippet-classic-snippets/snippets/ruby-mode/general/req
diff --git a/packages/yasnippet/snippets/ruby-mode/general/rreq 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/general/rreq
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/general/rreq
rename to packages/yasnippet-classic-snippets/snippets/ruby-mode/general/rreq
diff --git a/packages/yasnippet/snippets/ruby-mode/general/y 
b/packages/yasnippet-classic-snippets/snippets/ruby-mode/general/y
similarity index 100%
rename from packages/yasnippet/snippets/ruby-mode/general/y
rename to packages/yasnippet-classic-snippets/snippets/ruby-mode/general/y
diff --git a/packages/yasnippet/snippets/scala-mode/.yas-parents 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/.yas-parents
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/.yas-parents
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/.yas-parents
diff --git a/packages/yasnippet/snippets/scala-mode/act 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/act
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/act
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/act
diff --git a/packages/yasnippet/snippets/scala-mode/act.arg 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/act.arg
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/act.arg
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/act.arg
diff --git a/packages/yasnippet/snippets/scala-mode/actor 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/actor
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/actor
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/actor
diff --git a/packages/yasnippet/snippets/scala-mode/ano 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/ano
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/ano
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/ano
diff --git a/packages/yasnippet/snippets/scala-mode/app 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/app
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/app
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/app
diff --git a/packages/yasnippet/snippets/scala-mode/arr.new 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/arr.new
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/arr.new
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/arr.new
diff --git a/packages/yasnippet/snippets/scala-mode/arr.val-new 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/arr.val-new
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/arr.val-new
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/arr.val-new
diff --git a/packages/yasnippet/snippets/scala-mode/asof 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/asof
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/asof
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/asof
diff --git a/packages/yasnippet/snippets/scala-mode/ass 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/ass
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/ass
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/ass
diff --git a/packages/yasnippet/snippets/scala-mode/ass.true 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/ass.true
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/ass.true
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/ass.true
diff --git a/packages/yasnippet/snippets/scala-mode/at.author 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/at.author
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/at.author
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/at.author
diff --git a/packages/yasnippet/snippets/scala-mode/at.param 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/at.param
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/at.param
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/at.param
diff --git a/packages/yasnippet/snippets/scala-mode/at.return 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/at.return
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/at.return
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/at.return
diff --git a/packages/yasnippet/snippets/scala-mode/at.version 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/at.version
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/at.version
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/at.version
diff --git a/packages/yasnippet/snippets/scala-mode/bang 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/bang
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/bang
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/bang
diff --git a/packages/yasnippet/snippets/scala-mode/case 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/case
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/case
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/case
diff --git a/packages/yasnippet/snippets/scala-mode/case.match-all 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/case.match-all
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/case.match-all
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/case.match-all
diff --git a/packages/yasnippet/snippets/scala-mode/cast 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/cast
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/cast
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/cast
diff --git a/packages/yasnippet/snippets/scala-mode/cc 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/cc
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/cc
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/cc
diff --git a/packages/yasnippet/snippets/scala-mode/cl 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/cl
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/cl
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/cl
diff --git a/packages/yasnippet/snippets/scala-mode/cl.abs 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/cl.abs
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/cl.abs
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/cl.abs
diff --git a/packages/yasnippet/snippets/scala-mode/cl.abs-arg 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/cl.abs-arg
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/cl.abs-arg
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/cl.abs-arg
diff --git a/packages/yasnippet/snippets/scala-mode/cl.arg 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/cl.arg
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/cl.arg
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/cl.arg
diff --git a/packages/yasnippet/snippets/scala-mode/clof 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/clof
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/clof
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/clof
diff --git a/packages/yasnippet/snippets/scala-mode/co 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/co
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/co
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/co
diff --git a/packages/yasnippet/snippets/scala-mode/cons 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/cons
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/cons
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/cons
diff --git a/packages/yasnippet/snippets/scala-mode/cons.nil 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/cons.nil
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/cons.nil
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/cons.nil
diff --git a/packages/yasnippet/snippets/scala-mode/def.arg 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/def.arg
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/def.arg
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/def.arg
diff --git a/packages/yasnippet/snippets/scala-mode/def.arg-body 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/def.arg-body
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/def.arg-body
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/def.arg-body
diff --git a/packages/yasnippet/snippets/scala-mode/def.arg-ret 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/def.arg-ret
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/def.arg-ret
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/def.arg-ret
diff --git a/packages/yasnippet/snippets/scala-mode/def.arg-ret-body 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/def.arg-ret-body
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/def.arg-ret-body
rename to 
packages/yasnippet-classic-snippets/snippets/scala-mode/def.arg-ret-body
diff --git a/packages/yasnippet/snippets/scala-mode/def.body 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/def.body
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/def.body
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/def.body
diff --git a/packages/yasnippet/snippets/scala-mode/def.ret 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/def.ret
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/def.ret
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/def.ret
diff --git a/packages/yasnippet/snippets/scala-mode/def.ret-body 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/def.ret-body
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/def.ret-body
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/def.ret-body
diff --git a/packages/yasnippet/snippets/scala-mode/def.simple 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/def.simple
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/def.simple
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/def.simple
diff --git a/packages/yasnippet/snippets/scala-mode/doc.class 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/doc.class
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/doc.class
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/doc.class
diff --git a/packages/yasnippet/snippets/scala-mode/doc.def 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/doc.def
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/doc.def
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/doc.def
diff --git a/packages/yasnippet/snippets/scala-mode/doc.file 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/doc.file
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/doc.file
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/doc.file
diff --git a/packages/yasnippet/snippets/scala-mode/doc.file-scala 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/doc.file-scala
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/doc.file-scala
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/doc.file-scala
diff --git a/packages/yasnippet/snippets/scala-mode/doc.file-scala-api 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/doc.file-scala-api
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/doc.file-scala-api
rename to 
packages/yasnippet-classic-snippets/snippets/scala-mode/doc.file-scala-api
diff --git a/packages/yasnippet/snippets/scala-mode/doc.scaladoc 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/doc.scaladoc
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/doc.scaladoc
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/doc.scaladoc
diff --git a/packages/yasnippet/snippets/scala-mode/expect 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/expect
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/expect
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/expect
diff --git a/packages/yasnippet/snippets/scala-mode/ext 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/ext
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/ext
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/ext
diff --git a/packages/yasnippet/snippets/scala-mode/for.extract 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/for.extract
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/for.extract
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/for.extract
diff --git a/packages/yasnippet/snippets/scala-mode/for.if 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/for.if
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/for.if
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/for.if
diff --git a/packages/yasnippet/snippets/scala-mode/for.loop 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/for.loop
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/for.loop
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/for.loop
diff --git a/packages/yasnippet/snippets/scala-mode/for.multi 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/for.multi
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/for.multi
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/for.multi
diff --git a/packages/yasnippet/snippets/scala-mode/foreach 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/foreach
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/foreach
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/foreach
diff --git a/packages/yasnippet/snippets/scala-mode/hmap.new 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/hmap.new
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/hmap.new
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/hmap.new
diff --git a/packages/yasnippet/snippets/scala-mode/hmap.val-new 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/hmap.val-new
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/hmap.val-new
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/hmap.val-new
diff --git a/packages/yasnippet/snippets/scala-mode/hset.new 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/hset.new
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/hset.new
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/hset.new
diff --git a/packages/yasnippet/snippets/scala-mode/hset.val-new 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/hset.val-new
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/hset.val-new
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/hset.val-new
diff --git a/packages/yasnippet/snippets/scala-mode/if 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/if
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/if
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/if
diff --git a/packages/yasnippet/snippets/scala-mode/if.else 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/if.else
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/if.else
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/if.else
diff --git a/packages/yasnippet/snippets/scala-mode/imp 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/imp
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/imp
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/imp
diff --git a/packages/yasnippet/snippets/scala-mode/intercept 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/intercept
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/intercept
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/intercept
diff --git a/packages/yasnippet/snippets/scala-mode/isof 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/isof
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/isof
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/isof
diff --git a/packages/yasnippet/snippets/scala-mode/ls.new 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/ls.new
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/ls.new
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/ls.new
diff --git a/packages/yasnippet/snippets/scala-mode/ls.val-new 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/ls.val-new
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/ls.val-new
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/ls.val-new
diff --git a/packages/yasnippet/snippets/scala-mode/main 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/main
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/main
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/main
diff --git a/packages/yasnippet/snippets/scala-mode/map 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/map
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/map
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/map
diff --git a/packages/yasnippet/snippets/scala-mode/map.new 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/map.new
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/map.new
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/map.new
diff --git a/packages/yasnippet/snippets/scala-mode/match 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/match
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/match
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/match
diff --git a/packages/yasnippet/snippets/scala-mode/match.can 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/match.can
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/match.can
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/match.can
diff --git a/packages/yasnippet/snippets/scala-mode/match.option 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/match.option
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/match.option
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/match.option
diff --git a/packages/yasnippet/snippets/scala-mode/mix 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/mix
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/mix
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/mix
diff --git a/packages/yasnippet/snippets/scala-mode/ob 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/ob
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/ob
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/ob
diff --git a/packages/yasnippet/snippets/scala-mode/pac 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/pac
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/pac
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/pac
diff --git a/packages/yasnippet/snippets/scala-mode/pr.newline 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/pr.newline
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/pr.newline
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/pr.newline
diff --git a/packages/yasnippet/snippets/scala-mode/pr.simple 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/pr.simple
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/pr.simple
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/pr.simple
diff --git a/packages/yasnippet/snippets/scala-mode/pr.string 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/pr.string
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/pr.string
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/pr.string
diff --git a/packages/yasnippet/snippets/scala-mode/pr.trace 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/pr.trace
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/pr.trace
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/pr.trace
diff --git a/packages/yasnippet/snippets/scala-mode/pri 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/pri
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/pri
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/pri
diff --git a/packages/yasnippet/snippets/scala-mode/pri.param 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/pri.param
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/pri.param
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/pri.param
diff --git a/packages/yasnippet/snippets/scala-mode/pro 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/pro
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/pro
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/pro
diff --git a/packages/yasnippet/snippets/scala-mode/pro.param 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/pro.param
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/pro.param
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/pro.param
diff --git a/packages/yasnippet/snippets/scala-mode/suite 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/suite
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/suite
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/suite
diff --git a/packages/yasnippet/snippets/scala-mode/test 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/test
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/test
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/test
diff --git a/packages/yasnippet/snippets/scala-mode/throw 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/throw
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/throw
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/throw
diff --git a/packages/yasnippet/snippets/scala-mode/tr 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/tr
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/tr
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/tr
diff --git a/packages/yasnippet/snippets/scala-mode/tr.ext 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/tr.ext
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/tr.ext
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/tr.ext
diff --git a/packages/yasnippet/snippets/scala-mode/tr.ext-with 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/tr.ext-with
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/tr.ext-with
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/tr.ext-with
diff --git a/packages/yasnippet/snippets/scala-mode/tr.with 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/tr.with
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/tr.with
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/tr.with
diff --git a/packages/yasnippet/snippets/scala-mode/try 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/try
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/try
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/try
diff --git a/packages/yasnippet/snippets/scala-mode/try.catch-finally 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/try.catch-finally
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/try.catch-finally
rename to 
packages/yasnippet-classic-snippets/snippets/scala-mode/try.catch-finally
diff --git a/packages/yasnippet/snippets/scala-mode/try.finally 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/try.finally
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/try.finally
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/try.finally
diff --git a/packages/yasnippet/snippets/scala-mode/tup.arrow 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/tup.arrow
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/tup.arrow
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/tup.arrow
diff --git a/packages/yasnippet/snippets/scala-mode/tup.paren 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/tup.paren
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/tup.paren
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/tup.paren
diff --git a/packages/yasnippet/snippets/scala-mode/val 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/val
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/val
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/val
diff --git a/packages/yasnippet/snippets/scala-mode/val.new 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/val.new
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/val.new
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/val.new
diff --git a/packages/yasnippet/snippets/scala-mode/val.ret 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/val.ret
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/val.ret
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/val.ret
diff --git a/packages/yasnippet/snippets/scala-mode/var 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/var
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/var
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/var
diff --git a/packages/yasnippet/snippets/scala-mode/var.new 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/var.new
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/var.new
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/var.new
diff --git a/packages/yasnippet/snippets/scala-mode/var.ret 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/var.ret
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/var.ret
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/var.ret
diff --git a/packages/yasnippet/snippets/scala-mode/whi 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/whi
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/whi
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/whi
diff --git a/packages/yasnippet/snippets/scala-mode/with 
b/packages/yasnippet-classic-snippets/snippets/scala-mode/with
similarity index 100%
rename from packages/yasnippet/snippets/scala-mode/with
rename to packages/yasnippet-classic-snippets/snippets/scala-mode/with
diff --git a/packages/yasnippet/snippets/snippet-mode/.yas-parents 
b/packages/yasnippet-classic-snippets/snippets/snippet-mode/.yas-parents
similarity index 100%
rename from packages/yasnippet/snippets/snippet-mode/.yas-parents
rename to packages/yasnippet-classic-snippets/snippets/snippet-mode/.yas-parents
diff --git a/packages/yasnippet/snippets/snippet-mode/field 
b/packages/yasnippet-classic-snippets/snippets/snippet-mode/field
similarity index 100%
rename from packages/yasnippet/snippets/snippet-mode/field
rename to packages/yasnippet-classic-snippets/snippets/snippet-mode/field
diff --git a/packages/yasnippet/snippets/snippet-mode/mirror 
b/packages/yasnippet-classic-snippets/snippets/snippet-mode/mirror
similarity index 100%
rename from packages/yasnippet/snippets/snippet-mode/mirror
rename to packages/yasnippet-classic-snippets/snippets/snippet-mode/mirror
diff --git a/packages/yasnippet/snippets/snippet-mode/vars 
b/packages/yasnippet-classic-snippets/snippets/snippet-mode/vars
similarity index 100%
rename from packages/yasnippet/snippets/snippet-mode/vars
rename to packages/yasnippet-classic-snippets/snippets/snippet-mode/vars
diff --git a/packages/yasnippet/snippets/sql-mode/.yas-parents 
b/packages/yasnippet-classic-snippets/snippets/sql-mode/.yas-parents
similarity index 100%
rename from packages/yasnippet/snippets/sql-mode/.yas-parents
rename to packages/yasnippet-classic-snippets/snippets/sql-mode/.yas-parents
diff --git a/packages/yasnippet/snippets/sql-mode/column 
b/packages/yasnippet-classic-snippets/snippets/sql-mode/column
similarity index 100%
rename from packages/yasnippet/snippets/sql-mode/column
rename to packages/yasnippet-classic-snippets/snippets/sql-mode/column
diff --git a/packages/yasnippet/snippets/sql-mode/constraint 
b/packages/yasnippet-classic-snippets/snippets/sql-mode/constraint
similarity index 100%
rename from packages/yasnippet/snippets/sql-mode/constraint
rename to packages/yasnippet-classic-snippets/snippets/sql-mode/constraint
diff --git a/packages/yasnippet/snippets/sql-mode/constraint.1 
b/packages/yasnippet-classic-snippets/snippets/sql-mode/constraint.1
similarity index 100%
rename from packages/yasnippet/snippets/sql-mode/constraint.1
rename to packages/yasnippet-classic-snippets/snippets/sql-mode/constraint.1
diff --git a/packages/yasnippet/snippets/sql-mode/create 
b/packages/yasnippet-classic-snippets/snippets/sql-mode/create
similarity index 100%
rename from packages/yasnippet/snippets/sql-mode/create
rename to packages/yasnippet-classic-snippets/snippets/sql-mode/create
diff --git a/packages/yasnippet/snippets/sql-mode/create.1 
b/packages/yasnippet-classic-snippets/snippets/sql-mode/create.1
similarity index 100%
rename from packages/yasnippet/snippets/sql-mode/create.1
rename to packages/yasnippet-classic-snippets/snippets/sql-mode/create.1
diff --git a/packages/yasnippet/snippets/sql-mode/references 
b/packages/yasnippet-classic-snippets/snippets/sql-mode/references
similarity index 100%
rename from packages/yasnippet/snippets/sql-mode/references
rename to packages/yasnippet-classic-snippets/snippets/sql-mode/references
diff --git a/packages/yasnippet/snippets/text-mode/email 
b/packages/yasnippet-classic-snippets/snippets/text-mode/email
similarity index 100%
rename from packages/yasnippet/snippets/text-mode/email
rename to packages/yasnippet-classic-snippets/snippets/text-mode/email
diff --git a/packages/yasnippet/snippets/text-mode/time 
b/packages/yasnippet-classic-snippets/snippets/text-mode/time
similarity index 100%
rename from packages/yasnippet/snippets/text-mode/time
rename to packages/yasnippet-classic-snippets/snippets/text-mode/time
diff --git a/packages/yasnippet-classic-snippets/yasnippet-classic-snippets.el 
b/packages/yasnippet-classic-snippets/yasnippet-classic-snippets.el
new file mode 100644
index 0000000..9ef6f4e
--- /dev/null
+++ b/packages/yasnippet-classic-snippets/yasnippet-classic-snippets.el
@@ -0,0 +1,46 @@
+;;; yasnippet-classic-snippets.el --- "Classic" yasnippet snippets
+
+;; Copyright (C) 2018 Free Software Foundation, Inc.
+
+;; Keywords: snippets
+;; Version: 1.0.0
+;; Package-Requires: ((yasnippet "0.9.1"))
+;; Keywords: convenience, snippets
+
+;;; Commentary:
+
+;; Snippets that were previously shipped with the GNU ELPA yasnippet package.
+
+;;; License:
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(require 'yasnippet)
+
+(defconst yasnippet-classic-snippets-dir
+  (expand-file-name
+   "snippets"
+   (file-name-directory (or load-file-name buffer-file-name))))
+
+;;;###autoload
+(eval-after-load 'yasnippet
+  '(unless (memq 'yasnippet-classic-snippets-dir yas-snippet-dirs)
+    (add-to-list 'yas-snippet-dirs 'yasnippet-classic-snippets-dir t)
+    (yas-load-directory yasnippet-classic-snippets-dir)))
+
+(provide 'yasnippet-classic-snippets)
+
+;;; yasnippet-classic-snippets.el ends here
diff --git a/packages/yasnippet/.gitmodules b/packages/yasnippet/.gitmodules
index a8cc391..e69de29 100644
--- a/packages/yasnippet/.gitmodules
+++ b/packages/yasnippet/.gitmodules
@@ -1,7 +0,0 @@
-[submodule "snippets"]
-        path = snippets
-        url = https://github.com/AndreaCrotti/yasnippet-snippets.git
-        branch = master
-[submodule "yasmate"]
-        path = yasmate
-        url = https://github.com/capitaomorte/yasmate.git
diff --git a/packages/yasnippet/.travis.yml b/packages/yasnippet/.travis.yml
index 3e27a32..9a999ec 100644
--- a/packages/yasnippet/.travis.yml
+++ b/packages/yasnippet/.travis.yml
@@ -14,7 +14,8 @@ env:
     # unused' warnings.
     - EMACS_VERSION=24.3 tests_Werror=nil
     - EMACS_VERSION=24.5
-    - EMACS_VERSION=25.2
+    - EMACS_VERSION=25.3
+    - EMACS_VERSION=26-prerelease
 
 
 install:
diff --git a/packages/yasnippet/NEWS b/packages/yasnippet/NEWS
index 57d9259..6bea12f 100644
--- a/packages/yasnippet/NEWS
+++ b/packages/yasnippet/NEWS
@@ -1,8 +1,82 @@
 Yasnippet NEWS -- history of user-visible changes.
 
-Copyright (C) 2017 Free Software Foundation, Inc.
+Copyright (C) 2017-2018 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
+* 0.13.0 (May 13, 2018)
+
+** Changes
+
+*** Snippets for Yasnippet must now be installed separately.  The
+submodule linking to yasnippet-snippets was removed, as were the
+"classic" snippets that came with the GNU ELPA package.  The latter
+can now be installed via the 'yasnippet-classic-snippets' package from
+GNU ELPA.
+See Github #848, #858, #834, #775.
+
+*** 'snippet-mode' no longer derives from 'text-mode'.
+It will derive from 'prog-mode' where available (Emacs 24.1 and newer)
+or 'fundamental-mode' otherwise.  See Github #826.
+
+*** The default value of 'yas-key-syntaxes' is changed
+Longer snippet abbrev keys are now preferred over shorter ones.
+See Github #805.
+
+*** New snippets are now created for the current major mode by default
+Previously, extra activated modes could be guessed first.
+See Github #875.
+
+*** Yasnippet supports 'unload-feature' via 'yasnippet-unload-function'
+See Github #753, #891.
+
+*** New command 'yas-skip-and-clear-field' conditionally bound to 'C-d'
+replaces obsoleted 'yas-skip-and-clear-or-delete-char'.  The new
+function may be bound to any key via the conditional binding value
+'yas-maybe-skip-and-clear-field', instead of hardcoding the
+'delete-char' fallback action.  See Github #408, #892.
+
+*** 'yas-lookup-snippet' now returns a struct
+This allows 'yas-expand-snippet' to take looked up snippet's
+environment into account.  'yas-expand-snippet' handles both
+structured snippets, and plain text snippet bodies.
+See Github #897.
+
+** Fixed bugs
+
+*** Avoid crashing due to Emacs Bug#30931
+This prevents yasnippet's routines from triggering the bug, although
+it is still possible to trigger it independently.
+
+*** Don't enable undo when it's disabled
+
+*** yas-also-auto-indent-first-line is once again respected
+Yasnippet was behaving as if it was always t for single line snippets.
+See Github #912.
+
+*** Fixed handling of fixed indent with fields at beginning of line
+See Github #906, #908.
+
+*** Fixed incorrect snippets leaving "bad memory"
+and possibly corrupting future expansions.
+See Github #800.
+
+*** 'global-whitespace-mode' now functions in new snippet buffers.
+To fix this, the buffer name for new snippet buffers is now '+new
+snippet+' instead of '*new snippet*'.  See Github #842.
+
+*** Nest snippet expansion may clear default field text
+See Github #844.
+
+*** Fixed undo list corruption snippet expand+indent.
+See Github #869.
+
+*** The '# --' marker in snippets now allows trailing whitespace.
+See Github #862.
+
+*** Fixed handling of nested simple $n fields
+See Github #824, #894.
+
+
 * 0.12.2 (Aug 28, 2017)
 
 ** The new option 'yas-also-auto-indent-empty-lines' allows restoring
diff --git a/packages/yasnippet/README.mdown b/packages/yasnippet/README.mdown
index e3d99f7..76772c8 100644
--- a/packages/yasnippet/README.mdown
+++ b/packages/yasnippet/README.mdown
@@ -55,25 +55,18 @@ where you want YASnippet enabled.
 
 <a name="import"></a>
 
-Yasnippet no longer bundles snippets directly, but it's very easy to
+YASnippet no longer bundles snippets directly, but it's very easy to
 get some!
 
-If you git-cloned yasnippet with the `--recursive` option you'll also
-download "git submodules" and find two subdirs under the main tree.
-
-1. `snippets/`
-
-    Points to [yasnippet-snippets] the snippet collection of
+1. [yasnippet-snippets] - a snippet collection package maintained by
     [AndreaCrotti](https://github.com/AndreaCrotti).
 
-    The default configuraiton already points to this dir, so to use
-    them, just make sure the submodule really was downloaded
-    (i.e. there are some files under `snippets/`)
-
-2. `yasmate/`
+    It can be installed with `M-x install-package RET
+    yasnippet-snippets` if you have added MELPA to your package
+    sources.
 
-    Points to a github repo of the [yasmate] tool, which is dedicated
-    to converting textmate bundles into yasnippet snippets.
+2. [yasmate] a tool which is dedicated to converting textmate bundles
+    into yasnippet snippets.
 
     To use these snippets you have to run the tool first, so
     [see its doc][yasmate]), and then point the `yas-snippet-dirs`
@@ -96,18 +89,22 @@ should be added like this to `yas-snippet-dirs`:
           '("~/.emacs.d/snippets"                 ;; personal snippets
             "/path/to/some/collection/"           ;; foo-mode and bar-mode 
snippet collection
             "/path/to/yasnippet/yasmate/snippets" ;; the yasmate collection
-            "/path/to/yasnippet/snippets"         ;; the default collection
             ))
 
     (yas-global-mode 1) ;; or M-x yas-reload-all if you've started YASnippet 
already.
 
 # Manual, issues etc
 
-Please refer to the comprehensive [documentation][docs] for full
-customisation and support.  If you find a bug in the code or in the
-documentation, please report it to the main Emacs bug list,
address@hidden, and put "yasnippet" somewhere in the subject.
-Alternatively, you may use the [Github issue tracker][issues].
+There's comprehensive [documentation][docs] on using and customising
+YASnippet.
+
+There's a [list of support issues][support-issues], with solutions to
+common problems and practical snippet examples.
+
+The [Github issue tracker][issues] is where most YASnippet-related
+discussion happens.  Nevertheless, since YASnippet is a part of Emacs,
+you may alternatively report bugs to the main Emacs bug list,
address@hidden, putting "yasnippet" somewhere in the subject.
 
 ## Important note regarding bug reporting
 
@@ -155,16 +152,11 @@ do `git log -1` in the dir).
 Any more info is welcome, but don't just paste a backtrace or an error
 message string you got, unless we ask for it.
 
-There is also a [YASnippet google group][forum]. I will keep the group
-open for reference and for discussion among users. Unfortunately I
-can't guarantee a timely response, so maybe it's better to create a
-github issue clearly marking your intent (user support/bug/feature
-request).
-
 Finally, thank you very much for using YASnippet!
 
 [docs]: http://joaotavora.github.io/yasnippet/
 [issues]: https://github.com/joaotavora/yasnippet/issues
+[support-issues]: 
https://github.com/joaotavora/yasnippet/issues?q=label%3Asupport
 [googlecode tracker]: http://code.google.com/p/yasnippet/issues/list
 [forum]: http://groups.google.com/group/smart-snippet
 [melpa]: http://melpa.milkbox.net/
diff --git a/packages/yasnippet/Rakefile b/packages/yasnippet/Rakefile
index 83c6257..c63d269 100644
--- a/packages/yasnippet/Rakefile
+++ b/packages/yasnippet/Rakefile
@@ -50,6 +50,10 @@ task :release => [:package, 'doc:archive'] do
   raise "Not implemented for github yet!"
 end
 
+# rake doc[../htmlize]
+#
+# To do this interactively, load doc/yas-doc-helper, open one of the
+# org files, and do `C-c C-e P'.
 desc "Generate document"
 task :doc, [:htmlize] do |t, args|
   load_path = '-L .'
diff --git a/packages/yasnippet/doc/faq.org b/packages/yasnippet/doc/faq.org
index d80bb3b..9994e7b 100644
--- a/packages/yasnippet/doc/faq.org
+++ b/packages/yasnippet/doc/faq.org
@@ -2,6 +2,11 @@
 
 #+TITLE: Frequently Asked Questions
 
+-  *Note*: In addition to the questions and answers presented here,
+  you might also with to visit the list of 
[[https://github.com/joaotavora/yasnippet/issues?q=label%3Asupport][solved 
support issues]] in
+  the Github issue tracker.  It might be more up-to-date than this
+  list.
+
 * Why is there an extra newline?
 
 If there is a newline at the end of a snippet definition file,
@@ -32,7 +37,7 @@ same property in YASnippet's overlays, even if one sets the 
latter's
 solve this problem, drop a line in the
 [[http://groups.google.com/group/smart-snippet][discussion group]].
 
-* How to I use alternative keys, i.e. not TAB?
+* How do I use alternative keys, i.e. not TAB?
 
 Edit the keymaps [[sym:yas-minor-mode-map][=yas-minor-mode-map=]] and
 [[sym:yas-keymap][=yas-keymap=]] as you would any other keymap:
diff --git a/packages/yasnippet/doc/nav-menu.html.inc 
b/packages/yasnippet/doc/nav-menu.html.inc
index 2a3f0a1..3e74cf8 100644
--- a/packages/yasnippet/doc/nav-menu.html.inc
+++ b/packages/yasnippet/doc/nav-menu.html.inc
@@ -3,8 +3,8 @@
     <li> <a href="index.html">Overview</a>
     <li> <a 
href="https://github.com/joaotavora/yasnippet/blob/master/README.mdown";>
         Intro and Tutorial</a>
-    <li class="center">Snippet
-      <ul>
+    <li class="center border">Snippet
+      <ul class="nopad">
         <li> <a href="snippet-organization.html">Organization</a>
         <li> <a href="snippet-expansion.html">Expansion</a>
         <li> <a href="snippet-development.html">Development</a>
diff --git a/packages/yasnippet/doc/snippet-development.org 
b/packages/yasnippet/doc/snippet-development.org
index ffe648c..9112cd0 100644
--- a/packages/yasnippet/doc/snippet-development.org
+++ b/packages/yasnippet/doc/snippet-development.org
@@ -80,7 +80,7 @@ Here's a list of currently supported directives:
 
 This is the probably the most important directive, it's the
 abbreviation you type to expand a snippet just before hitting the key
-that runs [[sym:yas-expand][=yas-expand=]]. If you don't specify this
+that runs [[sym:yas-expand][=yas-expand=]]. If you don't specify this,
 the snippet will not be expandable through the trigger mechanism.
 
 ** =# name:= snippet name
@@ -89,8 +89,8 @@ This is a one-line description of the snippet. It will be 
displayed in
 the menu. It's a good idea to select a descriptive name for a snippet --
 especially distinguishable among similar snippets.
 
-If you omit this name it will default to the file name the snippet was
-loaded from.
+If you omit this name, it will default to the file name the snippet
+was loaded from.
 
 ** =# condition:= snippet condition
 
@@ -277,16 +277,16 @@ like this:
   ${N:default value}
 #+END_SRC
 
-They acts as the default value for a tab stop. But when you firstly
+They act as the default value for a tab stop. But when you first
 type at a tab stop, the default value will be replaced by your typing.
 The number can be omitted if you don't want to create 
[[mirrors-fields][mirrors]] or
 [[mirror-transformations][transformations]] for this field.
 
 ** Mirrors <<mirrors-fields>>
 
-We refer the tab stops with placeholders as a /field/. A field can have
-mirrors. Its mirrors will get updated when you change the text of a
-field. Here's an example:
+We refer the tab stops with placeholders as a /field/.  A field can
+have mirrors.  *All* mirrors get updated whenever you update any field
+text.  Here's an example:
 
 #+BEGIN_SRC snippet
   \begin{${1:enumerate}}
@@ -362,12 +362,26 @@ is not. Here's an snippet for rst title:
   $0
 #+END_SRC
 
+Note that a mirror with a transform is not restricted to the text of
+the field it is mirroring.  By making use of 
[[sym:yas-field-value][=yas-field-value=]], a
+mirror can look at any of the snippet's field (as mentioned above, all
+mirrors are updated when any field is updated).  Here is an example
+which shows a "live" result of calling format:
+
+#+BEGIN_SRC snippet
+(format "${1:formatted %s}" "${2:value}")
+=> "${1:$(ignore-errors (format (yas-field-value 1) (yas-field-value 2)))}"
+#+END_SRC
+
+To keep the example simple, it uses =ignore-errors= to suppress errors
+due to incomplete format codes.
+
 ** Fields with transformations
 
 From version 0.6 on, you can also have lisp transformation inside
-fields. These work mostly mirror transformations but are evaluated when
-you first enter the field, after each change you make to the field and
-also just before you exit the field.
+fields. These work mostly like mirror transformations. However, they
+are evaluated when you first enter the field, after each change you
+make to the field and also just before you exit the field.
 
 The syntax is also a tiny bit different, so that the parser can
 distinguish between fields and mirrors. In the following example
@@ -431,7 +445,7 @@ From version 0.6 on, you can also have nested placeholders 
of the type:
 #+END_SRC
 
 This allows you to choose if you want to give this =div= an =id=
-attribute. If you tab forward after expanding it will let you change
+attribute. If you tab forward after expanding, it will let you change
 "some\_id" to whatever you like. Alternatively, you can just press =C-d=
 (which executes 
[[sym:yas-skip-and-clear-or-delete-char][=yas-skip-and-clear-or-delete-char=]]) 
and go straight to
 the exit marker.
diff --git a/packages/yasnippet/doc/snippet-expansion.org 
b/packages/yasnippet/doc/snippet-expansion.org
index a14ce15..a699d57 100644
--- a/packages/yasnippet/doc/snippet-expansion.org
+++ b/packages/yasnippet/doc/snippet-expansion.org
@@ -21,7 +21,7 @@
 
      - Using hippie-expand
 
-   - Call [[sym:yas-insert-snippet][=yas-insert-snippet=]] (use =M-x 
yas-insert-snippet== or its
+   - Call [[sym:yas-insert-snippet][=yas-insert-snippet=]] (use =M-x 
yas-insert-snippet= or its
      keybinding =C-c & C-s=).
 
    - Use m2m's excellent auto-complete
@@ -77,7 +77,7 @@ obsolete.
 
 ** Insert at point
 
-The command [[#yas-insert-snippet][=yas-insert-snippet=]] lets you insert 
snippets at point
+The command [[sym:yas-insert-snippet][=yas-insert-snippet=]] lets you insert 
snippets at point
 /for your current major mode/. It prompts you for the snippet key
 first, and then for a snippet template if more than one template
 exists for the same key.
@@ -94,7 +94,7 @@ The prompting methods used are again controlled by
 It's often useful to inject already written text in the middle of a
 snippet.  The variable 
[[sym:yas-wrap-around-region][=yas-wrap-around-region=]] when to t substitute
 the region contents into the =$0= placeholder of a snippet expanded by
-[[#yas-insert-snippet][=yas-insert-snippet=]].  Setting it to a character 
value (e.g. =?0=)
+[[sym:yas-insert-snippet][=yas-insert-snippet=]].  Setting it to a character 
value (e.g. =?0=)
 will insert the contents of corresponding register.
 
 Older (versions 0.9.1 and below) of Yasnippet, supported a setting of
@@ -169,7 +169,7 @@ In particular, the following things matter:
 
 -  Buffer-local list of extra modes
 
-   Use [[#yas-activate-extra-mode][=yas-activate-extra-mode=]] to
+   Use [[sym:yas-activate-extra-mode][=yas-activate-extra-mode=]] to
    consider snippet tables whose name does not correspond to a major
    mode. Typically, you call this from a minor mode hook, for example:
 
diff --git a/packages/yasnippet/doc/snippet-menu.org 
b/packages/yasnippet/doc/snippet-menu.org
index 272ea16..fee3a19 100644
--- a/packages/yasnippet/doc/snippet-menu.org
+++ b/packages/yasnippet/doc/snippet-menu.org
@@ -24,7 +24,7 @@ In this menu, you can find
 Invoking "Load snippets..." from the menu invokes 
[[sym:yas-load-directory][=yas-load-directory=]]
 and prompts you for a snippet directory hierarchy to load.
 
-Also useful is the "Reload everything" item to invoke 
[[#yas-reload-all][=yas-reload-all=]]
+Also useful is the "Reload everything" item to invoke 
[[sym:yas-reload-all][=yas-reload-all=]]
 which uncondionally reloads all the snippets directories defined in
 [[sym:yas-snippet-dirs][=yas-snippet-dirs=]] and rebuilds the menus.
 
diff --git a/packages/yasnippet/doc/snippet-organization.org 
b/packages/yasnippet/doc/snippet-organization.org
index 746cff0..22d3e46 100644
--- a/packages/yasnippet/doc/snippet-organization.org
+++ b/packages/yasnippet/doc/snippet-organization.org
@@ -4,8 +4,9 @@
 
 * Basic structure
 
-   Snippet collections can be stored in plain text files. They are arranged by
-   sub-directories naming *snippet tables*. These mostly name Emacs major 
names.
+   Snippet collections can be stored in plain text files. They are
+   arranged by sub-directories naming *snippet tables*.  These mostly
+   name Emacs major mode names.
 
    #+begin_example
    .
@@ -81,7 +82,7 @@
 
    If you place an empty plain text file =.yas-make-groups= inside one
    of the mode directories, the names of these sub-directories are
-   considered groups of snippets and [[snippet-menu.org][the menu]] is 
organized much more
+   considered groups of snippets and [[file:snippet-menu.org][the menu]] is 
organized much more
    cleanly:
 
    [[./images/menu-groups.png]]
diff --git a/packages/yasnippet/doc/stylesheets/manual.css 
b/packages/yasnippet/doc/stylesheets/manual.css
index 9580347..74bfe16 100644
--- a/packages/yasnippet/doc/stylesheets/manual.css
+++ b/packages/yasnippet/doc/stylesheets/manual.css
@@ -1,5 +1,14 @@
-nav > ul > li.center > ul {
-    padding: 0;
+.center { margin-left: auto; margin-right: auto; text-align: center; }
+.current {
+    font-weight: bold;
+    background-color: #E0E8F0;
+}
+
+body { background-color:  #E4F0F4 }
+div#content {
+    max-width: 20cm;
+    margin-left: auto;
+    margin-right: auto;
 }
 
 nav li {
@@ -9,20 +18,22 @@ nav li {
     list-style-type: none;
     padding: 0.5em;
 }
-
 nav > ul > li {
     display: inline-block;
 }
-
-/* match org's css for <pre> */
-code {
-    background-color: #F3F5F7;
-    font-family: courier, monospace;
+.nopad {
+    padding: 0;
+}
+li.border {
+    border: solid;
+    border-width: 1px;
 }
 
-#content {
-    margin-left: 5%;
-    margin-right: 10%;
+pre, code{ background-color: #F3F5F7; }
+code {
+    /* 
http://neugierig.org/software/chromium/notes/2009/09/monospace-fonts-workaround.html
 */
+    font-family: WorkAroundWebKitAndMozilla, monospace;
+    white-space: nowrap;
 }
 
 /* Styles for htmlize.el fontification.  */
diff --git a/packages/yasnippet/doc/stylesheets/styles.css 
b/packages/yasnippet/doc/stylesheets/styles.css
deleted file mode 100644
index a158012..0000000
--- a/packages/yasnippet/doc/stylesheets/styles.css
+++ /dev/null
@@ -1,93 +0,0 @@
address@hidden all
-{
-    body {
-        margin: 1em auto;
-        /*margin: 10px 18% 10px 18%;*/
-        font-family: Arial;
-        /*text-align: justify;*/
-        font-size: 14pt;
-        padding: 10px;
-        line-height: 1.2em;
-        max-width: 600pt;
-    }
-
-    div#table-of-contents {
-        position: fixed;
-        left: 0%;
-        right: 0%;
-        top: 0px;
-        z-index: 100;
-        background: black;
-    }
-
-    div#table-of-contents h2 {
-        display: none;
-    }
-
-    div#table-of-contents a {
-        text-decoration: none;
-        color: white;
-    }
-
-    div#table-of-contents a:visited {
-        color: white;
-    }
-
-    div#table-of-contents a:hover {
-        color: orange;
-    }
-
-    div.outline-2 h2{
-        padding-top: 50px;
-    }
-
-    div#text-table-of-contents {
-        text-color: white;
-        text-align: center;
-        margin-left: 30%;
-        margin-right: 30%;
-    }
-
-    div#text-table-of-contents ul {
-        height: 2em;
-        width: 500px;
-        list-style: none;
-        margin: auto;
-    }
-
-    div#text-table-of-contents ul li {
-        float: left;
-        margin-left:auto;
-        margin-right: auto;
-        padding-left: 10px;
-    }
-
-    div#postamble{
-        position: fixed;
-        width: 800px;
-        height: 250px;
-        left: 50%;
-        right: 50%;
-        margin:-75px 0 0 -400px;
-        bottom: -20px;
-        font-size: 10pt;
-        color: grey;
-        background: url('siscog-bottom-logo.png') no-repeat;
-        /* background-size: 100% 100%; */
-    }
-
-    div#postamble *{
-        display: none;
-    }
-
-    div#postamble p.date{
-        position: relative;
-        bottom: -200px;
-        text-align: center;
-        display: block;
-    }
-
-
-
-
-}
\ No newline at end of file
diff --git a/packages/yasnippet/doc/yas-doc-helper.el 
b/packages/yasnippet/doc/yas-doc-helper.el
index e272e41..f48628f 100644
--- a/packages/yasnippet/doc/yas-doc-helper.el
+++ b/packages/yasnippet/doc/yas-doc-helper.el
@@ -31,13 +31,14 @@
     (require 'ox-publish))
 (require 'yasnippet) ; docstrings must be loaded
 
-(defun yas--org-raw-html (tag content)
+(defun yas--org-raw-html (tag content &optional attrs)
   ;; in version 8.0 org-mode changed the export syntax, see
   ;; http://orgmode.org/worg/org-8.0.html#sec-8-1
   (format (if (version< org-version "8.0.0")
               "@<%s>%s@</%s>"                ; old: @<tag>
             "@@html:<%s>@@%s@@html:</%s>@@") ; new: @@html:<tag>@@
-          tag content tag))
+          (concat tag (if attrs " ") attrs)
+          content tag))
 
 (defun yas--document-symbol (symbol level)
   (let* ((stars (make-string level ?*))
@@ -45,14 +46,17 @@
                     (mapcar #'symbol-name (help-function-arglist symbol t))))
          (heading (cond ((fboundp symbol)
                          (format
-                          "%s =%s= (%s)" stars symbol
+                          "%s %s (%s)\n" stars (yas--org-raw-html "code" 
symbol "class='function'")
                           (mapconcat (lambda (a)
                                        (format (if (string-prefix-p "&" a)
-                                                   "/%s/" "=%s=") a))
+                                                   "/%s/" "=%s=")
+                                               a))
                                      args " ")))
                         (t
-                         (format "%s =%s=\n" stars symbol))))
+                         (format "%s %s\n" stars
+                                 (yas--org-raw-html "code" symbol 
"class='variable'")))))
          (after-heading (format ":PROPERTIES:\n:CUSTOM_ID: %s\n:END:" symbol))
+         (text-quoting-style 'grave)
          (body (or (cond ((fboundp symbol)
                           (let ((doc-synth (car-safe (get symbol 
'function-documentation))))
                             (if (functionp doc-synth)
@@ -64,10 +68,17 @@
                           (format "*WARNING*: no symbol named =%s=" symbol)))
                    (format "*WARNING*: no doc for symbol =%s=" symbol)))
          (case-fold-search nil))
-    ;; do some transformations on the body:
+    ;; Do some transformations on the body:
     ;; ARGxxx becomes @<code>arg@</code>xxx
     ;; FOO becomes /foo/
     ;; `bar' becomes [[#bar][=bar=]]
+    ;;    (...) becomes #+BEGIN_SRC elisp (...) #+END_SRC
+    ;; Info node `(some-manual) Node Name' becomes
+    ;; 
[[https://www.gnu.org/software/emacs/manual/html_node/some-manual/Node-Name.html]
+    ;;  [(some-manual) Node Name]]
+    ;;
+    ;; This is fairly fragile, though it seems to be working for
+    ;; now...
     (setq body (replace-regexp-in-string
                 "\\<\\([A-Z][-A-Z0-9]+\\)\\(\\sw+\\)?\\>"
                 #'(lambda (match)
@@ -82,16 +93,41 @@
                         match1)))
                 body t t 1)
           body (replace-regexp-in-string
-                "`\\([a-z-]+\\)'"
+                "\\\\{[^}]+}"
+                (lambda (match)
+                  (concat "#+BEGIN_EXAMPLE\n"
+                          (substitute-command-keys match)
+                          "#+END_EXAMPLE\n"))
+                body t t)
+          body (substitute-command-keys body)
+          body (replace-regexp-in-string
+                "Info node `(\\([-a-z]+\\)) \\([A-Za-z0-9 ]+\\)'"
+                (lambda (match)
+                  (let* ((manual (match-string 1 match))
+                         (node (match-string 2 match))
+                         (html-node (replace-regexp-in-string " " "-" node t 
t)))
+                    (format "Info node\
+ [[https://www.gnu.org/software/emacs/manual/html_node/%s/%s.html][(%s) %s]]"
+                            manual html-node manual node)))
+                body t t)
+          body (replace-regexp-in-string
+                "`\\([-a-z]+\\)'"
                 #'(lambda (match)
                     (let* ((name (downcase (match-string 1 match)))
-                           (sym (intern name)))
+                           (sym (intern-soft name)))
                       (if (memq sym yas--exported-syms)
                           (format "[[#%s][=%s=]]" name name)
                         (format "=%s=" name))))
-                body t))
+                body t t)
+          body (replace-regexp-in-string
+                "\n\n    +(.+\\(?:\n    +.+\\)*"
+                (lambda (match)
+                  (concat "\n#+BEGIN_SRC elisp\n"
+                          match
+                          "\n#+END_SRC\n"))
+                body t t))
     ;; output the paragraph
-    (concat heading "\n" after-heading "\n" body)))
+    (concat heading after-heading "\n" body)))
 
 (defun yas--document-symbols (level &rest names-and-predicates)
   (let ((sym-lists (make-vector (length names-and-predicates) nil))
@@ -118,6 +154,22 @@
 ;; This lets all the org files be exported to HTML with
 ;; `org-publish-current-project' (C-c C-e P).
 
+(defun yas--make-preamble (props)
+  "Return contents of nav-menu-html.inc.
+But replace link to \"current\" page with a span element."
+  (with-temp-buffer
+    (let ((dir (file-name-directory (plist-get props :input-file))))
+      (insert-file-contents (expand-file-name "nav-menu.html.inc" dir))
+      (goto-char (point-min))
+      (search-forward (concat "<a href=\""
+                              (file-name-nondirectory
+                               (plist-get props :output-file))
+                              "\">"))
+      (replace-match "<span class='current'>")
+      (search-forward "</a>")
+      (replace-match "</span>")
+      (buffer-string))))
+
 (let* ((dir (if load-file-name (file-name-directory load-file-name)
               default-directory))
        (src-epoch (getenv "SOURCE_DATE_EPOCH"))
@@ -138,10 +190,8 @@
         `(,@(when (fboundp 'org-html-publish-to-html)
               '(:publishing-function org-html-publish-to-html))
           :base-directory ,dir :publishing-directory ,dir
-          :html-preamble
-          ,(with-temp-buffer
-             (insert-file-contents (expand-file-name "nav-menu.html.inc" dir))
-             (buffer-string))
+          :html-preamble yas--make-preamble
+          ;;:with-broken-links mark
           :html-postamble
           ,(concat "<hr><p class='creator'>Generated by %c from "
                    (or rev yas--version) " " date "</p>\n"
diff --git a/packages/yasnippet/yasnippet-debug.el 
b/packages/yasnippet/yasnippet-debug.el
index 178e627..abce89c 100644
--- a/packages/yasnippet/yasnippet-debug.el
+++ b/packages/yasnippet/yasnippet-debug.el
@@ -1,6 +1,6 @@
 ;;; yasnippet-debug.el --- debug functions for yasnippet -*- lexical-binding: 
t -*-
 
-;; Copyright (C) 2010, 2013, 2014, 2017  Free Software Foundation, Inc.
+;; Copyright (C) 2010, 2013-2014, 2017-2018  Free Software Foundation, Inc.
 
 ;; Author: João Távora
 ;; Keywords: emulations, convenience
@@ -46,13 +46,19 @@
 (require 'color nil t)
 (require 'edebug)
 (eval-when-compile
-  (unless (and (require 'subr-x nil t) (fboundp 'when-let))
-    ;; Introduced in 25.1
-    (defmacro when-let (key-val &rest body)
-      (declare (indent 1) (debug ((symbolp form) body)))
-      `(let ((,(car key-val) ,(cadr key-val)))
-         (when ,(car key-val)
-           ,@body)))))
+  (require 'subr-x nil t)
+  (cond ((fboundp 'when-let*) nil) ; Introduced in 26.
+        ((fboundp 'when-let)       ; Introduced in 25.1,
+         (defalias 'when-let* 'when-let)) ; deprecated in 26.
+        (t (defmacro when-let* (key-vals &rest body)
+             (declare (indent 1) (debug ((symbolp form) body)))
+             (let ((key-val (pop key-vals)))
+               (if key-val
+                   `(let ((,(car key-val) ,(cadr key-val)))
+                      (if ,(car key-val)
+                        (when-let* ,key-vals
+                          ,@body)))
+                 `(progn ,@body)))))))
 
 (defvar yas-debug-live-indicators
   (make-hash-table :test #'eq))
@@ -73,7 +79,7 @@
         (setq beg (setq end (marker-position location)))
       (setq beg (yas-debug-ov-fom-start location)
             end (yas-debug-ov-fom-end location)))
-    (or (when-let (color-ov (gethash location yas-debug-live-indicators))
+    (or (when-let* ((color-ov (gethash location yas-debug-live-indicators)))
           (if (and beg end) (move-overlay (cdr color-ov) beg end)
             (delete-overlay (cdr color-ov)))
           color-ov)
@@ -170,30 +176,34 @@
 
 (defun yas-debug-snippet (snippet &optional outbuf)
   (yas-debug-with-tracebuf outbuf
-    (when-let (overlay (yas--snippet-control-overlay snippet))
+    (when-let* ((overlay (yas--snippet-control-overlay snippet)))
       (printf "\tsid: %d control overlay %s\n"
               (yas--snippet-id snippet)
               (yas-debug-live-range overlay)))
-    (when-let (active-field (yas--snippet-active-field snippet))
+    (when-let* ((active-field (yas--snippet-active-field snippet)))
       (unless (consp (yas--field-start active-field))
         (printf "\tactive field: #%d %s %s covering \"%s\"\n"
-                (yas--field-number active-field)
+                (or (yas--field-number active-field) -1)
                 (if (yas--field-modified-p active-field) "**" "--")
                 (yas-debug-live-range active-field)
                 (buffer-substring-no-properties (yas--field-start 
active-field) (yas--field-end active-field)))))
-    (when-let (exit (yas--snippet-exit snippet))
+    (when-let* ((exit (yas--snippet-exit snippet)))
       (printf "\tsnippet-exit: %s next: %s\n"
               (yas-debug-live-marker (yas--exit-marker exit))
               (yas--exit-next exit)))
     (dolist (field (yas--snippet-fields snippet))
       (unless (consp (yas--field-start field))
         (printf "\tfield: %d %s %s covering \"%s\" next: %s%s\n"
-                (yas--field-number field)
+                (or (yas--field-number field) -1)
                 (if (yas--field-modified-p field) "**" "--")
                 (yas-debug-live-range field)
                 (buffer-substring-no-properties (yas--field-start field) 
(yas--field-end field))
                 (yas--debug-format-fom-concise (yas--field-next field))
-                (if (yas--field-parent-field field) "(has a parent)" "")))
+                (if (yas--field-parent-field field)
+                    (format " parent: %s"
+                            (yas--debug-format-fom-concise
+                             (yas--field-parent-field field)))
+                  "")))
       (dolist (mirror (yas--field-mirrors field))
         (unless (consp (yas--mirror-start mirror))
           (printf "\t\tmirror: %s covering \"%s\" next: %s\n"
@@ -224,6 +234,14 @@
   (clrhash yas-debug-live-indicators))
 
 (defun yas-debug-snippets (&optional outbuf hook)
+  "Print debug information on active snippets to buffer OUTBUF.
+If OUTBUF is nil, use a buffer named \"*YASsnippet trace*\".
+If HOOK is non-nil, install `yas-debug-snippets' in
+`post-command-hook' to update the information on every command
+after this one. If it is `snippet-navigation' then install hook
+buffer-locally, otherwise install it globally.  If HOOK is
+`edebug-create', also instrument the function
+`yas--snippet-parse-create' with `edebug' and show its source."
   (interactive (list nil t))
   (condition-case err
       (yas-debug-with-tracebuf outbuf
@@ -253,11 +271,12 @@
           (ad-activate 'yas--snippet-parse-create)
           (ad-enable-advice 'yas--commit-snippet 'after 
'yas-debug-untarget-snippet)
           (ad-activate 'yas--commit-snippet)
-          (add-hook 'post-command-hook #'yas-debug-snippets)
+          (add-hook 'post-command-hook #'yas-debug-snippets
+                    nil (eq hook 'snippet-navigation))
           ;; Window management is slapped together, it does what I
           ;; want when the caller has a single window open.  Good
           ;; enough for now.
-          (when (eq hook 'create)
+          (when (eq hook 'edebug-create)
             (edebug-instrument-function 'yas--snippet-parse-create)
             (let ((buf-point (find-function-noselect 
'yas--snippet-parse-create)))
               (with-current-buffer (car buf-point)
@@ -295,15 +314,15 @@
                              while (and opt (not (equal opt "--"))
                                         (string-prefix-p "-" opt))
                              collect opt)))
-    (when-let (mode (cl-member "-M:" options :test #'string-prefix-p))
+    (when-let* ((mode (cl-member "-M:" options :test #'string-prefix-p)))
       (setq snippet-mode (intern (concat (substring (car mode) 3) "-mode"))))
-    (when-let (mode (cl-member "-M." options :test #'string-prefix-p))
+    (when-let* ((mode (cl-member "-M." options :test #'string-prefix-p)))
       (setq snippet-mode
             (cdr (cl-assoc (substring (car mode) 2) auto-mode-alist
                            :test (lambda (ext regexp) (string-match-p regexp 
ext))))))
     (switch-to-buffer (get-buffer-create "*yas test*"))
     (funcall snippet-mode)
-    (when-let (snippet-file (cl-member "-S:" options :test #'string-prefix-p))
+    (when-let* ((snippet-file (cl-member "-S:" options :test 
#'string-prefix-p)))
       (setq snippet-file (substring (car snippet-file) 3))
       (if (file-exists-p snippet-file)
           (with-temp-buffer
@@ -318,26 +337,19 @@
             (error "No such snippet `%s'" snippet-file)))))
     (display-buffer (find-file-noselect
                      (expand-file-name "yasnippet.el" yas--loaddir)))
-    (when-let (verbosity (car (or (member "-v" options) (member "-vv" 
options))))
+    (when-let* ((verbosity (car (or (member "-v" options) (member "-vv" 
options)))))
       (set-window-buffer
        (split-window) (yas-debug-snippets
-                       nil (if (equal verbosity "-vv") 'create t))))
+                       nil (if (equal verbosity "-vv") 'edebug-create t))))
     (yas-minor-mode +1)
     (when snippet-key (insert snippet-key))))
 
 (when command-line-args-left
   (yas-debug-process-command-line))
 
-(defun yas-exterminate-package ()
-  (interactive)
-  (yas-global-mode -1)
-  (yas-minor-mode -1)
-  (mapatoms #'(lambda (atom)
-                (when (string-match "yas[-/]" (symbol-name atom))
-                  (unintern atom obarray)))))
-
 (provide 'yasnippet-debug)
 ;; Local Variables:
 ;; indent-tabs-mode: nil
+;; autoload-compute-prefixes: nil
 ;; End:
 ;;; yasnippet-debug.el ends here
diff --git a/packages/yasnippet/yasnippet-tests.el 
b/packages/yasnippet/yasnippet-tests.el
index fc66de3..6048467 100644
--- a/packages/yasnippet/yasnippet-tests.el
+++ b/packages/yasnippet/yasnippet-tests.el
@@ -1,6 +1,6 @@
 ;;; yasnippet-tests.el --- some yasnippet tests  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2012, 2013, 2014, 2015, 2017  Free Software Foundation, Inc.
+;; Copyright (C) 2012-2015, 2017-2018  Free Software Foundation, Inc.
 
 ;; Author: Jo�o T�vora <address@hidden>
 ;; Keywords: emulations, convenience
@@ -274,10 +274,21 @@ attention to case differences."
     (ert-simulate-command '(yas-next-field-or-maybe-expand))
     (should (looking-at "testblable"))
     (ert-simulate-command '(yas-next-field-or-maybe-expand))
-    (ert-simulate-command '(yas-skip-and-clear-or-delete-char))
+    (ert-simulate-command '(yas-skip-and-clear-field))
     (should (looking-at "ble"))
     (should (null (yas-active-snippets)))))
 
+(ert-deftest delete-nested-simple-field-issue-824 ()
+  "Test deleting a field with a nested simple field in it."
+  (with-temp-buffer
+    (yas-minor-mode 1)
+    (yas-expand-snippet "${3:so-$4and}$0${2:-so}")
+    (ert-simulate-command '(yas-next-field-or-maybe-expand))
+    (should (looking-at "so-and-so"))
+    (ert-simulate-command '(yas-skip-and-clear-or-delete-char))
+    (should (looking-at "-so"))
+    (should (null (yas-active-snippets)))))
+
 (ert-deftest ignore-trailing-whitespace ()
   (should (equal
            (with-temp-buffer
@@ -297,40 +308,75 @@ attention to case differences."
 ;;     (should (string= (yas--buffer-contents)
 ;;                      "brother from another mother!"))))
 
-(ert-deftest undo-indentation ()
-  "Check undoing works when only line of snippet is indented."
-  (let ((yas-also-auto-indent-first-line t))
-    (yas-with-snippet-dirs
-     '((".emacs.d/snippets" ("emacs-lisp-mode" ("s" . "(setq $0)"))))
-     (with-temp-buffer
-       (emacs-lisp-mode)
-       (yas-reload-all)
-       (yas-minor-mode 1)
-       (insert "(let\n(while s")
+(ert-deftest undo-redo ()
+  "Check redoing of snippet undo."
+  (yas-with-snippet-dirs '((".emacs.d/snippets"
+                            ("emacs-lisp-mode" ("x" . "${1:one},and done"))))
+    (with-temp-buffer
+      (emacs-lisp-mode)
+      (yas-reload-all)
+      (yas-minor-mode 1)
+      (yas-expand-snippet "x$0")
+      (let ((pre-expand-string (buffer-string)))
+        (setq buffer-undo-list nil)
+        (ert-simulate-command '(yas-expand))
+        (push nil buffer-undo-list)
+        (ert-simulate-command '(yas-next-field)) ; $1 -> exit snippet.
+        (should (string-match-p "\\`one,and done" (buffer-string)))
+        (push nil buffer-undo-list)
+        (ert-simulate-command '(undo))  ; Revive snippet.
+        (ert-simulate-command '(undo))  ; Undo expansion.
+        (should (string= (buffer-string) pre-expand-string))
+        (ert-simulate-command '(move-end-of-line 1))
+        (push nil buffer-undo-list)
+        (ert-simulate-command '(undo))  ; Redo (re-expand snippet).
+        (should (string-match-p "\\`one,and done" (buffer-string)))))))
+
+(defun yas-test-expand-and-undo (mode snippet-entry initial-contents)
+  (yas-with-snippet-dirs
+   `((".emacs.d/snippets" (,(symbol-name mode) ,snippet-entry)))
+   (with-temp-buffer
+     (funcall mode)
+     (yas-reload-all)
+     (yas-minor-mode 1)
+     (yas-expand-snippet initial-contents)
+     (let ((pre-expand-string (buffer-string)))
        (setq buffer-undo-list ())
        (ert-simulate-command '(yas-expand))
        ;; Need undo barrier, I think command loop puts it normally.
        (push nil buffer-undo-list)
-       (should (string= (buffer-string) "(let\n    (while (setq )"))
        (ert-simulate-command '(undo))
-       (should (string= (buffer-string) "(let\n(while s"))))))
+       (should (string= (buffer-string) pre-expand-string))))))
 
-(ert-deftest undo-indentation-multiline ()
-  "Check undoing works when first line of multi-line snippet is indented."
-  (yas-with-snippet-dirs
-    '((".emacs.d/snippets" ("js-mode" ("if" . "if ($1) {\n\n}\n"))))
-    (with-temp-buffer
-      (js-mode)
-      (yas-reload-all)
-      (yas-minor-mode 1)
-      (insert "if\nabc = 123456789 + abcdef;")
-      (setq buffer-undo-list ())
-      (goto-char (point-min))
-      (search-forward "if")
-      (ert-simulate-command '(yas-expand))
-      (push nil buffer-undo-list)       ; See test above.
-      (ert-simulate-command '(undo))
-      (should (string= (buffer-string) "if\nabc = 123456789 + abcdef;")))))
+(ert-deftest undo-indentation-1 ()
+  "Check undoing works when only line of snippet is indented."
+  (let ((yas-also-auto-indent-first-line t))
+    (yas-test-expand-and-undo
+     'emacs-lisp-mode '("s" . "(setq $0)") "(let\n(while s$0")))
+
+(ert-deftest undo-indentation-2 ()
+  "Check undoing works when only line of snippet is indented."
+  (let ((yas-also-auto-indent-first-line t)
+        (indent-tabs-mode nil))
+    (yas-test-expand-and-undo
+     'emacs-lisp-mode '("t" . "; TODO") "t$0")))
+
+(ert-deftest undo-indentation-multiline-1 ()
+  "Check undoing works when 1st line of multi-line snippet is indented."
+  (let ((yas-also-auto-indent-first-line t)
+        (indent-tabs-mode nil))
+    (yas-test-expand-and-undo
+     'js-mode '("if" . "if ($1) {\n\n}\n")
+     "if$0\nabc = 123456789 + abcdef;")))
+
+
+(ert-deftest undo-indentation-multiline-2 ()
+  "Check undoing works when 2nd line of multi-line snippet is indented."
+  (let ((yas-also-auto-indent-first-line t)
+        (indent-tabs-mode nil))
+    (yas-test-expand-and-undo
+     'js-mode '("if" . "if (true) {\n${1:foo};\n}\n")
+     "if$0\nabc = 123456789 + abcdef;")))
 
 (ert-deftest dont-clear-on-partial-deletion-issue-515 ()
   "Ensure fields are not cleared when user doesn't really mean to."
@@ -401,6 +447,30 @@ end" (buffer-string)))
     (yas-expand-snippet "def foo\n\nend")
     (should (string= "def foo\n  \nend" (buffer-string)))))
 
+(ert-deftest yas-indent-first-line ()
+  (with-temp-buffer
+    (ruby-mode)
+    (yas-minor-mode 1)
+    (set (make-local-variable 'yas-indent-line) 'auto)
+    (set (make-local-variable 'yas-also-auto-indent-first-line) nil)
+    (set (make-local-variable 'yas-also-indent-empty-lines) nil)
+    (yas-expand-snippet "def foo\n$0\nend\n")
+    ;; First (and only) line should not indent.
+    (yas-expand-snippet "#not indented")
+    (should (equal "def foo\n#not indented\nend\n" (buffer-string)))))
+
+(ert-deftest yas-indent-first-line-fixed ()
+  (with-temp-buffer
+    (ruby-mode)
+    (yas-minor-mode 1)
+    (set (make-local-variable 'yas-indent-line) 'fixed)
+    (set (make-local-variable 'yas-also-auto-indent-first-line) nil)
+    (set (make-local-variable 'yas-also-indent-empty-lines) nil)
+    (yas-expand-snippet "    def foo\n    $0\n    end\n")
+    ;; First (and only) line should not indent.
+    (yas-expand-snippet "#not more indented")
+    (should (equal "    def foo\n    #not more indented\n    end\n" 
(buffer-string)))))
+
 (ert-deftest indentation-markers ()
   "Test a snippet with indentation markers (`$<')."
   (with-temp-buffer
@@ -606,6 +676,43 @@ mapconcat #'(lambda (arg)
       (yas-expand-snippet "Look ma! ${1:`(yas-selected-text)`} OK?")
       (should (string= (yas--buffer-contents) "Look ma! He)}o world! OK?")))))
 
+(ert-deftest insert-snippet-with-backslashes-in-active-field ()
+  ;; This test case fails if `yas--inhibit-overlay-hooks' is not bound
+  ;; in `yas-expand-snippet' (see Github #844).
+  (with-temp-buffer
+    (yas-minor-mode 1)
+    (yas-expand-snippet "${1:$$(if (not yas-modified-p) \"a\")}")
+    (yas-expand-snippet "\\\\alpha")))
+
+(ert-deftest expand-with-unused-yas-selected-text ()
+  (with-temp-buffer
+    (yas-with-snippet-dirs
+      '((".emacs.d/snippets"
+         ("emacs-lisp-mode"
+          ("foo" . "expanded `yas-selected-text`foo"))))
+      (yas-reload-all)
+      (emacs-lisp-mode)
+      (yas-minor-mode +1)
+      (insert "foo")
+      (ert-simulate-command '(yas-expand))
+      (should (equal (buffer-string) "expanded foo")))))
+
+(ert-deftest yas-expand-command-snippet ()
+  (with-temp-buffer
+    (yas-with-snippet-dirs
+      '((".emacs.d/snippets"
+         ("emacs-lisp-mode"
+          ("foo" . "\
+# type: command
+# --
+\(insert \"expanded foo\")"))))
+      (yas-reload-all)
+      (emacs-lisp-mode)
+      (yas-minor-mode +1)
+      (insert "foo")
+      (ert-simulate-command '(yas-expand))
+      (should (equal (buffer-string) "expanded foo")))))
+
 (ert-deftest example-for-issue-271 ()
   (with-temp-buffer
     (yas-minor-mode 1)
@@ -616,6 +723,17 @@ mapconcat #'(lambda (arg)
       (yas-mock-insert "bbb")
       (should (string= (yas--buffer-contents) "if 
condition\naaa\nelse\nbbb\nend")))))
 
+(ert-deftest yas-no-memory-of-bad-snippet ()
+  "Expanding an incorrect snippet should not influence future expansions."
+  ;; See https://github.com/joaotavora/yasnippet/issues/800.
+  (with-temp-buffer
+    (yas-minor-mode 1)
+    (should-error (yas-expand-snippet "```foo\n\n```"))
+    (erase-buffer) ; Bad snippet may leave wrong text.
+    ;; But expanding the corrected snippet should work fine.
+    (yas-expand-snippet "\\`\\`\\`foo\n\n\\`\\`\\`")
+    (should (equal (buffer-string) "```foo\n\n```"))))
+
 (defmacro yas--with-font-locked-temp-buffer (&rest body)
   "Like `with-temp-buffer', but ensure `font-lock-mode'."
   (declare (indent 0) (debug t))
@@ -953,11 +1071,28 @@ hello ${1:$(when (stringp yas-text) (funcall func 
yas-text))} foo${1:$$(concat \
   "Test `yas-lookup-snippet'."
   (yas-with-some-interesting-snippet-dirs
    (yas-reload-all 'no-jit)
-   (should (equal (yas-lookup-snippet "printf" 'c-mode) "printf($1);"))
-   (should (equal (yas-lookup-snippet "def" 'c-mode) "# define"))
+   (should (equal (yas--template-content (yas-lookup-snippet "printf" 'c-mode))
+                  "printf($1);"))
+   (should (equal (yas--template-content (yas-lookup-snippet "def" 'c-mode))
+                  "# define"))
    (should-not (yas-lookup-snippet "no such snippet" nil 'noerror))
    (should-not (yas-lookup-snippet "printf" 'emacs-lisp-mode 'noerror))))
 
+(ert-deftest yas-lookup-snippet-with-env ()
+  (with-temp-buffer
+    (yas-with-snippet-dirs
+      '((".emacs.d/snippets"
+         ("emacs-lisp-mode"
+          ("foo" . "\
+# expand-env: ((foo \"bar\"))
+# --
+`foo`"))))
+      (yas-reload-all)
+      (emacs-lisp-mode)
+      (yas-minor-mode +1)
+      (yas-expand-snippet (yas-lookup-snippet "foo"))
+      (should (equal (buffer-string) "bar")))))
+
 (ert-deftest basic-jit-loading ()
   "Test basic loading and expansion of snippets"
   (yas-with-some-interesting-snippet-dirs
@@ -985,13 +1120,15 @@ hello ${1:$(when (stringp yas-text) (funcall func 
yas-text))} foo${1:$$(concat \
    (with-temp-buffer
      (text-mode)
      (yas-minor-mode +1)
-     (should (equal (yas-lookup-snippet "one") "one"))
+     (should (equal (yas--template-content (yas-lookup-snippet "one"))
+                    "one"))
      (should (eq (yas--key-binding "\C-c1") 'yas-expand-from-keymap))
      (yas-define-snippets
       'text-mode '(("_1" "one!" "won" nil nil nil nil nil "uuid-1")))
      (should (null (yas-lookup-snippet "one" nil 'noerror)))
      (should (null (yas--key-binding "\C-c1")))
-     (should (equal (yas-lookup-snippet "won") "one!")))))
+     (should (equal (yas--template-content(yas-lookup-snippet "won"))
+                    "one!")))))
 
 (ert-deftest snippet-save ()
   "Make sure snippets can be saved correctly."
@@ -1011,13 +1148,13 @@ hello ${1:$(when (stringp yas-text) (funcall func 
yas-text))} foo${1:$$(concat \
         (yas-minor-mode +1)
         (save-current-buffer
           (yas-new-snippet t)
-          (with-current-buffer "*new snippet*"
+          (with-current-buffer yas-new-snippet-buffer-name
             (snippet-mode)
             (insert "# name: foo\n# key: bar\n# --\nsnippet foo")
             (call-interactively 'yas-load-snippet-buffer-and-close)))
         (save-current-buffer
           (yas-new-snippet t)
-          (with-current-buffer "*new snippet*"
+          (with-current-buffer yas-new-snippet-buffer-name
             (snippet-mode)
             (insert "# name: bar\n# key: bar\n# --\nsnippet bar")
             (call-interactively 'yas-load-snippet-buffer-and-close)))
@@ -1058,7 +1195,7 @@ hello ${1:$(when (stringp yas-text) (funcall func 
yas-text))} foo${1:$$(concat \
                           yet-another-c-mode
                           and-also-this-one
                           and-that-one
-                          ;; prog-mode doesn't exist in emacs 24.3
+                          ;; prog-mode doesn't exist in emacs 23.4
                           ,@(if (fboundp 'prog-mode)
                                 '(prog-mode))
                           emacs-lisp-mode
@@ -1085,7 +1222,7 @@ hello ${1:$(when (stringp yas-text) (funcall func 
yas-text))} foo${1:$$(concat \
                                 c-mode
                                 ,major-mode))
               (expected-rest `(cc-mode
-                               ;; prog-mode doesn't exist in emacs 24.3
+                               ;; prog-mode doesn't exist in emacs 23.4
                                ,@(if (fboundp 'prog-mode)
                                      '(prog-mode))
                                emacs-lisp-mode
@@ -1158,6 +1295,34 @@ hello ${1:$(when (stringp yas-text) (funcall func 
yas-text))} foo${1:$$(concat \
     (yas-should-not-expand '("sc" "dolist" "ert-deftest"))))
 
 
+;;; Unloading
+(ert-deftest yas-unload ()
+  "Test unloading and reloading."
+  (with-temp-buffer
+    (let ((status (call-process
+                   (concat invocation-directory invocation-name)
+                   nil '(t t) nil
+                   "-Q" "--batch" "-L" yas--loaddir "-l" "yasnippet"
+                   "--eval"
+                   (prin1-to-string
+                    '(condition-case err
+                         (progn
+                           (yas-minor-mode +1)
+                           (unload-feature 'yasnippet)
+                           ;; Unloading leaves `yas-minor-mode' bound,
+                           ;; harmless, though perhaps surprising.
+                           (when (bound-and-true-p yas-minor-mode)
+                             (error "`yas-minor-mode' still enabled"))
+                           (when (fboundp 'yas-minor-mode)
+                             (error "`yas-minor-mode' still fboundp"))
+                           (require 'yasnippet)
+                           (unless (fboundp 'yas-minor-mode)
+                             (error "Failed to reload")))
+                       (error (message "%S" (error-message-string err))
+                              (kill-emacs 1)))))))
+      (ert-info ((buffer-string)) (should (eq status 0))))))
+
+
 ;;; Menu
 ;;;
 (defmacro yas-with-even-more-interesting-snippet-dirs (&rest body)
@@ -1332,7 +1497,7 @@ TODO: be meaner"
 
 (ert-deftest yas-org-native-tab-in-source-block ()
   "Test expansion of snippets in org source blocks."
-  :expected-result (if (fboundp 'org-in-src-block-p)
+  :expected-result (if (and (fboundp 'org-in-src-block-p) (version< 
(org-version) "9"))
                        :passed :failed)
   (yas-saving-variables
    (yas-with-snippet-dirs
@@ -1398,5 +1563,6 @@ add the snippets associated with the given mode."
 (provide 'yasnippet-tests)
 ;; Local Variables:
 ;; indent-tabs-mode: nil
+;; autoload-compute-prefixes: nil
 ;; End:
 ;;; yasnippet-tests.el ends here
diff --git a/packages/yasnippet/yasnippet.el b/packages/yasnippet/yasnippet.el
index 6660f57..d478073 100644
--- a/packages/yasnippet/yasnippet.el
+++ b/packages/yasnippet/yasnippet.el
@@ -1,11 +1,11 @@
 ;;; yasnippet.el --- Yet another snippet extension for Emacs.
 
-;; Copyright (C) 2008-2017 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
 ;; Authors: pluskid <address@hidden>,
 ;;          João Távora <address@hidden>,
 ;;          Noam Postavsky <address@hidden>
 ;; Maintainer: Noam Postavsky <address@hidden>
-;; Version: 0.12.2
+;; Version: 0.13.0
 ;; X-URL: http://github.com/joaotavora/yasnippet
 ;; Keywords: convenience, emulation
 ;; URL: http://github.com/joaotavora/yasnippet
@@ -157,16 +157,14 @@
   (file-name-directory (or load-file-name buffer-file-name))
   "Directory that yasnippet was loaded from.")
 
-(defvar yas-installed-snippets-dir nil)
-(setq yas-installed-snippets-dir
-      (expand-file-name "snippets" yas--loaddir))
+(defconst yas-installed-snippets-dir (expand-file-name "snippets" 
yas--loaddir))
+(make-obsolete-variable 'yas-installed-snippets-dir "\
+Yasnippet no longer comes with installed snippets" "0.13")
 
 (defconst yas--default-user-snippets-dir
   (expand-file-name "snippets" user-emacs-directory))
 
-(defcustom yas-snippet-dirs (remove nil
-                                    (list yas--default-user-snippets-dir
-                                          'yas-installed-snippets-dir))
+(defcustom yas-snippet-dirs (list yas--default-user-snippets-dir)
   "List of top-level snippet directories.
 
 Each element, a string or a symbol whose value is a string,
@@ -239,7 +237,7 @@ nil.
 - To signal that the user quit the prompting process, you can
 signal `quit' with
 
-  (signal \\='quit \"user quit!\")."
+    (signal \\='quit \"user quit!\")"
   :type '(repeat function))
 
 (defcustom yas-indent-line 'auto
@@ -398,18 +396,26 @@ It must be set to nil before loading yasnippet to take 
effect."
 
 ;;; User-visible variables
 
+(defconst yas-maybe-skip-and-clear-field
+  '(menu-item "" yas-skip-and-clear-field
+              :filter yas--maybe-clear-field-filter)
+  "A conditional key definition.
+This can be used as a key definition in keymaps to bind a key to
+`yas-skip-and-clear-field' only when at the beginning of an
+unmodified snippey field.")
+
 (defvar yas-keymap  (let ((map (make-sparse-keymap)))
                       (define-key map [(tab)]       
'yas-next-field-or-maybe-expand)
                       (define-key map (kbd "TAB")   
'yas-next-field-or-maybe-expand)
                       (define-key map [(shift tab)] 'yas-prev-field)
                       (define-key map [backtab]     'yas-prev-field)
                       (define-key map (kbd "C-g")   'yas-abort-snippet)
-                      (define-key map (kbd "C-d")   
'yas-skip-and-clear-or-delete-char)
+                      (define-key map (kbd "C-d")   
yas-maybe-skip-and-clear-field)
                       map)
   "The active keymap while a snippet expansion is in progress.")
 
-(defvar yas-key-syntaxes (list "w" "w_" "w_." "w_.()"
-                               #'yas-try-key-from-whitespace)
+(defvar yas-key-syntaxes (list #'yas-try-key-from-whitespace
+                               "w_.()" "w_." "w_" "w")
   "Syntaxes and functions to help look for trigger keys before point.
 
 Each element in this list specifies how to skip buffer positions
@@ -540,7 +546,7 @@ override bindings from other packages (e.g., 
`company-mode')."
 
 ;;; Internal variables
 
-(defconst yas--version "0.12.2")
+(defconst yas--version "0.13.0")
 
 (defvar yas--menu-table (make-hash-table)
   "A hash table of MAJOR-MODE symbols to menu keymaps.")
@@ -576,6 +582,34 @@ override bindings from other packages (e.g., 
`company-mode')."
   "The original value of `auto-fill-function'.")
 (make-variable-buffer-local 'yas--original-auto-fill-function)
 
+(defvar yas--watch-auto-fill-backtrace nil)
+
+(defun yas--watch-auto-fill (sym newval op _where)
+  (when (and (or (and (eq sym 'yas--original-auto-fill-function)
+                      (null newval)
+                      (eq auto-fill-function 'yas--auto-fill))
+                 (and (eq sym 'auto-fill-function)
+                      (eq newval 'yas--auto-fill)
+                      (null yas--original-auto-fill-function)))
+             (null yas--watch-auto-fill-backtrace)
+             (fboundp 'backtrace-frames) ; Suppress compiler warning.
+             ;; If we're about to change `auto-fill-function' too,
+             ;; it's okay (probably).
+             (not (and (eq op 'makunbound)
+                       (not (eq (default-value 'auto-fill-function) 
'yas--auto-fill))
+                       (cl-member 'kill-all-local-variables
+                                  (backtrace-frames 'yas--watch-auto-fill)
+                                  :key (lambda (frame) (nth 1 frame))))))
+    (setq yas--watch-auto-fill-backtrace
+          (backtrace-frames 'yas--watch-auto-fill))))
+
+;; Try to get more info on #873/919 (this only works for Emacs 26+).
+(when (fboundp 'add-variable-watcher)
+  (add-variable-watcher 'yas--original-auto-fill-function
+                        #'yas--watch-auto-fill)
+  (add-variable-watcher 'auto-fill-function
+                        #'yas--watch-auto-fill))
+
 (defun yas--snippet-next-id ()
   (let ((id yas--snippet-id-seed))
     (cl-incf yas--snippet-id-seed)
@@ -953,25 +987,33 @@ Honour `yas-dont-activate-functions', which see."
   "The keymap used when `snippet-mode' is active.")
 
 
-;;;###autoload
-(define-derived-mode snippet-mode text-mode "Snippet"
-  "A mode for editing yasnippets"
-  (setq font-lock-defaults '(yas--font-lock-keywords))
-  (set (make-local-variable 'require-final-newline) nil)
-  (set (make-local-variable 'comment-start) "#")
-  (set (make-local-variable 'comment-start-skip) "#+[\t ]*")
-  (add-hook 'after-save-hook #'yas-maybe-load-snippet-buffer nil t))
+
+;;;###autoload(autoload 'snippet-mode "yasnippet" "A mode for editing 
yasnippets" t nil)
+(eval-and-compile
+  (if (fboundp 'prog-mode)
+      ;; `prog-mode' is new in 24.1.
+      (define-derived-mode snippet-mode prog-mode "Snippet"
+        "A mode for editing yasnippets"
+        (setq font-lock-defaults '(yas--font-lock-keywords))
+        (set (make-local-variable 'require-final-newline) nil)
+        (set (make-local-variable 'comment-start) "#")
+        (set (make-local-variable 'comment-start-skip) "#+[\t ]*")
+        (add-hook 'after-save-hook #'yas-maybe-load-snippet-buffer nil t))
+    (define-derived-mode snippet-mode fundamental-mode "Snippet"
+      "A mode for editing yasnippets"
+      (setq font-lock-defaults '(yas--font-lock-keywords))
+      (set (make-local-variable 'require-final-newline) nil)
+      (set (make-local-variable 'comment-start) "#")
+      (set (make-local-variable 'comment-start-skip) "#+[\t ]*")
+      (add-hook 'after-save-hook #'yas-maybe-load-snippet-buffer nil t))))
 
 (defun yas-snippet-mode-buffer-p ()
   "Return non-nil if current buffer should be in `snippet-mode'.
 Meaning it's visiting a file under one of the mode directories in
 `yas-snippet-dirs'."
   (when buffer-file-name
-    (member
-     (expand-file-name
-      ".."
-      (file-name-directory buffer-file-name))
-     (yas-snippet-dirs))))
+    (cl-member buffer-file-name (yas-snippet-dirs)
+               :test #'file-in-directory-p)))
 
 ;; We're abusing `magic-fallback-mode-alist' here because
 ;; `auto-mode-alist' doesn't support function matchers.
@@ -1370,15 +1412,51 @@ Returns (TEMPLATES START END). This function respects
 
 ;;; Internal functions and macros:
 
+(defun yas--remove-misc-free-from-undo (old-undo-list)
+  "Tries to work around Emacs Bug#30931.
+Helper function for `yas--save-restriction-and-widen'."
+  ;; If Bug#30931 is unfixed, we get (#<Lisp_Misc_Free> . INTEGER)
+  ;; entries in the undo list.  If we call `type-of' on the
+  ;; Lisp_Misc_Free object then Emacs aborts, so try to find it by
+  ;; checking that its type is none of the expected ones.
+  (when (consp buffer-undo-list)
+    (let* ((prev buffer-undo-list)
+           (undo-list prev))
+      (while (and (consp undo-list)
+                  ;; Only check new entries.
+                  (not (eq undo-list old-undo-list)))
+        (let ((entry (pop undo-list)))
+          (when (consp entry)
+            (let ((head (car entry)))
+              (unless (or (stringp head)
+                          (markerp head)
+                          (integerp head)
+                          (symbolp head)
+                          (not (integerp (cdr entry))))
+                ;; (message "removing misc free %S" entry)
+                (setcdr prev undo-list)))))
+        (setq prev undo-list)))))
+
+(defmacro yas--save-restriction-and-widen (&rest body)
+  "Equivalent to (save-restriction (widen) BODY).
+Also tries to work around Emacs Bug#30931."
+  (declare (debug (body)) (indent 0))
+  ;; Disable garbage collection, since it could cause an abort.
+  `(let ((gc-cons-threshold most-positive-fixnum)
+         (old-undo-list buffer-undo-list))
+     (prog1 (save-restriction
+              (widen)
+              ,@body)
+       (yas--remove-misc-free-from-undo old-undo-list))))
+
 (defun yas--eval-for-string (form)
   "Evaluate FORM and convert the result to string."
   (let ((debug-on-error (and (not (memq yas-good-grace '(t inline)))
                              debug-on-error)))
     (condition-case oops
         (save-excursion
-          (save-restriction
+          (yas--save-restriction-and-widen
             (save-match-data
-              (widen)
               (let ((result (eval form)))
                 (when result
                   (format "%s" result))))))
@@ -1493,7 +1571,7 @@ Here's a list of currently recognized directives:
          expand-env
          binding
          uuid)
-    (if (re-search-forward "^# --\n" nil t)
+    (if (re-search-forward "^# --\\s-*\n" nil t)
         (progn (setq template
                      (buffer-substring-no-properties (point)
                                                      (point-max)))
@@ -1938,12 +2016,19 @@ prefix argument."
       (yas-direct-keymaps-reload)
 
       (run-hooks 'yas-after-reload-hook)
-      (yas--message (if errors 2 3)
-                    (if no-jit "Snippets loaded %s."
-                      "Prepared just-in-time loading of snippets %s.")
-                    (if errors
-                        "with some errors. Check *Messages*"
-                      "successfully")))))
+      (let ((no-snippets
+             (cl-every (lambda (table) (= (hash-table-count table) 0))
+                       (list yas--scheduled-jit-loads
+                             yas--parents yas--tables))))
+        (yas--message (if (or no-snippets errors) 2 3)
+                      (if no-jit "Snippets loaded %s."
+                        "Prepared just-in-time loading of snippets %s.")
+                      (cond (errors
+                             "with some errors.  Check *Messages*")
+                            (no-snippets
+                             "(but no snippets found)")
+                            (t
+                             "successfully")))))))
 
 (defvar yas-after-reload-hook nil
   "Hooks run after `yas-reload-all'.")
@@ -2388,18 +2473,17 @@ Honours `yas-choose-tables-first', 
`yas-choose-keys-first' and
              :key #'yas--template-name :test #'string=)))
 
 (defun yas-lookup-snippet (name &optional mode noerror)
-  "Get the snippet content for the snippet NAME in MODE's tables.
+  "Get the snippet named NAME in MODE's tables.
 
 MODE defaults to the current buffer's `major-mode'.  If NOERROR
 is non-nil, then don't signal an error if there isn't any snippet
 called NAME.
 
 Honours `yas-buffer-local-condition'."
-  (let ((snippet (yas--lookup-snippet-1 name mode)))
-    (cond
-     (snippet (yas--template-content snippet))
-     (noerror nil)
-     (t (error "No snippet named: %s" name)))))
+  (cond
+   ((yas--lookup-snippet-1 name mode))
+   (noerror nil)
+   (t (error "No snippet named: %s" name))))
 
 (defun yas-insert-snippet (&optional no-condition)
   "Choose a snippet to expand, pop-up a list of choices according
@@ -2495,10 +2579,11 @@ where snippets of table might exist."
         (tables (if table (list table)
                   (yas--get-snippet-tables))))
     ;; HACK! the snippet table created here is actually registered!
-    ;;
-    (unless (or table (gethash major-mode yas--tables))
-      (push (yas--table-get-create major-mode)
-            tables))
+    (unless table
+      ;; The major mode is probably the best guess, put it first.
+      (let ((major-mode-table (yas--table-get-create major-mode)))
+        (cl-callf2 delq major-mode-table tables)
+        (push major-mode-table tables)))
 
     (mapcar #'(lambda (table)
                 (cons table
@@ -2528,6 +2613,10 @@ where snippets of table might exist."
               ;; create the .yas-parents file here...
               candidate)))))
 
+;; NOTE: Using the traditional "*new snippet*" stops whitespace mode
+;; from activating (it doesn't like the leading "*").
+(defconst yas-new-snippet-buffer-name "+new-snippet+")
+
 (defun yas-new-snippet (&optional no-template)
   "Pops a new buffer for writing a snippet.
 
@@ -2540,7 +2629,7 @@ NO-TEMPLATE is non-nil."
                                     (buffer-substring-no-properties
                                      (region-beginning) (region-end))))))
 
-    (switch-to-buffer "*new snippet*")
+    (switch-to-buffer yas-new-snippet-buffer-name)
     (erase-buffer)
     (kill-all-local-variables)
     (snippet-mode)
@@ -2685,8 +2774,11 @@ and `kill-buffer' instead."
         (save-buffer)))
     (quit-window kill)))
 
+(declare-function yas-debug-snippets "yasnippet-debug")
+
 (defun yas-tryout-snippet (&optional debug)
-  "Test current buffer's snippet template in other buffer."
+  "Test current buffer's snippet template in other buffer.
+DEBUG is for debugging the YASnippet engine itself."
   (interactive "P")
   (let* ((major-mode-and-parent (yas--compute-major-mode-and-parents 
buffer-file-name))
          (parsed (yas--parse-template))
@@ -2716,9 +2808,9 @@ and `kill-buffer' instead."
                                  (point-max)
                                  (yas--template-expand-env 
yas--current-template))
              (when (and debug
-                        (require 'yasnippet-debug nil t)
-                        (fboundp 'yas-debug-snippet-vars))
-               (add-hook 'post-command-hook #'yas-debug-snippet-vars nil t))))
+                        (require 'yasnippet-debug nil t))
+               (yas-debug-snippets "*YASnippet trace*" 'snippet-navigation)
+               (display-buffer "*YASnippet trace*"))))
           (t
            (yas--message 1 "Cannot test snippet for unknown major mode")))))
 
@@ -2918,7 +3010,8 @@ Otherwise signal `yas-exception'."
 (defun yas-field-value (number)
   "Get the string for field with NUMBER.
 
-Use this in primary and mirror transformations to tget."
+Use this in primary and mirror transformations to get the text of
+other fields."
   (let* ((snippet (car (yas-active-snippets)))
          (field (and snippet
                      (yas--snippet-find-field snippet number))))
@@ -3333,9 +3426,8 @@ This renders the snippet as ordinary text."
     ;;
     (yas--markers-to-points snippet)
 
-    ;; Take care of snippet revival
-    ;;
-    (if yas-snippet-revival
+    ;; Take care of snippet revival on undo.
+    (if (and yas-snippet-revival (listp buffer-undo-list))
         (push `(apply yas--snippet-revive ,yas-snippet-beg ,yas-snippet-end 
,snippet)
               buffer-undo-list)
       ;; Dismember the snippet... this is useful if we get called
@@ -3523,22 +3615,37 @@ holds the keymap."
     (overlay-put overlay 'yas--snippet snippet)
     overlay))
 
+(defun yas-current-field ()
+  "Return the currently active field."
+  (and yas--active-field-overlay
+       (overlay-buffer yas--active-field-overlay)
+       (overlay-get yas--active-field-overlay 'yas--field)))
+
+(defun yas--maybe-clear-field-filter (cmd)
+  "Return CMD if at start of unmodified snippet field.
+Use as a `:filter' argument for a conditional keybinding."
+  (let ((field (yas-current-field)))
+    (when (and field
+               (not (yas--field-modified-p field))
+               (eq (point) (marker-position (yas--field-start field))))
+      cmd)))
+
+(defun yas-skip-and-clear-field (&optional field)
+  "Clears unmodified FIELD if at field start, skips to next tab."
+  (interactive)
+  (yas--skip-and-clear (or field (yas-current-field)))
+  (yas-next-field 1))
+
 (defun yas-skip-and-clear-or-delete-char (&optional field)
   "Clears unmodified field if at field start, skips to next tab.
 
 Otherwise deletes a character normally by calling `delete-char'."
   (interactive)
-  (let ((field (or field
-                   (and yas--active-field-overlay
-                        (overlay-buffer yas--active-field-overlay)
-                        (overlay-get yas--active-field-overlay 'yas--field)))))
-    (cond ((and field
-                (not (yas--field-modified-p field))
-                (eq (point) (marker-position (yas--field-start field))))
-           (yas--skip-and-clear field)
-           (yas-next-field 1))
-          (t
-           (call-interactively 'delete-char)))))
+  (declare (obsolete "Bind to `yas-maybe-skip-and-clear-field' instead." 
"0.13"))
+  (cond ((yas--maybe-clear-field-filter t)
+         (yas--skip-and-clear (or field (yas-current-field)))
+         (yas-next-field 1))
+        (t (call-interactively 'delete-char))))
 
 (defun yas--skip-and-clear (field &optional from)
   "Deletes the region of FIELD and sets it's modified state to t.
@@ -3639,7 +3746,44 @@ field start.  This hook does nothing if an undo is in 
progress."
             reoverlays))
     (goto-char orig-point)
     (let ((yas--inhibit-overlay-hooks t))
-      (funcall yas--original-auto-fill-function))
+      (if (null yas--original-auto-fill-function)
+          ;; Try to get more info on #873/919.
+          (let ((yas--fill-fun-values `((t ,(default-value 
'yas--original-auto-fill-function))))
+                (fill-fun-values `((t ,(default-value 'auto-fill-function))))
+                ;; Listing 2 buffers with the same value is enough
+                (print-length 3))
+            (save-current-buffer
+              (dolist (buf (let ((bufs (buffer-list)))
+                             ;; List the current buffer first.
+                             (setq bufs (cons (current-buffer)
+                                              (remq (current-buffer) bufs)))))
+                (set-buffer buf)
+                (let* ((yf-cell (assq yas--original-auto-fill-function
+                                      yas--fill-fun-values))
+                       (af-cell (assq auto-fill-function fill-fun-values)))
+                  (when (local-variable-p 'yas--original-auto-fill-function)
+                    (if yf-cell (setcdr yf-cell (cons buf (cdr yf-cell)))
+                      (push (list yas--original-auto-fill-function buf) 
yas--fill-fun-values)))
+                  (when (local-variable-p 'auto-fill-function)
+                    (if af-cell (setcdr af-cell (cons buf (cdr af-cell)))
+                      (push (list auto-fill-function buf) fill-fun-values))))))
+                 (lwarn '(yasnippet auto-fill bug) :error
+                        "`yas--original-auto-fill-function' unexpectedly nil 
in %S!  Disabling auto-fill.
+  %S
+  `auto-fill-function': %S\n%s"
+                        (current-buffer) yas--fill-fun-values fill-fun-values
+                        (if (fboundp 'backtrace--print-frame)
+                            (with-output-to-string
+                              (mapc (lambda (frame)
+                                      (apply #'backtrace--print-frame frame))
+                                    yas--watch-auto-fill-backtrace))
+                          ""))
+                 ;; Try to avoid repeated triggering of this bug.
+                 (auto-fill-mode -1)
+                 ;; Don't pop up more than once in a session (still log 
though).
+                 (defvar warning-suppress-types) ; `warnings' is autoloaded by 
`lwarn'.
+                 (add-to-list 'warning-suppress-types '(yasnippet auto-fill 
bug)))
+        (funcall yas--original-auto-fill-function)))
     (save-excursion
       (setq end (progn (forward-paragraph) (point)))
       (setq beg (progn (backward-paragraph) (point))))
@@ -3736,124 +3880,100 @@ Move the overlays, or create them if they do not 
exit."
 ;; running, but if managed correctly (including overlay priorities)
 ;; they should account for all situations...
 
-(defvar yas--first-indent-undo nil
-  "Internal variable for indent undo entries.
-Used to pass info from `yas--indent-region' to `yas-expand-snippet'.")
-(defvar yas--get-indent-undo-pos nil
-  "Record undo info for line beginning at given position.
-We bind this when first creating a snippet.  See also
-`yas--first-indent-undo'.")
-
-(defun yas-expand-snippet (content &optional start end expand-env)
-  "Expand snippet CONTENT at current point.
+(defun yas-expand-snippet (snippet &optional start end expand-env)
+  "Expand SNIPPET at current point.
 
 Text between START and END will be deleted before inserting
-template.  EXPAND-ENV is a list of (SYM VALUE) let-style dynamic bindings
-considered when expanding the snippet."
+template.  EXPAND-ENV is a list of (SYM VALUE) let-style dynamic
+bindings considered when expanding the snippet.  If omitted, use
+SNIPPET's expand-env field.
+
+SNIPPET may be a snippet structure (e.g., as returned by
+`yas-lookup-snippet'), or just a snippet body (which is a string
+for normal snippets, and a list for command snippets)."
   (cl-assert (and yas-minor-mode
                   (memq 'yas--post-command-handler post-command-hook))
              nil
              "[yas] `yas-expand-snippet' needs properly setup 
`yas-minor-mode'")
   (run-hooks 'yas-before-expand-snippet-hook)
 
-  ;;
-  (let* ((yas-selected-text (or yas-selected-text
-                                (and (region-active-p)
-                                     (buffer-substring-no-properties 
(region-beginning)
-                                                                     
(region-end)))))
-         (start (or start
-                    (and (region-active-p)
-                         (region-beginning))
-                    (point)))
-         (end (or end
-                  (and (region-active-p)
-                       (region-end))
-                  (point)))
-         (to-delete (and start
-                         end
+  (let* ((clear-field
+          (let ((field (and yas--active-field-overlay
+                            (overlay-buffer yas--active-field-overlay)
+                            (overlay-get yas--active-field-overlay 
'yas--field))))
+            (and field (yas--skip-and-clear-field-p
+                        field (point) (point) 0)
+                 field)))
+         (start (cond (start)
+                      ((region-active-p)
+                       (region-beginning))
+                      (clear-field
+                       (yas--field-start clear-field))
+                      (t (point))))
+         (end (cond (end)
+                    ((region-active-p)
+                     (region-end))
+                    (clear-field
+                     (yas--field-end clear-field))
+                    (t (point))))
+         (to-delete (and (> end start)
                          (buffer-substring-no-properties start end)))
-         (yas--first-indent-undo nil)
-         snippet)
+         (yas-selected-text
+          (cond (yas-selected-text)
+                ((and (region-active-p)
+                      (not clear-field))
+                 to-delete))))
     (goto-char start)
     (setq yas--indent-original-column (current-column))
     ;; Delete the region to delete, this *does* get undo-recorded.
-    ;;
-    (when (and to-delete
-               (> end start))
+    (when to-delete
       (delete-region start end))
 
-    (cond ((listp content)
-           ;; x) This is a snippet-command
-           ;;
-           (yas--eval-for-effect content))
-          (t
-           ;; x) This is a snippet-snippet :-)
-           ;;
-           ;;    Narrow the region down to the content, shoosh the
-           ;;    `buffer-undo-list', and create the snippet, the new
-           ;;    snippet updates its mirrors once, so we are left with
-           ;;    some plain text.  The undo action for deleting this
-           ;;    plain text will get recorded at the end.
-           ;;
-           ;;    stacked expansion: also shoosh the overlay modification hooks
-           (let ((buffer-undo-list t)
-                 (yas--get-indent-undo-pos (line-beginning-position)))
-             ;; snippet creation might evaluate users elisp, which
-             ;; might generate errors, so we have to be ready to catch
-             ;; them mostly to make the undo information
-             ;;
+    (let ((content (if (yas--template-p snippet)
+                       (yas--template-content snippet)
+                     snippet)))
+      (when (and (not expand-env) (yas--template-p snippet))
+        (setq expand-env (yas--template-expand-env snippet)))
+      (cond ((listp content)
+             ;; x) This is a snippet-command.
+             (yas--eval-for-effect content))
+            (t
+             ;; x) This is a snippet-snippet :-)
              (setq yas--start-column (current-column))
+             ;; Stacked expansion: also shoosh the overlay modification hooks.
              (let ((yas--inhibit-overlay-hooks t))
-               (insert content)
                (setq snippet
-                     (yas--snippet-create expand-env start (point)))))
-
-           ;; stacked-expansion: This checks for stacked expansion, save the
-           ;; `yas--previous-active-field' and advance its boundary.
-           ;;
-           (let ((existing-field (and yas--active-field-overlay
-                                      (overlay-buffer 
yas--active-field-overlay)
-                                      (overlay-get yas--active-field-overlay 
'yas--field))))
-             (when existing-field
-               (setf (yas--snippet-previous-active-field snippet) 
existing-field)
-               (yas--advance-end-maybe existing-field (overlay-end 
yas--active-field-overlay))))
-
-           ;; Exit the snippet immediately if no fields
-           ;;
-           (unless (yas--snippet-fields snippet)
-             (yas-exit-snippet snippet))
-
-           ;; Undo actions from indent of snippet's 1st line.
-           (setq buffer-undo-list
-                 (nconc yas--first-indent-undo buffer-undo-list))
-           ;; Undo action for the expand snippet contents.
-           (push (cons (overlay-start (yas--snippet-control-overlay snippet))
-                       (overlay-end (yas--snippet-control-overlay snippet)))
-                 buffer-undo-list)
-           ;; Follow up with `yas--take-care-of-redo' on the newly
-           ;; inserted snippet boundaries.
-           (push `(apply yas--take-care-of-redo ,start
-                         ,(overlay-end (yas--snippet-control-overlay snippet))
-                         ,snippet)
-                 buffer-undo-list)
-
-           ;; Now, schedule a move to the first field
-           ;;
-           (let ((first-field (car (yas--snippet-fields snippet))))
-             (when first-field
-               (sit-for 0) ;; fix issue 125
-               (yas--letenv (yas--snippet-expand-env snippet)
-                 (yas--move-to-field snippet first-field))
-               (when (and (eq (yas--field-number first-field) 0)
-                          (> (length (yas--field-text-for-display
-                                      first-field))
-                             0))
-                 ;; Keep region for ${0:exit text}.
-                 (setq deactivate-mark nil))))
-           (yas--message 4 "snippet %d expanded." (yas--snippet-id snippet))
-           t))))
-
-(defun yas--take-care-of-redo (_beg _end snippet)
+                     (yas--snippet-create content expand-env start (point))))
+
+             ;; Stacked-expansion: This checks for stacked expansion, save the
+             ;; `yas--previous-active-field' and advance its boundary.
+             (let ((existing-field (and yas--active-field-overlay
+                                        (overlay-buffer 
yas--active-field-overlay)
+                                        (overlay-get yas--active-field-overlay 
'yas--field))))
+               (when existing-field
+                 (setf (yas--snippet-previous-active-field snippet) 
existing-field)
+                 (yas--advance-end-maybe existing-field (overlay-end 
yas--active-field-overlay))))
+
+             ;; Exit the snippet immediately if no fields.
+             (unless (yas--snippet-fields snippet)
+               (yas-exit-snippet snippet))
+
+             ;; Now, schedule a move to the first field.
+             (let ((first-field (car (yas--snippet-fields snippet))))
+               (when first-field
+                 (sit-for 0) ;; fix issue 125
+                 (yas--letenv (yas--snippet-expand-env snippet)
+                   (yas--move-to-field snippet first-field))
+                 (when (and (eq (yas--field-number first-field) 0)
+                            (> (length (yas--field-text-for-display
+                                        first-field))
+                               0))
+                   ;; Keep region for ${0:exit text}.
+                   (setq deactivate-mark nil))))
+             (yas--message 4 "snippet %d expanded." (yas--snippet-id snippet))
+             t)))))
+
+(defun yas--take-care-of-redo (snippet)
   "Commits SNIPPET, which in turn pushes an undo action for reviving it.
 
 Meant to exit in the `buffer-undo-list'."
@@ -3878,19 +3998,40 @@ After revival, push the `yas--take-care-of-redo' in the
   (when (yas--maybe-move-to-active-field snippet)
     (setf (yas--snippet-control-overlay snippet) (yas--make-control-overlay 
snippet beg end))
     (overlay-put (yas--snippet-control-overlay snippet) 'yas--snippet snippet)
-    (push `(apply yas--take-care-of-redo ,beg ,end ,snippet)
-          buffer-undo-list)))
+    (when (listp buffer-undo-list)
+      (push `(apply yas--take-care-of-redo ,snippet)
+            buffer-undo-list))))
 
-(defun yas--snippet-create (expand-env begin end)
+(defun yas--snippet-create (content expand-env begin end)
   "Create a snippet from a template inserted at BEGIN to END.
 
 Returns the newly created snippet."
   (save-restriction
-    (narrow-to-region begin end)
     (let ((snippet (yas--make-snippet expand-env)))
       (yas--letenv expand-env
-        (goto-char begin)
-        (yas--snippet-parse-create snippet)
+        ;; Put a single undo action for the expanded snippet's
+        ;; content.
+        (let ((buffer-undo-list t))
+          ;; Some versions of cc-mode fail when inserting snippet
+          ;; content in a narrowed buffer.
+          (goto-char begin)
+          (insert content)
+          (setq end (+ end (length content)))
+          (narrow-to-region begin end)
+          (goto-char (point-min))
+          (yas--snippet-parse-create snippet))
+        (when (listp buffer-undo-list)
+          (push (cons (point-min) (point-max))
+                buffer-undo-list))
+
+        ;; Indent, collecting undo information normally.
+        (yas--indent snippet)
+
+        ;; Follow up with `yas--take-care-of-redo' on the newly
+        ;; inserted snippet boundaries.
+        (when (listp buffer-undo-list)
+          (push `(apply yas--take-care-of-redo ,snippet)
+                buffer-undo-list))
 
         ;; Sort and link each field
         (yas--snippet-sort-fields snippet)
@@ -3987,22 +4128,27 @@ has to be called before the $-constructs are deleted."
       (when soup
         (cl-reduce link-foms soup)))))
 
-(defun yas--calculate-mirrors-in-fields (snippet mirror)
-  "Attempt to assign a parent field of SNIPPET to the mirror MIRROR.
+(defun yas--calculate-simple-fom-parentage (snippet fom)
+  "Discover if FOM is parented by some field in SNIPPET.
 
 Use the tightest containing field if more than one field contains
 the mirror.  Intended to be called *before* the dollar-regions are
 deleted."
   (let ((min (point-min))
         (max (point-max)))
-    (dolist (field (yas--snippet-fields snippet))
-      (when (and (<= (yas--field-start field) (yas--mirror-start mirror))
-                 (<= (yas--mirror-end mirror) (yas--field-end field))
+    (dolist (field (remq fom (yas--snippet-fields snippet)))
+      (when (and (<= (yas--field-start field) (yas--fom-start fom))
+                 (<= (yas--fom-end fom) (yas--field-end field))
                (< min (yas--field-start field))
                (< (yas--field-end field) max))
           (setq min (yas--field-start field)
                 max (yas--field-end field))
-          (setf (yas--mirror-parent-field mirror) field)))))
+          (cond ((yas--field-p fom)
+                 (setf (yas--field-parent-field fom) field))
+                ((yas--mirror-p fom)
+                 (setf (yas--mirror-parent-field fom) field))
+                (t ; it's an exit, so noop
+                 nil ))))))
 
 (defun yas--advance-end-maybe (fom newend)
   "Maybe advance FOM's end to NEWEND if it needs it.
@@ -4046,11 +4192,6 @@ next FOM.  Works its way up recursively for parents of 
parents."
   "When expanding the snippet the \"parse-create\" functions add
 cons cells to this var.")
 
-(defvar yas--backquote-markers-and-strings nil
-  "List of (MARKER . STRING) marking where the values from
-backquoted Lisp expressions should be inserted at the end of
-expansion.")
-
 (defvar yas--indent-markers nil
   "List of markers for manual indentation.")
 
@@ -4059,21 +4200,22 @@ expansion.")
 necessary fields, mirrors and exit points.
 
 Meant to be called in a narrowed buffer, does various passes"
-  (let ((parse-start (point)))
+  (let ((saved-quotes nil)
+        (parse-start (point)))
     ;; Avoid major-mode's syntax propertizing function, since we
     ;; change the syntax-table while calling `scan-sexps'.
     (let ((syntax-propertize-function nil))
       (setq yas--dollar-regions nil)  ; Reset the yas--dollar-regions.
       (yas--protect-escapes nil '(?`))  ; Protect just the backquotes.
       (goto-char parse-start)
-      (yas--save-backquotes)     ; Replace all backquoted expressions.
-      (yas--protect-escapes)     ; Protect escaped characters.
+      (setq saved-quotes (yas--save-backquotes)) ; `expressions`.
+      (yas--protect-escapes)            ; Protect escaped characters.
       (goto-char parse-start)
       (yas--indent-parse-create)        ; Parse indent markers: `$>'.
       (goto-char parse-start)
       (yas--field-parse-create snippet) ; Parse fields with {}.
       (goto-char parse-start)
-      (yas--simple-mirror-parse-create snippet) ; Parse simple mirrors & 
fields.
+      (yas--simple-fom-create snippet) ; Parse simple mirrors & fields.
       (goto-char parse-start)
       (yas--transform-mirror-parse-create snippet) ; Parse mirror transforms.
       ;; Invalidate any syntax-propertizing done while
@@ -4081,8 +4223,7 @@ Meant to be called in a narrowed buffer, does various 
passes"
       (syntax-ppss-flush-cache parse-start))
     ;; Set "next" links of fields & mirrors.
     (yas--calculate-adjacencies snippet)
-    (save-restriction
-      (widen)                           ; Delete $-constructs.
+    (yas--save-restriction-and-widen    ; Delete $-constructs.
       (yas--delete-regions yas--dollar-regions))
     ;; Make sure to do this insertion *after* deleting the dollar
     ;; regions, otherwise we invalidate the calculated positions of
@@ -4097,12 +4238,11 @@ Meant to be called in a narrowed buffer, does various 
passes"
                 (get-register yas-wrap-around-region))
            (insert (prog1 (get-register yas-wrap-around-region)
                      (set-register yas-wrap-around-region nil)))))
-    (yas--restore-backquotes)  ; Restore backquoted expression values.
+    (yas--restore-backquotes saved-quotes)  ; Restore `expression` values.
     (goto-char parse-start)
     (yas--restore-escapes)        ; Restore escapes.
     (yas--update-mirrors snippet) ; Update mirrors for the first time.
-    (goto-char parse-start))
-  (yas--indent snippet))                ; Indent the best we can.
+    (goto-char parse-start)))
 
 ;; HACK: Some implementations of `indent-line-function' (called via
 ;; `indent-according-to-mode') delete text before they insert (like
@@ -4224,8 +4364,7 @@ Buffer must be narrowed to BEG..END used to create the 
snapshot info."
   "Indent the lines between FROM and TO with `indent-according-to-mode'.
 The SNIPPET's markers are preserved."
   (save-excursion
-    (save-restriction
-      (widen)
+    (yas--save-restriction-and-widen
       (let* ((snippet-markers (yas--collect-snippet-markers snippet))
              (to (set-marker (make-marker) to)))
         (goto-char from)
@@ -4242,12 +4381,7 @@ The SNIPPET's markers are preserved."
                              remarkers)))
                    (unwind-protect
                        (progn (back-to-indentation)
-                              (if (eq yas--get-indent-undo-pos bol)
-                                  (let ((buffer-undo-list nil))
-                                    (indent-according-to-mode)
-                                    (setq yas--first-indent-undo
-                                          (delq nil buffer-undo-list)))
-                                (indent-according-to-mode)))
+                              (indent-according-to-mode))
                      (save-restriction
                        (narrow-to-region bol (line-end-position))
                        (mapc #'yas--restore-marker-location remarkers))))
@@ -4269,16 +4403,26 @@ The SNIPPET's markers are preserved."
     (setq yas--indent-markers nil))
   ;; Now do stuff for `fixed' and `auto'.
   (save-excursion
+    ;; We need to be at end of line, so that `forward-line' will only
+    ;; report 0 if it actually moves over a newline.
+    (end-of-line)
     (cond ((eq yas-indent-line 'fixed)
-           (while (and (zerop (forward-line))
-                       (zerop (current-column)))
-             (indent-to-column yas--indent-original-column)))
+           (when (= (forward-line 1) 0)
+             (let ((indent-line-function
+                    (lambda ()
+                      ;; We need to be at beginning of line in order to
+                      ;; indent existing whitespace correctly.
+                      (beginning-of-line)
+                      (indent-to-column yas--indent-original-column))))
+               (yas--indent-region (line-beginning-position)
+                                   (point-max)
+                                   snippet))))
           ((eq yas-indent-line 'auto)
-           (unless yas-also-auto-indent-first-line
-             (forward-line 1))
-           (yas--indent-region (line-beginning-position)
-                               (point-max)
-                               snippet)))))
+           (when (or yas-also-auto-indent-first-line
+                     (= (forward-line 1) 0))
+             (yas--indent-region (line-beginning-position)
+                                 (point-max)
+                                 snippet))))))
 
 (defun yas--collect-snippet-markers (snippet)
   "Make a list of all the markers used by SNIPPET."
@@ -4318,17 +4462,19 @@ With optional string TEXT do it in string instead of 
the buffer."
     changed-text))
 
 (defun yas--save-backquotes ()
-  "Save all the \"\\=`(lisp-expression)\\=`\"-style expressions
-with their evaluated value into `yas--backquote-markers-and-strings'."
-  (let* ((yas--snippet-buffer (current-buffer))
+  "Save all \"\\=`(lisp-expression)\\=`\"-style expressions.
+Return a list of (MARKER . STRING) entires for each backquoted
+Lisp expression."
+  (let* ((saved-quotes nil)
+         (yas--snippet-buffer (current-buffer))
          (yas--change-detected nil)
          (detect-change (lambda (_beg _end)
                           (when (eq (current-buffer) yas--snippet-buffer)
                             (setq yas--change-detected t)))))
     (while (re-search-forward yas--backquote-lisp-expression-regexp nil t)
       (let ((current-string (match-string-no-properties 1)) transformed)
-        (save-restriction (widen)
-                          (delete-region (match-beginning 0) (match-end 0)))
+        (yas--save-restriction-and-widen
+          (delete-region (match-beginning 0) (match-end 0)))
         (let ((before-change-functions
                (cons detect-change before-change-functions)))
           (setq transformed (yas--eval-for-string (yas--read-lisp
@@ -4338,34 +4484,31 @@ with their evaluated value into 
`yas--backquote-markers-and-strings'."
         (when transformed
           (let ((marker (make-marker))
                 (before-change-functions (cdr before-change-functions)))
-            (save-restriction
-              (widen)
+            (yas--save-restriction-and-widen
               (insert "Y") ;; quite horrendous, I love it :)
               (set-marker marker (point))
               (insert "Y"))
-            (push (cons marker transformed) 
yas--backquote-markers-and-strings)))))
+            (push (cons marker transformed) saved-quotes)))))
     (when yas--change-detected
       (lwarn '(yasnippet backquote-change) :warning
              "`%s' modified buffer in a backquote expression.
   To hide this warning, add (yasnippet backquote-change) to 
`warning-suppress-types'."
              (if yas--current-template
                  (yas--template-name yas--current-template)
-               "Snippet")))))
-
-(defun yas--restore-backquotes ()
-  "Replace markers in `yas--backquote-markers-and-strings' with their values."
-  (while yas--backquote-markers-and-strings
-    (let* ((marker-and-string (pop yas--backquote-markers-and-strings))
-           (marker (car marker-and-string))
-           (string (cdr marker-and-string)))
-      (save-excursion
-        (goto-char marker)
-        (save-restriction
-          (widen)
-          (delete-char -1)
-          (insert string)
-          (delete-char 1))
-        (set-marker marker nil)))))
+               "Snippet")))
+    saved-quotes))
+
+(defun yas--restore-backquotes (saved-quotes)
+  "Replace markers in SAVED-QUOTES with their values.
+SAVED-QUOTES is the in format returned by `yas--save-backquotes'."
+  (cl-loop for (marker . string) in saved-quotes do
+           (save-excursion
+             (goto-char marker)
+             (yas--save-restriction-and-widen
+               (delete-char -1)
+               (insert string)
+               (delete-char 1))
+             (set-marker marker nil))))
 
 (defun yas--scan-sexps (from count)
   (ignore-errors
@@ -4484,10 +4627,10 @@ When multiple expressions are found, only the last one 
counts."
       (when brand-new-mirror
         (push brand-new-mirror
               (yas--field-mirrors field))
-        (yas--calculate-mirrors-in-fields snippet brand-new-mirror)
+        (yas--calculate-simple-fom-parentage snippet brand-new-mirror)
         (push (cons (match-beginning 0) real-match-end-0) 
yas--dollar-regions)))))
 
-(defun yas--simple-mirror-parse-create (snippet)
+(defun yas--simple-fom-create (snippet)
   "Parse the simple \"$n\" fields/mirrors/exitmarkers in SNIPPET."
   (while (re-search-forward yas--simple-mirror-regexp nil t)
     (let ((number (string-to-number (match-string-no-properties 1))))
@@ -4497,20 +4640,22 @@ When multiple expressions are found, only the last one 
counts."
              (push (cons (match-beginning 0) (yas--exit-marker 
(yas--snippet-exit snippet)))
                    yas--dollar-regions))
             (t
-             (let ((field (yas--snippet-find-field snippet number)))
+             (let ((field (yas--snippet-find-field snippet number))
+                   (fom))
                (if field
-                   (let ((brand-new-mirror (yas--make-mirror
-                                            (yas--make-marker (match-beginning 
0))
-                                            (yas--make-marker (match-beginning 
0))
-                                            nil)))
-                     (push brand-new-mirror
-                           (yas--field-mirrors field))
-                     (yas--calculate-mirrors-in-fields snippet 
brand-new-mirror))
-                 (push (yas--make-field number
-                                       (yas--make-marker (match-beginning 0))
-                                       (yas--make-marker (match-beginning 0))
-                                       nil)
-                       (yas--snippet-fields snippet))))
+                   (push
+                    (setq fom (yas--make-mirror
+                               (yas--make-marker (match-beginning 0))
+                               (yas--make-marker (match-beginning 0))
+                               nil))
+                    (yas--field-mirrors field))
+                 (push
+                  (setq fom (yas--make-field number
+                                             (yas--make-marker 
(match-beginning 0))
+                                             (yas--make-marker 
(match-beginning 0))
+                                             nil))
+                  (yas--snippet-fields snippet)))
+               (yas--calculate-simple-fom-parentage snippet fom))
              (push (cons (match-beginning 0) (match-end 0))
                    yas--dollar-regions))))))
 
@@ -4540,8 +4685,7 @@ When multiple expressions are found, only the last one 
counts."
 
 (defun yas--update-mirrors (snippet)
   "Update all the mirrors of SNIPPET."
-  (save-restriction
-    (widen)
+  (yas--save-restriction-and-widen
     (save-excursion
       (cl-loop
        for (field . mirror)
@@ -4624,6 +4768,18 @@ When multiple expressions are found, only the last one 
counts."
 ;;
 (defun yas--post-command-handler ()
   "Handles various yasnippet conditions after each command."
+  (when (and yas--watch-auto-fill-backtrace
+             (fboundp 'backtrace--print-frame)
+             (null yas--original-auto-fill-function)
+             (eq auto-fill-function 'yas--auto-fill))
+    (lwarn '(yasnippet auto-fill bug) :error
+           "`yas--original-auto-fill-function' unexpectedly nil! Please report 
this backtrace\n%S"
+           (with-output-to-string
+             (mapc #'backtrace--print-frame
+                     yas--watch-auto-fill-backtrace)))
+    ;; Don't pop up more than once in a session (still log though).
+    (defvar warning-suppress-types) ; `warnings' is autoloaded by `lwarn'.
+    (add-to-list 'warning-suppress-types '(yasnippet auto-fill bug)))
   (condition-case err
       (progn (yas--finish-moving-snippets)
              (cond ((eq 'undo this-command)
@@ -4733,7 +4889,7 @@ object satisfying `yas--field-p' to restrict the 
expansion to.")))
   "Log level for `yas--message' 4 means trace most anything, 0 means nothing.")
 
 (defun yas--message (level message &rest args)
-  "When LEVEL is at or below `yas-verbosity-level', log MESSAGE and ARGS."
+  "When LEVEL is at or below `yas-verbosity', log MESSAGE and ARGS."
   (when (>= yas-verbosity level)
     (message "%s" (apply #'yas--format message args))))
 
@@ -4801,6 +4957,31 @@ and return the directory.  Return nil if not found."
                                          (directory-file-name file))))
                  (setq file nil))))
         root))))
+
+;;; Unloading
+
+(defvar unload-function-defs-list) ; loadhist.el
+
+(defun yasnippet-unload-function ()
+  "Disable minor modes when calling `unload-feature'."
+  ;; Disable `yas-minor-mode' everywhere it's enabled.
+  (yas-global-mode -1)
+  (save-current-buffer
+    (dolist (buffer (buffer-list))
+      (set-buffer buffer)
+      (when yas-minor-mode
+        (yas-minor-mode -1))))
+  ;; Remove symbol properties of all our functions, this avoids
+  ;; Bug#25088 in Emacs 25.1, where the compiler macro on
+  ;; `cl-defstruct' created functions hang around in the symbol plist
+  ;; and cause errors when loading again (we don't *need* to clean
+  ;; *all* symbol plists, but it's easier than being precise).
+  (dolist (def unload-function-defs-list)
+    (when (eq (car-safe def) 'defun)
+      (setplist (cdr def) nil)))
+  ;; Return nil so that `unload-feature' will take of undefining
+  ;; functions, and changing any buffers using `snippet-mode'.
+  nil)
 
 
 ;;; Backward compatibility to yasnippet <= 0.7