diff --git a/cmd/pm/runner.go b/cmd/pm/runner.go
index d181c17..d06d045 100644
--- a/cmd/pm/runner.go
+++ b/cmd/pm/runner.go
@@ -7,8 +7,7 @@ import (
 	"math/rand"
 
 	"github.com/LazyBachelor/LazyPM/cmd/pm/tasks"
-	survey "github.com/LazyBachelor/LazyPM/internal/commands/survey"
-	"github.com/LazyBachelor/LazyPM/internal/models"
+	"github.com/LazyBachelor/LazyPM/internal/commands/survey"
 	"github.com/LazyBachelor/LazyPM/pkg/task"
 	"github.com/spf13/cobra"
 )
@@ -61,7 +60,7 @@ func runStartCmd(cmd *cobra.Command, args []string) error {
 	return nil
 }
 
-func taskLoop(ctx context.Context, application *models.App, surveyTasks map[string]task.Tasker, interfaces map[string]task.Interface) error {
+func taskLoop(ctx context.Context, application *task.App, surveyTasks map[string]task.Tasker, interfaces map[string]task.Interface) error {
 	var iNames []string
 	for name := range interfaces {
 		iNames = append(iNames, name)
@@ -93,7 +92,7 @@ func taskLoop(ctx context.Context, application *models.App, surveyTasks map[stri
 }
 
 func returnIfUserQuit(err error, msg string) error {
-	if errors.Is(err, models.ErrUserQuit) {
+	if errors.Is(err, task.ErrUserQuit) {
 		return nil
 	}
 	return fmt.Errorf("%s: %w", msg, err)
diff --git a/cmd/pm/tasks/base.go b/cmd/pm/tasks/base.go
index 3736c32..ca78479 100644
--- a/cmd/pm/tasks/base.go
+++ b/cmd/pm/tasks/base.go
@@ -117,13 +117,13 @@ func TUIQuestion(interfaceType InterfaceType, fields ...huh.Field) *huh.Group {
 
 // FetchIssues retrieves all issues from the app and returns those that are relevant for validation,
 // excluding the setup issue. It also updates the setup issue with the latest data from the app.
-func FetchIssues(ctx context.Context, app *app.App, setupIssue *models.Issue) ([]*models.Issue, error) {
+func FetchIssues(ctx context.Context, app *App, setupIssue *Issue) ([]*Issue, error) {
 	issues, err := app.Issues.SearchIssues(ctx, "", models.IssueFilter{})
 	if err != nil {
 		return nil, err
 	}
 
-	var relevantIssues []*models.Issue
+	var relevantIssues []*Issue
 	for _, issue := range issues {
 		if issue.ID != setupIssue.ID {
 			relevantIssues = append(relevantIssues, issue)