* git reset to reorder dirs

* fix: typos

* chore(waffle-example): make tests pass
Co-authored-by: Georgios Konstantopoulos <me@gakonst.com>