reorganized handlebars (added full version); working on test specs