84 files changed, 115 insertions, 113 deletions

diff --git a/.travis.yml b/.travis.yml
index da6d914..6e30a40 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,5 +9,5 @@ before_install:
   - go get github.com/mattn/goveralls
 
 script:
-  - go test -coverprofile=tools-golang.cov ./v0/...
+  - go test -coverprofile=tools-golang.cov ./...
   - $GOPATH/bin/goveralls -coverprofile=tools-golang.cov -service=travis-ci
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 48c6eb8..9aef43a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -12,7 +12,7 @@ Since this library is intended to be relied upon by other tools to work with SPD
 
 PRs with new code should include corresponding test files, and should continue to pass existing tests. Unit tests for `foo.go` should be placed in `foo_test.go`. Test data files and folders should be placed in the top-level `testdata/` folder.
 
-To run the test suite, from the top-level directory run: `go test ./v0/...`
+To run the test suite, from the top-level directory run: `go test ./...`
 
 ## License information
 
diff --git a/README.md b/README.md
index a89c923..c25ce1b 100644
--- a/README.md
+++ b/README.md
@@ -6,8 +6,7 @@
 tools-golang is a collection of Go packages intended to make it easier for
 Go programs to work with [SPDX®](https://spdx.org/) files.
 
-This software is in an early state, and its API may change significantly
-(hence the "v0/" directory).
+This software is in an early state, and its API may change significantly.
 
 ## What it does
 
@@ -16,14 +15,14 @@ SPDX specification, available at: https://spdx.org/specifications
 
 tools-golang provides the following packages:
 
-* *v0/spdx* - in-memory data model for the sections of an SPDX document
-* *v0/tvloader* - tag-value file loader
-* *v0/tvsaver* - tag-value file saver
-* *v0/builder* - builds "empty" SPDX document (with hashes) for directory contents
-* *v0/idsearcher* - searches for [SPDX short-form IDs](https://spdx.org/ids/) and builds SPDX document
-* *v0/licensediff* - compares concluded licenses between files in two packages
-* *v0/reporter* - generates basic license count report from SPDX document
-* *v0/utils* - various utility functions that support the other tools-golang packages
+* *spdx* - in-memory data model for the sections of an SPDX document
+* *tvloader* - tag-value file loader
+* *tvsaver* - tag-value file saver
+* *builder* - builds "empty" SPDX document (with hashes) for directory contents
+* *idsearcher* - searches for [SPDX short-form IDs](https://spdx.org/ids/) and builds SPDX document
+* *licensediff* - compares concluded licenses between files in two packages
+* *reporter* - generates basic license count report from SPDX document
+* *utils* - various utility functions that support the other tools-golang packages
 
 Examples for how to use these packages can be found in the `examples/`
 directory.
diff --git a/v0/builder/build.go b/builder/build.go
index 975cc91..b5a5a55 100644
--- a/v0/builder/build.go
+++ b/builder/build.go
@@ -5,8 +5,8 @@
 package builder
 
 import (
-	"github.com/spdx/tools-golang/v0/builder/builder2v1"
-	"github.com/spdx/tools-golang/v0/spdx"
+	"github.com/spdx/tools-golang/builder/builder2v1"
+	"github.com/spdx/tools-golang/spdx"
 )
 
 // Config2_1 is a collection of configuration settings for builder
diff --git a/v0/builder/build_test.go b/builder/build_test.go
index 66a2d5b..48e5047 100644
--- a/v0/builder/build_test.go
+++ b/builder/build_test.go
@@ -9,7 +9,7 @@ import (
 
 // ===== Builder top-level Document test =====
 func TestBuild2_1CreatesDocument(t *testing.T) {
-	dirRoot := "../../testdata/project1/"
+	dirRoot := "../testdata/project1/"
 
 	config := &Config2_1{
 		NamespacePrefix: "https://github.com/swinslow/spdx-docs/spdx-go/testdata-",
@@ -58,8 +58,8 @@ func TestBuild2_1CreatesDocument(t *testing.T) {
 	if len(doc.CreationInfo.CreatorTools) != 1 {
 		t.Fatalf("expected %d, got %d", 1, len(doc.CreationInfo.CreatorTools))
 	}
-	if doc.CreationInfo.CreatorTools[0] != "github.com/spdx/tools-golang/v0/builder" {
-		t.Errorf("expected %s, got %s", "github.com/spdx/tools-golang/v0/builder", doc.CreationInfo.CreatorTools[0])
+	if doc.CreationInfo.CreatorTools[0] != "github.com/spdx/tools-golang/builder" {
+		t.Errorf("expected %s, got %s", "github.com/spdx/tools-golang/builder", doc.CreationInfo.CreatorTools[0])
 	}
 	if doc.CreationInfo.Created != "2018-10-19T04:38:00Z" {
 		t.Errorf("expected %s, got %s", "2018-10-19T04:38:00Z", doc.CreationInfo.Created)
@@ -300,7 +300,7 @@ func TestBuild2_1CreatesDocument(t *testing.T) {
 }
 
 func TestBuild2_1CanIgnoreFiles(t *testing.T) {
-	dirRoot := "../../testdata/project3/"
+	dirRoot := "../testdata/project3/"
 
 	config := &Config2_1{
 		NamespacePrefix: "https://github.com/swinslow/spdx-docs/spdx-go/testdata-",
diff --git a/v0/builder/builder2v1/build_creation_info.go b/builder/builder2v1/build_creation_info.go
index 570bb58..3a01528 100644
--- a/v0/builder/builder2v1/build_creation_info.go
+++ b/builder/builder2v1/build_creation_info.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/spdx/tools-golang/v0/spdx"
+	"github.com/spdx/tools-golang/spdx"
 )
 
 // BuildCreationInfoSection2_1 creates an SPDX Package (version 2.1), returning that
@@ -23,7 +23,7 @@ func BuildCreationInfoSection2_1(packageName string, code string, namespacePrefi
 	cOrganizations := []string{}
 	cTools := []string{}
 	// add builder as a tool
-	cTools = append(cTools, "github.com/spdx/tools-golang/v0/builder")
+	cTools = append(cTools, "github.com/spdx/tools-golang/builder")
 
 	switch creatorType {
 	case "Person":
diff --git a/v0/builder/builder2v1/build_creation_info_test.go b/builder/builder2v1/build_creation_info_test.go
index 4ef0b69..3cdfe83 100644
--- a/v0/builder/builder2v1/build_creation_info_test.go
+++ b/builder/builder2v1/build_creation_info_test.go
@@ -54,8 +54,8 @@ func TestBuilder2_1CanBuildCreationInfoSection(t *testing.T) {
 	if len(ci.CreatorTools) != 1 {
 		t.Fatalf("expected %d, got %d", 1, len(ci.CreatorTools))
 	}
-	if ci.CreatorTools[0] != "github.com/spdx/tools-golang/v0/builder" {
-		t.Errorf("expected %s, got %s", "github.com/spdx/tools-golang/v0/builder", ci.CreatorTools[0])
+	if ci.CreatorTools[0] != "github.com/spdx/tools-golang/builder" {
+		t.Errorf("expected %s, got %s", "github.com/spdx/tools-golang/builder", ci.CreatorTools[0])
 	}
 	if ci.Created != "2018-10-20T16:48:00Z" {
 		t.Errorf("expected %s, got %s", "2018-10-20T16:48:00Z", ci.Created)
@@ -91,8 +91,8 @@ func TestBuilder2_1CanBuildCreationInfoSectionWithCreatorPerson(t *testing.T) {
 	if len(ci.CreatorTools) != 1 {
 		t.Fatalf("expected %d, got %d", 1, len(ci.CreatorTools))
 	}
-	if ci.CreatorTools[0] != "github.com/spdx/tools-golang/v0/builder" {
-		t.Errorf("expected %s, got %s", "github.com/spdx/tools-golang/v0/builder", ci.CreatorTools[0])
+	if ci.CreatorTools[0] != "github.com/spdx/tools-golang/builder" {
+		t.Errorf("expected %s, got %s", "github.com/spdx/tools-golang/builder", ci.CreatorTools[0])
 	}
 }
 
@@ -122,8 +122,8 @@ func TestBuilder2_1CanBuildCreationInfoSectionWithCreatorTool(t *testing.T) {
 	if len(ci.CreatorTools) != 2 {
 		t.Fatalf("expected %d, got %d", 2, len(ci.CreatorTools))
 	}
-	if ci.CreatorTools[0] != "github.com/spdx/tools-golang/v0/builder" {
-		t.Errorf("expected %s, got %s", "github.com/spdx/tools-golang/v0/builder", ci.CreatorTools[0])
+	if ci.CreatorTools[0] != "github.com/spdx/tools-golang/builder" {
+		t.Errorf("expected %s, got %s", "github.com/spdx/tools-golang/builder", ci.CreatorTools[0])
 	}
 	if ci.CreatorTools[1] != "some-other-tool-2.1" {
 		t.Errorf("expected %s, got %s", "some-other-tool-2.1", ci.CreatorTools[1])
@@ -159,7 +159,7 @@ func TestBuilder2_1CanBuildCreationInfoSectionWithInvalidPerson(t *testing.T) {
 	if len(ci.CreatorTools) != 1 {
 		t.Fatalf("expected %d, got %d", 1, len(ci.CreatorTools))
 	}
-	if ci.CreatorTools[0] != "github.com/spdx/tools-golang/v0/builder" {
-		t.Errorf("expected %s, got %s", "github.com/spdx/tools-golang/v0/builder", ci.CreatorTools[0])
+	if ci.CreatorTools[0] != "github.com/spdx/tools-golang/builder" {
+		t.Errorf("expected %s, got %s", "github.com/spdx/tools-golang/builder", ci.CreatorTools[0])
 	}
 }
diff --git a/v0/builder/builder2v1/build_file.go b/builder/builder2v1/build_file.go
index 1e91092..c7cc6be 100644
--- a/v0/builder/builder2v1/build_file.go
+++ b/builder/builder2v1/build_file.go
@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"path/filepath"
 
-	"github.com/spdx/tools-golang/v0/spdx"
-	"github.com/spdx/tools-golang/v0/utils"
+	"github.com/spdx/tools-golang/spdx"
+	"github.com/spdx/tools-golang/utils"
 )
 
 // BuildFileSection2_1 creates an SPDX File (version 2.1), returning that
diff --git a/v0/builder/builder2v1/build_file_test.go b/builder/builder2v1/build_file_test.go
index d6b6cb8..66816ba 100644
--- a/v0/builder/builder2v1/build_file_test.go
+++ b/builder/builder2v1/build_file_test.go
@@ -9,7 +9,7 @@ import (
 // ===== File section builder tests =====
 func TestBuilder2_1CanBuildFileSection(t *testing.T) {
 	filePath := "/file1.testdata.txt"
-	prefix := "../../../testdata/project1/"
+	prefix := "../../testdata/project1/"
 	fileNumber := 17
 
 	file1, err := BuildFileSection2_1(filePath, prefix, fileNumber)
diff --git a/v0/builder/builder2v1/build_package.go b/builder/builder2v1/build_package.go
index 5b0499e..d2f0ec9 100644
--- a/v0/builder/builder2v1/build_package.go
+++ b/builder/builder2v1/build_package.go
@@ -5,8 +5,8 @@ package builder2v1
 import (
 	"fmt"
 
-	"github.com/spdx/tools-golang/v0/spdx"
-	"github.com/spdx/tools-golang/v0/utils"
+	"github.com/spdx/tools-golang/spdx"
+	"github.com/spdx/tools-golang/utils"
 )
 
 // BuildPackageSection2_1 creates an SPDX Package (version 2.1), returning
diff --git a/v0/builder/builder2v1/build_package_test.go b/builder/builder2v1/build_package_test.go
index 704413e..68aa5b5 100644
--- a/v0/builder/builder2v1/build_package_test.go
+++ b/builder/builder2v1/build_package_test.go
@@ -9,7 +9,7 @@ import (
 // ===== Package section builder tests =====
 func TestBuilder2_1CanBuildPackageSection(t *testing.T) {
 	packageName := "project1"
-	dirRoot := "../../../testdata/project1/"
+	dirRoot := "../../testdata/project1/"
 
 	wantVerificationCode := "fc9ac4a370af0a471c2e52af66d6b4cf4e2ba12b"
 
@@ -94,7 +94,7 @@ func TestBuilder2_1CanBuildPackageSection(t *testing.T) {
 
 func TestBuilder2_1CanIgnoreFiles(t *testing.T) {
 	packageName := "project3"
-	dirRoot := "../../../testdata/project3/"
+	dirRoot := "../../testdata/project3/"
 	pathsIgnored := []string{
 		"**/ignoredir/",
 		"/excludedir/",
diff --git a/v0/builder/builder2v1/build_relationship.go b/builder/builder2v1/build_relationship.go
index 6866d14..2215581 100644
--- a/v0/builder/builder2v1/build_relationship.go
+++ b/builder/builder2v1/build_relationship.go
@@ -5,7 +5,7 @@ package builder2v1
 import (
 	"fmt"
 
-	"github.com/spdx/tools-golang/v0/spdx"
+	"github.com/spdx/tools-golang/spdx"
 )
 
 // BuildRelationshipSection2_1 creates an SPDX Relationship (version 2.1)
diff --git a/v0/builder/builder2v1/build_relationship_test.go b/builder/builder2v1/build_relationship_test.go
index c8a2dac..c8a2dac 100644
--- a/v0/builder/builder2v1/build_relationship_test.go
+++ b/builder/builder2v1/build_relationship_test.go
diff --git a/examples/1-load/example_load.go b/examples/1-load/example_load.go
index bd87d9a..7cc9575 100644
--- a/examples/1-load/example_load.go
+++ b/examples/1-load/example_load.go
@@ -11,7 +11,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/spdx/tools-golang/v0/tvloader"
+	"github.com/spdx/tools-golang/tvloader"
 )
 
 func main() {
diff --git a/examples/2-load-save/example_load_save.go b/examples/2-load-save/example_load_save.go
index d415fcd..39ab501 100644
--- a/examples/2-load-save/example_load_save.go
+++ b/examples/2-load-save/example_load_save.go
@@ -11,8 +11,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/spdx/tools-golang/v0/tvloader"
-	"github.com/spdx/tools-golang/v0/tvsaver"
+	"github.com/spdx/tools-golang/tvloader"
+	"github.com/spdx/tools-golang/tvsaver"
 )
 
 func main() {
diff --git a/examples/3-build/example_build.go b/examples/3-build/example_build.go
index 7bb2146..64d6eb0 100644
--- a/examples/3-build/example_build.go
+++ b/examples/3-build/example_build.go
@@ -12,8 +12,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/spdx/tools-golang/v0/builder"
-	"github.com/spdx/tools-golang/v0/tvsaver"
+	"github.com/spdx/tools-golang/builder"
+	"github.com/spdx/tools-golang/tvsaver"
 )
 
 func main() {
@@ -56,7 +56,7 @@ func main() {
 
 		// note that builder will also add the following, in addition to the
 		// Creator defined above:
-		// Creator: Tool: github.com/spdx/tools-golang/v0/builder
+		// Creator: Tool: github.com/spdx/tools-golang/builder
 
 		// Finally, you can define one or more paths that should be ignored
 		// when walking through the directory. This is intended to omit files
diff --git a/examples/4-search/example_search.go b/examples/4-search/example_search.go
index c5d4854..4a983e4 100644
--- a/examples/4-search/example_search.go
+++ b/examples/4-search/example_search.go
@@ -14,9 +14,9 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/spdx/tools-golang/v0/idsearcher"
+	"github.com/spdx/tools-golang/idsearcher"
 
-	"github.com/spdx/tools-golang/v0/tvsaver"
+	"github.com/spdx/tools-golang/tvsaver"
 )
 
 func main() {
@@ -52,8 +52,8 @@ func main() {
 		// CreatorType and Creator, from builder.Config2_1, are not needed for
 		// idsearcher.Config. Because it is automated and doesn't assume
 		// further review, the following two Creator fields are filled in:
-		// Creator: Tool: github.com/spdx/tools-golang/v0/builder
-		// Creator: Tool: github.com/spdx/tools-golang/v0/idsearcher
+		// Creator: Tool: github.com/spdx/tools-golang/builder
+		// Creator: Tool: github.com/spdx/tools-golang/idsearcher
 
 		// You can define one or more paths that should be ignored
 		// when walking through the directory. This is intended to omit files
diff --git a/examples/5-report/example_report.go b/examples/5-report/example_report.go
index fa295ce..fff3439 100644
--- a/examples/5-report/example_report.go
+++ b/examples/5-report/example_report.go
@@ -12,8 +12,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/spdx/tools-golang/v0/reporter"
-	"github.com/spdx/tools-golang/v0/tvloader"
+	"github.com/spdx/tools-golang/reporter"
+	"github.com/spdx/tools-golang/tvloader"
 )
 
 func main() {
diff --git a/examples/6-licensediff/example_licensediff.go b/examples/6-licensediff/example_licensediff.go
index 435fc7c..3a7b401 100644
--- a/examples/6-licensediff/example_licensediff.go
+++ b/examples/6-licensediff/example_licensediff.go
@@ -14,8 +14,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/spdx/tools-golang/v0/licensediff"
-	"github.com/spdx/tools-golang/v0/tvloader"
+	"github.com/spdx/tools-golang/licensediff"
+	"github.com/spdx/tools-golang/tvloader"
 )
 
 func main() {
diff --git a/go.mod b/go.mod
new file mode 100644
index 0000000..c58bf98
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,3 @@
+module github.com/spdx/tools-golang
+
+go 1.13
diff --git a/v0/idsearcher/idsearcher.go b/idsearcher/idsearcher.go
index c20f330..253bdaa 100644
--- a/v0/idsearcher/idsearcher.go
+++ b/idsearcher/idsearcher.go
@@ -13,9 +13,9 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/spdx/tools-golang/v0/builder"
-	"github.com/spdx/tools-golang/v0/spdx"
-	"github.com/spdx/tools-golang/v0/utils"
+	"github.com/spdx/tools-golang/builder"
+	"github.com/spdx/tools-golang/spdx"
+	"github.com/spdx/tools-golang/utils"
 )
 
 // Config is a collection of configuration settings for docbuilder
@@ -53,7 +53,7 @@ func BuildIDsDocument(packageName string, dirRoot string, idconfig *Config) (*sp
 	bconfig := &builder.Config2_1{
 		NamespacePrefix: idconfig.NamespacePrefix,
 		CreatorType:     "Tool",
-		Creator:         "github.com/spdx/tools-golang/v0/idsearcher",
+		Creator:         "github.com/spdx/tools-golang/idsearcher",
 		PathsIgnored:    idconfig.BuilderPathsIgnored,
 	}
 	doc, err := builder.Build2_1(packageName, dirRoot, bconfig)
diff --git a/v0/idsearcher/idsearcher_test.go b/idsearcher/idsearcher_test.go
index 10178f9..7c70209 100644
--- a/v0/idsearcher/idsearcher_test.go
+++ b/idsearcher/idsearcher_test.go
@@ -9,7 +9,7 @@ import (
 // ===== Searcher top-level function tests =====
 func TestSearcherCanFillInIDs(t *testing.T) {
 	packageName := "project2"
-	dirRoot := "../../testdata/project2/"
+	dirRoot := "../testdata/project2/"
 	config := &Config{
 		NamespacePrefix: "https://github.com/swinslow/spdx-docs/spdx-go/testdata-",
 	}
@@ -174,7 +174,7 @@ func TestSearcherCanFillInIDs(t *testing.T) {
 
 func TestSearcherCanFillInIDsAndIgnorePaths(t *testing.T) {
 	packageName := "project3"
-	dirRoot := "../../testdata/project3/"
+	dirRoot := "../testdata/project3/"
 	config := &Config{
 		NamespacePrefix: "https://github.com/swinslow/spdx-docs/spdx-go/testdata-",
 		BuilderPathsIgnored: []string{
@@ -291,7 +291,7 @@ func TestSearcherFailsWithInvalidPath(t *testing.T) {
 
 // ===== Searcher utility tests =====
 func TestCanFindShortFormIDWhenPresent(t *testing.T) {
-	filePath := "../../testdata/project2/has-id.txt"
+	filePath := "../testdata/project2/has-id.txt"
 
 	ids, err := searchFileIDs(filePath)
 	if err != nil {
@@ -308,7 +308,7 @@ func TestCanFindShortFormIDWhenPresent(t *testing.T) {
 }
 
 func TestCanFindMultipleShortFormIDsWhenPresent(t *testing.T) {
-	filePath := "../../testdata/project2/has-multiple-ids.txt"
+	filePath := "../testdata/project2/has-multiple-ids.txt"
 
 	ids, err := searchFileIDs(filePath)
 	if err != nil {
@@ -331,7 +331,7 @@ func TestCanFindMultipleShortFormIDsWhenPresent(t *testing.T) {
 }
 
 func TestCanCollapseDuplicateShortFormIDsWhenPresent(t *testing.T) {
-	filePath := "../../testdata/project2/has-duplicate-ids.txt"
+	filePath := "../testdata/project2/has-duplicate-ids.txt"
 
 	ids, err := searchFileIDs(filePath)
 	if err != nil {
@@ -348,7 +348,7 @@ func TestCanCollapseDuplicateShortFormIDsWhenPresent(t *testing.T) {
 }
 
 func TestCanStripTrailingStarSlash(t *testing.T) {
-	filePath := "../../testdata/project2/folder/has-trailing-comment-marker.c"
+	filePath := "../testdata/project2/folder/has-trailing-comment-marker.c"
 
 	ids, err := searchFileIDs(filePath)
 	if err != nil {
@@ -365,7 +365,7 @@ func TestCanStripTrailingStarSlash(t *testing.T) {
 }
 
 func TestCanIgnoreShortFormIDWhenTooManyPrefixChars(t *testing.T) {
-	filePath := "../../testdata/project4/has-id-to-ignore.txt"
+	filePath := "../testdata/project4/has-id-to-ignore.txt"
 
 	ids, err := searchFileIDs(filePath)
 	if err != nil {
@@ -378,7 +378,7 @@ func TestCanIgnoreShortFormIDWhenTooManyPrefixChars(t *testing.T) {
 }
 
 func TestCanPickJustTheRightID(t *testing.T) {
-	filePath := "../../testdata/project4/has-mix-of-ids.txt"
+	filePath := "../testdata/project4/has-mix-of-ids.txt"
 
 	ids, err := searchFileIDs(filePath)
 	if err != nil {
@@ -395,7 +395,7 @@ func TestCanPickJustTheRightID(t *testing.T) {
 }
 
 func TestCannotFindShortFormIDWhenAbsent(t *testing.T) {
-	filePath := "../../testdata/project2/no-id.txt"
+	filePath := "../testdata/project2/no-id.txt"
 
 	ids, err := searchFileIDs(filePath)
 	if err != nil {
diff --git a/v0/licensediff/licensediff.go b/licensediff/licensediff.go
index b3ab184..9d693b0 100644
--- a/v0/licensediff/licensediff.go
+++ b/licensediff/licensediff.go
@@ -4,7 +4,7 @@
 package licensediff
 
 import (
-	"github.com/spdx/tools-golang/v0/spdx"
+	"github.com/spdx/tools-golang/spdx"
 )
 
 // LicensePair is a result set where we are talking about two license strings,
diff --git a/v0/licensediff/licensediff_test.go b/licensediff/licensediff_test.go
index c78cc68..4dedc58 100644
--- a/v0/licensediff/licensediff_test.go
+++ b/licensediff/licensediff_test.go
@@ -5,7 +5,7 @@ package licensediff
 import (
 	"testing"
 
-	"github.com/spdx/tools-golang/v0/spdx"
+	"github.com/spdx/tools-golang/spdx"
 )
 
 // ===== License diff top-level function tests =====
diff --git a/v0/reporter/reporter.go b/reporter/reporter.go
index 1c5cc23..a794d8a 100644
--- a/v0/reporter/reporter.go
+++ b/reporter/reporter.go
@@ -10,7 +10,7 @@ import (
 	"sort"
 	"text/tabwriter"
 
-	"github.com/spdx/tools-golang/v0/spdx"
+	"github.com/spdx/tools-golang/spdx"
 )
 
 // Generate takes a Package whose Files have been analyzed and an
diff --git a/v0/reporter/reporter_test.go b/reporter/reporter_test.go
index 65fc261..919e46b 100644
--- a/v0/reporter/reporter_test.go
+++ b/reporter/reporter_test.go
@@ -6,7 +6,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/spdx/tools-golang/v0/spdx"
+	"github.com/spdx/tools-golang/spdx"
 )
 
 // ===== Reporter top-level function tests =====
diff --git a/v0/spdx/annotation.go b/spdx/annotation.go
index 0846d62..0846d62 100644
--- a/v0/spdx/annotation.go
+++ b/spdx/annotation.go
diff --git a/v0/spdx/creation_info.go b/spdx/creation_info.go
index 1d4355c..1d4355c 100644
--- a/v0/spdx/creation_info.go
+++ b/spdx/creation_info.go
diff --git a/v0/spdx/document.go b/spdx/document.go
index 9f0c919..9f0c919 100644
--- a/v0/spdx/document.go
+++ b/spdx/document.go
diff --git a/v0/spdx/file.go b/spdx/file.go
index 3732107..3732107 100644
--- a/v0/spdx/file.go
+++ b/spdx/file.go
diff --git a/v0/spdx/other_license.go b/spdx/other_license.go
index 8d15d7f..8d15d7f 100644
--- a/v0/spdx/other_license.go
+++ b/spdx/other_license.go
diff --git a/v0/spdx/package.go b/spdx/package.go
index d49922f..d49922f 100644
--- a/v0/spdx/package.go
+++ b/spdx/package.go
diff --git a/v0/spdx/relationship.go b/spdx/relationship.go
index bc87967..bc87967 100644
--- a/v0/spdx/relationship.go
+++ b/spdx/relationship.go
diff --git a/v0/spdx/review.go b/spdx/review.go
index 36a6ea7..36a6ea7 100644
--- a/v0/spdx/review.go
+++ b/spdx/review.go
diff --git a/v0/spdx/snippet.go b/spdx/snippet.go
index 14b3b25..14b3b25 100644
--- a/v0/spdx/snippet.go
+++ b/spdx/snippet.go
diff --git a/v0/tvloader/parser2v1/parse_annotation.go b/tvloader/parser2v1/parse_annotation.go
index f83d5bb..f83d5bb 100644
--- a/v0/tvloader/parser2v1/parse_annotation.go
+++ b/tvloader/parser2v1/parse_annotation.go
diff --git a/v0/tvloader/parser2v1/parse_annotation_test.go b/tvloader/parser2v1/parse_annotation_test.go
index 2cceb23..9e53b2d 100644
--- a/v0/tvloader/parser2v1/parse_annotation_test.go
+++ b/tvloader/parser2v1/parse_annotation_test.go
@@ -4,7 +4,7 @@ package parser2v1
 import (
 	"testing"
 
-	"github.com/spdx/tools-golang/v0/spdx"
+	"github.com/spdx/tools-golang/spdx"
 )
 
 // ===== Annotation section tests =====
diff --git a/v0/tvloader/parser2v1/parse_creation_info.go b/tvloader/parser2v1/parse_creation_info.go
index 66e5d23..f29fe12 100644
--- a/v0/tvloader/parser2v1/parse_creation_info.go
+++ b/tvloader/parser2v1/parse_creation_info.go
@@ -5,7 +5,7 @@ package parser2v1
 import (
 	"fmt"
 
-	"github.com/spdx/tools-golang/v0/spdx"
+	"github.com/spdx/tools-golang/spdx"
 )
 
 func (parser *tvParser2_1) parsePairFromCreationInfo2_1(tag string, value string) error {
diff --git a/v0/tvloader/parser2v1/parse_creation_info_test.go b/tvloader/parser2v1/parse_creation_info_test.go
index 586842d..ea63dbc 100644
--- a/v0/tvloader/parser2v1/parse_creation_info_test.go
+++ b/tvloader/parser2v1/parse_creation_info_test.go
@@ -4,7 +4,7 @@ package parser2v1
 import (
 	"testing"
 
-	"github.com/spdx/tools-golang/v0/spdx"
+	"github.com/spdx/tools-golang/spdx"
 )
 
 // ===== Parser creation info state change tests =====
diff --git a/v0/tvloader/parser2v1/parse_file.go b/tvloader/parser2v1/parse_file.go
index 6290c60..449b4ae 100644
--- a/v0/tvloader/parser2v1/parse_file.go
+++ b/tvloader/parser2v1/parse_file.go
@@ -5,7 +5,7 @@ package parser2v1
 import (
 	"fmt"
 
-	"github.com/spdx/tools-golang/v0/spdx"
+	"github.com/spdx/tools-golang/spdx"
 )
 
 func (parser *tvParser2_1) parsePairFromFile2_1(tag string, value string) error {
diff --git a/v0/tvloader/parser2v1/parse_file_test.go b/tvloader/parser2v1/parse_file_test.go
index 6738825..9aef1ea 100644
--- a/v0/tvloader/parser2v1/parse_file_test.go
+++ b/tvloader/parser2v1/parse_file_test.go
@@ -4,7 +4,7 @@ package parser2v1
 import (
 	"testing"
 
-	"github.com/spdx/tools-golang/v0/spdx"
+	"github.com/spdx/tools-golang/spdx"
 )
 
 // ===== Parser file section state change tests =====
diff --git a/v0/tvloader/parser2v1/parse_other_license.go b/tvloader/parser2v1/parse_other_license.go
index 4aacd12..3090a89 100644
--- a/v0/tvloader/parser2v1/parse_other_license.go
+++ b/tvloader/parser2v1/parse_other_license.go
@@ -5,7 +5,7 @@ package parser2v1
 import (
 	"fmt"
 
-	"github.com/spdx/tools-golang/v0/spdx"
+	"github.com/spdx/tools-golang/spdx"
 )
 
 func (parser *tvParser2_1) parsePairFromOtherLicense2_1(tag string, value string) error {
diff --git a/v0/tvloader/parser2v1/parse_other_license_test.go b/tvloader/parser2v1/parse_other_license_test.go
index 68fbe9a..7d004de 100644
--- a/v0/tvloader/parser2v1/parse_other_license_test.go
+++ b/tvloader/parser2v1/parse_other_license_test.go
@@ -4,7 +4,7 @@ package parser2v1
 import (
 	"testing"
 
-	"github.com/spdx/tools-golang/v0/spdx"
+	"github.com/spdx/tools-golang/spdx"
 )
 
 // ===== Parser other license section state change tests =====
diff --git a/v0/tvloader/parser2v1/parse_package.go b/tvloader/parser2v1/parse_package.go
index 23a2726..1d04861 100644
--- a/v0/tvloader/parser2v1/parse_package.go
+++ b/tvloader/parser2v1/parse_package.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/spdx/tools-golang/v0/spdx"
+	"github.com/spdx/tools-golang/spdx"
 )
 
 func (parser *tvParser2_1) parsePairFromPackage2_1(tag string, value string) error {
diff --git a/v0/tvloader/parser2v1/parse_package_test.go b/tvloader/parser2v1/parse_package_test.go
index c1cffb1..bba6070 100644
--- a/v0/tvloader/parser2v1/parse_package_test.go
+++ b/tvloader/parser2v1/parse_package_test.go
@@ -4,7 +4,7 @@ package parser2v1
 import (
 	"testing"
 
-	"github.com/spdx/tools-golang/v0/spdx"
+	"github.com/spdx/tools-golang/spdx"
 )
 
 // ===== Parser package section state change tests =====
diff --git a/v0/tvloader/parser2v1/parse_relationship.go b/tvloader/parser2v1/parse_relationship.go
index 8b72285..8b72285 100644
--- a/v0/tvloader/parser2v1/parse_relationship.go
+++ b/tvloader/parser2v1/parse_relationship.go
diff --git a/v0/tvloader/parser2v1/parse_relationship_test.go b/tvloader/parser2v1/parse_relationship_test.go
index 17a36f5..17964fc 100644
--- a/v0/tvloader/parser2v1/parse_relationship_test.go
+++ b/tvloader/parser2v1/parse_relationship_test.go
@@ -4,7 +4,7 @@ package parser2v1
 import (
 	"testing"
 
-	"github.com/spdx/tools-golang/v0/spdx"
+	"github.com/spdx/tools-golang/spdx"
 )
 
 // ===== Relationship section tests =====
diff --git a/v0/tvloader/parser2v1/parse_review.go b/tvloader/parser2v1/parse_review.go
index 7494e5c..0d102d3 100644
--- a/v0/tvloader/parser2v1/parse_review.go
+++ b/tvloader/parser2v1/parse_review.go
@@ -5,7 +5,7 @@ package parser2v1
 import (
 	"fmt"
 
-	"github.com/spdx/tools-golang/v0/spdx"
+	"github.com/spdx/tools-golang/spdx"
 )
 
 func (parser *tvParser2_1) parsePairFromReview2_1(tag string, value string) error {
diff --git a/v0/tvloader/parser2v1/parse_review_test.go b/tvloader/parser2v1/parse_review_test.go
index 259723e..56a0fa8 100644
--- a/v0/tvloader/parser2v1/parse_review_test.go
+++ b/tvloader/parser2v1/parse_review_test.go
@@ -4,7 +4,7 @@ package parser2v1
 import (
 	"testing"
 
-	"github.com/spdx/tools-golang/v0/spdx"
+	"github.com/spdx/tools-golang/spdx"
 )
 
 // ===== Parser review section state change tests =====
diff --git a/v0/tvloader/parser2v1/parse_snippet.go b/tvloader/parser2v1/parse_snippet.go
index 7e8a45d..b9abbaf 100644
--- a/v0/tvloader/parser2v1/parse_snippet.go
+++ b/tvloader/parser2v1/parse_snippet.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/spdx/tools-golang/v0/spdx"
+	"github.com/spdx/tools-golang/spdx"
 )
 
 func (parser *tvParser2_1) parsePairFromSnippet2_1(tag string, value string) error {
diff --git a/v0/tvloader/parser2v1/parse_snippet_test.go b/tvloader/parser2v1/parse_snippet_test.go
index 5d5ad88..41b2f9e 100644
--- a/v0/tvloader/parser2v1/parse_snippet_test.go
+++ b/tvloader/parser2v1/parse_snippet_test.go
@@ -4,7 +4,7 @@ package parser2v1
 import (
 	"testing"
 
-	"github.com/spdx/tools-golang/v0/spdx"
+	"github.com/spdx/tools-golang/spdx"
 )
 
 // ===== Parser snippet section state change tests =====
diff --git a/v0/tvloader/parser2v1/parser.go b/tvloader/parser2v1/parser.go
index d437aaa..78f4685 100644
--- a/v0/tvloader/parser2v1/parser.go
+++ b/tvloader/parser2v1/parser.go
@@ -6,8 +6,8 @@ package parser2v1
 import (
 	"fmt"
 
-	"github.com/spdx/tools-golang/v0/spdx"
-	"github.com/spdx/tools-golang/v0/tvloader/reader"
+	"github.com/spdx/tools-golang/spdx"
+	"github.com/spdx/tools-golang/tvloader/reader"
 )
 
 // ParseTagValues takes a list of (tag, value) pairs, parses it and returns
diff --git a/v0/tvloader/parser2v1/parser_test.go b/tvloader/parser2v1/parser_test.go
index b07728e..55cb129 100644
--- a/v0/tvloader/parser2v1/parser_test.go
+++ b/tvloader/parser2v1/parser_test.go
@@ -4,7 +4,7 @@ package parser2v1
 import (
 	"testing"
 
-	"github.com/spdx/tools-golang/v0/tvloader/reader"
+	"github.com/spdx/tools-golang/tvloader/reader"
 )
 
 // ===== Parser exported entry point tests =====
diff --git a/v0/tvloader/parser2v1/types.go b/tvloader/parser2v1/types.go
index d56661a..5a73864 100644
--- a/v0/tvloader/parser2v1/types.go
+++ b/tvloader/parser2v1/types.go
@@ -3,7 +3,7 @@
 package parser2v1
 
 import (
-	"github.com/spdx/tools-golang/v0/spdx"
+	"github.com/spdx/tools-golang/spdx"
 )
 
 type tvParser2_1 struct {
diff --git a/v0/tvloader/parser2v1/util.go b/tvloader/parser2v1/util.go
index ed99063..ed99063 100644
--- a/v0/tvloader/parser2v1/util.go
+++ b/tvloader/parser2v1/util.go
diff --git a/v0/tvloader/parser2v1/util_test.go b/tvloader/parser2v1/util_test.go
index c544001..c544001 100644
--- a/v0/tvloader/parser2v1/util_test.go
+++ b/tvloader/parser2v1/util_test.go
diff --git a/v0/tvloader/reader/reader.go b/tvloader/reader/reader.go
index 786f7ea..786f7ea 100644
--- a/v0/tvloader/reader/reader.go
+++ b/tvloader/reader/reader.go
diff --git a/v0/tvloader/reader/reader_test.go b/tvloader/reader/reader_test.go
index 73b4c9f..73b4c9f 100644
--- a/v0/tvloader/reader/reader_test.go
+++ b/tvloader/reader/reader_test.go
diff --git a/v0/tvloader/tvloader.go b/tvloader/tvloader.go
index 7ff86c5..d24c174 100644
--- a/v0/tvloader/tvloader.go
+++ b/tvloader/tvloader.go
@@ -6,9 +6,9 @@ package tvloader
 import (
 	"io"
 
-	"github.com/spdx/tools-golang/v0/spdx"
-	"github.com/spdx/tools-golang/v0/tvloader/parser2v1"
-	"github.com/spdx/tools-golang/v0/tvloader/reader"
+	"github.com/spdx/tools-golang/spdx"
+	"github.com/spdx/tools-golang/tvloader/parser2v1"
+	"github.com/spdx/tools-golang/tvloader/reader"
 )
 
 // Load2_1 takes an io.Reader and returns a fully-parsed SPDX Document
diff --git a/v0/tvsaver/saver2v1/save_annotation.go b/tvsaver/saver2v1/save_annotation.go
index 18ee888..f46ed4a 100644
--- a/v0/tvsaver/saver2v1/save_annotation.go
+++ b/tvsaver/saver2v1/save_annotation.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/spdx/tools-golang/v0/spdx"
+	"github.com/spdx/tools-golang/spdx"
 )
 
 func renderAnnotation2_1(ann *spdx.Annotation2_1, w io.Writer) error {
diff --git a/v0/tvsaver/saver2v1/save_annotation_test.go b/tvsaver/saver2v1/save_annotation_test.go
index 7f22324..077e9f8 100644
--- a/v0/tvsaver/saver2v1/save_annotation_test.go
+++ b/tvsaver/saver2v1/save_annotation_test.go
@@ -6,7 +6,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/spdx/tools-golang/v0/spdx"
+	"github.com/spdx/tools-golang/spdx"
 )
 
 // ===== Annotation section Saver tests =====
diff --git a/v0/tvsaver/saver2v1/save_creation_info.go b/tvsaver/saver2v1/save_creation_info.go
index 0f3bfc7..1592923 100644
--- a/v0/tvsaver/saver2v1/save_creation_info.go
+++ b/tvsaver/saver2v1/save_creation_info.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/spdx/tools-golang/v0/spdx"
+	"github.com/spdx/tools-golang/spdx"
 )
 
 func renderCreationInfo2_1(ci *spdx.CreationInfo2_1, w io.Writer) error {
diff --git a/v0/tvsaver/saver2v1/save_creation_info_test.go b/tvsaver/saver2v1/save_creation_info_test.go
index 8ff5902..45db057 100644
--- a/v0/tvsaver/saver2v1/save_creation_info_test.go
+++ b/tvsaver/saver2v1/save_creation_info_test.go
@@ -6,7 +6,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/spdx/tools-golang/v0/spdx"
+	"github.com/spdx/tools-golang/spdx"
 )
 
 // ===== Creation Info section Saver tests =====
diff --git a/v0/tvsaver/saver2v1/save_document.go b/tvsaver/saver2v1/save_document.go
index 3d0c0e7..97891f5 100644
--- a/v0/tvsaver/saver2v1/save_document.go
+++ b/tvsaver/saver2v1/save_document.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/spdx/tools-golang/v0/spdx"
+	"github.com/spdx/tools-golang/spdx"
 )
 
 // RenderDocument2_1 is the main entry point to take an SPDX in-memory
diff --git a/v0/tvsaver/saver2v1/save_document_test.go b/tvsaver/saver2v1/save_document_test.go
index 1064c46..fd47b9c 100644
--- a/v0/tvsaver/saver2v1/save_document_test.go
+++ b/tvsaver/saver2v1/save_document_test.go
@@ -6,7 +6,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/spdx/tools-golang/v0/spdx"
+	"github.com/spdx/tools-golang/spdx"
 )
 
 // ===== entire Document Saver tests =====
diff --git a/v0/tvsaver/saver2v1/save_file.go b/tvsaver/saver2v1/save_file.go
index f7f94ed..a8b50f0 100644
--- a/v0/tvsaver/saver2v1/save_file.go
+++ b/tvsaver/saver2v1/save_file.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/spdx/tools-golang/v0/spdx"
+	"github.com/spdx/tools-golang/spdx"
 )
 
 func renderFile2_1(f *spdx.File2_1, w io.Writer) error {
diff --git a/v0/tvsaver/saver2v1/save_file_test.go b/tvsaver/saver2v1/save_file_test.go
index b992352..7b9fb87 100644
--- a/v0/tvsaver/saver2v1/save_file_test.go
+++ b/tvsaver/saver2v1/save_file_test.go
@@ -6,7 +6,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/spdx/tools-golang/v0/spdx"
+	"github.com/spdx/tools-golang/spdx"
 )
 
 // ===== File section Saver tests =====
diff --git a/v0/tvsaver/saver2v1/save_other_license.go b/tvsaver/saver2v1/save_other_license.go
index 0bc9f98..ea48b80 100644
--- a/v0/tvsaver/saver2v1/save_other_license.go
+++ b/tvsaver/saver2v1/save_other_license.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/spdx/tools-golang/v0/spdx"
+	"github.com/spdx/tools-golang/spdx"
 )
 
 func renderOtherLicense2_1(ol *spdx.OtherLicense2_1, w io.Writer) error {
diff --git a/v0/tvsaver/saver2v1/save_other_license_test.go b/tvsaver/saver2v1/save_other_license_test.go
index 149ddd0..5feb96e 100644
--- a/v0/tvsaver/saver2v1/save_other_license_test.go
+++ b/tvsaver/saver2v1/save_other_license_test.go
@@ -6,7 +6,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/spdx/tools-golang/v0/spdx"
+	"github.com/spdx/tools-golang/spdx"
 )
 
 // ===== Other License section Saver tests =====
diff --git a/v0/tvsaver/saver2v1/save_package.go b/tvsaver/saver2v1/save_package.go
index 5c0815d..3c83547 100644
--- a/v0/tvsaver/saver2v1/save_package.go
+++ b/tvsaver/saver2v1/save_package.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/spdx/tools-golang/v0/spdx"
+	"github.com/spdx/tools-golang/spdx"
 )
 
 func renderPackage2_1(pkg *spdx.Package2_1, w io.Writer) error {
diff --git a/v0/tvsaver/saver2v1/save_package_test.go b/tvsaver/saver2v1/save_package_test.go
index 7653491..deb80a8 100644
--- a/v0/tvsaver/saver2v1/save_package_test.go
+++ b/tvsaver/saver2v1/save_package_test.go
@@ -6,7 +6,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/spdx/tools-golang/v0/spdx"
+	"github.com/spdx/tools-golang/spdx"
 )
 
 // ===== Package section Saver tests =====
diff --git a/v0/tvsaver/saver2v1/save_relationship.go b/tvsaver/saver2v1/save_relationship.go
index 5c5ca91..0ba0670 100644
--- a/v0/tvsaver/saver2v1/save_relationship.go
+++ b/tvsaver/saver2v1/save_relationship.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/spdx/tools-golang/v0/spdx"
+	"github.com/spdx/tools-golang/spdx"
 )
 
 func renderRelationship2_1(rln *spdx.Relationship2_1, w io.Writer) error {
diff --git a/v0/tvsaver/saver2v1/save_relationship_test.go b/tvsaver/saver2v1/save_relationship_test.go
index 6cd07c7..9f4191a 100644
--- a/v0/tvsaver/saver2v1/save_relationship_test.go
+++ b/tvsaver/saver2v1/save_relationship_test.go
@@ -6,7 +6,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/spdx/tools-golang/v0/spdx"
+	"github.com/spdx/tools-golang/spdx"
 )
 
 // ===== Relationship section Saver tests =====
diff --git a/v0/tvsaver/saver2v1/save_review.go b/tvsaver/saver2v1/save_review.go
index 382d0ab..8d192ba 100644
--- a/v0/tvsaver/saver2v1/save_review.go
+++ b/tvsaver/saver2v1/save_review.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/spdx/tools-golang/v0/spdx"
+	"github.com/spdx/tools-golang/spdx"
 )
 
 func renderReview2_1(rev *spdx.Review2_1, w io.Writer) error {
diff --git a/v0/tvsaver/saver2v1/save_review_test.go b/tvsaver/saver2v1/save_review_test.go
index cf91282..d780467 100644
--- a/v0/tvsaver/saver2v1/save_review_test.go
+++ b/tvsaver/saver2v1/save_review_test.go
@@ -6,7 +6,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/spdx/tools-golang/v0/spdx"
+	"github.com/spdx/tools-golang/spdx"
 )
 
 // ===== Review section Saver tests =====
diff --git a/v0/tvsaver/saver2v1/save_snippet.go b/tvsaver/saver2v1/save_snippet.go
index 88a6703..d42282b 100644
--- a/v0/tvsaver/saver2v1/save_snippet.go
+++ b/tvsaver/saver2v1/save_snippet.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/spdx/tools-golang/v0/spdx"
+	"github.com/spdx/tools-golang/spdx"
 )
 
 func renderSnippet2_1(sn *spdx.Snippet2_1, w io.Writer) error {
diff --git a/v0/tvsaver/saver2v1/save_snippet_test.go b/tvsaver/saver2v1/save_snippet_test.go
index 7ea017a..e4c76e9 100644
--- a/v0/tvsaver/saver2v1/save_snippet_test.go
+++ b/tvsaver/saver2v1/save_snippet_test.go
@@ -6,7 +6,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/spdx/tools-golang/v0/spdx"
+	"github.com/spdx/tools-golang/spdx"
 )
 
 // ===== Snippet section Saver tests =====
diff --git a/v0/tvsaver/saver2v1/util.go b/tvsaver/saver2v1/util.go
index e206449..e206449 100644
--- a/v0/tvsaver/saver2v1/util.go
+++ b/tvsaver/saver2v1/util.go
diff --git a/v0/tvsaver/saver2v1/util_test.go b/tvsaver/saver2v1/util_test.go
index aceccb7..aceccb7 100644
--- a/v0/tvsaver/saver2v1/util_test.go
+++ b/tvsaver/saver2v1/util_test.go
diff --git a/v0/tvsaver/tvsaver.go b/tvsaver/tvsaver.go
index 968e4cf..3f09d91 100644
--- a/v0/tvsaver/tvsaver.go
+++ b/tvsaver/tvsaver.go
@@ -6,8 +6,8 @@ package tvsaver
 import (
 	"io"
 
-	"github.com/spdx/tools-golang/v0/spdx"
-	"github.com/spdx/tools-golang/v0/tvsaver/saver2v1"
+	"github.com/spdx/tools-golang/spdx"
+	"github.com/spdx/tools-golang/tvsaver/saver2v1"
 )
 
 // Save2_1 takes an io.Writer and an SPDX Document (version 2.1),
diff --git a/v0/utils/filesystem.go b/utils/filesystem.go
index bb8c53e..bb8c53e 100644
--- a/v0/utils/filesystem.go
+++ b/utils/filesystem.go
diff --git a/v0/utils/filesystem_test.go b/utils/filesystem_test.go
index 89405a6..70e1291 100644
--- a/v0/utils/filesystem_test.go
+++ b/utils/filesystem_test.go
@@ -8,7 +8,7 @@ import (
 
 // ===== Filesystem and hash functionality tests =====
 func TestFilesystemCanGetSliceOfFolderContents(t *testing.T) {
-	dirRoot := "../../testdata/project1/"
+	dirRoot := "../testdata/project1/"
 
 	filePaths, err := GetAllFilePaths(dirRoot, nil)
 	if err != nil {
@@ -51,7 +51,7 @@ func TestFilesystemGetAllFilePathsFailsForNonExistentDirectory(t *testing.T) {
 }
 
 func TestFilesystemCanIgnoreFilesWhenGettingFilePaths(t *testing.T) {
-	dirRoot := "../../testdata/project3/"
+	dirRoot := "../testdata/project3/"
 	pathsIgnored := []string{
 		"**/ignoredir/",
 		"/excludedir/",
@@ -95,7 +95,7 @@ func TestFilesystemCanIgnoreFilesWhenGettingFilePaths(t *testing.T) {
 // FIXME appropriate permissions to read its (sub)contents
 
 func TestFilesystemGetsHashesForFilePath(t *testing.T) {
-	f := "../../testdata/project1/file1.testdata.txt"
+	f := "../testdata/project1/file1.testdata.txt"
 
 	ssha1, ssha256, smd5, err := GetHashesForFilePath(f)
 	if err != nil {
diff --git a/v0/utils/verification.go b/utils/verification.go
index 8ababec..5fbf62b 100644
--- a/v0/utils/verification.go
+++ b/utils/verification.go
@@ -9,7 +9,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/spdx/tools-golang/v0/spdx"
+	"github.com/spdx/tools-golang/spdx"
 )
 
 // GetVerificationCode2_1 takes a slice of files and an optional filename
diff --git a/v0/utils/verification_test.go b/utils/verification_test.go
index f9dd161..b8ba9a0 100644
--- a/v0/utils/verification_test.go
+++ b/utils/verification_test.go
@@ -5,7 +5,7 @@ package utils
 import (
 	"testing"
 
-	"github.com/spdx/tools-golang/v0/spdx"
+	"github.com/spdx/tools-golang/spdx"
 )
 
 // ===== Verification code functionality tests =====