refactor: move all experiments into internal/experiment (#1033)

See ooni/probe#2115 and ooni/probe#2273 While there, fix a test that was broken by c6b275e.
ooni · Jan 16, 2023 · 92b657d · 92b657d
1 parent c6b275e
commit 92b657d
Show file tree

Hide file tree

Showing 211 changed files with 103 additions and 102 deletions.
diff --git a/internal/cmd/ooporthelper/main.go b/internal/cmd/ooporthelper/main.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/apex/log"
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/portfiltering"
+	"github.com/ooni/probe-cli/v3/internal/experiment/portfiltering"
 	"github.com/ooni/probe-cli/v3/internal/runtimex"
 )
 

diff --git a/internal/engine/experiment/README.md → internal/experiment/README.md b/internal/engine/experiment/README.md → internal/experiment/README.md
diff --git a/internal/engine/experiment/dash/collect.go → internal/experiment/dash/collect.go b/internal/engine/experiment/dash/collect.go → internal/experiment/dash/collect.go
diff --git a/...al/engine/experiment/dash/collect_test.go → internal/experiment/dash/collect_test.go b/...al/engine/experiment/dash/collect_test.go → internal/experiment/dash/collect_test.go
diff --git a/internal/engine/experiment/dash/dash.go → internal/experiment/dash/dash.go b/internal/engine/experiment/dash/dash.go → internal/experiment/dash/dash.go
diff --git a/internal/engine/experiment/dash/dash_test.go → internal/experiment/dash/dash_test.go b/internal/engine/experiment/dash/dash_test.go → internal/experiment/dash/dash_test.go
diff --git a/internal/engine/experiment/dash/doc.go → internal/experiment/dash/doc.go b/internal/engine/experiment/dash/doc.go → internal/experiment/dash/doc.go
diff --git a/internal/engine/experiment/dash/download.go → internal/experiment/dash/download.go b/internal/engine/experiment/dash/download.go → internal/experiment/dash/download.go
diff --git a/...l/engine/experiment/dash/download_test.go → internal/experiment/dash/download_test.go b/...l/engine/experiment/dash/download_test.go → internal/experiment/dash/download_test.go
diff --git a/internal/engine/experiment/dash/fake_test.go → internal/experiment/dash/fake_test.go b/internal/engine/experiment/dash/fake_test.go → internal/experiment/dash/fake_test.go
diff --git a/internal/engine/experiment/dash/locate.go → internal/experiment/dash/locate.go b/internal/engine/experiment/dash/locate.go → internal/experiment/dash/locate.go
diff --git a/internal/engine/experiment/dash/model.go → internal/experiment/dash/model.go b/internal/engine/experiment/dash/model.go → internal/experiment/dash/model.go
diff --git a/internal/engine/experiment/dash/negotiate.go → internal/experiment/dash/negotiate.go b/internal/engine/experiment/dash/negotiate.go → internal/experiment/dash/negotiate.go
diff --git a/.../engine/experiment/dash/negotiate_test.go → internal/experiment/dash/negotiate_test.go b/.../engine/experiment/dash/negotiate_test.go → internal/experiment/dash/negotiate_test.go
diff --git a/internal/engine/experiment/dash/spec.go → internal/experiment/dash/spec.go b/internal/engine/experiment/dash/spec.go → internal/experiment/dash/spec.go
diff --git a/...al/engine/experiment/dnscheck/dnscheck.go → internal/experiment/dnscheck/dnscheck.go b/...al/engine/experiment/dnscheck/dnscheck.go → internal/experiment/dnscheck/dnscheck.go
@@ -14,7 +14,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter"
+	"github.com/ooni/probe-cli/v3/internal/experiment/urlgetter"
 	"github.com/ooni/probe-cli/v3/internal/legacy/netx"
 	"github.com/ooni/probe-cli/v3/internal/model"
 	"github.com/ooni/probe-cli/v3/internal/runtimex"

diff --git a/...gine/experiment/dnscheck/dnscheck_test.go → ...rnal/experiment/dnscheck/dnscheck_test.go b/...gine/experiment/dnscheck/dnscheck_test.go → ...rnal/experiment/dnscheck/dnscheck_test.go
diff --git a/...rnal/engine/experiment/dnsping/dnsping.go → internal/experiment/dnsping/dnsping.go b/...rnal/engine/experiment/dnsping/dnsping.go → internal/experiment/dnsping/dnsping.go
diff --git a/...engine/experiment/dnsping/dnsping_test.go → internal/experiment/dnsping/dnsping_test.go b/...engine/experiment/dnsping/dnsping_test.go → internal/experiment/dnsping/dnsping_test.go
diff --git a/...nal/engine/experiment/dnsping/testkeys.go → internal/experiment/dnsping/testkeys.go b/...nal/engine/experiment/dnsping/testkeys.go → internal/experiment/dnsping/testkeys.go
diff --git a/...rnal/engine/experiment/echcheck/config.go → internal/experiment/echcheck/config.go b/...rnal/engine/experiment/echcheck/config.go → internal/experiment/echcheck/config.go
diff --git a/...engine/experiment/echcheck/config_test.go → internal/experiment/echcheck/config_test.go b/...engine/experiment/echcheck/config_test.go → internal/experiment/echcheck/config_test.go
diff --git a/internal/engine/experiment/echcheck/doc.go → internal/experiment/echcheck/doc.go b/internal/engine/experiment/echcheck/doc.go → internal/experiment/echcheck/doc.go
diff --git a/...al/engine/experiment/echcheck/generate.go → internal/experiment/echcheck/generate.go b/...al/engine/experiment/echcheck/generate.go → internal/experiment/echcheck/generate.go
diff --git a/...l/engine/experiment/echcheck/handshake.go → internal/experiment/echcheck/handshake.go b/...l/engine/experiment/echcheck/handshake.go → internal/experiment/echcheck/handshake.go
diff --git a/...ine/experiment/echcheck/handshake_test.go → ...nal/experiment/echcheck/handshake_test.go b/...ine/experiment/echcheck/handshake_test.go → ...nal/experiment/echcheck/handshake_test.go
diff --git a/...nal/engine/experiment/echcheck/measure.go → internal/experiment/echcheck/measure.go b/...nal/engine/experiment/echcheck/measure.go → internal/experiment/echcheck/measure.go
diff --git a/...ngine/experiment/echcheck/measure_test.go → internal/experiment/echcheck/measure_test.go b/...ngine/experiment/echcheck/measure_test.go → internal/experiment/echcheck/measure_test.go
diff --git a/internal/engine/experiment/echcheck/utls.go → internal/experiment/echcheck/utls.go b/internal/engine/experiment/echcheck/utls.go → internal/experiment/echcheck/utls.go
diff --git a/...rnal/engine/experiment/example/example.go → internal/experiment/example/example.go b/...rnal/engine/experiment/example/example.go → internal/experiment/example/example.go
diff --git a/...engine/experiment/example/example_test.go → internal/experiment/example/example_test.go b/...engine/experiment/example/example_test.go → internal/experiment/example/example_test.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/apex/log"
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/example"
+	"github.com/ooni/probe-cli/v3/internal/experiment/example"
 	"github.com/ooni/probe-cli/v3/internal/legacy/mockable"
 	"github.com/ooni/probe-cli/v3/internal/model"
 )

