restructure passes cucumber tests
...and now passes unit-tests.
manifest update
update gemspec
updated gemspec