diff --git a/Taskfile.yml b/Taskfile.yml
index 4f3b5605..d8333a1c 100644
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -35,9 +35,7 @@ test:
   desc: Runs test suite
   deps: [install]
   cmds:
-    - go test ./args
-    - go test ./status
-    - go test
+    - go test {{.GO_PACKAGES}}
 
 # https://github.com/goreleaser/goreleaser
 release:
diff --git a/Taskvars.yml b/Taskvars.yml
index 947ac050..14911472 100644
--- a/Taskvars.yml
+++ b/Taskvars.yml
@@ -3,7 +3,7 @@ GIT_COMMIT:
 
 GO_PACKAGES:
   .
-  ./args
   ./cmd/task
-  ./execext
-  ./status
+  ./internal/args
+  ./internal/execext
+  ./internal/status
diff --git a/cmd/task/task.go b/cmd/task/task.go
index f3d47ebb..72d4eb13 100644
--- a/cmd/task/task.go
+++ b/cmd/task/task.go
@@ -6,7 +6,7 @@ import (
 	"os"
 
 	"github.com/go-task/task"
-	"github.com/go-task/task/args"
+	"github.com/go-task/task/internal/args"
 
 	"github.com/spf13/pflag"
 )
diff --git a/args/args.go b/internal/args/args.go
similarity index 100%
rename from args/args.go
rename to internal/args/args.go
diff --git a/args/args_test.go b/internal/args/args_test.go
similarity index 96%
rename from args/args_test.go
rename to internal/args/args_test.go
index a1964d58..99b0f04a 100644
--- a/args/args_test.go
+++ b/internal/args/args_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/go-task/task"
-	"github.com/go-task/task/args"
+	"github.com/go-task/task/internal/args"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/execext/exec.go b/internal/execext/exec.go
similarity index 100%
rename from execext/exec.go
rename to internal/execext/exec.go
diff --git a/status/checksum.go b/internal/status/checksum.go
similarity index 100%
rename from status/checksum.go
rename to internal/status/checksum.go
diff --git a/status/checksum_test.go b/internal/status/checksum_test.go
similarity index 100%
rename from status/checksum_test.go
rename to internal/status/checksum_test.go
diff --git a/status/glob.go b/internal/status/glob.go
similarity index 100%
rename from status/glob.go
rename to internal/status/glob.go
diff --git a/status/none.go b/internal/status/none.go
similarity index 100%
rename from status/none.go
rename to internal/status/none.go
diff --git a/status/status.go b/internal/status/status.go
similarity index 100%
rename from status/status.go
rename to internal/status/status.go
diff --git a/status/timestamp.go b/internal/status/timestamp.go
similarity index 100%
rename from status/timestamp.go
rename to internal/status/timestamp.go
diff --git a/status.go b/status.go
index bd564071..40f3db66 100644
--- a/status.go
+++ b/status.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/go-task/task/execext"
-	"github.com/go-task/task/status"
+	"github.com/go-task/task/internal/execext"
+	"github.com/go-task/task/internal/status"
 )
 
 func (t *Task) isUpToDate(ctx context.Context) (bool, error) {
diff --git a/task.go b/task.go
index 0446737c..d72fd500 100644
--- a/task.go
+++ b/task.go
@@ -8,7 +8,7 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"github.com/go-task/task/execext"
+	"github.com/go-task/task/internal/execext"
 
 	"golang.org/x/sync/errgroup"
 )
@@ -92,10 +92,7 @@ func (e *Executor) Run(calls ...Call) error {
 	}
 
 	if e.Watch {
-		if err := e.watchTasks(calls...); err != nil {
-			return err
-		}
-		return nil
+		return e.watchTasks(calls...)
 	}
 
 	for _, c := range calls {
diff --git a/variables.go b/variables.go
index 0ca38d16..9133a681 100644
--- a/variables.go
+++ b/variables.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/go-task/task/execext"
+	"github.com/go-task/task/internal/execext"
 
 	"github.com/Masterminds/sprig"
 )