diff --git a/...ine/experiment/fbmessenger/fbmessenger.go → ...nal/experiment/fbmessenger/fbmessenger.go b/...ine/experiment/fbmessenger/fbmessenger.go → ...nal/experiment/fbmessenger/fbmessenger.go
@@ -9,7 +9,7 @@ import (
 	"math/rand"
 	"time"
 
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter"
+	"github.com/ooni/probe-cli/v3/internal/experiment/urlgetter"
 	"github.com/ooni/probe-cli/v3/internal/model"
 	"github.com/ooni/probe-cli/v3/internal/netxlite"
 )

diff --git a/...xperiment/fbmessenger/fbmessenger_test.go → ...xperiment/fbmessenger/fbmessenger_test.go b/...xperiment/fbmessenger/fbmessenger_test.go → ...xperiment/fbmessenger/fbmessenger_test.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/apex/log"
 	engine "github.com/ooni/probe-cli/v3/internal/engine"
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/fbmessenger"
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter"
+	"github.com/ooni/probe-cli/v3/internal/experiment/fbmessenger"
+	"github.com/ooni/probe-cli/v3/internal/experiment/urlgetter"
 	"github.com/ooni/probe-cli/v3/internal/legacy/mockable"
 	"github.com/ooni/probe-cli/v3/internal/model"
 	"github.com/ooni/probe-cli/v3/internal/netxlite"

