diff --git a/.gitignore b/.gitignore
index 2cab8da..8e8da87 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,8 @@
 /*.tar.gz
 /*.zip
 /coverage.cov
+/miniooni
+/miniooni.exe
 /ooniprobe
 /ooniprobe.exe
 /ooniprobe_checksums.txt
diff --git a/build-miniooni.sh b/build-miniooni.sh
index 7ba4273..18b2434 100755
--- a/build-miniooni.sh
+++ b/build-miniooni.sh
@@ -3,27 +3,27 @@ set -e
 case $1 in
   macos|darwin)
     export GOOS=darwin GOARCH=amd64
-    go build -o ./CLI/darwin/amd64 -ldflags="-s -w" ./internal/engine/cmd/miniooni
+    go build -o ./CLI/darwin/amd64 -ldflags="-s -w" ./internal/cmd/miniooni
     echo "Binary ready at ./CLI/darwin/amd64/miniooni";;
   linux)
     export GOOS=linux GOARCH=386
-    go build -o ./CLI/linux/386 -tags netgo -ldflags='-s -w -extldflags "-static"' ./internal/engine/cmd/miniooni
+    go build -o ./CLI/linux/386 -tags netgo -ldflags='-s -w -extldflags "-static"' ./internal/cmd/miniooni
     echo "Binary ready at ./CLI/linux/386/miniooni"
     export GOOS=linux GOARCH=amd64
-    go build -o ./CLI/linux/amd64 -tags netgo -ldflags='-s -w -extldflags "-static"' ./internal/engine/cmd/miniooni
+    go build -o ./CLI/linux/amd64 -tags netgo -ldflags='-s -w -extldflags "-static"' ./internal/cmd/miniooni
     echo "Binary ready at ./CLI/linux/amd64/miniooni"
     export GOOS=linux GOARCH=arm GOARM=7
-    go build -o ./CLI/linux/arm -tags netgo -ldflags='-s -w -extldflags "-static"' ./internal/engine/cmd/miniooni
+    go build -o ./CLI/linux/arm -tags netgo -ldflags='-s -w -extldflags "-static"' ./internal/cmd/miniooni
     echo "Binary ready at ./CLI/linux/arm/miniooni"
     export GOOS=linux GOARCH=arm64
-    go build -o ./CLI/linux/arm64 -tags netgo -ldflags='-s -w -extldflags "-static"' ./internal/engine/cmd/miniooni
+    go build -o ./CLI/linux/arm64 -tags netgo -ldflags='-s -w -extldflags "-static"' ./internal/cmd/miniooni
     echo "Binary ready at ./CLI/linux/arm64/miniooni";;
   windows)
     export GOOS=windows GOARCH=386
-    go build -o ./CLI/windows/386 -ldflags="-s -w" ./internal/engine/cmd/miniooni
+    go build -o ./CLI/windows/386 -ldflags="-s -w" ./internal/cmd/miniooni
     echo "Binary ready at ./CLI/windows/386/miniooni.exe"
     export GOOS=windows GOARCH=amd64
-    go build -o ./CLI/windows/amd64 -ldflags="-s -w" ./internal/engine/cmd/miniooni
+    go build -o ./CLI/windows/amd64 -ldflags="-s -w" ./internal/cmd/miniooni
     echo "Binary ready at ./CLI/windows/amd64/miniooni.exe";;
   *)
     echo "usage: $0 darwin|linux|windows" 1>&2
diff --git a/internal/engine/cmd/miniooni/README.md b/internal/cmd/miniooni/README.md
similarity index 100%
rename from internal/engine/cmd/miniooni/README.md
rename to internal/cmd/miniooni/README.md
diff --git a/internal/engine/cmd/miniooni/main.go b/internal/cmd/miniooni/main.go
similarity index 85%
rename from internal/engine/cmd/miniooni/main.go
rename to internal/cmd/miniooni/main.go
index 6ee48f8..79546db 100644
--- a/internal/engine/cmd/miniooni/main.go
+++ b/internal/cmd/miniooni/main.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/ooni/probe-cli/v3/internal/engine/libminiooni"
+	"github.com/ooni/probe-cli/v3/internal/libminiooni"
 )
 
 func main() {
diff --git a/internal/engine/experiment/dash/dash.go b/internal/engine/experiment/dash/dash.go
index ae01c22..5fdfd14 100644
--- a/internal/engine/experiment/dash/dash.go
+++ b/internal/engine/experiment/dash/dash.go
@@ -15,7 +15,7 @@ import (
 	"time"
 
 	"github.com/montanaflynn/stats"
-	"github.com/ooni/probe-cli/v3/internal/engine/internal/humanizex"
+	"github.com/ooni/probe-cli/v3/internal/engine/humanizex"
 	"github.com/ooni/probe-cli/v3/internal/engine/model"
 	"github.com/ooni/probe-cli/v3/internal/engine/netx"
 	"github.com/ooni/probe-cli/v3/internal/engine/netx/errorx"
diff --git a/internal/engine/experiment/ndt7/ndt7.go b/internal/engine/experiment/ndt7/ndt7.go
index ef268d9..5fe3982 100644
--- a/internal/engine/experiment/ndt7/ndt7.go
+++ b/internal/engine/experiment/ndt7/ndt7.go
@@ -11,7 +11,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/ooni/probe-cli/v3/internal/engine/internal/humanizex"
+	"github.com/ooni/probe-cli/v3/internal/engine/humanizex"
 	"github.com/ooni/probe-cli/v3/internal/engine/internal/mlablocatev2"
 	"github.com/ooni/probe-cli/v3/internal/engine/model"
 	"github.com/ooni/probe-cli/v3/internal/engine/netx"
diff --git a/internal/engine/internal/humanizex/humanizex.go b/internal/engine/humanizex/humanizex.go
similarity index 100%
rename from internal/engine/internal/humanizex/humanizex.go
rename to internal/engine/humanizex/humanizex.go
diff --git a/internal/engine/internal/humanizex/humanizex_test.go b/internal/engine/humanizex/humanizex_test.go
similarity index 92%
rename from internal/engine/internal/humanizex/humanizex_test.go
rename to internal/engine/humanizex/humanizex_test.go
index 0d5f10c..75d0c2d 100644
--- a/internal/engine/internal/humanizex/humanizex_test.go
+++ b/internal/engine/humanizex/humanizex_test.go
@@ -3,7 +3,7 @@ package humanizex_test
 import (
 	"testing"
 
-	"github.com/ooni/probe-cli/v3/internal/engine/internal/humanizex"
+	"github.com/ooni/probe-cli/v3/internal/engine/humanizex"
 )
 
 func TestGood(t *testing.T) {
diff --git a/internal/engine/libminiooni/.gitignore b/internal/libminiooni/.gitignore
similarity index 100%
rename from internal/engine/libminiooni/.gitignore
rename to internal/libminiooni/.gitignore
diff --git a/internal/engine/libminiooni/README.md b/internal/libminiooni/README.md
similarity index 100%
rename from internal/engine/libminiooni/README.md
rename to internal/libminiooni/README.md
diff --git a/internal/engine/libminiooni/libminiooni.go b/internal/libminiooni/libminiooni.go
similarity index 99%
rename from internal/engine/libminiooni/libminiooni.go
rename to internal/libminiooni/libminiooni.go
index b60d2f0..2d4231b 100644
--- a/internal/engine/libminiooni/libminiooni.go
+++ b/internal/libminiooni/libminiooni.go
@@ -28,8 +28,8 @@ import (
 	"time"
 
 	"github.com/apex/log"
-	engine "github.com/ooni/probe-cli/v3/internal/engine"
-	"github.com/ooni/probe-cli/v3/internal/engine/internal/humanizex"
+	"github.com/ooni/probe-cli/v3/internal/engine"
+	"github.com/ooni/probe-cli/v3/internal/engine/humanizex"
 	"github.com/ooni/probe-cli/v3/internal/engine/model"
 	"github.com/ooni/probe-cli/v3/internal/engine/netx/selfcensor"
 	"github.com/ooni/probe-cli/v3/internal/engine/version"
diff --git a/internal/engine/libminiooni/libminiooni_integration_test.go b/internal/libminiooni/libminiooni_integration_test.go
similarity index 79%
rename from internal/engine/libminiooni/libminiooni_integration_test.go
rename to internal/libminiooni/libminiooni_integration_test.go
index 89f0873..66870ca 100644
--- a/internal/engine/libminiooni/libminiooni_integration_test.go
+++ b/internal/libminiooni/libminiooni_integration_test.go
@@ -3,7 +3,7 @@ package libminiooni_test
 import (
 	"testing"
 
-	"github.com/ooni/probe-cli/v3/internal/engine/libminiooni"
+	"github.com/ooni/probe-cli/v3/internal/libminiooni"
 )
 
 func TestSimple(t *testing.T) {