refactors specs and structure/grapevine
increments version