Cleanup, reorg, renaming and spelling fix
Cleanup, reorg, renaming and spelling fix

fstrozzi/bio-gherkin,rydnr/gherkin,rydnr/gherkin,colindean/gherkin,fstrozzi/bio-gherkin,rydnr/gherkin,fstrozzi/bio-gherkin,rydnr/gherkin,fstrozzi/bio-gherkin,colindean/gherkin,colindean/gherkin,fstrozzi/bio-gherkin,colindean/gherkin,rydnr/gherkin