diff --git a/internal/engine/experiment/hhfm/fake_test.go → internal/experiment/hhfm/fake_test.go b/internal/engine/experiment/hhfm/fake_test.go → internal/experiment/hhfm/fake_test.go
diff --git a/internal/engine/experiment/hhfm/hhfm.go → internal/experiment/hhfm/hhfm.go b/internal/engine/experiment/hhfm/hhfm.go → internal/experiment/hhfm/hhfm.go
@@ -14,7 +14,7 @@ import (
 	"sort"
 	"time"
 
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter"
+	"github.com/ooni/probe-cli/v3/internal/experiment/urlgetter"
 	"github.com/ooni/probe-cli/v3/internal/model"
 	"github.com/ooni/probe-cli/v3/internal/netxlite"
 	"github.com/ooni/probe-cli/v3/internal/randx"

diff --git a/internal/engine/experiment/hhfm/hhfm_test.go → internal/experiment/hhfm/hhfm_test.go b/internal/engine/experiment/hhfm/hhfm_test.go → internal/experiment/hhfm/hhfm_test.go
@@ -13,8 +13,8 @@ import (
 
 	"github.com/apex/log"
 	"github.com/google/go-cmp/cmp"
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/hhfm"
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter"
+	"github.com/ooni/probe-cli/v3/internal/experiment/hhfm"
+	"github.com/ooni/probe-cli/v3/internal/experiment/urlgetter"
 	"github.com/ooni/probe-cli/v3/internal/legacy/mockable"
 	"github.com/ooni/probe-cli/v3/internal/model"
 	"github.com/ooni/probe-cli/v3/internal/netxlite"

diff --git a/internal/engine/experiment/hirl/fake_test.go → internal/experiment/hirl/fake_test.go b/internal/engine/experiment/hirl/fake_test.go → internal/experiment/hirl/fake_test.go
diff --git a/internal/engine/experiment/hirl/hirl.go → internal/experiment/hirl/hirl.go b/internal/engine/experiment/hirl/hirl.go → internal/experiment/hirl/hirl.go
diff --git a/internal/engine/experiment/hirl/hirl_test.go → internal/experiment/hirl/hirl_test.go b/internal/engine/experiment/hirl/hirl_test.go → internal/experiment/hirl/hirl_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/apex/log"
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/hirl"
+	"github.com/ooni/probe-cli/v3/internal/experiment/hirl"
 	"github.com/ooni/probe-cli/v3/internal/legacy/mockable"
 	"github.com/ooni/probe-cli/v3/internal/legacy/netx"
 	"github.com/ooni/probe-cli/v3/internal/model"

diff --git a/...periment/httphostheader/httphostheader.go → ...periment/httphostheader/httphostheader.go b/...periment/httphostheader/httphostheader.go → ...periment/httphostheader/httphostheader.go
@@ -9,7 +9,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter"
+	"github.com/ooni/probe-cli/v3/internal/experiment/urlgetter"
 	"github.com/ooni/probe-cli/v3/internal/model"
 )
 

diff --git a/...ent/httphostheader/httphostheader_test.go → ...ent/httphostheader/httphostheader_test.go b/...ent/httphostheader/httphostheader_test.go → ...ent/httphostheader/httphostheader_test.go
diff --git a/internal/engine/experiment/ndt7/callback.go → internal/experiment/ndt7/callback.go b/internal/engine/experiment/ndt7/callback.go → internal/experiment/ndt7/callback.go
diff --git a/internal/engine/experiment/ndt7/dial.go → internal/experiment/ndt7/dial.go b/internal/engine/experiment/ndt7/dial.go → internal/experiment/ndt7/dial.go
diff --git a/internal/engine/experiment/ndt7/dial_test.go → internal/experiment/ndt7/dial_test.go b/internal/engine/experiment/ndt7/dial_test.go → internal/experiment/ndt7/dial_test.go
diff --git a/internal/engine/experiment/ndt7/doc.go → internal/experiment/ndt7/doc.go b/internal/engine/experiment/ndt7/doc.go → internal/experiment/ndt7/doc.go
diff --git a/internal/engine/experiment/ndt7/download.go → internal/experiment/ndt7/download.go b/internal/engine/experiment/ndt7/download.go → internal/experiment/ndt7/download.go
diff --git a/...l/engine/experiment/ndt7/download_test.go → internal/experiment/ndt7/download_test.go b/...l/engine/experiment/ndt7/download_test.go → internal/experiment/ndt7/download_test.go
diff --git a/internal/engine/experiment/ndt7/ndt7.go → internal/experiment/ndt7/ndt7.go b/internal/engine/experiment/ndt7/ndt7.go → internal/experiment/ndt7/ndt7.go
diff --git a/internal/engine/experiment/ndt7/ndt7_test.go → internal/experiment/ndt7/ndt7_test.go b/internal/engine/experiment/ndt7/ndt7_test.go → internal/experiment/ndt7/ndt7_test.go
diff --git a/internal/engine/experiment/ndt7/param.go → internal/experiment/ndt7/param.go b/internal/engine/experiment/ndt7/param.go → internal/experiment/ndt7/param.go
diff --git a/internal/engine/experiment/ndt7/spec.go → internal/experiment/ndt7/spec.go b/internal/engine/experiment/ndt7/spec.go → internal/experiment/ndt7/spec.go
diff --git a/internal/engine/experiment/ndt7/upload.go → internal/experiment/ndt7/upload.go b/internal/engine/experiment/ndt7/upload.go → internal/experiment/ndt7/upload.go
diff --git a/...nal/engine/experiment/ndt7/upload_test.go → internal/experiment/ndt7/upload_test.go b/...nal/engine/experiment/ndt7/upload_test.go → internal/experiment/ndt7/upload_test.go
diff --git a/internal/engine/experiment/ndt7/wsconn.go → internal/experiment/ndt7/wsconn.go b/internal/engine/experiment/ndt7/wsconn.go → internal/experiment/ndt7/wsconn.go
diff --git a/...nal/engine/experiment/ndt7/wsconn_test.go → internal/experiment/ndt7/wsconn_test.go b/...nal/engine/experiment/ndt7/wsconn_test.go → internal/experiment/ndt7/wsconn_test.go
diff --git a/...engine/experiment/portfiltering/config.go → internal/experiment/portfiltering/config.go b/...engine/experiment/portfiltering/config.go → internal/experiment/portfiltering/config.go
diff --git a/...e/experiment/portfiltering/config_test.go → ...l/experiment/portfiltering/config_test.go b/...e/experiment/portfiltering/config_test.go → ...l/experiment/portfiltering/config_test.go
diff --git a/...al/engine/experiment/portfiltering/doc.go → internal/experiment/portfiltering/doc.go b/...al/engine/experiment/portfiltering/doc.go → internal/experiment/portfiltering/doc.go
diff --git a/...gine/experiment/portfiltering/measurer.go → ...rnal/experiment/portfiltering/measurer.go b/...gine/experiment/portfiltering/measurer.go → ...rnal/experiment/portfiltering/measurer.go
diff --git a/...experiment/portfiltering/measurer_test.go → ...experiment/portfiltering/measurer_test.go b/...experiment/portfiltering/measurer_test.go → ...experiment/portfiltering/measurer_test.go
diff --git a/.../engine/experiment/portfiltering/ports.go → internal/experiment/portfiltering/ports.go b/.../engine/experiment/portfiltering/ports.go → internal/experiment/portfiltering/ports.go
diff --git a/...ngine/experiment/portfiltering/summary.go → internal/experiment/portfiltering/summary.go b/...ngine/experiment/portfiltering/summary.go → internal/experiment/portfiltering/summary.go
diff --git a/...ne/experiment/portfiltering/tcpconnect.go → ...al/experiment/portfiltering/tcpconnect.go b/...ne/experiment/portfiltering/tcpconnect.go → ...al/experiment/portfiltering/tcpconnect.go
diff --git a/...gine/experiment/portfiltering/testkeys.go → ...rnal/experiment/portfiltering/testkeys.go b/...gine/experiment/portfiltering/testkeys.go → ...rnal/experiment/portfiltering/testkeys.go
diff --git a/...rnal/engine/experiment/psiphon/psiphon.go → internal/experiment/psiphon/psiphon.go b/...rnal/engine/experiment/psiphon/psiphon.go → internal/experiment/psiphon/psiphon.go
@@ -10,7 +10,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter"
+	"github.com/ooni/probe-cli/v3/internal/experiment/urlgetter"
 	"github.com/ooni/probe-cli/v3/internal/model"
 )
 

diff --git a/...engine/experiment/psiphon/psiphon_test.go → internal/experiment/psiphon/psiphon_test.go b/...engine/experiment/psiphon/psiphon_test.go → internal/experiment/psiphon/psiphon_test.go
@@ -9,8 +9,8 @@ import (
 	"time"
 
 	"github.com/apex/log"
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/psiphon"
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter"
+	"github.com/ooni/probe-cli/v3/internal/experiment/psiphon"
+	"github.com/ooni/probe-cli/v3/internal/experiment/urlgetter"
 	"github.com/ooni/probe-cli/v3/internal/legacy/mockable"
 	"github.com/ooni/probe-cli/v3/internal/model"
 )

