diff --git a/README.md b/README.md
index 4aa7158..9ec626c 100644
--- a/README.md
+++ b/README.md
@@ -88,10 +88,6 @@ folder at the root of the repository.
 
 ## Prerequisites
 
-This tutorial was developed on a system running Pop OS based on Ubuntu 21. As
-such there may be some small differences compared to Ubuntu 20, but protobuf
-will still be version 3.
-
 In general, you will be deploying your binaries to systems also running ubuntu
 20 or 21 or similar, on x86-64 platform, so the same instructions can be used in
 setting up a fresh server when deploying. We will not cover Docker or any other
@@ -314,7 +310,8 @@ why the tutorial uses such a simple application.
 To run the protobuf compiler and generate the code, from the root of the
 repository you run the following command:
 
-    protoc --go_out=. --go_opt=paths=source_relative --go-grpc_out=. --go-grpc_opt=paths=source_relative ./pkg/proto/based32.proto
+    protoc --go_out=. --go_opt=paths=source_relative --go-grpc_out=. \ 
+      --go-grpc_opt=paths=source_relative ./pkg/proto/based32.proto
 
 `--go_out` is essential for when generating Go versions of the protobuf handler
 code. Without this, the remaining options are not understood.
diff --git a/pkg/based32/based32.go b/pkg/based32/based32.go
index f1cb3ec..cf981e3 100644
--- a/pkg/based32/based32.go
+++ b/pkg/based32/based32.go
@@ -13,7 +13,7 @@ package based32
 
 import (
 	"encoding/base32"
-	"github.com/quanterall/kitchensink"
+	"github.com/quanterall/kitchensink/pkg/codec"
 	"github.com/quanterall/kitchensink/pkg/proto"
 	"lukechampine.com/blake3"
 	"strings"
@@ -244,8 +244,9 @@ func makeCodec(
 		// and won't decode as it is expected.
 		if !strings.HasPrefix(input, cdc.HRP) {
 
-			log.Printf("Provided string has incorrect human readable part:"+
-				"found '%s' expected '%s'", input[:len(cdc.HRP)], cdc.HRP,
+			log.Printf(
+				"Provided string has incorrect human readable part:"+
+					"found '%s' expected '%s'", input[:len(cdc.HRP)], cdc.HRP,
 			)
 
 			err = proto.Error_INCORRECT_HUMAN_READABLE_PART
diff --git a/types.go b/pkg/codec/types.go
similarity index 100%
rename from types.go
rename to pkg/codec/types.go
diff --git a/installtoc.sh b/scripts/installtoc.sh
similarity index 100%
rename from installtoc.sh
rename to scripts/installtoc.sh
diff --git a/toc.sh b/scripts/toc.sh
similarity index 100%
rename from toc.sh
rename to scripts/toc.sh