diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000..fea39d4
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,23 @@
+version: 2.1
+executors:
+  go:
+    docker:
+    - image: circleci/golang:1.13
+
+jobs:
+  test:
+    working_directory: /go/src/github.com/cucumber/godog
+    environment:
+      GO111MODULE: auto
+    executor: go
+    steps:
+      - checkout
+      - run: cd $GOPATH
+      - run: go get github.com/cucumber/godog/cmd/godog
+      - run: go test
+
+workflows:
+  version: 2
+  test:
+    jobs:
+      - test
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 152b7c4..30ebdfb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,110 +1,48 @@
-# Change LOG
+# CHANGE LOG
 
-**2020-01-31**
-- change license to MIT and moving project repository to **cucumber**
-  organization.
+All notable changes to this project will be documented in this file.
 
-**2018-11-16**
-- added formatter output test suite, currently mainly pretty format
-  tested.
-- these tests, helped to identify some output format issues.
+This project adheres to [Semantic Versioning](http://semver.org).
 
-**2018-11-12**
-- proper go module support added for `godog` command build.
-- added build tests.
+This document is formatted according to the principles of [Keep A CHANGELOG](http://keepachangelog.com).
 
-**2018-10-27**
-- support go1.11 new compiler and linker changes for **godog** command.
-- support go1.11 modules and `go mod` builds.
-- `BindFlags` now has a prefix option for flags, so that `go test` command
-  can avoid flag name collisions.
-- `BindFlags` respect default options provided for binding, so that it
-  does not override predefined options when flags are bind, see #144.
-- Minor patch to support tag filters on example tables for
-  ScenarioOutline.
-- Minor patch for pretty printer, when scenario has no steps, comment
-  possition computation was in panic.
+----
 
-**2018-03-04**
-- support go1.10 new compiler and linker changes for **godog** command.
+## [Unreleased]
 
-**2017-08-31**
-- added **BeforeFeature** and **AfterFeature** hooks.
-- failed multistep error is now prepended with a parent step text in order
-  to determine failed nested step.
-- pretty format now removes the step definition location package name in
-  comment next to step if the step definition matches tested package. If
-  step definition is imported from other package, full package name will
-  be printed.
+### Added
 
-**2017-05-04**
-- added **--strict** option in order to fail suite when there are pending
-  or undefined steps. By default, suite passes and treats pending or
-  undefined steps as TODOs.
+- Added initial CircleCI config. ([jaysonesmith])
 
-**2017-04-29** - **v0.7.0**
-- added support for nested steps. From now on, it is possible to return
-  **godog.Steps** instead of an **error** in the step definition func.
-  This change introduced few minor changes in **Formatter** interface. Be
-  sure to adapt the changes if you have custom formatters.
+### Changed
 
-**2017-04-27**
-- added an option to randomize scenario execution order, so we could
-  ensure that scenarios do not depend on global state.
-- godog was manually sorting feature files by name. Now it just runs them
-  in given order, you may sort them anyway you like. For example `godog
-  $(find . -name '*.feature' | sort)`
+- Changed code references to DATA-DOG/godog to cucumber/godog to help get things building correctly. ([jaysonesmith])
 
-**2016-10-30** - **v0.6.0**
-- added experimental **events** format, this might be used for unified
-  cucumber formats. But should be not adapted widely, since it is highly
-  possible that specification will change.
-- added **RunWithOptions** method which allows to easily run godog from
-  **TestMain** without needing to simulate flag arguments. These options
-  now allows to configure output writer.
-- added flag **-o, --output=runner.binary** which only compiles the test
-  runner executable, but does not execute it.
-- **FlagSet** initialization now takes io.Writer as output for help text
-  output. It was not showing nice colors on windows before.
-  **--no-colors** option only applies to test run output.
+### Deprecated
 
-**2016-06-14** - **v0.5.0**
-- godog now uses **go tool compile** and **go tool link** to support
-  vendor directory dependencies. It also compiles test executable the same
-  way as standard **go test** utility. With this change, only go
-  versions from **1.5** are now supported.
+### Removed
 
-**2016-06-01**
-- parse flags in main command, to show version and help without needing
-  to compile test package and buildable go sources.
+### Fixed
 
-**2016-05-28**
-- show nicely formatted called step func name and file path
+## [0.8.0]
 
-**2016-05-26**
-- pack gherkin dependency in a subpackage to prevent compatibility
-  conflicts in the future. If recently upgraded, probably you will need to
-  reference gherkin as `github.com/DATA-DOG/godog/gherkin` instead.
+### Added
 
-**2016-05-25**
-- refactored test suite build tooling in order to use standard **go test**
-  tool. Which allows to compile package with godog runner script in **go**
-  idiomatic way. It also supports all build environment options as usual.
-- **godog.Run** now returns an **int** exit status. It was not returning
-  anything before, so there is no compatibility breaks.
+- Added initial CircleCI config. ([jaysonesmith])
 
-**2016-03-04**
-- added **junit** compatible output formatter, which prints **xml**
-  results to **os.Stdout**
-- fixed #14 which skipped printing background steps when there was
-  scenario outline in feature.
+### Changed
 
-**2015-07-03**
-- changed **godog.Suite** from interface to struct. Context registration should be updated accordingly. The reason
-for change: since it exports the same methods and there is no need to mock a function in tests, there is no
-obvious reason to keep an interface.
-- in order to support running suite concurrently, needed to refactor an entry point of application. The **Run** method
-now is a func of godog package which initializes and run the suite (or more suites). Method **New** is removed. This
-change made godog a little cleaner.
-- renamed **RegisterFormatter** func to **Format** to be more consistent.
+- Changed code references to DATA-DOG/godog to cucumber/godog to help get things building correctly. ([jaysonesmith])
 
+### Deprecated
+
+### Removed
+
+### Fixed
+
+<!-- Releases -->
+[Unreleased]: https://github.com/cucumber/cucumber/compare/godog/v0.8.0...master
+[0.8.0]:      https://github.com/cucumber/cucumber/compare/godog/v0.7.13...godog/v0.8.0
+
+<!-- Contributors -->
+[jaysonesmith]:     https://github.com/jaysonesmith
diff --git a/CHANGELOG_OLD.md b/CHANGELOG_OLD.md
new file mode 100644
index 0000000..0703379
--- /dev/null
+++ b/CHANGELOG_OLD.md
@@ -0,0 +1,113 @@
+# Change LOG
+
+**2020-02-06**
+- move to new [CHANGELOG.md](CHANGELOG.md)
+
+**2020-01-31**
+- change license to MIT and moving project repository to **cucumber**
+  organization.
+
+**2018-11-16**
+- added formatter output test suite, currently mainly pretty format
+  tested.
+- these tests, helped to identify some output format issues.
+
+**2018-11-12**
+- proper go module support added for `godog` command build.
+- added build tests.
+
+**2018-10-27**
+- support go1.11 new compiler and linker changes for **godog** command.
+- support go1.11 modules and `go mod` builds.
+- `BindFlags` now has a prefix option for flags, so that `go test` command
+  can avoid flag name collisions.
+- `BindFlags` respect default options provided for binding, so that it
+  does not override predefined options when flags are bind, see #144.
+- Minor patch to support tag filters on example tables for
+  ScenarioOutline.
+- Minor patch for pretty printer, when scenario has no steps, comment
+  possition computation was in panic.
+
+**2018-03-04**
+- support go1.10 new compiler and linker changes for **godog** command.
+
+**2017-08-31**
+- added **BeforeFeature** and **AfterFeature** hooks.
+- failed multistep error is now prepended with a parent step text in order
+  to determine failed nested step.
+- pretty format now removes the step definition location package name in
+  comment next to step if the step definition matches tested package. If
+  step definition is imported from other package, full package name will
+  be printed.
+
+**2017-05-04**
+- added **--strict** option in order to fail suite when there are pending
+  or undefined steps. By default, suite passes and treats pending or
+  undefined steps as TODOs.
+
+**2017-04-29** - **v0.7.0**
+- added support for nested steps. From now on, it is possible to return
+  **godog.Steps** instead of an **error** in the step definition func.
+  This change introduced few minor changes in **Formatter** interface. Be
+  sure to adapt the changes if you have custom formatters.
+
+**2017-04-27**
+- added an option to randomize scenario execution order, so we could
+  ensure that scenarios do not depend on global state.
+- godog was manually sorting feature files by name. Now it just runs them
+  in given order, you may sort them anyway you like. For example `godog
+  $(find . -name '*.feature' | sort)`
+
+**2016-10-30** - **v0.6.0**
+- added experimental **events** format, this might be used for unified
+  cucumber formats. But should be not adapted widely, since it is highly
+  possible that specification will change.
+- added **RunWithOptions** method which allows to easily run godog from
+  **TestMain** without needing to simulate flag arguments. These options
+  now allows to configure output writer.
+- added flag **-o, --output=runner.binary** which only compiles the test
+  runner executable, but does not execute it.
+- **FlagSet** initialization now takes io.Writer as output for help text
+  output. It was not showing nice colors on windows before.
+  **--no-colors** option only applies to test run output.
+
+**2016-06-14** - **v0.5.0**
+- godog now uses **go tool compile** and **go tool link** to support
+  vendor directory dependencies. It also compiles test executable the same
+  way as standard **go test** utility. With this change, only go
+  versions from **1.5** are now supported.
+
+**2016-06-01**
+- parse flags in main command, to show version and help without needing
+  to compile test package and buildable go sources.
+
+**2016-05-28**
+- show nicely formatted called step func name and file path
+
+**2016-05-26**
+- pack gherkin dependency in a subpackage to prevent compatibility
+  conflicts in the future. If recently upgraded, probably you will need to
+  reference gherkin as `github.com/DATA-DOG/godog/gherkin` instead.
+
+**2016-05-25**
+- refactored test suite build tooling in order to use standard **go test**
+  tool. Which allows to compile package with godog runner script in **go**
+  idiomatic way. It also supports all build environment options as usual.
+- **godog.Run** now returns an **int** exit status. It was not returning
+  anything before, so there is no compatibility breaks.
+
+**2016-03-04**
+- added **junit** compatible output formatter, which prints **xml**
+  results to **os.Stdout**
+- fixed #14 which skipped printing background steps when there was
+  scenario outline in feature.
+
+**2015-07-03**
+- changed **godog.Suite** from interface to struct. Context registration should be updated accordingly. The reason
+for change: since it exports the same methods and there is no need to mock a function in tests, there is no
+obvious reason to keep an interface.
+- in order to support running suite concurrently, needed to refactor an entry point of application. The **Run** method
+now is a func of godog package which initializes and run the suite (or more suites). Method **New** is removed. This
+change made godog a little cleaner.
+- renamed **RegisterFormatter** func to **Format** to be more consistent.
+
diff --git a/Makefile b/Makefile
index 9ceeaee..1d19223 100644
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,8 @@ test:
 	@echo "running all tests"
 	@go install ./...
 	@go fmt ./...
-	@golint github.com/DATA-DOG/godog
-	@golint github.com/DATA-DOG/godog/cmd/godog
+	@golint github.com/cucumber/godog
+	@golint github.com/cucumber/godog/cmd/godog
 	go vet ./...
 	go test -race
 	godog -f progress -c 4
@@ -23,7 +23,7 @@ bump:
 	@if [ -z "$(VERSION)" ]; then echo "Provide version like: 'VERSION=$(VERS) make bump'"; exit 1; fi
 	@echo "bumping version from: $(VERS) to $(VERSION)"
 	@sed -i.bak 's/$(VERS)/$(VERSION)/g' godog.go
-	@sed -i.bak 's/$(VERS)/$(VERSION)/g' examples/api/version.feature
+	@sed -i.bak 's/$(VERS)/$(VERSION)/g' examples/api/features/version.feature
 	@find . -name '*.bak' | xargs rm
 
 cover:
diff --git a/README.md b/README.md
index ed16c2f..1e98d7b 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/DATA-DOG/godog.svg?branch=master)](https://travis-ci.org/DATA-DOG/godog)
+[![CircleCI](https://circleci.com/gh/cucumber/godog/tree/master.svg?style=svg)](https://circleci.com/gh/cucumber/godog/tree/master)
 [![GoDoc](https://godoc.org/github.com/DATA-DOG/godog?status.svg)](https://godoc.org/github.com/DATA-DOG/godog)
 [![codecov.io](https://codecov.io/github/DATA-DOG/godog/branch/master/graph/badge.svg)](https://codecov.io/github/DATA-DOG/godog)
 
diff --git a/ast_test.go b/ast_test.go
index d14bc79..799ce78 100644
--- a/ast_test.go
+++ b/ast_test.go
@@ -9,7 +9,7 @@ import (
 var astContextSrc = `package main
 
 import (
-	"github.com/DATA-DOG/godog"
+	"github.com/cucumber/godog"
 )
 
 func MyContext(s *godog.Suite) {
@@ -18,7 +18,7 @@ func MyContext(s *godog.Suite) {
 var astTwoContextSrc = `package lib
 
 import (
-	"github.com/DATA-DOG/godog"
+	"github.com/cucumber/godog"
 )
 
 func ApiContext(s *godog.Suite) {
diff --git a/builder.go b/builder.go
index 4281f50..7663521 100644
--- a/builder.go
+++ b/builder.go
@@ -26,11 +26,11 @@ var gopaths = filepath.SplitList(build.Default.GOPATH)
 var goarch = build.Default.GOARCH
 var goos = build.Default.GOOS
 
-var godogImportPath = "github.com/DATA-DOG/godog"
+var godogImportPath = "github.com/cucumber/godog"
 var runnerTemplate = template.Must(template.New("testmain").Parse(`package main
 
 import (
-	"github.com/DATA-DOG/godog"
+	"github.com/cucumber/godog"
 	{{if .Contexts}}_test "{{.ImportPath}}"{{end}}
 	"os"
 )
diff --git a/builder_go110.go b/builder_go110.go
index 7bb63ad..cf8f0cb 100644
--- a/builder_go110.go
+++ b/builder_go110.go
@@ -25,13 +25,13 @@ var (
 	compiler        = filepath.Join(tooldir, "compile")
 	linker          = filepath.Join(tooldir, "link")
 	gopaths         = filepath.SplitList(build.Default.GOPATH)
-	godogImportPath = "github.com/DATA-DOG/godog"
+	godogImportPath = "github.com/cucumber/godog"
 
 	// godep
 	runnerTemplate = template.Must(template.New("testmain").Parse(`package main
 
 import (
-	"github.com/DATA-DOG/godog"
+	"github.com/cucumber/godog"
 	{{if .Contexts}}_test "{{.ImportPath}}"{{end}}
 	{{if .XContexts}}_xtest "{{.ImportPath}}_test"{{end}}
 	{{if .XContexts}}"testing/internal/testdeps"{{end}}
@@ -60,7 +60,7 @@ func main() {
 	// temp file for import
 	tempFileTemplate = template.Must(template.New("temp").Parse(`package {{.Name}}
 
-import "github.com/DATA-DOG/godog"
+import "github.com/cucumber/godog"
 
 var _ = godog.Version
 `))
diff --git a/builder_go111_test.go b/builder_go111_test.go
index af73124..cf5d21e 100644
--- a/builder_go111_test.go
+++ b/builder_go111_test.go
@@ -36,7 +36,7 @@ func TestGodogBuildWithModuleOutsideGopathAndHavingOnlyFeature(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if out, err := exec.Command("go", "mod", "edit", "-require", "github.com/DATA-DOG/godog@v0.7.12").CombinedOutput(); err != nil {
+	if out, err := exec.Command("go", "mod", "edit", "-require", "github.com/cucumber/godog@v0.7.12").CombinedOutput(); err != nil {
 		t.Log(string(out))
 		t.Fatal(err)
 	}
diff --git a/builder_test.go b/builder_test.go
index 46a9abd..327b502 100644
--- a/builder_test.go
+++ b/builder_test.go
@@ -27,7 +27,7 @@ var builderTestFile = `package godogs
 import (
 	"fmt"
 
-	"github.com/DATA-DOG/godog"
+	"github.com/cucumber/godog"
 )
 
 func thereAreGodogs(available int) error {
@@ -66,7 +66,7 @@ var builderXTestFile = `package godogs_test
 import (
 	"fmt"
 
-	"github.com/DATA-DOG/godog"
+	"github.com/cucumber/godog"
 	"godogs"
 )
 
@@ -275,7 +275,7 @@ func TestGodogBuildWithinGopath(t *testing.T) {
 	}
 	defer os.RemoveAll(gopath)
 
-	pkg := filepath.Join(gopath, "src", "github.com", "DATA-DOG")
+	pkg := filepath.Join(gopath, "src", "github.com", "cucumber")
 	if err := os.MkdirAll(pkg, 0755); err != nil {
 		t.Fatal(err)
 	}
@@ -325,7 +325,7 @@ func TestGodogBuildWithVendoredGodogAndMod(t *testing.T) {
 	}
 	defer os.RemoveAll(gopath)
 
-	pkg := filepath.Join(dir, "vendor", "github.com", "DATA-DOG")
+	pkg := filepath.Join(dir, "vendor", "github.com", "cucumber")
 	if err := os.MkdirAll(pkg, 0755); err != nil {
 		t.Fatal(err)
 	}
@@ -371,7 +371,7 @@ func TestGodogBuildWithVendoredGodogWithoutModule(t *testing.T) {
 	}
 	defer os.RemoveAll(gopath)
 
-	pkg := filepath.Join(dir, "vendor", "github.com", "DATA-DOG")
+	pkg := filepath.Join(dir, "vendor", "github.com", "cucumber")
 	if err := os.MkdirAll(pkg, 0755); err != nil {
 		t.Fatal(err)
 	}
diff --git a/cmd/godog/main.go b/cmd/godog/main.go
index 2ac6adc..f5fce7c 100644
--- a/cmd/godog/main.go
+++ b/cmd/godog/main.go
@@ -8,8 +8,8 @@ import (
 	"path/filepath"
 	"syscall"
 
-	"github.com/DATA-DOG/godog"
-	"github.com/DATA-DOG/godog/colors"
+	"github.com/cucumber/godog"
+	"github.com/cucumber/godog/colors"
 )
 
 var parsedStatus int
diff --git a/color_tag_test.go b/color_tag_test.go
index 862c82b..18d6e71 100644
--- a/color_tag_test.go
+++ b/color_tag_test.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/DATA-DOG/godog/colors"
+	"github.com/cucumber/godog/colors"
 )
 
 type csiState int
diff --git a/examples/api/api.go b/examples/api/api.go
index 0383767..9e5ee3b 100644
--- a/examples/api/api.go
+++ b/examples/api/api.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/DATA-DOG/godog"
+	"github.com/cucumber/godog"
 )
 
 func getVersion(w http.ResponseWriter, r *http.Request) {
diff --git a/examples/api/api_test.go b/examples/api/api_test.go
index 11a3b38..4a24813 100644
--- a/examples/api/api_test.go
+++ b/examples/api/api_test.go
@@ -7,8 +7,8 @@ import (
 	"net/http/httptest"
 	"reflect"
 
-	"github.com/DATA-DOG/godog"
-	"github.com/DATA-DOG/godog/gherkin"
+	"github.com/cucumber/godog"
+	"github.com/cucumber/godog/gherkin"
 )
 
 type apiFeature struct {
diff --git a/examples/db/api_test.go b/examples/db/api_test.go
index 77e45aa..3e980ca 100644
--- a/examples/db/api_test.go
+++ b/examples/db/api_test.go
@@ -10,8 +10,8 @@ import (
 	"strings"
 
 	txdb "github.com/DATA-DOG/go-txdb"
-	"github.com/DATA-DOG/godog"
-	"github.com/DATA-DOG/godog/gherkin"
+	"github.com/cucumber/godog"
+	"github.com/cucumber/godog/gherkin"
 )
 
 func init() {
diff --git a/examples/godogs/godogs_test.go b/examples/godogs/godogs_test.go
index dc7eebe..44d2aa3 100644
--- a/examples/godogs/godogs_test.go
+++ b/examples/godogs/godogs_test.go
@@ -7,8 +7,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/DATA-DOG/godog"
-	"github.com/DATA-DOG/godog/colors"
+	"github.com/cucumber/godog"
+	"github.com/cucumber/godog/colors"
 )
 
 var opt = godog.Options{Output: colors.Colored(os.Stdout)}
diff --git a/flags.go b/flags.go
index d31dee5..88aa9da 100644
--- a/flags.go
+++ b/flags.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/DATA-DOG/godog/colors"
+	"github.com/cucumber/godog/colors"
 )
 
 var descFeaturesArgument = "Optional feature(s) to run. Can be:\n" +
diff --git a/flags_test.go b/flags_test.go
index 0087b2c..8520d27 100644
--- a/flags_test.go
+++ b/flags_test.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/DATA-DOG/godog/colors"
+	"github.com/cucumber/godog/colors"
 )
 
 func TestFlagsShouldRandomizeAndGenerateSeed(t *testing.T) {
diff --git a/fmt.go b/fmt.go
index 3799309..367de8b 100644
--- a/fmt.go
+++ b/fmt.go
@@ -13,8 +13,8 @@ import (
 	"time"
 	"unicode"
 
-	"github.com/DATA-DOG/godog/colors"
-	"github.com/DATA-DOG/godog/gherkin"
+	"github.com/cucumber/godog/colors"
+	"github.com/cucumber/godog/gherkin"
 )
 
 // some snippet formatting regexps
diff --git a/fmt_cucumber.go b/fmt_cucumber.go
index f67b883..86c43fa 100644
--- a/fmt_cucumber.go
+++ b/fmt_cucumber.go
@@ -19,7 +19,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/DATA-DOG/godog/gherkin"
+	"github.com/cucumber/godog/gherkin"
 )
 
 func init() {
diff --git a/fmt_events.go b/fmt_events.go
index 17e92ff..1bd4744 100644
--- a/fmt_events.go
+++ b/fmt_events.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/DATA-DOG/godog/gherkin"
+	"github.com/cucumber/godog/gherkin"
 )
 
 const nanoSec = 1000000
diff --git a/fmt_junit.go b/fmt_junit.go
index 091c440..2014889 100644
--- a/fmt_junit.go
+++ b/fmt_junit.go
@@ -9,7 +9,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/DATA-DOG/godog/gherkin"
+	"github.com/cucumber/godog/gherkin"
 )
 
 func init() {
diff --git a/fmt_junit_test.go b/fmt_junit_test.go
index 36f6257..3066980 100644
--- a/fmt_junit_test.go
+++ b/fmt_junit_test.go
@@ -9,8 +9,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/DATA-DOG/godog/colors"
-	"github.com/DATA-DOG/godog/gherkin"
+	"github.com/cucumber/godog/colors"
+	"github.com/cucumber/godog/gherkin"
 )
 
 var sampleGherkinFeature = `
diff --git a/fmt_pretty.go b/fmt_pretty.go
index 0ae2446..e0f240f 100644
--- a/fmt_pretty.go
+++ b/fmt_pretty.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 	"unicode/utf8"
 
-	"github.com/DATA-DOG/godog/colors"
-	"github.com/DATA-DOG/godog/gherkin"
+	"github.com/cucumber/godog/colors"
+	"github.com/cucumber/godog/gherkin"
 )
 
 func init() {
diff --git a/fmt_progress.go b/fmt_progress.go
index bca5d75..9f66301 100644
--- a/fmt_progress.go
+++ b/fmt_progress.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/DATA-DOG/godog/gherkin"
+	"github.com/cucumber/godog/gherkin"
 )
 
 func init() {
diff --git a/fmt_progress_test.go b/fmt_progress_test.go
index 3e696a4..e148788 100644
--- a/fmt_progress_test.go
+++ b/fmt_progress_test.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/DATA-DOG/godog/colors"
-	"github.com/DATA-DOG/godog/gherkin"
+	"github.com/cucumber/godog/colors"
+	"github.com/cucumber/godog/gherkin"
 )
 
 func TestProgressFormatterOutput(t *testing.T) {
diff --git a/formatters_print_test.go b/formatters_print_test.go
index 0f245d3..baad19c 100644
--- a/formatters_print_test.go
+++ b/formatters_print_test.go
@@ -30,7 +30,7 @@ func TestPrintingFormatters(t *testing.T) {
 	suite.Step(`^odd (\d+) and even (\d+) number$`, oddEvenStepDef)
 
 	pkg := os.Getenv("GODOG_TESTED_PACKAGE")
-	os.Setenv("GODOG_TESTED_PACKAGE", "github.com/DATA-DOG/godog")
+	os.Setenv("GODOG_TESTED_PACKAGE", "github.com/cucumber/godog")
 	for _, feat := range features {
 		for name := range AvailableFormatters() {
 			expectOutputPath := strings.Replace(feat.Path, "features", name, 1)
diff --git a/gherkin.go b/gherkin.go
index 6a4e804..c2a8185 100644
--- a/gherkin.go
+++ b/gherkin.go
@@ -1,6 +1,6 @@
 package godog
 
-import "github.com/DATA-DOG/godog/gherkin"
+import "github.com/cucumber/godog/gherkin"
 
 // examples is a helper func to cast gherkin.Examples
 // or gherkin.BaseExamples if its empty
diff --git a/go.mod b/go.mod
index 9f6d438..73489c3 100644
--- a/go.mod
+++ b/go.mod
@@ -1,9 +1,8 @@
-module github.com/DATA-DOG/godog
+module github.com/cucumber/godog
 
-go 1.12
+go 1.13
 
 require (
 	github.com/DATA-DOG/go-txdb v0.1.3
 	github.com/go-sql-driver/mysql v1.5.0
-	github.com/lib/pq v1.3.0 // indirect
 )
diff --git a/go.sum b/go.sum
index feea547..39f69df 100644
--- a/go.sum
+++ b/go.sum
@@ -1,3 +1,4 @@
+github.com/DATA-DOG/go-txdb v0.1.3 h1:R4v6OuOcy2O147e2zHxU0B4NDtF+INb5R9q/CV7AEMg=
 github.com/DATA-DOG/go-txdb v0.1.3/go.mod h1:DhAhxMXZpUJVGnT+p9IbzJoRKvlArO2pkHjnGX7o0n0=
+github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
-github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
diff --git a/godog.go b/godog.go
index dcaf0d2..e367a82 100644
--- a/godog.go
+++ b/godog.go
@@ -39,4 +39,4 @@ Godog was inspired by Behat and Cucumber the above description is taken from it'
 package godog
 
 // Version of package - based on Semantic Versioning 2.0.0 http://semver.org/
-const Version = "v0.7.14"
+const Version = "v0.8.0"
diff --git a/run.go b/run.go
index 1c5682a..e4c0f84 100644
--- a/run.go
+++ b/run.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/DATA-DOG/godog/colors"
+	"github.com/cucumber/godog/colors"
 )
 
 const (
diff --git a/run_test.go b/run_test.go
index 62ad6e7..de2207e 100644
--- a/run_test.go
+++ b/run_test.go
@@ -10,8 +10,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/DATA-DOG/godog/colors"
-	"github.com/DATA-DOG/godog/gherkin"
+	"github.com/cucumber/godog/colors"
+	"github.com/cucumber/godog/gherkin"
 )
 
 func okStep() error {
diff --git a/stepdef.go b/stepdef.go
index 952c954..1361d11 100644
--- a/stepdef.go
+++ b/stepdef.go
@@ -10,7 +10,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/DATA-DOG/godog/gherkin"
+	"github.com/cucumber/godog/gherkin"
 )
 
 var matchFuncDefRef = regexp.MustCompile(`\(([^\)]+)\)`)
diff --git a/stepdef_test.go b/stepdef_test.go
index 59ab016..6e92a90 100644
--- a/stepdef_test.go
+++ b/stepdef_test.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/DATA-DOG/godog/gherkin"
+	"github.com/cucumber/godog/gherkin"
 )
 
 func TestShouldSupportIntTypes(t *testing.T) {
diff --git a/suite.go b/suite.go
index 1950b7d..5b9a2c9 100644
--- a/suite.go
+++ b/suite.go
@@ -15,7 +15,7 @@ import (
 	"time"
 	"unicode/utf8"
 
-	"github.com/DATA-DOG/godog/gherkin"
+	"github.com/cucumber/godog/gherkin"
 )
 
 var errorInterface = reflect.TypeOf((*error)(nil)).Elem()
diff --git a/suite_context.go b/suite_context.go
index 35470f4..a771168 100644
--- a/suite_context.go
+++ b/suite_context.go
@@ -11,7 +11,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/DATA-DOG/godog/gherkin"
+	"github.com/cucumber/godog/gherkin"
 )
 
 // SuiteContext provides steps for godog suite execution and
diff --git a/utils.go b/utils.go
index 1b5b3a5..5dd53bb 100644
--- a/utils.go
+++ b/utils.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/DATA-DOG/godog/colors"
+	"github.com/cucumber/godog/colors"
 )
 
 var (