diff --git a/...rnal/engine/experiment/quicping/crypto.go → internal/experiment/quicping/crypto.go b/...rnal/engine/experiment/quicping/crypto.go → internal/experiment/quicping/crypto.go
diff --git a/internal/engine/experiment/quicping/quic.go → internal/experiment/quicping/quic.go b/internal/engine/experiment/quicping/quic.go → internal/experiment/quicping/quic.go
diff --git a/...al/engine/experiment/quicping/quicping.go → internal/experiment/quicping/quicping.go b/...al/engine/experiment/quicping/quicping.go → internal/experiment/quicping/quicping.go
diff --git a/...gine/experiment/quicping/quicping_test.go → ...rnal/experiment/quicping/quicping_test.go b/...gine/experiment/quicping/quicping_test.go → ...rnal/experiment/quicping/quicping_test.go
diff --git a/.../engine/experiment/riseupvpn/riseupvpn.go → internal/experiment/riseupvpn/riseupvpn.go b/.../engine/experiment/riseupvpn/riseupvpn.go → internal/experiment/riseupvpn/riseupvpn.go
@@ -9,7 +9,7 @@ import (
 	"errors"
 	"time"
 
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter"
+	"github.com/ooni/probe-cli/v3/internal/experiment/urlgetter"
 	"github.com/ooni/probe-cli/v3/internal/model"
 	"github.com/ooni/probe-cli/v3/internal/netxlite"
 	"github.com/ooni/probe-cli/v3/internal/tracex"

diff --git a/...ne/experiment/riseupvpn/riseupvpn_test.go → ...al/experiment/riseupvpn/riseupvpn_test.go b/...ne/experiment/riseupvpn/riseupvpn_test.go → ...al/experiment/riseupvpn/riseupvpn_test.go
@@ -12,8 +12,8 @@ import (
 
 	"github.com/apex/log"
 	"github.com/google/go-cmp/cmp"
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/riseupvpn"
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter"
+	"github.com/ooni/probe-cli/v3/internal/experiment/riseupvpn"
+	"github.com/ooni/probe-cli/v3/internal/experiment/urlgetter"
 	"github.com/ooni/probe-cli/v3/internal/legacy/mockable"
 	"github.com/ooni/probe-cli/v3/internal/model"
 	"github.com/ooni/probe-cli/v3/internal/netxlite"

diff --git a/internal/engine/experiment/run/dnscheck.go → internal/experiment/run/dnscheck.go b/internal/engine/experiment/run/dnscheck.go → internal/experiment/run/dnscheck.go
@@ -3,7 +3,7 @@ package run
 import (
 	"context"
 
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/dnscheck"
+	"github.com/ooni/probe-cli/v3/internal/experiment/dnscheck"
 	"github.com/ooni/probe-cli/v3/internal/model"
 )
 

diff --git a/internal/engine/experiment/run/doc.go → internal/experiment/run/doc.go b/internal/engine/experiment/run/doc.go → internal/experiment/run/doc.go
diff --git a/internal/engine/experiment/run/run.go → internal/experiment/run/run.go b/internal/engine/experiment/run/run.go → internal/experiment/run/run.go
@@ -5,8 +5,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/dnscheck"
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter"
+	"github.com/ooni/probe-cli/v3/internal/experiment/dnscheck"
+	"github.com/ooni/probe-cli/v3/internal/experiment/urlgetter"
 	"github.com/ooni/probe-cli/v3/internal/model"
 )
 

diff --git a/internal/engine/experiment/run/run_test.go → internal/experiment/run/run_test.go b/internal/engine/experiment/run/run_test.go → internal/experiment/run/run_test.go
@@ -5,9 +5,9 @@ import (
 	"testing"
 
 	"github.com/apex/log"
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/dnscheck"
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/run"
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter"
+	"github.com/ooni/probe-cli/v3/internal/experiment/dnscheck"
+	"github.com/ooni/probe-cli/v3/internal/experiment/run"
+	"github.com/ooni/probe-cli/v3/internal/experiment/urlgetter"
 	"github.com/ooni/probe-cli/v3/internal/legacy/mockable"
 	"github.com/ooni/probe-cli/v3/internal/model"
 )

diff --git a/internal/engine/experiment/run/table.go → internal/experiment/run/table.go b/internal/engine/experiment/run/table.go → internal/experiment/run/table.go
@@ -3,7 +3,7 @@ package run
 import (
 	"context"
 
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/dnscheck"
+	"github.com/ooni/probe-cli/v3/internal/experiment/dnscheck"
 	"github.com/ooni/probe-cli/v3/internal/model"
 )
 

diff --git a/internal/engine/experiment/run/urlgetter.go → internal/experiment/run/urlgetter.go b/internal/engine/experiment/run/urlgetter.go → internal/experiment/run/urlgetter.go
@@ -3,7 +3,7 @@ package run
 import (
 	"context"
 
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter"
+	"github.com/ooni/probe-cli/v3/internal/experiment/urlgetter"
 	"github.com/ooni/probe-cli/v3/internal/model"
 )
 

diff --git a/internal/engine/experiment/signal/signal.go → internal/experiment/signal/signal.go b/internal/engine/experiment/signal/signal.go → internal/experiment/signal/signal.go
@@ -8,7 +8,7 @@ import (
 	"errors"
 	"time"
 
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter"
+	"github.com/ooni/probe-cli/v3/internal/experiment/urlgetter"
 	"github.com/ooni/probe-cli/v3/internal/model"
 	"github.com/ooni/probe-cli/v3/internal/netxlite"
 )

diff --git a/...l/engine/experiment/signal/signal_test.go → internal/experiment/signal/signal_test.go b/...l/engine/experiment/signal/signal_test.go → internal/experiment/signal/signal_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	"github.com/apex/log"
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/signal"
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter"
+	"github.com/ooni/probe-cli/v3/internal/experiment/signal"
+	"github.com/ooni/probe-cli/v3/internal/experiment/urlgetter"
 	"github.com/ooni/probe-cli/v3/internal/legacy/mockable"
 	"github.com/ooni/probe-cli/v3/internal/model"
 	"github.com/ooni/probe-cli/v3/internal/netxlite"

diff --git a/...periment/simplequicping/simplequicping.go → ...periment/simplequicping/simplequicping.go b/...periment/simplequicping/simplequicping.go → ...periment/simplequicping/simplequicping.go
diff --git a/...ent/simplequicping/simplequicping_test.go → ...ent/simplequicping/simplequicping_test.go b/...ent/simplequicping/simplequicping_test.go → ...ent/simplequicping/simplequicping_test.go
diff --git a/...ine/experiment/sniblocking/sniblocking.go → ...nal/experiment/sniblocking/sniblocking.go b/...ine/experiment/sniblocking/sniblocking.go → ...nal/experiment/sniblocking/sniblocking.go
@@ -13,7 +13,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter"
+	"github.com/ooni/probe-cli/v3/internal/experiment/urlgetter"
 	"github.com/ooni/probe-cli/v3/internal/model"
 	"github.com/ooni/probe-cli/v3/internal/netxlite"
 )

