diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index cc92844..a7943c1 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -3,15 +3,17 @@ on:
   push:
     branches:
       - master
+      - v2
   pull_request:
     branches:
       - master
+      - v2
 
 jobs:
   build:
     strategy:
       matrix:
-        go-version: [1.19.x, 1.20.x]
+        go-version: [1.21.x, 1.22.x]
     name: Linux
     runs-on: ubuntu-latest
     steps:
@@ -25,11 +27,11 @@ jobs:
     - name: Install libpcsc
       run: sudo apt-get install -y libpcsclite-dev pcscd pcsc-tools
     - name: Test
-      run: "make test"
+      run: "go test -C v2 ./..."
   build-windows:
     strategy:
       matrix:
-        go-version: [1.19.x, 1.20.x]
+        go-version: [1.21.x, 1.22.x]
     name: Windows
     runs-on: windows-latest
     steps:
@@ -41,6 +43,6 @@ jobs:
     - name: Check out code into the Go module directory
       uses: actions/checkout@v2
     - name: Test
-      run: "make build"
+      run: "go build -C v2 ./..."
       env:
         CGO_ENABLED: 0
diff --git a/Makefile b/Makefile
deleted file mode 100644
index d454b69..0000000
--- a/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-.PHONY: test
-test:
-	go test -v ./...
-
-.PHONY: build
-build:
-	go build ./...
diff --git a/go.mod b/v2/go.mod
similarity index 100%
rename from go.mod
rename to v2/go.mod
diff --git a/piv/doc.go b/v2/piv/doc.go
similarity index 100%
rename from piv/doc.go
rename to v2/piv/doc.go
diff --git a/piv/key.go b/v2/piv/key.go
similarity index 100%
rename from piv/key.go
rename to v2/piv/key.go
diff --git a/piv/key_test.go b/v2/piv/key_test.go
similarity index 100%
rename from piv/key_test.go
rename to v2/piv/key_test.go
diff --git a/piv/pcsc.go b/v2/piv/pcsc.go
similarity index 100%
rename from piv/pcsc.go
rename to v2/piv/pcsc.go
diff --git a/piv/pcsc_darwin.go b/v2/piv/pcsc_darwin.go
similarity index 100%
rename from piv/pcsc_darwin.go
rename to v2/piv/pcsc_darwin.go
diff --git a/piv/pcsc_errors b/v2/piv/pcsc_errors
similarity index 100%
rename from piv/pcsc_errors
rename to v2/piv/pcsc_errors
diff --git a/piv/pcsc_errors.go b/v2/piv/pcsc_errors.go
similarity index 100%
rename from piv/pcsc_errors.go
rename to v2/piv/pcsc_errors.go
diff --git a/piv/pcsc_errors.py b/v2/piv/pcsc_errors.py
similarity index 100%
rename from piv/pcsc_errors.py
rename to v2/piv/pcsc_errors.py
diff --git a/piv/pcsc_freebsd.go b/v2/piv/pcsc_freebsd.go
similarity index 100%
rename from piv/pcsc_freebsd.go
rename to v2/piv/pcsc_freebsd.go
diff --git a/piv/pcsc_linux.go b/v2/piv/pcsc_linux.go
similarity index 100%
rename from piv/pcsc_linux.go
rename to v2/piv/pcsc_linux.go
diff --git a/piv/pcsc_openbsd.go b/v2/piv/pcsc_openbsd.go
similarity index 100%
rename from piv/pcsc_openbsd.go
rename to v2/piv/pcsc_openbsd.go
diff --git a/piv/pcsc_test.go b/v2/piv/pcsc_test.go
similarity index 100%
rename from piv/pcsc_test.go
rename to v2/piv/pcsc_test.go
diff --git a/piv/pcsc_unix.go b/v2/piv/pcsc_unix.go
similarity index 100%
rename from piv/pcsc_unix.go
rename to v2/piv/pcsc_unix.go
diff --git a/piv/pcsc_windows.go b/v2/piv/pcsc_windows.go
similarity index 100%
rename from piv/pcsc_windows.go
rename to v2/piv/pcsc_windows.go
diff --git a/piv/piv.go b/v2/piv/piv.go
similarity index 100%
rename from piv/piv.go
rename to v2/piv/piv.go
diff --git a/piv/piv_test.go b/v2/piv/piv_test.go
similarity index 100%
rename from piv/piv_test.go
rename to v2/piv/piv_test.go
diff --git a/third_party/rsa/LICENSE b/v2/third_party/rsa/LICENSE
similarity index 100%
rename from third_party/rsa/LICENSE
rename to v2/third_party/rsa/LICENSE
diff --git a/third_party/rsa/README b/v2/third_party/rsa/README
similarity index 100%
rename from third_party/rsa/README
rename to v2/third_party/rsa/README
diff --git a/third_party/rsa/pss.go b/v2/third_party/rsa/pss.go
similarity index 100%
rename from third_party/rsa/pss.go
rename to v2/third_party/rsa/pss.go