mendixlabs · engalar · Mar 23, 2026 · Mar 23, 2026 · Mar 23, 2026 · Mar 23, 2026
diff --git a/bson/classify.go → cmd/mxcli/bson/classify.go b/bson/classify.go → cmd/mxcli/bson/classify.go
diff --git a/bson/compare.go → cmd/mxcli/bson/compare.go b/bson/compare.go → cmd/mxcli/bson/compare.go
diff --git a/bson/compare_test.go → cmd/mxcli/bson/compare_test.go b/bson/compare_test.go → cmd/mxcli/bson/compare_test.go
diff --git a/bson/discover.go → cmd/mxcli/bson/discover.go b/bson/discover.go → cmd/mxcli/bson/discover.go
diff --git a/bson/discover_test.go → cmd/mxcli/bson/discover_test.go b/bson/discover_test.go → cmd/mxcli/bson/discover_test.go
diff --git a/bson/registry.go → cmd/mxcli/bson/registry.go b/bson/registry.go → cmd/mxcli/bson/registry.go
diff --git a/bson/registry_test.go → cmd/mxcli/bson/registry_test.go b/bson/registry_test.go → cmd/mxcli/bson/registry_test.go
diff --git a/bson/render.go → cmd/mxcli/bson/render.go b/bson/render.go → cmd/mxcli/bson/render.go
diff --git a/bson/render_test.go → cmd/mxcli/bson/render_test.go b/bson/render_test.go → cmd/mxcli/bson/render_test.go
diff --git a/cmd/mxcli/cmd_bson_compare.go b/cmd/mxcli/cmd_bson_compare.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	bsondebug "github.com/mendixlabs/mxcli/bson"
+	bsondebug "github.com/mendixlabs/mxcli/cmd/mxcli/bson"
 	"github.com/mendixlabs/mxcli/sdk/mpr"
 	"github.com/spf13/cobra"
 	"go.mongodb.org/mongo-driver/bson"

diff --git a/cmd/mxcli/cmd_bson_discover.go b/cmd/mxcli/cmd_bson_discover.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	bsondiscover "github.com/mendixlabs/mxcli/bson"
+	bsondiscover "github.com/mendixlabs/mxcli/cmd/mxcli/bson"
 	"github.com/mendixlabs/mxcli/sdk/mpr"
 	"github.com/spf13/cobra"
 	"go.mongodb.org/mongo-driver/bson"

diff --git a/cmd/mxcli/cmd_bson_dump.go b/cmd/mxcli/cmd_bson_dump.go
@@ -8,7 +8,7 @@ import (
 	"os"
 	"strings"
 
-	bsondebug "github.com/mendixlabs/mxcli/bson"
+	bsondebug "github.com/mendixlabs/mxcli/cmd/mxcli/bson"
 	"github.com/mendixlabs/mxcli/sdk/mpr"
 	"github.com/spf13/cobra"
 	"go.mongodb.org/mongo-driver/bson"

diff --git a/cmd/mxcli/cmd_tui.go b/cmd/mxcli/cmd_tui.go
@@ -7,7 +7,7 @@ import (
 	"os"
 
 	tea "github.com/charmbracelet/bubbletea"
-	"github.com/mendixlabs/mxcli/tui"
+	"github.com/mendixlabs/mxcli/cmd/mxcli/tui"
 	"github.com/spf13/cobra"
 )
 
@@ -57,7 +57,7 @@ Example:
 
 		tui.SaveHistory(projectPath)
 
-		m := tui.New(mxcliPath, projectPath)
+		m := tui.NewApp(mxcliPath, projectPath)
 		p := tea.NewProgram(m, tea.WithAltScreen(), tea.WithMouseCellMotion())
 		if _, err := p.Run(); err != nil {
 			fmt.Fprintf(os.Stderr, "Error: %v\n", err)

diff --git a/cmd/mxcli/lsp_completions_gen.go b/cmd/mxcli/lsp_completions_gen.go