diff --git a/lib/funky/funky.go b/common/funky/funky.go
similarity index 100%
rename from lib/funky/funky.go
rename to common/funky/funky.go
diff --git a/lib/funky/iterator.go b/common/funky/iterator.go
similarity index 100%
rename from lib/funky/iterator.go
rename to common/funky/iterator.go
diff --git a/forge/stack/stack.go b/common/stack/stack.go
similarity index 100%
rename from forge/stack/stack.go
rename to common/stack/stack.go
diff --git a/forge/voc/voc.go b/common/voc/voc.go
similarity index 95%
rename from forge/voc/voc.go
rename to common/voc/voc.go
index 29a4c9d..11abe89 100644
--- a/forge/voc/voc.go
+++ b/common/voc/voc.go
@@ -5,7 +5,7 @@
 package voc
 
 import (
-	"git.sr.ht/~cco/go-scopes/lib/funky"
+	"git.sr.ht/~cco/go-scopes/common/funky"
 )
 
 type VocData[V any] map[string][]V
diff --git a/tests/forge_test.go b/tests/common_test.go
similarity index 87%
rename from tests/forge_test.go
rename to tests/common_test.go
index 315fb76..cbfdc68 100644
--- a/tests/forge_test.go
+++ b/tests/common_test.go
@@ -3,12 +3,12 @@ package scopes_test
 import (
 	tbase "testing"
 
-	"git.sr.ht/~cco/go-scopes/forge/stack"
-	"git.sr.ht/~cco/go-scopes/forge/voc"
+	"git.sr.ht/~cco/go-scopes/common/stack"
+	"git.sr.ht/~cco/go-scopes/common/voc"
 	"git.sr.ht/~cco/go-scopes/testing"
 )
 
-func TestForge(tb *tbase.T) {
+func TestCommon(tb *tbase.T) {
 	t := testing.SetUp(tb)
 	t.Run("stack", StackTest)
 	t.Run("voc", VocTest)
diff --git a/tests/funky_test.go b/tests/funky_test.go
index 364e3ef..b530b4c 100644
--- a/tests/funky_test.go
+++ b/tests/funky_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	tbase "testing"
 
-	"git.sr.ht/~cco/go-scopes/lib/funky"
+	"git.sr.ht/~cco/go-scopes/common/funky"
 	"git.sr.ht/~cco/go-scopes/testing"
 )