Add x/property package to main module

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6a73f72..81dce93 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml

@@ -12,17 +12,11 @@
           executor:
             name: go/golang
             tag:  1.18-alpine
-          post-steps: &xgenerics
-            - run:
-                name: "test x/generics"
-                working_directory: ./x/generics
-                command: gotestsum -ftestname
       - go/test:
           name: test-golang-1.19
           executor:
             name: go/golang
             tag:  1.19-alpine
-          post-steps: *xgenerics
       - go/test:
           name: test-golang-1.20
           executor:
@@ -62,7 +56,3 @@
     - run:
         name: Lint
         command: golangci-lint run -v --concurrency 2
-    - run:
-        name: Lint x/generics
-        working_directory: ./x/generics
-        command: golangci-lint run -v --concurrency 2

diff --git a/go.mod b/go.mod
index 3837812..061023f 100644
--- a/go.mod
+++ b/go.mod

@@ -1,6 +1,6 @@
 module gotest.tools/v3
 
-go 1.17
+go 1.18
 
 require (
 	github.com/google/go-cmp v0.5.9

diff --git a/x/generics/go.mod b/x/generics/go.mod
deleted file mode 100644
index a9eb9aa..0000000
--- a/x/generics/go.mod
+++ /dev/null

@@ -1,7 +0,0 @@
-module gotest.tools/x/generics
-
-go 1.18
-
-require gotest.tools/v3 v3.3.0
-
-require github.com/google/go-cmp v0.5.5 // indirect

diff --git a/x/generics/go.sum b/x/generics/go.sum
deleted file mode 100644
index de1dfc7..0000000
--- a/x/generics/go.sum
+++ /dev/null

@@ -1,29 +0,0 @@
-github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-gotest.tools/v3 v3.3.0 h1:MfDY1b1/0xN1CyMlQDac0ziEy9zJQd9CXBRRDHw2jJo=
-gotest.tools/v3 v3.3.0/go.mod h1:Mcr9QNxkg0uMvy/YElmo4SpXgJKWgQvYrT7Kw5RzJ1A=

diff --git a/x/generics/property/complete.go b/x/property/complete.go
similarity index 100%
rename from x/generics/property/complete.go
rename to x/property/complete.go


diff --git a/x/generics/property/complete_example_test.go b/x/property/complete_example_test.go
similarity index 96%
rename from x/generics/property/complete_example_test.go
rename to x/property/complete_example_test.go
index b9f3386..78655a8 100644
--- a/x/generics/property/complete_example_test.go
+++ b/x/property/complete_example_test.go

@@ -3,7 +3,7 @@
 import (
 	"testing"
 
-	"gotest.tools/x/generics/property"
+	"gotest.tools/v3/x/property"
 )
 
 type FoodRequest struct {

diff --git a/x/generics/property/complete_test.go b/x/property/complete_test.go
similarity index 100%
rename from x/generics/property/complete_test.go
rename to x/property/complete_test.go


diff --git a/x/generics/property/doc.go b/x/property/doc.go
similarity index 100%
rename from x/generics/property/doc.go
rename to x/property/doc.go