diff --git a/...xperiment/sniblocking/sniblocking_test.go → ...xperiment/sniblocking/sniblocking_test.go b/...xperiment/sniblocking/sniblocking_test.go → ...xperiment/sniblocking/sniblocking_test.go
diff --git a/.../experiment/stunreachability/fake_test.go → .../experiment/stunreachability/fake_test.go b/.../experiment/stunreachability/fake_test.go → .../experiment/stunreachability/fake_test.go
diff --git a/...ment/stunreachability/stunreachability.go → ...ment/stunreachability/stunreachability.go b/...ment/stunreachability/stunreachability.go → ...ment/stunreachability/stunreachability.go
diff --git a/...stunreachability/stunreachability_test.go → ...stunreachability/stunreachability_test.go b/...stunreachability/stunreachability_test.go → ...stunreachability/stunreachability_test.go
diff --git a/...rnal/engine/experiment/tcpping/tcpping.go → internal/experiment/tcpping/tcpping.go b/...rnal/engine/experiment/tcpping/tcpping.go → internal/experiment/tcpping/tcpping.go
diff --git a/...engine/experiment/tcpping/tcpping_test.go → internal/experiment/tcpping/tcpping_test.go b/...engine/experiment/tcpping/tcpping_test.go → internal/experiment/tcpping/tcpping_test.go
diff --git a/...al/engine/experiment/telegram/telegram.go → internal/experiment/telegram/telegram.go b/...al/engine/experiment/telegram/telegram.go → internal/experiment/telegram/telegram.go
@@ -8,7 +8,7 @@ import (
 	"errors"
 	"time"
 
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter"
+	"github.com/ooni/probe-cli/v3/internal/experiment/urlgetter"
 	"github.com/ooni/probe-cli/v3/internal/model"
 	"github.com/ooni/probe-cli/v3/internal/netxlite"
 )

