worf.el: major re-structuring