Refactor, move method
Refactor GherkinBuilder just tidying up.

Now possible thanks to @tooky for fixing the build.