diff --git a/...gine/experiment/telegram/telegram_test.go → ...rnal/experiment/telegram/telegram_test.go b/...gine/experiment/telegram/telegram_test.go → ...rnal/experiment/telegram/telegram_test.go
@@ -6,8 +6,8 @@ import (
 	"io"
 	"testing"
 
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/telegram"
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter"
+	"github.com/ooni/probe-cli/v3/internal/experiment/telegram"
+	"github.com/ooni/probe-cli/v3/internal/experiment/urlgetter"
 	"github.com/ooni/probe-cli/v3/internal/legacy/mockable"
 	"github.com/ooni/probe-cli/v3/internal/model"
 	"github.com/ooni/probe-cli/v3/internal/netxlite"

diff --git a/.../engine/experiment/tlsmiddlebox/config.go → internal/experiment/tlsmiddlebox/config.go b/.../engine/experiment/tlsmiddlebox/config.go → internal/experiment/tlsmiddlebox/config.go
diff --git a/...ne/experiment/tlsmiddlebox/config_test.go → ...al/experiment/tlsmiddlebox/config_test.go b/...ne/experiment/tlsmiddlebox/config_test.go → ...al/experiment/tlsmiddlebox/config_test.go
diff --git a/...al/engine/experiment/tlsmiddlebox/conn.go → internal/experiment/tlsmiddlebox/conn.go b/...al/engine/experiment/tlsmiddlebox/conn.go → internal/experiment/tlsmiddlebox/conn.go
diff --git a/...gine/experiment/tlsmiddlebox/conn_test.go → ...rnal/experiment/tlsmiddlebox/conn_test.go b/...gine/experiment/tlsmiddlebox/conn_test.go → ...rnal/experiment/tlsmiddlebox/conn_test.go
diff --git a/...engine/experiment/tlsmiddlebox/connect.go → internal/experiment/tlsmiddlebox/connect.go b/...engine/experiment/tlsmiddlebox/connect.go → internal/experiment/tlsmiddlebox/connect.go
diff --git a/.../engine/experiment/tlsmiddlebox/dialer.go → internal/experiment/tlsmiddlebox/dialer.go b/.../engine/experiment/tlsmiddlebox/dialer.go → internal/experiment/tlsmiddlebox/dialer.go
diff --git a/...ne/experiment/tlsmiddlebox/dialer_test.go → ...al/experiment/tlsmiddlebox/dialer_test.go b/...ne/experiment/tlsmiddlebox/dialer_test.go → ...al/experiment/tlsmiddlebox/dialer_test.go
diff --git a/...nal/engine/experiment/tlsmiddlebox/dns.go → internal/experiment/tlsmiddlebox/dns.go b/...nal/engine/experiment/tlsmiddlebox/dns.go → internal/experiment/tlsmiddlebox/dns.go
diff --git a/...nal/engine/experiment/tlsmiddlebox/doc.go → internal/experiment/tlsmiddlebox/doc.go b/...nal/engine/experiment/tlsmiddlebox/doc.go → internal/experiment/tlsmiddlebox/doc.go
diff --git a/...ngine/experiment/tlsmiddlebox/measurer.go → internal/experiment/tlsmiddlebox/measurer.go b/...ngine/experiment/tlsmiddlebox/measurer.go → internal/experiment/tlsmiddlebox/measurer.go
diff --git a/.../experiment/tlsmiddlebox/measurer_test.go → .../experiment/tlsmiddlebox/measurer_test.go b/.../experiment/tlsmiddlebox/measurer_test.go → .../experiment/tlsmiddlebox/measurer_test.go
diff --git a/...engine/experiment/tlsmiddlebox/summary.go → internal/experiment/tlsmiddlebox/summary.go b/...engine/experiment/tlsmiddlebox/summary.go → internal/experiment/tlsmiddlebox/summary.go
diff --git a/...ne/experiment/tlsmiddlebox/syscall_cgo.go → ...al/experiment/tlsmiddlebox/syscall_cgo.go b/...ne/experiment/tlsmiddlebox/syscall_cgo.go → ...al/experiment/tlsmiddlebox/syscall_cgo.go
diff --git a/...eriment/tlsmiddlebox/syscall_otherwise.go → ...eriment/tlsmiddlebox/syscall_otherwise.go b/...eriment/tlsmiddlebox/syscall_otherwise.go → ...eriment/tlsmiddlebox/syscall_otherwise.go
diff --git a/...e/experiment/tlsmiddlebox/syscall_unix.go → ...l/experiment/tlsmiddlebox/syscall_unix.go b/...e/experiment/tlsmiddlebox/syscall_unix.go → ...l/experiment/tlsmiddlebox/syscall_unix.go
diff --git a/...xperiment/tlsmiddlebox/syscall_windows.go → ...xperiment/tlsmiddlebox/syscall_windows.go b/...xperiment/tlsmiddlebox/syscall_windows.go → ...xperiment/tlsmiddlebox/syscall_windows.go
diff --git a/...ngine/experiment/tlsmiddlebox/testkeys.go → internal/experiment/tlsmiddlebox/testkeys.go b/...ngine/experiment/tlsmiddlebox/testkeys.go → internal/experiment/tlsmiddlebox/testkeys.go
diff --git a/...l/engine/experiment/tlsmiddlebox/trace.go → internal/experiment/tlsmiddlebox/trace.go b/...l/engine/experiment/tlsmiddlebox/trace.go → internal/experiment/tlsmiddlebox/trace.go
diff --git a/...engine/experiment/tlsmiddlebox/tracing.go → internal/experiment/tlsmiddlebox/tracing.go b/...engine/experiment/tlsmiddlebox/tracing.go → internal/experiment/tlsmiddlebox/tracing.go
diff --git a/...e/experiment/tlsmiddlebox/tracing_test.go → ...l/experiment/tlsmiddlebox/tracing_test.go b/...e/experiment/tlsmiddlebox/tracing_test.go → ...l/experiment/tlsmiddlebox/tracing_test.go
diff --git a/...l/engine/experiment/tlsmiddlebox/utils.go → internal/experiment/tlsmiddlebox/utils.go b/...l/engine/experiment/tlsmiddlebox/utils.go → internal/experiment/tlsmiddlebox/utils.go
diff --git a/...ine/experiment/tlsmiddlebox/utils_test.go → ...nal/experiment/tlsmiddlebox/utils_test.go b/...ine/experiment/tlsmiddlebox/utils_test.go → ...nal/experiment/tlsmiddlebox/utils_test.go
diff --git a/...rnal/engine/experiment/tlsping/tlsping.go → internal/experiment/tlsping/tlsping.go b/...rnal/engine/experiment/tlsping/tlsping.go → internal/experiment/tlsping/tlsping.go
diff --git a/...engine/experiment/tlsping/tlsping_test.go → internal/experiment/tlsping/tlsping_test.go b/...engine/experiment/tlsping/tlsping_test.go → internal/experiment/tlsping/tlsping_test.go
diff --git a/...ine/experiment/tlstool/internal/dialer.go → ...nal/experiment/tlstool/internal/dialer.go b/...ine/experiment/tlstool/internal/dialer.go → ...nal/experiment/tlstool/internal/dialer.go
diff --git a/...xperiment/tlstool/internal/dialer_test.go → ...xperiment/tlstool/internal/dialer_test.go b/...xperiment/tlstool/internal/dialer_test.go → ...xperiment/tlstool/internal/dialer_test.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/tlstool/internal"
+	"github.com/ooni/probe-cli/v3/internal/experiment/tlstool/internal"
 )
 
 func TestDialerFailure(t *testing.T) {

diff --git a/.../experiment/tlstool/internal/fake_test.go → .../experiment/tlstool/internal/fake_test.go b/.../experiment/tlstool/internal/fake_test.go → .../experiment/tlstool/internal/fake_test.go
diff --git a/...e/experiment/tlstool/internal/internal.go → ...l/experiment/tlstool/internal/internal.go b/...e/experiment/tlstool/internal/internal.go → ...l/experiment/tlstool/internal/internal.go
diff --git a/...eriment/tlstool/internal/internal_test.go → ...eriment/tlstool/internal/internal_test.go b/...eriment/tlstool/internal/internal_test.go → ...eriment/tlstool/internal/internal_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/tlstool/internal"
+	"github.com/ooni/probe-cli/v3/internal/experiment/tlstool/internal"
 	"github.com/ooni/probe-cli/v3/internal/legacy/netx"
 	"github.com/ooni/probe-cli/v3/internal/model"
 )

diff --git a/...e/experiment/tlstool/internal/splitter.go → ...l/experiment/tlstool/internal/splitter.go b/...e/experiment/tlstool/internal/splitter.go → ...l/experiment/tlstool/internal/splitter.go
diff --git a/...eriment/tlstool/internal/splitter_test.go → ...eriment/tlstool/internal/splitter_test.go b/...eriment/tlstool/internal/splitter_test.go → ...eriment/tlstool/internal/splitter_test.go
@@ -3,7 +3,7 @@ package internal_test
 import (
 	"testing"
 
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/tlstool/internal"
+	"github.com/ooni/probe-cli/v3/internal/experiment/tlstool/internal"
 	"github.com/ooni/probe-cli/v3/internal/randx"
 )
 

