Fix structuring of tools to work with versions

This structuring keeps everything inside of the licenseclassifier Go
module instead of having modules for each helper package, which would've
required several commits just to bump a version.

8 files changed, 3 insertions, 79 deletions

diff --git a/tools/identify_license/backend/v2/go.mod b/tools/identify_license/backend/v2/go.mod
deleted file mode 100644
index 5509cba..0000000
--- a/tools/identify_license/backend/v2/go.mod
+++ /dev/null
@@ -1,8 +0,0 @@
-module github.com/google/licenseclassifier/tools/identify_license/backend/v2
-
-go 1.16
-
-require (
-	github.com/google/licenseclassifier/tools/identify_license/results/v2 v2.0.0-20220321195219-5d426f379162
-	github.com/google/licenseclassifier/v2 v2.0.0-pre.2
-)
diff --git a/tools/identify_license/backend/v2/go.sum b/tools/identify_license/backend/v2/go.sum
deleted file mode 100644
index 99bccbc..0000000
--- a/tools/identify_license/backend/v2/go.sum
+++ /dev/null
@@ -1,26 +0,0 @@
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM=
-github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/licenseclassifier/tools/identify_license/results/v2 v2.0.0-20220321195219-5d426f379162 h1:v7QSdtIriJ5IQMLtbj+XOkKWkctWA5eV2O5D1PVT12g=
-github.com/google/licenseclassifier/tools/identify_license/results/v2 v2.0.0-20220321195219-5d426f379162/go.mod h1:LXJ2SHJyGJMu1shJiFKk3+Y4vtutzzW7+l6UYbLbflM=
-github.com/google/licenseclassifier/v2 v2.0.0-pre.2 h1:2vxNhiMS4/UUBDnt1DJST8SD4h8KSEYVZDyv3WZrUIo=
-github.com/google/licenseclassifier/v2 v2.0.0-pre.2/go.mod h1:cOjbdH0kyC9R22sdQbYsFkto4NGCAc+ZSwbeThazEtM=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-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/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
-github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
-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/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/tools/identify_license/results/v2/go.mod b/tools/identify_license/results/v2/go.mod
deleted file mode 100644
index 165cabd..0000000
--- a/tools/identify_license/results/v2/go.mod
+++ /dev/null
@@ -1,3 +0,0 @@
-module github.com/google/licenseclassifier/tools/identify_license/results/v2
-
-go 1.16
diff --git a/tools/identify_license/v2/go.mod b/tools/identify_license/v2/go.mod
deleted file mode 100644
index ec9779b..0000000
--- a/tools/identify_license/v2/go.mod
+++ /dev/null
@@ -1,9 +0,0 @@
-module github.com/google/licenseclassifier/tools/identify_license/v2
-
-go 1.16
-
-require (
-	github.com/google/licenseclassifier/tools/identify_license/backend/v2 v2.0.0-20220321195219-5d426f379162
-	github.com/google/licenseclassifier/tools/identify_license/results/v2 v2.0.0-20220321195219-5d426f379162
-	github.com/google/licenseclassifier/v2 v2.0.0-pre.2
-)
diff --git a/tools/identify_license/v2/go.sum b/tools/identify_license/v2/go.sum
deleted file mode 100644
index 493bd0b..0000000
--- a/tools/identify_license/v2/go.sum
+++ /dev/null
@@ -1,30 +0,0 @@
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM=
-github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/licenseclassifier/tools/identify_license/backend/v2 v2.0.0-20220321195219-5d426f379162 h1:y6gjWhbhIk+9gz8BkR1ke3Odm14cOQbv+o5VXa2/0eg=
-github.com/google/licenseclassifier/tools/identify_license/backend/v2 v2.0.0-20220321195219-5d426f379162/go.mod h1:wQS6nwphTp1/v76mj4wQqREAvlgtCRtDJD7e68nh3mo=
-github.com/google/licenseclassifier/tools/identify_license/results/v2 v2.0.0-20220321191234-a6f4b9f7a6aa/go.mod h1:EFQrPGzBO34l07YBD+4sPhZJ5Xy99rWqt3YaATChG3o=
-github.com/google/licenseclassifier/tools/identify_license/results/v2 v2.0.0-20220321195219-5d426f379162 h1:v7QSdtIriJ5IQMLtbj+XOkKWkctWA5eV2O5D1PVT12g=
-github.com/google/licenseclassifier/tools/identify_license/results/v2 v2.0.0-20220321195219-5d426f379162/go.mod h1:LXJ2SHJyGJMu1shJiFKk3+Y4vtutzzW7+l6UYbLbflM=
-github.com/google/licenseclassifier/v2 v2.0.0-pre.1/go.mod h1:cOjbdH0kyC9R22sdQbYsFkto4NGCAc+ZSwbeThazEtM=
-github.com/google/licenseclassifier/v2 v2.0.0-pre.2 h1:2vxNhiMS4/UUBDnt1DJST8SD4h8KSEYVZDyv3WZrUIo=
-github.com/google/licenseclassifier/v2 v2.0.0-pre.2/go.mod h1:cOjbdH0kyC9R22sdQbYsFkto4NGCAc+ZSwbeThazEtM=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-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/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
-github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
-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/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/tools/identify_license/backend/v2/backend.go b/v2/tools/identify_license/backend/backend.go
index 5e11d78..1a98207 100644
--- a/tools/identify_license/backend/v2/backend.go
+++ b/v2/tools/identify_license/backend/backend.go
@@ -25,9 +25,9 @@ import (
 
 	//gc "google3/devtools/compliance/common/licenseclassifier/classifier"
 
-	"github.com/google/licenseclassifier/tools/identify_license/results/v2"
 	classifier "github.com/google/licenseclassifier/v2"
 	"github.com/google/licenseclassifier/v2/assets"
+	"github.com/google/licenseclassifier/v2/tools/identify_license/results"
 )
 
 // ClassifierInterface is the interface each backend must implement.
diff --git a/tools/identify_license/v2/identify_license.go b/v2/tools/identify_license/identify_license.go
index 42d9b94..22f172d 100644
--- a/tools/identify_license/v2/identify_license.go
+++ b/v2/tools/identify_license/identify_license.go
@@ -43,9 +43,9 @@ import (
 	"sort"
 	"time"
 
-	"github.com/google/licenseclassifier/tools/identify_license/backend/v2"
-	"github.com/google/licenseclassifier/tools/identify_license/results/v2"
 	classifier "github.com/google/licenseclassifier/v2"
+	"github.com/google/licenseclassifier/v2/tools/identify_license/backend"
+	"github.com/google/licenseclassifier/v2/tools/identify_license/results"
 )
 
 var (
diff --git a/tools/identify_license/results/v2/results.go b/v2/tools/identify_license/results/results.go
index fd7c598..fd7c598 100644
--- a/tools/identify_license/results/v2/results.go
+++ b/v2/tools/identify_license/results/results.go