diff --git a/README.md b/README.md
index 3cb60e6..c303978 100644
--- a/README.md
+++ b/README.md
@@ -4,15 +4,15 @@
 [![codecov](https://codecov.io/gh/go-jet/jet/branch/master/graph/badge.svg)](https://codecov.io/gh/go-jet/jet)
 [![Go Report Card](https://goreportcard.com/badge/github.com/go-jet/jet)](https://goreportcard.com/report/github.com/go-jet/jet)
 [![Documentation](https://godoc.org/github.com/go-jet/jet?status.svg)](http://godoc.org/github.com/go-jet/jet)
-[![GitHub release](https://img.shields.io/github/release/go-jet/jet.svg)](https://github.com/go-jet/jet/releases)
+[![GitHub release](https://img.shields.io/github/release/go-jet/jet.svg)](https://github.com/go-jet/jet/v2/releases)
 [![Gitter](https://badges.gitter.im/go-jet/community.svg)](https://gitter.im/go-jet/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
-Jet is a framework for writing type-safe SQL queries in Go, with ability to easily 
-convert database query result into desired arbitrary object structure.  
+Jet is a complete solution for interacting with database from Go, which includes type-safe SQL builder with a code generation and automatic query result
+data mapping.  
 Jet currently supports `PostgreSQL`, `MySQL` and `MariaDB`. Future releases will add support for additional databases.
 
 ![jet](https://github.com/go-jet/jet/wiki/image/jet.png)  
-Jet is the easiest and the fastest way to write complex SQL queries and map database query result 
+Jet is the easiest and the fastest way to write complex type-safe SQL queries as a Go code and map database query result 
 into complex object composition. __It is not an ORM.__ 
 
 ## Motivation
@@ -58,11 +58,17 @@ https://medium.com/@go.jet/jet-5f3667efa0cc
 
 To install Jet package, you need to install Go and set your Go workspace first.
 
-[Go](https://golang.org/) **version 1.8+ is required**
+[Go](https://golang.org/) **version 1.9+ is required**
 
 ### Installation
 
-Use the bellow command to install jet
+Use the bellow command to add jet as a dependency into `go.mod` project:
+```sh
+$ go get github.com/go-jet/jet/v2
+```
+
+Use the bellow command to add jet as a dependency into `GOPATH` project:
+
 ```sh
 $ go get -u github.com/go-jet/jet
 ```
@@ -70,10 +76,10 @@ $ go get -u github.com/go-jet/jet
 Install jet generator to GOPATH bin folder. This will allow generating jet files from the command line.
 
 ```sh
-go install github.com/go-jet/jet/cmd/jet
+cd $GOPATH/src/ && GO111MODULE=off go get -u github.com/go-jet/jet/cmd/jet
 ```
 
-Make sure GOPATH bin folder is added to the PATH environment variable.
+*Make sure GOPATH bin folder is added to the PATH environment variable.*
 
 ### Quick Start
 For this quick start example we will use PostgreSQL sample _'dvd rental'_ database. Full database dump can be found in [./tests/testdata/init/postgres/dvds.sql](./tests/testdata/init/postgres/dvds.sql).
@@ -85,7 +91,7 @@ connection parameters and root destination folder path for generated files.\
 Assuming we are running local postgres database, with user `jetuser`, user password `jetpass`, database `jetdb` and 
 schema `dvds` we will use this command:
 ```sh
-jet -source=PostgreSQL -host=localhost -port=5432 -user=jetuser -password=jetpass -dbname=jetdb -schema=dvds -path=./gen
+jet -source=PostgreSQL -host=localhost -port=5432 -user=jetuser -password=jetpass -dbname=jetdb -schema=dvds -path=./.gen
 ```
 ```sh
 Connecting to postgres database: host=localhost port=5432 user=jetuser password=jetpass dbname=jetdb sslmode=disable 
@@ -144,10 +150,10 @@ First we need to import jet and generated files from previous step:
 import (
 	// dot import so go code would resemble as much as native SQL
 	// dot import is not mandatory
-	. "github.com/go-jet/jet/examples/quick-start/.gen/jetdb/dvds/table"
-	. "github.com/go-jet/jet/postgres"
+	. "github.com/go-jet/jet/v2/examples/quick-start/.gen/jetdb/dvds/table"
+	. "github.com/go-jet/jet/v2/postgres"
 
-	"github.com/go-jet/jet/examples/quick-start/gen/jetdb/dvds/model"
+	"github.com/go-jet/jet/v2/examples/quick-start/gen/jetdb/dvds/model"
 )
 ```
 Lets say we want to retrieve the list of all _actors_ that acted in _films_ longer than 180 minutes, _film language_ is 'English' 
diff --git a/cmd/jet/main.go b/cmd/jet/main.go
index 8016545..8e0a606 100644
--- a/cmd/jet/main.go
+++ b/cmd/jet/main.go
@@ -3,10 +3,10 @@ package main
 import (
 	"flag"
 	"fmt"
-	mysqlgen "github.com/go-jet/jet/generator/mysql"
-	postgresgen "github.com/go-jet/jet/generator/postgres"
-	"github.com/go-jet/jet/mysql"
-	"github.com/go-jet/jet/postgres"
+	mysqlgen "github.com/go-jet/jet/v2/generator/mysql"
+	postgresgen "github.com/go-jet/jet/v2/generator/postgres"
+	"github.com/go-jet/jet/v2/mysql"
+	"github.com/go-jet/jet/v2/postgres"
 	_ "github.com/go-sql-driver/mysql"
 	_ "github.com/lib/pq"
 	"os"
diff --git a/doc.go b/doc.go
index daecbc5..f27c7d8 100644
--- a/doc.go
+++ b/doc.go
@@ -6,13 +6,16 @@ result into desired arbitrary object structure.
 Installation
 
 
-Use the bellow command to install jet
+Use the bellow command to add jet as a dependency into go.mod project:
+	$ go get github.com/go-jet/jet/v2
+
+Use the bellow command to add jet as a dependency into GOPATH project:
 	$ go get -u github.com/go-jet/jet
 
 Install jet generator to GOPATH bin folder. This will allow generating jet files from the command line.
-	go install github.com/go-jet/jet/cmd/jet
+	cd $GOPATH/src/ && GO111MODULE=off go get -u github.com/go-jet/jet/cmd/jet
 
-*Make sure GOPATH bin folder is added to the PATH environment variable.
+Make sure GOPATH bin folder is added to the PATH environment variable.
 
 Usage
 
@@ -26,10 +29,10 @@ Then next step is to import generated SQL Builder and Model files and write SQL
 	import "some_path/.gen/jetdb/dvds/model"
 
 To write SQL queries for PostgreSQL import:
-	. "github.com/go-jet/jet/postgres"
+	. "github.com/go-jet/jet/v2/postgres"
 
 To write SQL queries for MySQL and MariaDB import:
-	. "github.com/go-jet/jet/mysql"
+	. "github.com/go-jet/jet/v2/mysql"
 *Dot import is used so that Go code resemble as much as native SQL. Dot import is not mandatory.
 
 Write SQL:
diff --git a/examples/quick-start/.gen/jetdb/dvds/enum/mpaa_rating.go b/examples/quick-start/.gen/jetdb/dvds/enum/mpaa_rating.go
index 60cb23b..f2c7731 100644
--- a/examples/quick-start/.gen/jetdb/dvds/enum/mpaa_rating.go
+++ b/examples/quick-start/.gen/jetdb/dvds/enum/mpaa_rating.go
@@ -7,7 +7,7 @@
 
 package enum
 
-import "github.com/go-jet/jet/postgres"
+import "github.com/go-jet/jet/v2/postgres"
 
 var MpaaRating = &struct {
 	G    postgres.StringExpression
diff --git a/examples/quick-start/.gen/jetdb/dvds/table/actor.go b/examples/quick-start/.gen/jetdb/dvds/table/actor.go
index 4332015..376d73e 100644
--- a/examples/quick-start/.gen/jetdb/dvds/table/actor.go
+++ b/examples/quick-start/.gen/jetdb/dvds/table/actor.go
@@ -8,7 +8,7 @@
 package table
 
 import (
-	"github.com/go-jet/jet/postgres"
+	"github.com/go-jet/jet/v2/postgres"
 )
 
 var Actor = newActorTable()
diff --git a/examples/quick-start/.gen/jetdb/dvds/table/category.go b/examples/quick-start/.gen/jetdb/dvds/table/category.go
index 6b34fdf..ac2caac 100644
--- a/examples/quick-start/.gen/jetdb/dvds/table/category.go
+++ b/examples/quick-start/.gen/jetdb/dvds/table/category.go
@@ -8,7 +8,7 @@
 package table
 
 import (
-	"github.com/go-jet/jet/postgres"
+	"github.com/go-jet/jet/v2/postgres"
 )
 
 var Category = newCategoryTable()
diff --git a/examples/quick-start/.gen/jetdb/dvds/table/film.go b/examples/quick-start/.gen/jetdb/dvds/table/film.go
index 3550465..2f8c68e 100644
--- a/examples/quick-start/.gen/jetdb/dvds/table/film.go
+++ b/examples/quick-start/.gen/jetdb/dvds/table/film.go
@@ -8,7 +8,7 @@
 package table
 
 import (
-	"github.com/go-jet/jet/postgres"
+	"github.com/go-jet/jet/v2/postgres"
 )
 
 var Film = newFilmTable()
diff --git a/examples/quick-start/.gen/jetdb/dvds/table/film_actor.go b/examples/quick-start/.gen/jetdb/dvds/table/film_actor.go
index 89622ec..1f6bb57 100644
--- a/examples/quick-start/.gen/jetdb/dvds/table/film_actor.go
+++ b/examples/quick-start/.gen/jetdb/dvds/table/film_actor.go
@@ -8,7 +8,7 @@
 package table
 
 import (
-	"github.com/go-jet/jet/postgres"
+	"github.com/go-jet/jet/v2/postgres"
 )
 
 var FilmActor = newFilmActorTable()
diff --git a/examples/quick-start/.gen/jetdb/dvds/table/film_category.go b/examples/quick-start/.gen/jetdb/dvds/table/film_category.go
index eb932c4..41fa6f3 100644
--- a/examples/quick-start/.gen/jetdb/dvds/table/film_category.go
+++ b/examples/quick-start/.gen/jetdb/dvds/table/film_category.go
@@ -8,7 +8,7 @@
 package table
 
 import (
-	"github.com/go-jet/jet/postgres"
+	"github.com/go-jet/jet/v2/postgres"
 )
 
 var FilmCategory = newFilmCategoryTable()
diff --git a/examples/quick-start/.gen/jetdb/dvds/table/language.go b/examples/quick-start/.gen/jetdb/dvds/table/language.go
index c68a6ce..89470c2 100644
--- a/examples/quick-start/.gen/jetdb/dvds/table/language.go
+++ b/examples/quick-start/.gen/jetdb/dvds/table/language.go
@@ -8,7 +8,7 @@
 package table
 
 import (
-	"github.com/go-jet/jet/postgres"
+	"github.com/go-jet/jet/v2/postgres"
 )
 
 var Language = newLanguageTable()
diff --git a/examples/quick-start/.gen/jetdb/dvds/view/actor_info.go b/examples/quick-start/.gen/jetdb/dvds/view/actor_info.go
index 21e901a..65d2560 100644
--- a/examples/quick-start/.gen/jetdb/dvds/view/actor_info.go
+++ b/examples/quick-start/.gen/jetdb/dvds/view/actor_info.go
@@ -8,7 +8,7 @@
 package view
 
 import (
-	"github.com/go-jet/jet/postgres"
+	"github.com/go-jet/jet/v2/postgres"
 )
 
 var ActorInfo = newActorInfoTable()
diff --git a/examples/quick-start/.gen/jetdb/dvds/view/customer_list.go b/examples/quick-start/.gen/jetdb/dvds/view/customer_list.go
index 08b45d1..b4a2c8f 100644
--- a/examples/quick-start/.gen/jetdb/dvds/view/customer_list.go
+++ b/examples/quick-start/.gen/jetdb/dvds/view/customer_list.go
@@ -8,7 +8,7 @@
 package view
 
 import (
-	"github.com/go-jet/jet/postgres"
+	"github.com/go-jet/jet/v2/postgres"
 )
 
 var CustomerList = newCustomerListTable()
diff --git a/examples/quick-start/README.md b/examples/quick-start/README.md
index 2e5adc5..018aec8 100644
--- a/examples/quick-start/README.md
+++ b/examples/quick-start/README.md
@@ -9,4 +9,4 @@ Jet generated files of interest are in `./gen` folder.
 with a difference of redirecting json output to files(`dest.json` and `dest2.json`) rather then to a
 standard output.
 
-`./gen`, `dest.json` and `dest2.json` - added to git for presentation purposes.
+`./gen`, `dest.json` and `dest2.json` - added into git for presentation purposes.
diff --git a/examples/quick-start/quick-start.go b/examples/quick-start/quick-start.go
index 693edf7..ba5a0d8 100644
--- a/examples/quick-start/quick-start.go
+++ b/examples/quick-start/quick-start.go
@@ -9,10 +9,10 @@ import (
 
 	// dot import so that jet go code would resemble as much as native SQL
 	// dot import is not mandatory
-	. "github.com/go-jet/jet/examples/quick-start/.gen/jetdb/dvds/table"
-	. "github.com/go-jet/jet/postgres"
+	. "github.com/go-jet/jet/v2/examples/quick-start/.gen/jetdb/dvds/table"
+	. "github.com/go-jet/jet/v2/postgres"
 
-	"github.com/go-jet/jet/examples/quick-start/.gen/jetdb/dvds/model"
+	"github.com/go-jet/jet/v2/examples/quick-start/.gen/jetdb/dvds/model"
 )
 
 const (
diff --git a/generator/internal/metadata/column_meta_data.go b/generator/internal/metadata/column_meta_data.go
index 56ae54c..dceb7c0 100644
--- a/generator/internal/metadata/column_meta_data.go
+++ b/generator/internal/metadata/column_meta_data.go
@@ -3,7 +3,7 @@ package metadata
 import (
 	"database/sql"
 	"fmt"
-	"github.com/go-jet/jet/internal/utils"
+	"github.com/go-jet/jet/v2/internal/utils"
 	"strings"
 )
 
diff --git a/generator/internal/metadata/schema_meta_data.go b/generator/internal/metadata/schema_meta_data.go
index 836745b..bc85511 100644
--- a/generator/internal/metadata/schema_meta_data.go
+++ b/generator/internal/metadata/schema_meta_data.go
@@ -3,7 +3,7 @@ package metadata
 import (
 	"database/sql"
 	"fmt"
-	"github.com/go-jet/jet/internal/utils"
+	"github.com/go-jet/jet/v2/internal/utils"
 )
 
 // SchemaMetaData struct
diff --git a/generator/internal/metadata/table_meta_data.go b/generator/internal/metadata/table_meta_data.go
index bab1088..c106dd4 100644
--- a/generator/internal/metadata/table_meta_data.go
+++ b/generator/internal/metadata/table_meta_data.go
@@ -2,7 +2,7 @@ package metadata
 
 import (
 	"database/sql"
-	"github.com/go-jet/jet/internal/utils"
+	"github.com/go-jet/jet/v2/internal/utils"
 	"strings"
 )
 
diff --git a/generator/internal/template/generate.go b/generator/internal/template/generate.go
index eb52b1f..34e9ca1 100644
--- a/generator/internal/template/generate.go
+++ b/generator/internal/template/generate.go
@@ -3,9 +3,9 @@ package template
 import (
 	"bytes"
 	"fmt"
-	"github.com/go-jet/jet/generator/internal/metadata"
-	"github.com/go-jet/jet/internal/jet"
-	"github.com/go-jet/jet/internal/utils"
+	"github.com/go-jet/jet/v2/generator/internal/metadata"
+	"github.com/go-jet/jet/v2/internal/jet"
+	"github.com/go-jet/jet/v2/internal/utils"
 	"path/filepath"
 	"text/template"
 )
diff --git a/generator/internal/template/templates.go b/generator/internal/template/templates.go
index 7f432f1..56dba2c 100644
--- a/generator/internal/template/templates.go
+++ b/generator/internal/template/templates.go
@@ -20,7 +20,7 @@ var tableSQLBuilderTemplate = `
 package {{param "package"}}
 
 import (
-	"github.com/go-jet/jet/{{dialect.PackageName}}"
+	"github.com/go-jet/jet/v2/{{dialect.PackageName}}"
 )
 
 var {{ToGoIdentifier .Name}} = new{{.GoStructName}}()
@@ -77,7 +77,7 @@ var tablePostgreSQLBuilderTemplate = `
 package {{param "package"}}
 
 import (
-	"github.com/go-jet/jet/{{dialect.PackageName}}"
+	"github.com/go-jet/jet/v2/{{dialect.PackageName}}"
 )
 
 var {{ToGoIdentifier .Name}} = new{{.GoStructName}}()
@@ -158,7 +158,7 @@ type {{ToGoIdentifier .Name}} struct {
 `
 var enumSQLBuilderTemplate = `package enum
 
-import "github.com/go-jet/jet/{{dialect.PackageName}}"
+import "github.com/go-jet/jet/v2/{{dialect.PackageName}}"
 
 var {{ToGoIdentifier $.Name}} = &struct {
 {{- range $index, $element := .Values}}
diff --git a/generator/mysql/mysql_generator.go b/generator/mysql/mysql_generator.go
index 75405ea..7f5d99a 100644
--- a/generator/mysql/mysql_generator.go
+++ b/generator/mysql/mysql_generator.go
@@ -3,10 +3,10 @@ package mysql
 import (
 	"database/sql"
 	"fmt"
-	"github.com/go-jet/jet/generator/internal/metadata"
-	"github.com/go-jet/jet/generator/internal/template"
-	"github.com/go-jet/jet/internal/utils"
-	"github.com/go-jet/jet/mysql"
+	"github.com/go-jet/jet/v2/generator/internal/metadata"
+	"github.com/go-jet/jet/v2/generator/internal/template"
+	"github.com/go-jet/jet/v2/internal/utils"
+	"github.com/go-jet/jet/v2/mysql"
 	"path"
 )
 
diff --git a/generator/mysql/query_set.go b/generator/mysql/query_set.go
index a1ad8ec..1b4e2b2 100644
--- a/generator/mysql/query_set.go
+++ b/generator/mysql/query_set.go
@@ -2,8 +2,8 @@ package mysql
 
 import (
 	"database/sql"
-	"github.com/go-jet/jet/generator/internal/metadata"
-	"github.com/go-jet/jet/internal/utils"
+	"github.com/go-jet/jet/v2/generator/internal/metadata"
+	"github.com/go-jet/jet/v2/internal/utils"
 	"strings"
 )
 
diff --git a/generator/postgres/postgres_generator.go b/generator/postgres/postgres_generator.go
index 392a00b..970fd2d 100644
--- a/generator/postgres/postgres_generator.go
+++ b/generator/postgres/postgres_generator.go
@@ -3,10 +3,10 @@ package postgres
 import (
 	"database/sql"
 	"fmt"
-	"github.com/go-jet/jet/generator/internal/metadata"
-	"github.com/go-jet/jet/generator/internal/template"
-	"github.com/go-jet/jet/internal/utils"
-	"github.com/go-jet/jet/postgres"
+	"github.com/go-jet/jet/v2/generator/internal/metadata"
+	"github.com/go-jet/jet/v2/generator/internal/template"
+	"github.com/go-jet/jet/v2/internal/utils"
+	"github.com/go-jet/jet/v2/postgres"
 	"path"
 	"strconv"
 )
diff --git a/generator/postgres/query_set.go b/generator/postgres/query_set.go
index ce4a083..0fc8fdc 100644
--- a/generator/postgres/query_set.go
+++ b/generator/postgres/query_set.go
@@ -2,8 +2,8 @@ package postgres
 
 import (
 	"database/sql"
-	"github.com/go-jet/jet/generator/internal/metadata"
-	"github.com/go-jet/jet/internal/utils"
+	"github.com/go-jet/jet/v2/generator/internal/metadata"
+	"github.com/go-jet/jet/v2/internal/utils"
 )
 
 // postgresQuerySet is dialect query set for PostgreSQL
diff --git a/go.mod b/go.mod
new file mode 100644
index 0000000..665b9bd
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,12 @@
+module github.com/go-jet/jet/v2
+
+go 1.11
+
+require (
+	github.com/go-sql-driver/mysql v1.5.0
+	github.com/google/go-cmp v0.5.0
+	github.com/google/uuid v1.1.1
+	github.com/lib/pq v1.7.0
+	github.com/pkg/profile v1.5.0
+	github.com/stretchr/testify v1.6.1
+)
diff --git a/go.sum b/go.sum
new file mode 100644
index 0000000..9321721
--- /dev/null
+++ b/go.sum
@@ -0,0 +1,23 @@
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/go-jet/jet v1.0.0 h1:ENxUe/6lH82qLykIGAdZIlskZrpTeNfxjHz4VHtkVmA=
+github.com/go-jet/jet v2.3.0+incompatible h1:Yg7JSERDC0f9x3dHUBMA2cxe9/qC6qlozDDO/s38USU=
+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/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w=
+github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
+github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/lib/pq v1.7.0 h1:h93mCPfUSkaul3Ka/VG8uZdmW1uMHDGxzu0NWHuJmHY=
+github.com/lib/pq v1.7.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/pkg/profile v1.5.0 h1:042Buzk+NhDI+DeSAA62RwJL8VAuZUMQZUjCsRz1Mug=
+github.com/pkg/profile v1.5.0/go.mod h1:qBsxPvzyUincmltOk6iyRVxHYg4adc0OFOv72ZdLa18=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/internal/jet/clause.go b/internal/jet/clause.go
index 7b7e27b..8654547 100644
--- a/internal/jet/clause.go
+++ b/internal/jet/clause.go
@@ -1,7 +1,7 @@
 package jet
 
 import (
-	"github.com/go-jet/jet/internal/utils"
+	"github.com/go-jet/jet/v2/internal/utils"
 )
 
 // Clause interface
diff --git a/internal/jet/sql_builder.go b/internal/jet/sql_builder.go
index 546759b..bca078d 100644
--- a/internal/jet/sql_builder.go
+++ b/internal/jet/sql_builder.go
@@ -3,8 +3,8 @@ package jet
 import (
 	"bytes"
 	"fmt"
-	"github.com/go-jet/jet/internal/3rdparty/pq"
-	"github.com/go-jet/jet/internal/utils"
+	"github.com/go-jet/jet/v2/internal/3rdparty/pq"
+	"github.com/go-jet/jet/v2/internal/utils"
 	"github.com/google/uuid"
 	"reflect"
 	"strconv"
diff --git a/internal/jet/statement.go b/internal/jet/statement.go
index 23ae76c..6e87da8 100644
--- a/internal/jet/statement.go
+++ b/internal/jet/statement.go
@@ -3,7 +3,7 @@ package jet
 import (
 	"context"
 	"database/sql"
-	"github.com/go-jet/jet/qrm"
+	"github.com/go-jet/jet/v2/qrm"
 )
 
 //Statement is common interface for all statements(SELECT, INSERT, UPDATE, DELETE, LOCK)
diff --git a/internal/jet/table.go b/internal/jet/table.go
index ca76e3a..45d46e9 100644
--- a/internal/jet/table.go
+++ b/internal/jet/table.go
@@ -1,7 +1,7 @@
 package jet
 
 import (
-	"github.com/go-jet/jet/internal/utils"
+	"github.com/go-jet/jet/v2/internal/utils"
 )
 
 // SerializerTable interface
diff --git a/internal/jet/utils.go b/internal/jet/utils.go
index 2f301be..b2fff48 100644
--- a/internal/jet/utils.go
+++ b/internal/jet/utils.go
@@ -1,7 +1,7 @@
 package jet
 
 import (
-	"github.com/go-jet/jet/internal/utils"
+	"github.com/go-jet/jet/v2/internal/utils"
 	"reflect"
 )
 
diff --git a/internal/testutils/test_utils.go b/internal/testutils/test_utils.go
index e5d7a09..556ed6c 100644
--- a/internal/testutils/test_utils.go
+++ b/internal/testutils/test_utils.go
@@ -4,9 +4,9 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"github.com/go-jet/jet/internal/jet"
-	"github.com/go-jet/jet/internal/utils"
-	"github.com/go-jet/jet/qrm"
+	"github.com/go-jet/jet/v2/internal/jet"
+	"github.com/go-jet/jet/v2/internal/utils"
+	"github.com/go-jet/jet/v2/qrm"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
 	"io/ioutil"
@@ -40,8 +40,8 @@ func AssertExecErr(t *testing.T, stmt jet.Statement, db qrm.DB, errorStr string)
 }
 
 func getFullPath(relativePath string) string {
-	goPath := os.Getenv("GOPATH")
-	return filepath.Join(goPath, "src/github.com/go-jet/jet/tests", relativePath)
+	path, _ := os.Getwd()
+	return filepath.Join(path, "../", relativePath)
 }
 
 // PrintJson print v as json
diff --git a/internal/testutils/time_utils.go b/internal/testutils/time_utils.go
index 5c62802..2bf6653 100644
--- a/internal/testutils/time_utils.go
+++ b/internal/testutils/time_utils.go
@@ -1,7 +1,7 @@
 package testutils
 
 import (
-	"github.com/go-jet/jet/internal/utils"
+	"github.com/go-jet/jet/v2/internal/utils"
 	"strings"
 	"time"
 )
diff --git a/internal/utils/utils.go b/internal/utils/utils.go
index e346775..55005b4 100644
--- a/internal/utils/utils.go
+++ b/internal/utils/utils.go
@@ -3,7 +3,7 @@ package utils
 import (
 	"database/sql"
 	"fmt"
-	"github.com/go-jet/jet/internal/3rdparty/snaker"
+	"github.com/go-jet/jet/v2/internal/3rdparty/snaker"
 	"go/format"
 	"os"
 	"path/filepath"
diff --git a/mysql/cast.go b/mysql/cast.go
index ae3c58f..5a3e481 100644
--- a/mysql/cast.go
+++ b/mysql/cast.go
@@ -1,7 +1,7 @@
 package mysql
 
 import (
-	"github.com/go-jet/jet/internal/jet"
+	"github.com/go-jet/jet/v2/internal/jet"
 	"strconv"
 )
 
diff --git a/mysql/columns.go b/mysql/columns.go
index c6a60b3..3f08396 100644
--- a/mysql/columns.go
+++ b/mysql/columns.go
@@ -1,6 +1,6 @@
 package mysql
 
-import "github.com/go-jet/jet/internal/jet"
+import "github.com/go-jet/jet/v2/internal/jet"
 
 // Column is common column interface for all types of columns.
 type Column = jet.ColumnExpression
diff --git a/mysql/delete_statement.go b/mysql/delete_statement.go
index 4242813..5857e16 100644
--- a/mysql/delete_statement.go
+++ b/mysql/delete_statement.go
@@ -1,6 +1,6 @@
 package mysql
 
-import "github.com/go-jet/jet/internal/jet"
+import "github.com/go-jet/jet/v2/internal/jet"
 
 // DeleteStatement is interface for MySQL DELETE statement
 type DeleteStatement interface {
diff --git a/mysql/dialect.go b/mysql/dialect.go
index 55862f9..24b8755 100644
--- a/mysql/dialect.go
+++ b/mysql/dialect.go
@@ -1,7 +1,7 @@
 package mysql
 
 import (
-	"github.com/go-jet/jet/internal/jet"
+	"github.com/go-jet/jet/v2/internal/jet"
 )
 
 // Dialect is implementation of MySQL dialect for SQL Builder serialisation.
diff --git a/mysql/expressions.go b/mysql/expressions.go
index 6d9cea7..2292108 100644
--- a/mysql/expressions.go
+++ b/mysql/expressions.go
@@ -1,6 +1,6 @@
 package mysql
 
-import "github.com/go-jet/jet/internal/jet"
+import "github.com/go-jet/jet/v2/internal/jet"
 
 // Expression is common interface for all expressions.
 // Can be Bool, Int, Float, String, Date, Time, Timez, Timestamp or Timestampz expressions.
diff --git a/mysql/functions.go b/mysql/functions.go
index 1ee5a5d..347b433 100644
--- a/mysql/functions.go
+++ b/mysql/functions.go
@@ -1,6 +1,6 @@
 package mysql
 
-import "github.com/go-jet/jet/internal/jet"
+import "github.com/go-jet/jet/v2/internal/jet"
 
 // ROW is construct one table row from list of expressions.
 var ROW = jet.ROW
diff --git a/mysql/insert_statement.go b/mysql/insert_statement.go
index a4ecc94..8495e04 100644
--- a/mysql/insert_statement.go
+++ b/mysql/insert_statement.go
@@ -1,6 +1,6 @@
 package mysql
 
-import "github.com/go-jet/jet/internal/jet"
+import "github.com/go-jet/jet/v2/internal/jet"
 
 // InsertStatement is interface for SQL INSERT statements
 type InsertStatement interface {
diff --git a/mysql/interval.go b/mysql/interval.go
index ee0354e..f325bb8 100644
--- a/mysql/interval.go
+++ b/mysql/interval.go
@@ -5,8 +5,8 @@ import (
 	"regexp"
 	"time"
 
-	"github.com/go-jet/jet/internal/jet"
-	"github.com/go-jet/jet/internal/utils"
+	"github.com/go-jet/jet/v2/internal/jet"
+	"github.com/go-jet/jet/v2/internal/utils"
 )
 
 type unitType string
diff --git a/mysql/literal.go b/mysql/literal.go
index 847b181..74a9f24 100644
--- a/mysql/literal.go
+++ b/mysql/literal.go
@@ -1,7 +1,7 @@
 package mysql
 
 import (
-	"github.com/go-jet/jet/internal/jet"
+	"github.com/go-jet/jet/v2/internal/jet"
 	"time"
 )
 
diff --git a/mysql/lock_statement.go b/mysql/lock_statement.go
index 20ce76b..e23e6c8 100644
--- a/mysql/lock_statement.go
+++ b/mysql/lock_statement.go
@@ -1,6 +1,6 @@
 package mysql
 
-import "github.com/go-jet/jet/internal/jet"
+import "github.com/go-jet/jet/v2/internal/jet"
 
 // LockStatement is interface for MySQL LOCK tables
 type LockStatement interface {
diff --git a/mysql/select_statement.go b/mysql/select_statement.go
index 4a7f275..8882077 100644
--- a/mysql/select_statement.go
+++ b/mysql/select_statement.go
@@ -1,7 +1,7 @@
 package mysql
 
 import (
-	"github.com/go-jet/jet/internal/jet"
+	"github.com/go-jet/jet/v2/internal/jet"
 )
 
 // RowLock is interface for SELECT statement row lock types
diff --git a/mysql/select_statement_test.go b/mysql/select_statement_test.go
index 6180103..261ac20 100644
--- a/mysql/select_statement_test.go
+++ b/mysql/select_statement_test.go
@@ -1,7 +1,7 @@
 package mysql
 
 import (
-	"github.com/go-jet/jet/internal/testutils"
+	"github.com/go-jet/jet/v2/internal/testutils"
 	"testing"
 )
 
diff --git a/mysql/select_table.go b/mysql/select_table.go
index 9d45ba3..af9de27 100644
--- a/mysql/select_table.go
+++ b/mysql/select_table.go
@@ -1,6 +1,6 @@
 package mysql
 
-import "github.com/go-jet/jet/internal/jet"
+import "github.com/go-jet/jet/v2/internal/jet"
 
 // SelectTable is interface for MySQL sub-queries
 type SelectTable interface {
diff --git a/mysql/set_statement.go b/mysql/set_statement.go
index 596741d..df1ed8a 100644
--- a/mysql/set_statement.go
+++ b/mysql/set_statement.go
@@ -1,6 +1,6 @@
 package mysql
 
-import "github.com/go-jet/jet/internal/jet"
+import "github.com/go-jet/jet/v2/internal/jet"
 
 // UNION effectively appends the result of sub-queries(select statements) into single query.
 // It eliminates duplicate rows from its result.
diff --git a/mysql/table.go b/mysql/table.go
index ee798e2..5630966 100644
--- a/mysql/table.go
+++ b/mysql/table.go
@@ -1,6 +1,6 @@
 package mysql
 
-import "github.com/go-jet/jet/internal/jet"
+import "github.com/go-jet/jet/v2/internal/jet"
 
 // Table is interface for MySQL tables
 type Table interface {
diff --git a/mysql/types.go b/mysql/types.go
index 08ae20a..9ebaa27 100644
--- a/mysql/types.go
+++ b/mysql/types.go
@@ -1,6 +1,6 @@
 package mysql
 
-import "github.com/go-jet/jet/internal/jet"
+import "github.com/go-jet/jet/v2/internal/jet"
 
 // Statement is common interface for all statements(SELECT, INSERT, UPDATE, DELETE, LOCK)
 type Statement = jet.Statement
diff --git a/mysql/update_statement.go b/mysql/update_statement.go
index ed8d515..f053afe 100644
--- a/mysql/update_statement.go
+++ b/mysql/update_statement.go
@@ -1,6 +1,6 @@
 package mysql
 
-import "github.com/go-jet/jet/internal/jet"
+import "github.com/go-jet/jet/v2/internal/jet"
 
 // UpdateStatement is interface of SQL UPDATE statement
 type UpdateStatement interface {
diff --git a/mysql/utils_test.go b/mysql/utils_test.go
index 584bfee..cc8b3c3 100644
--- a/mysql/utils_test.go
+++ b/mysql/utils_test.go
@@ -1,8 +1,8 @@
 package mysql
 
 import (
-	"github.com/go-jet/jet/internal/jet"
-	"github.com/go-jet/jet/internal/testutils"
+	"github.com/go-jet/jet/v2/internal/jet"
+	"github.com/go-jet/jet/v2/internal/testutils"
 	"testing"
 )
 
diff --git a/mysql/with_statement.go b/mysql/with_statement.go
index 35066f7..1afcf26 100644
--- a/mysql/with_statement.go
+++ b/mysql/with_statement.go
@@ -1,6 +1,6 @@
 package mysql
 
-import "github.com/go-jet/jet/internal/jet"
+import "github.com/go-jet/jet/v2/internal/jet"
 
 // CommonTableExpression contains information about a CTE.
 type CommonTableExpression struct {
diff --git a/postgres/cast.go b/postgres/cast.go
index 0f4b255..e3a17a4 100644
--- a/postgres/cast.go
+++ b/postgres/cast.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/go-jet/jet/internal/jet"
+	"github.com/go-jet/jet/v2/internal/jet"
 )
 
 type cast interface {
diff --git a/postgres/clause.go b/postgres/clause.go
index 3812667..6174d4f 100644
--- a/postgres/clause.go
+++ b/postgres/clause.go
@@ -1,7 +1,7 @@
 package postgres
 
 import (
-	"github.com/go-jet/jet/internal/jet"
+	"github.com/go-jet/jet/v2/internal/jet"
 )
 
 type clauseReturning struct {
diff --git a/postgres/columns.go b/postgres/columns.go
index c62f202..a25a88c 100644
--- a/postgres/columns.go
+++ b/postgres/columns.go
@@ -1,7 +1,7 @@
 package postgres
 
 import (
-	"github.com/go-jet/jet/internal/jet"
+	"github.com/go-jet/jet/v2/internal/jet"
 )
 
 // Column is common column interface for all types of columns.
diff --git a/postgres/conflict_action.go b/postgres/conflict_action.go
index 55c9440..bf4444f 100644
--- a/postgres/conflict_action.go
+++ b/postgres/conflict_action.go
@@ -1,6 +1,6 @@
 package postgres
 
-import "github.com/go-jet/jet/internal/jet"
+import "github.com/go-jet/jet/v2/internal/jet"
 
 type conflictAction interface {
 	jet.Serializer
diff --git a/postgres/delete_statement.go b/postgres/delete_statement.go
index ff62710..ca2816c 100644
--- a/postgres/delete_statement.go
+++ b/postgres/delete_statement.go
@@ -1,6 +1,6 @@
 package postgres
 
-import "github.com/go-jet/jet/internal/jet"
+import "github.com/go-jet/jet/v2/internal/jet"
 
 // DeleteStatement is interface for PostgreSQL DELETE statement
 type DeleteStatement interface {
diff --git a/postgres/dialect.go b/postgres/dialect.go
index b440c5d..8679929 100644
--- a/postgres/dialect.go
+++ b/postgres/dialect.go
@@ -1,7 +1,7 @@
 package postgres
 
 import (
-	"github.com/go-jet/jet/internal/jet"
+	"github.com/go-jet/jet/v2/internal/jet"
 	"strconv"
 )
 
diff --git a/postgres/expressions.go b/postgres/expressions.go
index 93072b8..61c0449 100644
--- a/postgres/expressions.go
+++ b/postgres/expressions.go
@@ -1,6 +1,6 @@
 package postgres
 
-import "github.com/go-jet/jet/internal/jet"
+import "github.com/go-jet/jet/v2/internal/jet"
 
 // Expression is common interface for all expressions.
 // Can be Bool, Int, Float, String, Date, Time, Timez, Timestamp or Timestampz expressions.
diff --git a/postgres/functions.go b/postgres/functions.go
index b97d25a..34f8370 100644
--- a/postgres/functions.go
+++ b/postgres/functions.go
@@ -1,6 +1,6 @@
 package postgres
 
-import "github.com/go-jet/jet/internal/jet"
+import "github.com/go-jet/jet/v2/internal/jet"
 
 // ROW is construct one table row from list of expressions.
 var ROW = jet.ROW
diff --git a/postgres/insert_statement.go b/postgres/insert_statement.go
index da13370..a134a12 100644
--- a/postgres/insert_statement.go
+++ b/postgres/insert_statement.go
@@ -1,6 +1,6 @@
 package postgres
 
-import "github.com/go-jet/jet/internal/jet"
+import "github.com/go-jet/jet/v2/internal/jet"
 
 // InsertStatement is interface for SQL INSERT statements
 type InsertStatement interface {
diff --git a/postgres/insert_statement_test.go b/postgres/insert_statement_test.go
index beb8af2..609d38a 100644
--- a/postgres/insert_statement_test.go
+++ b/postgres/insert_statement_test.go
@@ -1,7 +1,7 @@
 package postgres
 
 import (
-	"github.com/go-jet/jet/internal/jet"
+	"github.com/go-jet/jet/v2/internal/jet"
 	"github.com/stretchr/testify/require"
 	"testing"
 	"time"
diff --git a/postgres/interval_expression.go b/postgres/interval_expression.go
index 50d29da..df2ed60 100644
--- a/postgres/interval_expression.go
+++ b/postgres/interval_expression.go
@@ -2,8 +2,8 @@ package postgres
 
 import (
 	"fmt"
-	"github.com/go-jet/jet/internal/jet"
-	"github.com/go-jet/jet/internal/utils"
+	"github.com/go-jet/jet/v2/internal/jet"
+	"github.com/go-jet/jet/v2/internal/utils"
 	"strconv"
 	"strings"
 	"time"
diff --git a/postgres/keywords.go b/postgres/keywords.go
index 7a06700..cfc90a2 100644
--- a/postgres/keywords.go
+++ b/postgres/keywords.go
@@ -1,6 +1,6 @@
 package postgres
 
-import "github.com/go-jet/jet/internal/jet"
+import "github.com/go-jet/jet/v2/internal/jet"
 
 const (
 	// DEFAULT is jet equivalent of SQL DEFAULT
diff --git a/postgres/literal.go b/postgres/literal.go
index bf05acd..0063cf4 100644
--- a/postgres/literal.go
+++ b/postgres/literal.go
@@ -1,7 +1,7 @@
 package postgres
 
 import (
-	"github.com/go-jet/jet/internal/jet"
+	"github.com/go-jet/jet/v2/internal/jet"
 	"time"
 )
 
diff --git a/postgres/lock_statement.go b/postgres/lock_statement.go
index 3473427..35c9aec 100644
--- a/postgres/lock_statement.go
+++ b/postgres/lock_statement.go
@@ -1,6 +1,6 @@
 package postgres
 
-import "github.com/go-jet/jet/internal/jet"
+import "github.com/go-jet/jet/v2/internal/jet"
 
 // TableLockMode is a type of possible SQL table lock
 type TableLockMode string
diff --git a/postgres/operators.go b/postgres/operators.go
index 30c40c2..04c8b23 100644
--- a/postgres/operators.go
+++ b/postgres/operators.go
@@ -1,6 +1,6 @@
 package postgres
 
-import "github.com/go-jet/jet/internal/jet"
+import "github.com/go-jet/jet/v2/internal/jet"
 
 // NOT returns negation of bool expression result
 var NOT = jet.NOT
diff --git a/postgres/select_statement.go b/postgres/select_statement.go
index 3e49534..7b7e969 100644
--- a/postgres/select_statement.go
+++ b/postgres/select_statement.go
@@ -1,7 +1,7 @@
 package postgres
 
 import (
-	"github.com/go-jet/jet/internal/jet"
+	"github.com/go-jet/jet/v2/internal/jet"
 	"math"
 )
 
diff --git a/postgres/select_table.go b/postgres/select_table.go
index fe96bbe..e11b7cd 100644
--- a/postgres/select_table.go
+++ b/postgres/select_table.go
@@ -1,6 +1,6 @@
 package postgres
 
-import "github.com/go-jet/jet/internal/jet"
+import "github.com/go-jet/jet/v2/internal/jet"
 
 // SelectTable is interface for MySQL sub-queries
 type SelectTable interface {
diff --git a/postgres/set_statement.go b/postgres/set_statement.go
index 4c83ecf..1f63f2e 100644
--- a/postgres/set_statement.go
+++ b/postgres/set_statement.go
@@ -1,6 +1,6 @@
 package postgres
 
-import "github.com/go-jet/jet/internal/jet"
+import "github.com/go-jet/jet/v2/internal/jet"
 
 // UNION effectively appends the result of sub-queries(select statements) into single query.
 // It eliminates duplicate rows from its result.
diff --git a/postgres/table.go b/postgres/table.go
index e928004..ac153d3 100644
--- a/postgres/table.go
+++ b/postgres/table.go
@@ -1,6 +1,6 @@
 package postgres
 
-import "github.com/go-jet/jet/internal/jet"
+import "github.com/go-jet/jet/v2/internal/jet"
 
 // Table is interface for MySQL tables
 type Table interface {
diff --git a/postgres/types.go b/postgres/types.go
index fb7b8a0..e2a51eb 100644
--- a/postgres/types.go
+++ b/postgres/types.go
@@ -1,6 +1,6 @@
 package postgres
 
-import "github.com/go-jet/jet/internal/jet"
+import "github.com/go-jet/jet/v2/internal/jet"
 
 // Statement is common interface for all statements(SELECT, INSERT, UPDATE, DELETE, LOCK)
 type Statement = jet.Statement
diff --git a/postgres/update_statement.go b/postgres/update_statement.go
index 29fd9c8..594efa4 100644
--- a/postgres/update_statement.go
+++ b/postgres/update_statement.go
@@ -1,7 +1,7 @@
 package postgres
 
 import (
-	"github.com/go-jet/jet/internal/jet"
+	"github.com/go-jet/jet/v2/internal/jet"
 )
 
 // UpdateStatement is interface of SQL UPDATE statement
diff --git a/postgres/utils_test.go b/postgres/utils_test.go
index cbca2bc..ef5f72e 100644
--- a/postgres/utils_test.go
+++ b/postgres/utils_test.go
@@ -3,8 +3,8 @@ package postgres
 import (
 	"testing"
 
-	"github.com/go-jet/jet/internal/jet"
-	"github.com/go-jet/jet/internal/testutils"
+	"github.com/go-jet/jet/v2/internal/jet"
+	"github.com/go-jet/jet/v2/internal/testutils"
 )
 
 var table1Col1 = IntegerColumn("col1")
diff --git a/postgres/with_statement.go b/postgres/with_statement.go
index c1f7a7b..1795b3d 100644
--- a/postgres/with_statement.go
+++ b/postgres/with_statement.go
@@ -1,6 +1,6 @@
 package postgres
 
-import "github.com/go-jet/jet/internal/jet"
+import "github.com/go-jet/jet/v2/internal/jet"
 
 // CommonTableExpression contains information about a CTE.
 type CommonTableExpression struct {
diff --git a/qrm/qrm.go b/qrm/qrm.go
index e7e6406..7477569 100644
--- a/qrm/qrm.go
+++ b/qrm/qrm.go
@@ -3,7 +3,7 @@ package qrm
 import (
 	"context"
 	"errors"
-	"github.com/go-jet/jet/internal/utils"
+	"github.com/go-jet/jet/v2/internal/utils"
 	"reflect"
 )
 
diff --git a/qrm/scan_context.go b/qrm/scan_context.go
index e3f7f40..9d9e059 100644
--- a/qrm/scan_context.go
+++ b/qrm/scan_context.go
@@ -4,7 +4,7 @@ import (
 	"database/sql"
 	"database/sql/driver"
 	"fmt"
-	"github.com/go-jet/jet/internal/utils"
+	"github.com/go-jet/jet/v2/internal/utils"
 	"reflect"
 	"strings"
 )
diff --git a/qrm/utill.go b/qrm/utill.go
index 7791f9a..5d8455d 100644
--- a/qrm/utill.go
+++ b/qrm/utill.go
@@ -3,8 +3,8 @@ package qrm
 import (
 	"database/sql"
 	"fmt"
-	"github.com/go-jet/jet/internal/utils"
-	"github.com/go-jet/jet/qrm/internal"
+	"github.com/go-jet/jet/v2/internal/utils"
+	"github.com/go-jet/jet/v2/qrm/internal"
 	"github.com/google/uuid"
 	"reflect"
 	"strings"
diff --git a/tests/init/init.go b/tests/init/init.go
index 22698b4..356806d 100644
--- a/tests/init/init.go
+++ b/tests/init/init.go
@@ -4,10 +4,10 @@ import (
 	"database/sql"
 	"flag"
 	"fmt"
-	"github.com/go-jet/jet/generator/mysql"
-	"github.com/go-jet/jet/generator/postgres"
-	"github.com/go-jet/jet/internal/utils"
-	"github.com/go-jet/jet/tests/dbconfig"
+	"github.com/go-jet/jet/v2/generator/mysql"
+	"github.com/go-jet/jet/v2/generator/postgres"
+	"github.com/go-jet/jet/v2/internal/utils"
+	"github.com/go-jet/jet/v2/tests/dbconfig"
 	_ "github.com/go-sql-driver/mysql"
 	_ "github.com/lib/pq"
 	"io/ioutil"
diff --git a/tests/mysql/alltypes_test.go b/tests/mysql/alltypes_test.go
index d791d42..5728725 100644
--- a/tests/mysql/alltypes_test.go
+++ b/tests/mysql/alltypes_test.go
@@ -9,13 +9,13 @@ import (
 
 	"github.com/google/uuid"
 
-	"github.com/go-jet/jet/internal/testutils"
-	"github.com/go-jet/jet/tests/.gentestdata/mysql/test_sample/model"
-	. "github.com/go-jet/jet/tests/.gentestdata/mysql/test_sample/table"
-	"github.com/go-jet/jet/tests/.gentestdata/mysql/test_sample/view"
-	"github.com/go-jet/jet/tests/testdata/results/common"
+	"github.com/go-jet/jet/v2/internal/testutils"
+	"github.com/go-jet/jet/v2/tests/.gentestdata/mysql/test_sample/model"
+	. "github.com/go-jet/jet/v2/tests/.gentestdata/mysql/test_sample/table"
+	"github.com/go-jet/jet/v2/tests/.gentestdata/mysql/test_sample/view"
+	"github.com/go-jet/jet/v2/tests/testdata/results/common"
 
-	. "github.com/go-jet/jet/mysql"
+	. "github.com/go-jet/jet/v2/mysql"
 )
 
 func TestAllTypes(t *testing.T) {
diff --git a/tests/mysql/cast_test.go b/tests/mysql/cast_test.go
index fda79e7..717438f 100644
--- a/tests/mysql/cast_test.go
+++ b/tests/mysql/cast_test.go
@@ -1,9 +1,9 @@
 package mysql
 
 import (
-	"github.com/go-jet/jet/internal/testutils"
-	. "github.com/go-jet/jet/mysql"
-	. "github.com/go-jet/jet/tests/.gentestdata/mysql/test_sample/table"
+	"github.com/go-jet/jet/v2/internal/testutils"
+	. "github.com/go-jet/jet/v2/mysql"
+	. "github.com/go-jet/jet/v2/tests/.gentestdata/mysql/test_sample/table"
 	"github.com/stretchr/testify/require"
 	"testing"
 	"time"
diff --git a/tests/mysql/delete_test.go b/tests/mysql/delete_test.go
index 90d15cc..cb7673c 100644
--- a/tests/mysql/delete_test.go
+++ b/tests/mysql/delete_test.go
@@ -2,10 +2,10 @@ package mysql
 
 import (
 	"context"
-	"github.com/go-jet/jet/internal/testutils"
-	. "github.com/go-jet/jet/mysql"
-	"github.com/go-jet/jet/tests/.gentestdata/mysql/test_sample/model"
-	. "github.com/go-jet/jet/tests/.gentestdata/mysql/test_sample/table"
+	"github.com/go-jet/jet/v2/internal/testutils"
+	. "github.com/go-jet/jet/v2/mysql"
+	"github.com/go-jet/jet/v2/tests/.gentestdata/mysql/test_sample/model"
+	. "github.com/go-jet/jet/v2/tests/.gentestdata/mysql/test_sample/table"
 	"github.com/stretchr/testify/require"
 	"testing"
 	"time"
diff --git a/tests/mysql/generator_test.go b/tests/mysql/generator_test.go
index b1ca685..2cc471e 100644
--- a/tests/mysql/generator_test.go
+++ b/tests/mysql/generator_test.go
@@ -1,9 +1,9 @@
 package mysql
 
 import (
-	"github.com/go-jet/jet/generator/mysql"
-	"github.com/go-jet/jet/internal/testutils"
-	"github.com/go-jet/jet/tests/dbconfig"
+	"github.com/go-jet/jet/v2/generator/mysql"
+	"github.com/go-jet/jet/v2/internal/testutils"
+	"github.com/go-jet/jet/v2/tests/dbconfig"
 	"github.com/stretchr/testify/require"
 	"io/ioutil"
 	"os"
@@ -35,7 +35,7 @@ func TestGenerator(t *testing.T) {
 }
 
 func TestCmdGenerator(t *testing.T) {
-	goInstallJet := exec.Command("sh", "-c", "go install github.com/go-jet/jet/cmd/jet")
+	goInstallJet := exec.Command("sh", "-c", "cd $GOPATH/src/ && GO111MODULE=off go get github.com/go-jet/jet/cmd/jet")
 	goInstallJet.Stderr = os.Stderr
 	err := goInstallJet.Run()
 	require.NoError(t, err)
@@ -109,7 +109,7 @@ var mpaaRatingEnumFile = `
 
 package enum
 
-import "github.com/go-jet/jet/mysql"
+import "github.com/go-jet/jet/v2/mysql"
 
 var FilmRating = &struct {
 	G    mysql.StringExpression
@@ -137,7 +137,7 @@ var actorSQLBuilderFile = `
 package table
 
 import (
-	"github.com/go-jet/jet/mysql"
+	"github.com/go-jet/jet/v2/mysql"
 )
 
 var Actor = newActorTable()
@@ -220,7 +220,7 @@ var actorInfoSQLBuilderFile = `
 package view
 
 import (
-	"github.com/go-jet/jet/mysql"
+	"github.com/go-jet/jet/v2/mysql"
 )
 
 var ActorInfo = newActorInfoTable()
diff --git a/tests/mysql/insert_test.go b/tests/mysql/insert_test.go
index 43091b2..4f39d6c 100644
--- a/tests/mysql/insert_test.go
+++ b/tests/mysql/insert_test.go
@@ -2,10 +2,10 @@ package mysql
 
 import (
 	"context"
-	"github.com/go-jet/jet/internal/testutils"
-	. "github.com/go-jet/jet/mysql"
-	"github.com/go-jet/jet/tests/.gentestdata/mysql/test_sample/model"
-	. "github.com/go-jet/jet/tests/.gentestdata/mysql/test_sample/table"
+	"github.com/go-jet/jet/v2/internal/testutils"
+	. "github.com/go-jet/jet/v2/mysql"
+	"github.com/go-jet/jet/v2/tests/.gentestdata/mysql/test_sample/model"
+	. "github.com/go-jet/jet/v2/tests/.gentestdata/mysql/test_sample/table"
 	"github.com/stretchr/testify/require"
 	"math/rand"
 	"testing"
diff --git a/tests/mysql/lock_test.go b/tests/mysql/lock_test.go
index c44c436..939fb5a 100644
--- a/tests/mysql/lock_test.go
+++ b/tests/mysql/lock_test.go
@@ -1,9 +1,9 @@
 package mysql
 
 import (
-	"github.com/go-jet/jet/internal/testutils"
-	. "github.com/go-jet/jet/mysql"
-	. "github.com/go-jet/jet/tests/.gentestdata/mysql/dvds/table"
+	"github.com/go-jet/jet/v2/internal/testutils"
+	. "github.com/go-jet/jet/v2/mysql"
+	. "github.com/go-jet/jet/v2/tests/.gentestdata/mysql/dvds/table"
 	"github.com/stretchr/testify/require"
 	"testing"
 )
diff --git a/tests/mysql/main_test.go b/tests/mysql/main_test.go
index fd513ac..5790ef6 100644
--- a/tests/mysql/main_test.go
+++ b/tests/mysql/main_test.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"database/sql"
 	"flag"
-	jetmysql "github.com/go-jet/jet/mysql"
-	"github.com/go-jet/jet/postgres"
-	"github.com/go-jet/jet/tests/dbconfig"
+	jetmysql "github.com/go-jet/jet/v2/mysql"
+	"github.com/go-jet/jet/v2/postgres"
+	"github.com/go-jet/jet/v2/tests/dbconfig"
 	"github.com/stretchr/testify/require"
 	"math/rand"
 	"time"
diff --git a/tests/mysql/select_test.go b/tests/mysql/select_test.go
index 5fd8fdc..dc6af0d 100644
--- a/tests/mysql/select_test.go
+++ b/tests/mysql/select_test.go
@@ -1,12 +1,12 @@
 package mysql
 
 import (
-	"github.com/go-jet/jet/internal/testutils"
-	. "github.com/go-jet/jet/mysql"
-	"github.com/go-jet/jet/tests/.gentestdata/mysql/dvds/enum"
-	"github.com/go-jet/jet/tests/.gentestdata/mysql/dvds/model"
-	. "github.com/go-jet/jet/tests/.gentestdata/mysql/dvds/table"
-	"github.com/go-jet/jet/tests/.gentestdata/mysql/dvds/view"
+	"github.com/go-jet/jet/v2/internal/testutils"
+	. "github.com/go-jet/jet/v2/mysql"
+	"github.com/go-jet/jet/v2/tests/.gentestdata/mysql/dvds/enum"
+	"github.com/go-jet/jet/v2/tests/.gentestdata/mysql/dvds/model"
+	. "github.com/go-jet/jet/v2/tests/.gentestdata/mysql/dvds/table"
+	"github.com/go-jet/jet/v2/tests/.gentestdata/mysql/dvds/view"
 	"github.com/stretchr/testify/require"
 
 	"testing"
diff --git a/tests/mysql/update_test.go b/tests/mysql/update_test.go
index 94a6716..bef22f9 100644
--- a/tests/mysql/update_test.go
+++ b/tests/mysql/update_test.go
@@ -3,11 +3,11 @@ package mysql
 import (
 	"context"
 	"fmt"
-	"github.com/go-jet/jet/internal/testutils"
-	. "github.com/go-jet/jet/mysql"
-	"github.com/go-jet/jet/tests/.gentestdata/mysql/dvds/table"
-	"github.com/go-jet/jet/tests/.gentestdata/mysql/test_sample/model"
-	. "github.com/go-jet/jet/tests/.gentestdata/mysql/test_sample/table"
+	"github.com/go-jet/jet/v2/internal/testutils"
+	. "github.com/go-jet/jet/v2/mysql"
+	"github.com/go-jet/jet/v2/tests/.gentestdata/mysql/dvds/table"
+	"github.com/go-jet/jet/v2/tests/.gentestdata/mysql/test_sample/model"
+	. "github.com/go-jet/jet/v2/tests/.gentestdata/mysql/test_sample/table"
 	"github.com/stretchr/testify/require"
 	"testing"
 	"time"
diff --git a/tests/mysql/with_test.go b/tests/mysql/with_test.go
index 0a82f2e..ddc1d12 100644
--- a/tests/mysql/with_test.go
+++ b/tests/mysql/with_test.go
@@ -1,9 +1,9 @@
 package mysql
 
 import (
-	"github.com/go-jet/jet/internal/testutils"
-	. "github.com/go-jet/jet/mysql"
-	. "github.com/go-jet/jet/tests/.gentestdata/mysql/dvds/table"
+	"github.com/go-jet/jet/v2/internal/testutils"
+	. "github.com/go-jet/jet/v2/mysql"
+	. "github.com/go-jet/jet/v2/tests/.gentestdata/mysql/dvds/table"
 	"github.com/stretchr/testify/require"
 	"strings"
 	"testing"
diff --git a/tests/postgres/alltypes_test.go b/tests/postgres/alltypes_test.go
index 3fa5543..4379e67 100644
--- a/tests/postgres/alltypes_test.go
+++ b/tests/postgres/alltypes_test.go
@@ -5,12 +5,12 @@ import (
 	"testing"
 	"time"
 
-	"github.com/go-jet/jet/internal/testutils"
-	. "github.com/go-jet/jet/postgres"
-	"github.com/go-jet/jet/tests/.gentestdata/jetdb/test_sample/model"
-	. "github.com/go-jet/jet/tests/.gentestdata/jetdb/test_sample/table"
-	"github.com/go-jet/jet/tests/.gentestdata/jetdb/test_sample/view"
-	"github.com/go-jet/jet/tests/testdata/results/common"
+	"github.com/go-jet/jet/v2/internal/testutils"
+	. "github.com/go-jet/jet/v2/postgres"
+	"github.com/go-jet/jet/v2/tests/.gentestdata/jetdb/test_sample/model"
+	. "github.com/go-jet/jet/v2/tests/.gentestdata/jetdb/test_sample/table"
+	"github.com/go-jet/jet/v2/tests/.gentestdata/jetdb/test_sample/view"
+	"github.com/go-jet/jet/v2/tests/testdata/results/common"
 	"github.com/google/uuid"
 )
 
diff --git a/tests/postgres/chinook_db_test.go b/tests/postgres/chinook_db_test.go
index 5c12010..50f5e60 100644
--- a/tests/postgres/chinook_db_test.go
+++ b/tests/postgres/chinook_db_test.go
@@ -3,10 +3,10 @@ package postgres
 import (
 	"context"
 	"fmt"
-	"github.com/go-jet/jet/internal/testutils"
-	. "github.com/go-jet/jet/postgres"
-	"github.com/go-jet/jet/tests/.gentestdata/jetdb/chinook/model"
-	. "github.com/go-jet/jet/tests/.gentestdata/jetdb/chinook/table"
+	"github.com/go-jet/jet/v2/internal/testutils"
+	. "github.com/go-jet/jet/v2/postgres"
+	"github.com/go-jet/jet/v2/tests/.gentestdata/jetdb/chinook/model"
+	. "github.com/go-jet/jet/v2/tests/.gentestdata/jetdb/chinook/table"
 	"github.com/stretchr/testify/require"
 	"testing"
 	"time"
diff --git a/tests/postgres/delete_test.go b/tests/postgres/delete_test.go
index 01104d4..5115a3f 100644
--- a/tests/postgres/delete_test.go
+++ b/tests/postgres/delete_test.go
@@ -2,10 +2,10 @@ package postgres
 
 import (
 	"context"
-	"github.com/go-jet/jet/internal/testutils"
-	. "github.com/go-jet/jet/postgres"
-	"github.com/go-jet/jet/tests/.gentestdata/jetdb/test_sample/model"
-	. "github.com/go-jet/jet/tests/.gentestdata/jetdb/test_sample/table"
+	"github.com/go-jet/jet/v2/internal/testutils"
+	. "github.com/go-jet/jet/v2/postgres"
+	"github.com/go-jet/jet/v2/tests/.gentestdata/jetdb/test_sample/model"
+	. "github.com/go-jet/jet/v2/tests/.gentestdata/jetdb/test_sample/table"
 	"github.com/stretchr/testify/require"
 	"testing"
 	"time"
diff --git a/tests/postgres/generator_test.go b/tests/postgres/generator_test.go
index a27f595..50e7223 100644
--- a/tests/postgres/generator_test.go
+++ b/tests/postgres/generator_test.go
@@ -1,9 +1,9 @@
 package postgres
 
 import (
-	"github.com/go-jet/jet/generator/postgres"
-	"github.com/go-jet/jet/internal/testutils"
-	"github.com/go-jet/jet/tests/dbconfig"
+	"github.com/go-jet/jet/v2/generator/postgres"
+	"github.com/go-jet/jet/v2/internal/testutils"
+	"github.com/go-jet/jet/v2/tests/dbconfig"
 	"github.com/stretchr/testify/require"
 	"io/ioutil"
 	"os"
@@ -11,7 +11,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/go-jet/jet/tests/.gentestdata/jetdb/dvds/model"
+	"github.com/go-jet/jet/v2/tests/.gentestdata/jetdb/dvds/model"
 )
 
 func TestGeneratedModel(t *testing.T) {
@@ -46,7 +46,7 @@ func TestGeneratedModel(t *testing.T) {
 const genTestDir2 = "./.gentestdata2"
 
 func TestCmdGenerator(t *testing.T) {
-	goInstallJet := exec.Command("sh", "-c", "go install github.com/go-jet/jet/cmd/jet")
+	goInstallJet := exec.Command("sh", "-c", "cd $GOPATH/src/ && GO111MODULE=off go get github.com/go-jet/jet/cmd/jet")
 	goInstallJet.Stderr = os.Stderr
 	err := goInstallJet.Run()
 	require.NoError(t, err)
@@ -142,7 +142,7 @@ var mpaaRatingEnumFile = `
 
 package enum
 
-import "github.com/go-jet/jet/postgres"
+import "github.com/go-jet/jet/v2/postgres"
 
 var MpaaRating = &struct {
 	G    postgres.StringExpression
@@ -170,7 +170,7 @@ var actorSQLBuilderFile = `
 package table
 
 import (
-	"github.com/go-jet/jet/postgres"
+	"github.com/go-jet/jet/v2/postgres"
 )
 
 var Actor = newActorTable()
@@ -266,7 +266,7 @@ var actorInfoSQLBuilderFile = `
 package view
 
 import (
-	"github.com/go-jet/jet/postgres"
+	"github.com/go-jet/jet/v2/postgres"
 )
 
 var ActorInfo = newActorInfoTable()
@@ -368,7 +368,7 @@ var moodEnumContent = `
 
 package enum
 
-import "github.com/go-jet/jet/postgres"
+import "github.com/go-jet/jet/v2/postgres"
 
 var Mood = &struct {
 	Sad   postgres.StringExpression
@@ -391,7 +391,7 @@ var levelEnumContent = `
 
 package enum
 
-import "github.com/go-jet/jet/postgres"
+import "github.com/go-jet/jet/v2/postgres"
 
 var Level = &struct {
 	Level1 postgres.StringExpression
@@ -499,7 +499,7 @@ var allTypesTableContent = `
 package table
 
 import (
-	"github.com/go-jet/jet/postgres"
+	"github.com/go-jet/jet/v2/postgres"
 )
 
 var AllTypes = newAllTypesTable()
diff --git a/tests/postgres/insert_test.go b/tests/postgres/insert_test.go
index e7dac15..9c9875c 100644
--- a/tests/postgres/insert_test.go
+++ b/tests/postgres/insert_test.go
@@ -2,10 +2,10 @@ package postgres
 
 import (
 	"context"
-	"github.com/go-jet/jet/internal/testutils"
-	. "github.com/go-jet/jet/postgres"
-	"github.com/go-jet/jet/tests/.gentestdata/jetdb/test_sample/model"
-	. "github.com/go-jet/jet/tests/.gentestdata/jetdb/test_sample/table"
+	"github.com/go-jet/jet/v2/internal/testutils"
+	. "github.com/go-jet/jet/v2/postgres"
+	"github.com/go-jet/jet/v2/tests/.gentestdata/jetdb/test_sample/model"
+	. "github.com/go-jet/jet/v2/tests/.gentestdata/jetdb/test_sample/table"
 	"github.com/stretchr/testify/require"
 	"math/rand"
 	"testing"
diff --git a/tests/postgres/lock_test.go b/tests/postgres/lock_test.go
index c27adf3..c028629 100644
--- a/tests/postgres/lock_test.go
+++ b/tests/postgres/lock_test.go
@@ -2,13 +2,13 @@ package postgres
 
 import (
 	"context"
-	"github.com/go-jet/jet/internal/testutils"
+	"github.com/go-jet/jet/v2/internal/testutils"
 	"github.com/stretchr/testify/require"
 	"testing"
 	"time"
 
-	. "github.com/go-jet/jet/postgres"
-	. "github.com/go-jet/jet/tests/.gentestdata/jetdb/dvds/table"
+	. "github.com/go-jet/jet/v2/postgres"
+	. "github.com/go-jet/jet/v2/tests/.gentestdata/jetdb/dvds/table"
 )
 
 func TestLockTable(t *testing.T) {
diff --git a/tests/postgres/main_test.go b/tests/postgres/main_test.go
index 2d5edf4..56d0363 100644
--- a/tests/postgres/main_test.go
+++ b/tests/postgres/main_test.go
@@ -3,8 +3,8 @@ package postgres
 import (
 	"context"
 	"database/sql"
-	"github.com/go-jet/jet/postgres"
-	"github.com/go-jet/jet/tests/dbconfig"
+	"github.com/go-jet/jet/v2/postgres"
+	"github.com/go-jet/jet/v2/tests/dbconfig"
 	_ "github.com/lib/pq"
 	"github.com/pkg/profile"
 	"github.com/stretchr/testify/require"
diff --git a/tests/postgres/northwind_test.go b/tests/postgres/northwind_test.go
index e45661a..2d6784d 100644
--- a/tests/postgres/northwind_test.go
+++ b/tests/postgres/northwind_test.go
@@ -1,9 +1,9 @@
 package postgres
 
 import (
-	"github.com/go-jet/jet/internal/testutils"
-	"github.com/go-jet/jet/tests/.gentestdata/jetdb/northwind/model"
-	. "github.com/go-jet/jet/tests/.gentestdata/jetdb/northwind/table"
+	"github.com/go-jet/jet/v2/internal/testutils"
+	"github.com/go-jet/jet/v2/tests/.gentestdata/jetdb/northwind/model"
+	. "github.com/go-jet/jet/v2/tests/.gentestdata/jetdb/northwind/table"
 	"github.com/stretchr/testify/require"
 	"testing"
 )
diff --git a/tests/postgres/sample_test.go b/tests/postgres/sample_test.go
index b3429fc..bcb7361 100644
--- a/tests/postgres/sample_test.go
+++ b/tests/postgres/sample_test.go
@@ -1,10 +1,10 @@
 package postgres
 
 import (
-	"github.com/go-jet/jet/internal/testutils"
-	. "github.com/go-jet/jet/postgres"
-	"github.com/go-jet/jet/tests/.gentestdata/jetdb/test_sample/model"
-	. "github.com/go-jet/jet/tests/.gentestdata/jetdb/test_sample/table"
+	"github.com/go-jet/jet/v2/internal/testutils"
+	. "github.com/go-jet/jet/v2/postgres"
+	"github.com/go-jet/jet/v2/tests/.gentestdata/jetdb/test_sample/model"
+	. "github.com/go-jet/jet/v2/tests/.gentestdata/jetdb/test_sample/table"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
 	"testing"
diff --git a/tests/postgres/scan_test.go b/tests/postgres/scan_test.go
index f6eb9f4..8eb3276 100644
--- a/tests/postgres/scan_test.go
+++ b/tests/postgres/scan_test.go
@@ -2,11 +2,11 @@ package postgres
 
 import (
 	"fmt"
-	"github.com/go-jet/jet/internal/testutils"
-	. "github.com/go-jet/jet/postgres"
-	"github.com/go-jet/jet/qrm"
-	"github.com/go-jet/jet/tests/.gentestdata/jetdb/dvds/model"
-	. "github.com/go-jet/jet/tests/.gentestdata/jetdb/dvds/table"
+	"github.com/go-jet/jet/v2/internal/testutils"
+	. "github.com/go-jet/jet/v2/postgres"
+	"github.com/go-jet/jet/v2/qrm"
+	"github.com/go-jet/jet/v2/tests/.gentestdata/jetdb/dvds/model"
+	. "github.com/go-jet/jet/v2/tests/.gentestdata/jetdb/dvds/table"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
 	"testing"
diff --git a/tests/postgres/select_test.go b/tests/postgres/select_test.go
index b8e759d..e9dd7d2 100644
--- a/tests/postgres/select_test.go
+++ b/tests/postgres/select_test.go
@@ -2,12 +2,12 @@ package postgres
 
 import (
 	"fmt"
-	"github.com/go-jet/jet/internal/testutils"
-	. "github.com/go-jet/jet/postgres"
-	"github.com/go-jet/jet/tests/.gentestdata/jetdb/dvds/enum"
-	"github.com/go-jet/jet/tests/.gentestdata/jetdb/dvds/model"
-	. "github.com/go-jet/jet/tests/.gentestdata/jetdb/dvds/table"
-	"github.com/go-jet/jet/tests/.gentestdata/jetdb/dvds/view"
+	"github.com/go-jet/jet/v2/internal/testutils"
+	. "github.com/go-jet/jet/v2/postgres"
+	"github.com/go-jet/jet/v2/tests/.gentestdata/jetdb/dvds/enum"
+	"github.com/go-jet/jet/v2/tests/.gentestdata/jetdb/dvds/model"
+	. "github.com/go-jet/jet/v2/tests/.gentestdata/jetdb/dvds/table"
+	"github.com/go-jet/jet/v2/tests/.gentestdata/jetdb/dvds/view"
 	"github.com/stretchr/testify/require"
 	"testing"
 	"time"
diff --git a/tests/postgres/update_test.go b/tests/postgres/update_test.go
index 5a7cdcd..043bf78 100644
--- a/tests/postgres/update_test.go
+++ b/tests/postgres/update_test.go
@@ -2,10 +2,10 @@ package postgres
 
 import (
 	"context"
-	"github.com/go-jet/jet/internal/testutils"
-	. "github.com/go-jet/jet/postgres"
-	"github.com/go-jet/jet/tests/.gentestdata/jetdb/test_sample/model"
-	. "github.com/go-jet/jet/tests/.gentestdata/jetdb/test_sample/table"
+	"github.com/go-jet/jet/v2/internal/testutils"
+	. "github.com/go-jet/jet/v2/postgres"
+	"github.com/go-jet/jet/v2/tests/.gentestdata/jetdb/test_sample/model"
+	. "github.com/go-jet/jet/v2/tests/.gentestdata/jetdb/test_sample/table"
 	"github.com/stretchr/testify/require"
 	"testing"
 	"time"
diff --git a/tests/postgres/util_test.go b/tests/postgres/util_test.go
index 4d6f478..847056f 100644
--- a/tests/postgres/util_test.go
+++ b/tests/postgres/util_test.go
@@ -1,9 +1,9 @@
 package postgres
 
 import (
-	"github.com/go-jet/jet/internal/jet"
-	"github.com/go-jet/jet/internal/testutils"
-	"github.com/go-jet/jet/tests/.gentestdata/jetdb/dvds/model"
+	"github.com/go-jet/jet/v2/internal/jet"
+	"github.com/go-jet/jet/v2/internal/testutils"
+	"github.com/go-jet/jet/v2/tests/.gentestdata/jetdb/dvds/model"
 	"github.com/stretchr/testify/require"
 	"testing"
 )
diff --git a/tests/postgres/with_test.go b/tests/postgres/with_test.go
index 3a21c63..8eadf21 100644
--- a/tests/postgres/with_test.go
+++ b/tests/postgres/with_test.go
@@ -1,10 +1,10 @@
 package postgres
 
 import (
-	"github.com/go-jet/jet/internal/testutils"
-	. "github.com/go-jet/jet/postgres"
-	"github.com/go-jet/jet/tests/.gentestdata/jetdb/northwind/model"
-	. "github.com/go-jet/jet/tests/.gentestdata/jetdb/northwind/table"
+	"github.com/go-jet/jet/v2/internal/testutils"
+	. "github.com/go-jet/jet/v2/postgres"
+	"github.com/go-jet/jet/v2/tests/.gentestdata/jetdb/northwind/model"
+	. "github.com/go-jet/jet/v2/tests/.gentestdata/jetdb/northwind/table"
 	"github.com/stretchr/testify/require"
 	"testing"
 )