diff --git a/pkg/oonimkall/.gitignore b/pkg/oonimkall/.gitignore
new file mode 100644
index 0000000..ace1063
--- /dev/null
+++ b/pkg/oonimkall/.gitignore
@@ -0,0 +1 @@
+/testdata
diff --git a/pkg/oonimkall/tasks/chanlogger.go b/pkg/oonimkall/internal/tasks/chanlogger.go
similarity index 100%
rename from pkg/oonimkall/tasks/chanlogger.go
rename to pkg/oonimkall/internal/tasks/chanlogger.go
diff --git a/pkg/oonimkall/tasks/event.go b/pkg/oonimkall/internal/tasks/event.go
similarity index 100%
rename from pkg/oonimkall/tasks/event.go
rename to pkg/oonimkall/internal/tasks/event.go
diff --git a/pkg/oonimkall/tasks/eventemitter.go b/pkg/oonimkall/internal/tasks/eventemitter.go
similarity index 100%
rename from pkg/oonimkall/tasks/eventemitter.go
rename to pkg/oonimkall/internal/tasks/eventemitter.go
diff --git a/pkg/oonimkall/tasks/eventemitter_test.go b/pkg/oonimkall/internal/tasks/eventemitter_test.go
similarity index 95%
rename from pkg/oonimkall/tasks/eventemitter_test.go
rename to pkg/oonimkall/internal/tasks/eventemitter_test.go
index 308d8ba..63630e3 100644
--- a/pkg/oonimkall/tasks/eventemitter_test.go
+++ b/pkg/oonimkall/internal/tasks/eventemitter_test.go
@@ -3,7 +3,7 @@ package tasks_test
 import (
 	"testing"
 
-	"github.com/ooni/probe-cli/v3/pkg/oonimkall/tasks"
+	"github.com/ooni/probe-cli/v3/pkg/oonimkall/internal/tasks"
 )
 
 func TestDisabledEvents(t *testing.T) {
diff --git a/pkg/oonimkall/tasks/runner.go b/pkg/oonimkall/internal/tasks/runner.go
similarity index 100%
rename from pkg/oonimkall/tasks/runner.go
rename to pkg/oonimkall/internal/tasks/runner.go
diff --git a/pkg/oonimkall/tasks/runner_integration_test.go b/pkg/oonimkall/internal/tasks/runner_integration_test.go
similarity index 99%
rename from pkg/oonimkall/tasks/runner_integration_test.go
rename to pkg/oonimkall/internal/tasks/runner_integration_test.go
index e8514b6..f508108 100644
--- a/pkg/oonimkall/tasks/runner_integration_test.go
+++ b/pkg/oonimkall/internal/tasks/runner_integration_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ooni/probe-cli/v3/pkg/oonimkall/tasks"
+	"github.com/ooni/probe-cli/v3/pkg/oonimkall/internal/tasks"
 )
 
 func TestRunnerMaybeLookupBackendsFailure(t *testing.T) {
diff --git a/pkg/oonimkall/tasks/runner_internal_test.go b/pkg/oonimkall/internal/tasks/runner_internal_test.go
similarity index 100%
rename from pkg/oonimkall/tasks/runner_internal_test.go
rename to pkg/oonimkall/internal/tasks/runner_internal_test.go
diff --git a/pkg/oonimkall/tasks/settings.go b/pkg/oonimkall/internal/tasks/settings.go
similarity index 100%
rename from pkg/oonimkall/tasks/settings.go
rename to pkg/oonimkall/internal/tasks/settings.go
diff --git a/pkg/oonimkall/task.go b/pkg/oonimkall/task.go
index 3e68e95..1ad82db 100644
--- a/pkg/oonimkall/task.go
+++ b/pkg/oonimkall/task.go
@@ -45,7 +45,7 @@ import (
 
 	"github.com/ooni/probe-cli/v3/internal/engine/atomicx"
 	"github.com/ooni/probe-cli/v3/internal/engine/runtimex"
-	"github.com/ooni/probe-cli/v3/pkg/oonimkall/tasks"
+	"github.com/ooni/probe-cli/v3/pkg/oonimkall/internal/tasks"
 )
 
 // Task is an asynchronous task running an experiment. It mimics the
diff --git a/pkg/oonimkall/task_integration_test.go b/pkg/oonimkall/task_integration_test.go
index 4e9282c..4bebd0e 100644
--- a/pkg/oonimkall/task_integration_test.go
+++ b/pkg/oonimkall/task_integration_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/ooni/probe-cli/v3/internal/engine/model"
 	"github.com/ooni/probe-cli/v3/pkg/oonimkall"
-	"github.com/ooni/probe-cli/v3/pkg/oonimkall/tasks"
+	"github.com/ooni/probe-cli/v3/pkg/oonimkall/internal/tasks"
 )
 
 type eventlike struct {