diff --git a/...ine/experiment/tlstool/internal/writer.go → ...nal/experiment/tlstool/internal/writer.go b/...ine/experiment/tlstool/internal/writer.go → ...nal/experiment/tlstool/internal/writer.go
diff --git a/...xperiment/tlstool/internal/writer_test.go → ...xperiment/tlstool/internal/writer_test.go b/...xperiment/tlstool/internal/writer_test.go → ...xperiment/tlstool/internal/writer_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/tlstool/internal"
+	"github.com/ooni/probe-cli/v3/internal/experiment/tlstool/internal"
 )
 
 func TestSleeperWriterWorksAsIntended(t *testing.T) {

diff --git a/...rnal/engine/experiment/tlstool/tlstool.go → internal/experiment/tlstool/tlstool.go b/...rnal/engine/experiment/tlstool/tlstool.go → internal/experiment/tlstool/tlstool.go
@@ -15,7 +15,7 @@ import (
 	"net"
 	"time"
 
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/tlstool/internal"
+	"github.com/ooni/probe-cli/v3/internal/experiment/tlstool/internal"
 	"github.com/ooni/probe-cli/v3/internal/legacy/netx"
 	"github.com/ooni/probe-cli/v3/internal/model"
 	"github.com/ooni/probe-cli/v3/internal/runtimex"

diff --git a/...engine/experiment/tlstool/tlstool_test.go → internal/experiment/tlstool/tlstool_test.go b/...engine/experiment/tlstool/tlstool_test.go → internal/experiment/tlstool/tlstool_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/apex/log"
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/tlstool"
+	"github.com/ooni/probe-cli/v3/internal/experiment/tlstool"
 	"github.com/ooni/probe-cli/v3/internal/legacy/mockable"
 	"github.com/ooni/probe-cli/v3/internal/model"
 )

diff --git a/internal/engine/experiment/tor/tor.go → internal/experiment/tor/tor.go b/internal/engine/experiment/tor/tor.go → internal/experiment/tor/tor.go
diff --git a/internal/engine/experiment/tor/tor_test.go → internal/experiment/tor/tor_test.go b/internal/engine/experiment/tor/tor_test.go → internal/experiment/tor/tor_test.go
diff --git a/internal/engine/experiment/torsf/.gitignore → internal/experiment/torsf/.gitignore b/internal/engine/experiment/torsf/.gitignore → internal/experiment/torsf/.gitignore
diff --git a/...gine/experiment/torsf/integration_test.go → ...rnal/experiment/torsf/integration_test.go b/...gine/experiment/torsf/integration_test.go → ...rnal/experiment/torsf/integration_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/apex/log"
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/torsf"
+	"github.com/ooni/probe-cli/v3/internal/experiment/torsf"
 	"github.com/ooni/probe-cli/v3/internal/legacy/mockable"
 	"github.com/ooni/probe-cli/v3/internal/model"
 	"golang.org/x/sys/execabs"

diff --git a/...ine/experiment/torsf/testdata/partial.log → ...nal/experiment/torsf/testdata/partial.log b/...ine/experiment/torsf/testdata/partial.log → ...nal/experiment/torsf/testdata/partial.log
diff --git a/.../engine/experiment/torsf/testdata/tor.log → internal/experiment/torsf/testdata/tor.log b/.../engine/experiment/torsf/testdata/tor.log → internal/experiment/torsf/testdata/tor.log
diff --git a/internal/engine/experiment/torsf/torsf.go → internal/experiment/torsf/torsf.go b/internal/engine/experiment/torsf/torsf.go → internal/experiment/torsf/torsf.go
diff --git a/...nal/engine/experiment/torsf/torsf_test.go → internal/experiment/torsf/torsf_test.go b/...nal/engine/experiment/torsf/torsf_test.go → internal/experiment/torsf/torsf_test.go
diff --git a/...al/engine/experiment/urlgetter/.gitignore → internal/experiment/urlgetter/.gitignore b/...al/engine/experiment/urlgetter/.gitignore → internal/experiment/urlgetter/.gitignore
diff --git a/...engine/experiment/urlgetter/configurer.go → internal/experiment/urlgetter/configurer.go b/...engine/experiment/urlgetter/configurer.go → internal/experiment/urlgetter/configurer.go
diff --git a/...e/experiment/urlgetter/configurer_test.go → ...l/experiment/urlgetter/configurer_test.go b/...e/experiment/urlgetter/configurer_test.go → ...l/experiment/urlgetter/configurer_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	"github.com/apex/log"
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter"
+	"github.com/ooni/probe-cli/v3/internal/experiment/urlgetter"
 	"github.com/ooni/probe-cli/v3/internal/netxlite"
 	"github.com/ooni/probe-cli/v3/internal/tracex"
 )

diff --git a/...nal/engine/experiment/urlgetter/getter.go → internal/experiment/urlgetter/getter.go b/...nal/engine/experiment/urlgetter/getter.go → internal/experiment/urlgetter/getter.go
diff --git a/...ment/urlgetter/getter_integration_test.go → ...ment/urlgetter/getter_integration_test.go b/...ment/urlgetter/getter_integration_test.go → ...ment/urlgetter/getter_integration_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 
 	"github.com/apex/log"
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter"
+	"github.com/ooni/probe-cli/v3/internal/experiment/urlgetter"
 	"github.com/ooni/probe-cli/v3/internal/legacy/mockable"
 	"github.com/ooni/probe-cli/v3/internal/netxlite"
 )

diff --git a/...ngine/experiment/urlgetter/getter_test.go → internal/experiment/urlgetter/getter_test.go b/...ngine/experiment/urlgetter/getter_test.go → internal/experiment/urlgetter/getter_test.go
diff --git a/...rnal/engine/experiment/urlgetter/multi.go → internal/experiment/urlgetter/multi.go b/...rnal/engine/experiment/urlgetter/multi.go → internal/experiment/urlgetter/multi.go
diff --git a/...engine/experiment/urlgetter/multi_test.go → internal/experiment/urlgetter/multi_test.go b/...engine/experiment/urlgetter/multi_test.go → internal/experiment/urlgetter/multi_test.go
@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"github.com/apex/log"
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter"
+	"github.com/ooni/probe-cli/v3/internal/experiment/urlgetter"
 	"github.com/ooni/probe-cli/v3/internal/legacy/mockable"
 	"github.com/ooni/probe-cli/v3/internal/model"
 )

diff --git a/...nal/engine/experiment/urlgetter/runner.go → internal/experiment/urlgetter/runner.go b/...nal/engine/experiment/urlgetter/runner.go → internal/experiment/urlgetter/runner.go
diff --git a/...ngine/experiment/urlgetter/runner_test.go → internal/experiment/urlgetter/runner_test.go b/...ngine/experiment/urlgetter/runner_test.go → internal/experiment/urlgetter/runner_test.go
@@ -9,7 +9,7 @@ import (
 	"sync/atomic"
 	"testing"
 
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter"
+	"github.com/ooni/probe-cli/v3/internal/experiment/urlgetter"
 	"github.com/ooni/probe-cli/v3/internal/model"
 )
 

