diff --git a/cmd/yaegi/extract.go b/cmd/yaegi/extract.go
index 9de94a65..600471b2 100644
--- a/cmd/yaegi/extract.go
+++ b/cmd/yaegi/extract.go
@@ -10,7 +10,7 @@ import (
 	"path"
 	"strings"
 
-	"github.com/traefik/yaegi/internal/extract"
+	"github.com/traefik/yaegi/extract"
 )
 
 func extractCmd(arg []string) error {
diff --git a/internal/extract/extract.go b/extract/extract.go
similarity index 100%
rename from internal/extract/extract.go
rename to extract/extract.go
diff --git a/internal/extract/extract_test.go b/extract/extract_test.go
similarity index 100%
rename from internal/extract/extract_test.go
rename to extract/extract_test.go
diff --git a/internal/extract/testdata/1/src/guthib.com/bar/main.go b/extract/testdata/1/src/guthib.com/bar/main.go
similarity index 100%
rename from internal/extract/testdata/1/src/guthib.com/bar/main.go
rename to extract/testdata/1/src/guthib.com/bar/main.go
diff --git a/internal/extract/testdata/1/src/guthib.com/baz/baz.go b/extract/testdata/1/src/guthib.com/baz/baz.go
similarity index 100%
rename from internal/extract/testdata/1/src/guthib.com/baz/baz.go
rename to extract/testdata/1/src/guthib.com/baz/baz.go
diff --git a/internal/extract/testdata/1/src/guthib.com/baz/go.mod b/extract/testdata/1/src/guthib.com/baz/go.mod
similarity index 100%
rename from internal/extract/testdata/1/src/guthib.com/baz/go.mod
rename to extract/testdata/1/src/guthib.com/baz/go.mod
diff --git a/internal/extract/testdata/2/src/guthib.com/bar/main.go b/extract/testdata/2/src/guthib.com/bar/main.go
similarity index 100%
rename from internal/extract/testdata/2/src/guthib.com/bar/main.go
rename to extract/testdata/2/src/guthib.com/bar/main.go
diff --git a/internal/extract/testdata/2/src/guthib.com/baz/baz.go b/extract/testdata/2/src/guthib.com/baz/baz.go
similarity index 100%
rename from internal/extract/testdata/2/src/guthib.com/baz/baz.go
rename to extract/testdata/2/src/guthib.com/baz/baz.go
diff --git a/internal/extract/testdata/3/src/guthib.com/bar/main.go b/extract/testdata/3/src/guthib.com/bar/main.go
similarity index 100%
rename from internal/extract/testdata/3/src/guthib.com/bar/main.go
rename to extract/testdata/3/src/guthib.com/bar/main.go
diff --git a/internal/extract/testdata/3/src/guthib.com/baz/baz.go b/extract/testdata/3/src/guthib.com/baz/baz.go
similarity index 100%
rename from internal/extract/testdata/3/src/guthib.com/baz/baz.go
rename to extract/testdata/3/src/guthib.com/baz/baz.go
diff --git a/internal/extract/testdata/3/src/guthib.com/baz/go.mod b/extract/testdata/3/src/guthib.com/baz/go.mod
similarity index 100%
rename from internal/extract/testdata/3/src/guthib.com/baz/go.mod
rename to extract/testdata/3/src/guthib.com/baz/go.mod
diff --git a/internal/extract/testdata/4/src/guthib.com/bar/main.go b/extract/testdata/4/src/guthib.com/bar/main.go
similarity index 100%
rename from internal/extract/testdata/4/src/guthib.com/bar/main.go
rename to extract/testdata/4/src/guthib.com/bar/main.go
diff --git a/internal/extract/testdata/4/src/guthib.com/bar/vendor/guthib.com/baz/baz.go b/extract/testdata/4/src/guthib.com/bar/vendor/guthib.com/baz/baz.go
similarity index 100%
rename from internal/extract/testdata/4/src/guthib.com/bar/vendor/guthib.com/baz/baz.go
rename to extract/testdata/4/src/guthib.com/bar/vendor/guthib.com/baz/baz.go
diff --git a/internal/extract/testdata/4/src/guthib.com/bar/vendor/guthib.com/baz/go.mod b/extract/testdata/4/src/guthib.com/bar/vendor/guthib.com/baz/go.mod
similarity index 100%
rename from internal/extract/testdata/4/src/guthib.com/bar/vendor/guthib.com/baz/go.mod
rename to extract/testdata/4/src/guthib.com/bar/vendor/guthib.com/baz/go.mod
diff --git a/internal/extract/testdata/5/src/guthib.com/bar/main.go b/extract/testdata/5/src/guthib.com/bar/main.go
similarity index 100%
rename from internal/extract/testdata/5/src/guthib.com/bar/main.go
rename to extract/testdata/5/src/guthib.com/bar/main.go
diff --git a/internal/extract/testdata/5/src/guthib.com/bar/vendor/guthib.com/baz/baz.go b/extract/testdata/5/src/guthib.com/bar/vendor/guthib.com/baz/baz.go
similarity index 100%
rename from internal/extract/testdata/5/src/guthib.com/bar/vendor/guthib.com/baz/baz.go
rename to extract/testdata/5/src/guthib.com/bar/vendor/guthib.com/baz/baz.go
diff --git a/generate.go b/generate.go
index dc7fad14..d80bb725 100644
--- a/generate.go
+++ b/generate.go
@@ -1,6 +1,6 @@
 package yaegi
 
-//go:generate go generate github.com/traefik/yaegi/internal/extract
+//go:generate go generate github.com/traefik/yaegi/internal/cmd/extract
 //go:generate go generate github.com/traefik/yaegi/interp
 //go:generate go generate github.com/traefik/yaegi/stdlib
 //go:generate go generate github.com/traefik/yaegi/stdlib/syscall
diff --git a/internal/cmd/extract/extract.go b/internal/cmd/extract/extract.go
index 271b6a44..e1ca5b28 100644
--- a/internal/cmd/extract/extract.go
+++ b/internal/cmd/extract/extract.go
@@ -28,7 +28,7 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/traefik/yaegi/internal/extract"
+	"github.com/traefik/yaegi/extract"
 )
 
 var (