Merge dagger.io/dagger/engine into dagger.io/dagger

Signed-off-by: Solomon Hykes <solomon@dagger.io>

tests/tasks/pull/pull.cue

@@ -1,11 +1,11 @@
 package main
 
 import (
-	"dagger.io/dagger/engine"
+	"dagger.io/dagger"
 )
 
-engine.#Plan & {
-	actions: pull: engine.#Pull & {
+dagger.#Plan & {
+	actions: pull: dagger.#Pull & {
 		source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 	} & {
 		// assert result

tests/tasks/pull/pull_auth.cue

@@ -2,10 +2,9 @@ package main
 
 import (
 	"dagger.io/dagger"
-	"dagger.io/dagger/engine"
 )
 
-engine.#Plan & {
+dagger.#Plan & {
 	inputs: secrets: sops: command: {
 		name: "sops"
 		args: ["-d", "../../secrets_sops.yaml"]
@@ -17,7 +16,7 @@ engine.#Plan & {
 			input:  inputs.secrets.sops.contents
 		}
 
-		pull: engine.#Pull & {
+		pull: dagger.#Pull & {
 			source: "daggerio/ci-test:private-pull@sha256:c74f1b1166784193ea6c8f9440263b9be6cae07dfe35e32a5df7a31358ac2060"
 			auth: {
 				username: "daggertest"