diff --git a/.../engine/experiment/urlgetter/urlgetter.go → internal/experiment/urlgetter/urlgetter.go b/.../engine/experiment/urlgetter/urlgetter.go → internal/experiment/urlgetter/urlgetter.go
diff --git a/...ne/experiment/urlgetter/urlgetter_test.go → ...al/experiment/urlgetter/urlgetter_test.go b/...ne/experiment/urlgetter/urlgetter_test.go → ...al/experiment/urlgetter/urlgetter_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/apex/log"
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter"
+	"github.com/ooni/probe-cli/v3/internal/experiment/urlgetter"
 	"github.com/ooni/probe-cli/v3/internal/legacy/mockable"
 	"github.com/ooni/probe-cli/v3/internal/model"
 )

diff --git a/...experiment/vanillator/integration_test.go → ...experiment/vanillator/integration_test.go b/...experiment/vanillator/integration_test.go → ...experiment/vanillator/integration_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/apex/log"
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/vanillator"
+	"github.com/ooni/probe-cli/v3/internal/experiment/vanillator"
 	"github.com/ooni/probe-cli/v3/internal/legacy/mockable"
 	"github.com/ooni/probe-cli/v3/internal/model"
 	"golang.org/x/sys/execabs"

diff --git a/...xperiment/vanillator/testdata/partial.log → ...xperiment/vanillator/testdata/partial.log b/...xperiment/vanillator/testdata/partial.log → ...xperiment/vanillator/testdata/partial.log
diff --git a/...ne/experiment/vanillator/testdata/tor.log → ...al/experiment/vanillator/testdata/tor.log b/...ne/experiment/vanillator/testdata/tor.log → ...al/experiment/vanillator/testdata/tor.log
diff --git a/...ngine/experiment/vanillator/vanillator.go → internal/experiment/vanillator/vanillator.go b/...ngine/experiment/vanillator/vanillator.go → internal/experiment/vanillator/vanillator.go
diff --git a/.../experiment/vanillator/vanillator_test.go → .../experiment/vanillator/vanillator_test.go b/.../experiment/vanillator/vanillator_test.go → .../experiment/vanillator/vanillator_test.go
diff --git a/...ne/experiment/webconnectivity/connects.go → ...al/experiment/webconnectivity/connects.go b/...ne/experiment/webconnectivity/connects.go → ...al/experiment/webconnectivity/connects.go
@@ -5,7 +5,7 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter"
+	"github.com/ooni/probe-cli/v3/internal/experiment/urlgetter"
 	"github.com/ooni/probe-cli/v3/internal/model"
 )
 

diff --git a/...periment/webconnectivity/connects_test.go → ...periment/webconnectivity/connects_test.go b/...periment/webconnectivity/connects_test.go → ...periment/webconnectivity/connects_test.go
@@ -5,7 +5,7 @@ import (
 	"net/url"
 	"testing"
 
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/webconnectivity"
+	"github.com/ooni/probe-cli/v3/internal/experiment/webconnectivity"
 )
 
 func TestConnectsSuccess(t *testing.T) {

diff --git a/...ine/experiment/webconnectivity/control.go → ...nal/experiment/webconnectivity/control.go b/...ine/experiment/webconnectivity/control.go → ...nal/experiment/webconnectivity/control.go
diff --git a/...xperiment/webconnectivity/control_test.go → ...xperiment/webconnectivity/control_test.go b/...xperiment/webconnectivity/control_test.go → ...xperiment/webconnectivity/control_test.go
diff --git a/...experiment/webconnectivity/dnsanalysis.go → ...experiment/webconnectivity/dnsanalysis.go b/...experiment/webconnectivity/dnsanalysis.go → ...experiment/webconnectivity/dnsanalysis.go
diff --git a/...iment/webconnectivity/dnsanalysis_test.go → ...iment/webconnectivity/dnsanalysis_test.go b/...iment/webconnectivity/dnsanalysis_test.go → ...iment/webconnectivity/dnsanalysis_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/webconnectivity"
+	"github.com/ooni/probe-cli/v3/internal/experiment/webconnectivity"
 	"github.com/ooni/probe-cli/v3/internal/netxlite"
 )
 

diff --git a/...e/experiment/webconnectivity/dnslookup.go → ...l/experiment/webconnectivity/dnslookup.go b/...e/experiment/webconnectivity/dnslookup.go → ...l/experiment/webconnectivity/dnslookup.go
@@ -7,7 +7,7 @@ import (
 	"sort"
 	"time"
 
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter"
+	"github.com/ooni/probe-cli/v3/internal/experiment/urlgetter"
 	"github.com/ooni/probe-cli/v3/internal/model"
 )
 

diff --git a/...eriment/webconnectivity/dnslookup_test.go → ...eriment/webconnectivity/dnslookup_test.go b/...eriment/webconnectivity/dnslookup_test.go → ...eriment/webconnectivity/dnslookup_test.go
@@ -7,8 +7,8 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter"
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/webconnectivity"
+	"github.com/ooni/probe-cli/v3/internal/experiment/urlgetter"
+	"github.com/ooni/probe-cli/v3/internal/experiment/webconnectivity"
 )
 
 func TestDNSLookup(t *testing.T) {

diff --git a/.../engine/experiment/webconnectivity/doc.go → internal/experiment/webconnectivity/doc.go b/.../engine/experiment/webconnectivity/doc.go → internal/experiment/webconnectivity/doc.go
diff --git a/...e/experiment/webconnectivity/endpoints.go → ...l/experiment/webconnectivity/endpoints.go b/...e/experiment/webconnectivity/endpoints.go → ...l/experiment/webconnectivity/endpoints.go
diff --git a/...eriment/webconnectivity/endpoints_test.go → ...eriment/webconnectivity/endpoints_test.go b/...eriment/webconnectivity/endpoints_test.go → ...eriment/webconnectivity/endpoints_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-	"github.com/ooni/probe-cli/v3/internal/engine/experiment/webconnectivity"
+	"github.com/ooni/probe-cli/v3/internal/experiment/webconnectivity"
 )
 
 func TestNewEndpointPortPanicsWithInvalidScheme(t *testing.T) {