From 296734ba3b7ca787b580f5628e14380ebfb1f43a Mon Sep 17 00:00:00 2001
From: Ettore Di Giacinto <mudler@localai.io>
Date: Tue, 25 Feb 2025 22:18:08 +0100
Subject: [PATCH] reordering

---
 {action => core/action}/custom.go             |  2 +-
 {action => core/action}/custom_test.go        |  2 +-
 {action => core/action}/definition.go         |  0
 {action => core/action}/intention.go          |  0
 {action => core/action}/newconversation.go    |  0
 {action => core/action}/noreply.go            |  0
 {action => core/action}/plan.go               |  0
 {action => core/action}/reasoning.go          |  0
 {action => core/action}/reply.go              |  0
 {action => core/action}/state.go              |  0
 {agent => core/agent}/actions.go              |  4 +--
 {agent => core/agent}/agent.go                |  6 ++--
 {agent => core/agent}/agent_suite_test.go     |  0
 {agent => core/agent}/agent_test.go           |  6 ++--
 {agent => core/agent}/jobs.go                 |  0
 {agent => core/agent}/options.go              |  0
 {agent => core/agent}/state.go                |  4 +--
 {agent => core/agent}/state_test.go           |  2 +-
 {agent => core/agent}/templates.go            |  2 +-
 example/webui/actions.go                      | 32 +++++++++----------
 example/webui/agentpool.go                    |  6 ++--
 example/webui/app.go                          |  4 +--
 example/webui/connectors.go                   | 23 +++++++------
 example/webui/main.go                         |  6 ++--
 example/webui/rag.go                          |  4 +--
 example/webui/routes.go                       |  2 +-
 {llm => pkg/llm}/client.go                    |  0
 {llm => pkg/llm}/json.go                      |  0
 {llm => pkg/llm}/rag/chromem.go               |  0
 {llm => pkg/llm}/rag/localai.go               |  0
 {llm => pkg/llm}/rag/store.go                 |  0
 {xlog => pkg/xlog}/xlog.go                    |  0
 {external => services/actions}/browse.go      |  4 +--
 .../actions}/githubissuecloser.go             |  4 +--
 .../actions}/githubissuelabeler.go            |  4 +--
 .../actions}/githubissueopener.go             |  4 +--
 .../actions}/githubissuesearch.go             |  4 +--
 {external => services/actions}/scrape.go      |  4 +--
 {external => services/actions}/search.go      |  4 +--
 {external => services/actions}/sendmail.go    |  4 +--
 {external => services/actions}/wikipedia.go   |  4 +--
 .../connectors}/discord.go                    |  6 ++--
 .../connectors}/githubissue.go                |  6 ++--
 .../connectors}/githubpr.go                   |  6 ++--
 .../connectors}/slack.go                      |  6 ++--
 .../connectors}/telegram.go                   |  4 +--
 46 files changed, 84 insertions(+), 85 deletions(-)
 rename {action => core/action}/custom.go (98%)
 rename {action => core/action}/custom_test.go (96%)
 rename {action => core/action}/definition.go (100%)
 rename {action => core/action}/intention.go (100%)
 rename {action => core/action}/newconversation.go (100%)
 rename {action => core/action}/noreply.go (100%)
 rename {action => core/action}/plan.go (100%)
 rename {action => core/action}/reasoning.go (100%)
 rename {action => core/action}/reply.go (100%)
 rename {action => core/action}/state.go (100%)
 rename {agent => core/agent}/actions.go (98%)
 rename {agent => core/agent}/agent.go (99%)
 rename {agent => core/agent}/agent_suite_test.go (100%)
 rename {agent => core/agent}/agent_test.go (97%)
 rename {agent => core/agent}/jobs.go (100%)
 rename {agent => core/agent}/options.go (100%)
 rename {agent => core/agent}/state.go (96%)
 rename {agent => core/agent}/state_test.go (95%)
 rename {agent => core/agent}/templates.go (98%)
 rename {llm => pkg/llm}/client.go (100%)
 rename {llm => pkg/llm}/json.go (100%)
 rename {llm => pkg/llm}/rag/chromem.go (100%)
 rename {llm => pkg/llm}/rag/localai.go (100%)
 rename {llm => pkg/llm}/rag/store.go (100%)
 rename {xlog => pkg/xlog}/xlog.go (100%)
 rename {external => services/actions}/browse.go (95%)
 rename {external => services/actions}/githubissuecloser.go (96%)
 rename {external => services/actions}/githubissuelabeler.go (97%)
 rename {external => services/actions}/githubissueopener.go (96%)
 rename {external => services/actions}/githubissuesearch.go (96%)
 rename {external => services/actions}/scrape.go (93%)
 rename {external => services/actions}/search.go (94%)
 rename {external => services/actions}/sendmail.go (95%)
 rename {external => services/actions}/wikipedia.go (93%)
 rename {example/webui/connector => services/connectors}/discord.go (96%)
 rename {example/webui/connector => services/connectors}/githubissue.go (97%)
 rename {example/webui/connector => services/connectors}/githubpr.go (97%)
 rename {example/webui/connector => services/connectors}/slack.go (96%)
 rename {example/webui/connector => services/connectors}/telegram.go (96%)

diff --git a/action/custom.go b/core/action/custom.go
similarity index 98%
rename from action/custom.go
rename to core/action/custom.go
index 57eef25..f493e5c 100644
--- a/action/custom.go
+++ b/core/action/custom.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/mudler/local-agent-framework/xlog"
+	"github.com/mudler/local-agent-framework/pkg/xlog"
 	"github.com/sashabaranov/go-openai/jsonschema"
 	"github.com/traefik/yaegi/interp"
 	"github.com/traefik/yaegi/stdlib"
diff --git a/action/custom_test.go b/core/action/custom_test.go
similarity index 96%
rename from action/custom_test.go
rename to core/action/custom_test.go
index 90c937c..00c0e7e 100644
--- a/action/custom_test.go
+++ b/core/action/custom_test.go
@@ -3,7 +3,7 @@ package action_test
 import (
 	"context"
 
-	. "github.com/mudler/local-agent-framework/action"
+	. "github.com/mudler/local-agent-framework/core/action"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
diff --git a/action/definition.go b/core/action/definition.go
similarity index 100%
rename from action/definition.go
rename to core/action/definition.go
diff --git a/action/intention.go b/core/action/intention.go
similarity index 100%
rename from action/intention.go
rename to core/action/intention.go
diff --git a/action/newconversation.go b/core/action/newconversation.go
similarity index 100%
rename from action/newconversation.go
rename to core/action/newconversation.go
diff --git a/action/noreply.go b/core/action/noreply.go
similarity index 100%
rename from action/noreply.go
rename to core/action/noreply.go
diff --git a/action/plan.go b/core/action/plan.go
similarity index 100%
rename from action/plan.go
rename to core/action/plan.go
diff --git a/action/reasoning.go b/core/action/reasoning.go
similarity index 100%
rename from action/reasoning.go
rename to core/action/reasoning.go
diff --git a/action/reply.go b/core/action/reply.go
similarity index 100%
rename from action/reply.go
rename to core/action/reply.go
diff --git a/action/state.go b/core/action/state.go
similarity index 100%
rename from action/state.go
rename to core/action/state.go
diff --git a/agent/actions.go b/core/agent/actions.go
similarity index 98%
rename from agent/actions.go
rename to core/agent/actions.go
index 8b4c7a1..b0c9f5e 100644
--- a/agent/actions.go
+++ b/core/agent/actions.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/mudler/local-agent-framework/action"
-	"github.com/mudler/local-agent-framework/xlog"
+	"github.com/mudler/local-agent-framework/core/action"
+	"github.com/mudler/local-agent-framework/pkg/xlog"
 
 	"github.com/sashabaranov/go-openai"
 )
diff --git a/agent/agent.go b/core/agent/agent.go
similarity index 99%
rename from agent/agent.go
rename to core/agent/agent.go
index 35731d2..fe2d7ea 100644
--- a/agent/agent.go
+++ b/core/agent/agent.go
@@ -8,10 +8,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/mudler/local-agent-framework/xlog"
+	"github.com/mudler/local-agent-framework/pkg/xlog"
 
-	"github.com/mudler/local-agent-framework/action"
-	"github.com/mudler/local-agent-framework/llm"
+	"github.com/mudler/local-agent-framework/core/action"
+	"github.com/mudler/local-agent-framework/pkg/llm"
 	"github.com/sashabaranov/go-openai"
 )
 
diff --git a/agent/agent_suite_test.go b/core/agent/agent_suite_test.go
similarity index 100%
rename from agent/agent_suite_test.go
rename to core/agent/agent_suite_test.go
diff --git a/agent/agent_test.go b/core/agent/agent_test.go
similarity index 97%
rename from agent/agent_test.go
rename to core/agent/agent_test.go
index 12a3711..c10b1b1 100644
--- a/agent/agent_test.go
+++ b/core/agent/agent_test.go
@@ -4,10 +4,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/mudler/local-agent-framework/xlog"
+	"github.com/mudler/local-agent-framework/pkg/xlog"
 
-	"github.com/mudler/local-agent-framework/action"
-	. "github.com/mudler/local-agent-framework/agent"
+	"github.com/mudler/local-agent-framework/core/action"
+	. "github.com/mudler/local-agent-framework/core/agent"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/sashabaranov/go-openai/jsonschema"
diff --git a/agent/jobs.go b/core/agent/jobs.go
similarity index 100%
rename from agent/jobs.go
rename to core/agent/jobs.go
diff --git a/agent/options.go b/core/agent/options.go
similarity index 100%
rename from agent/options.go
rename to core/agent/options.go
diff --git a/agent/state.go b/core/agent/state.go
similarity index 96%
rename from agent/state.go
rename to core/agent/state.go
index 05f42cd..1ac9e85 100644
--- a/agent/state.go
+++ b/core/agent/state.go
@@ -6,8 +6,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/mudler/local-agent-framework/action"
-	"github.com/mudler/local-agent-framework/llm"
+	"github.com/mudler/local-agent-framework/core/action"
+	"github.com/mudler/local-agent-framework/pkg/llm"
 )
 
 // PromptHUD contains
diff --git a/agent/state_test.go b/core/agent/state_test.go
similarity index 95%
rename from agent/state_test.go
rename to core/agent/state_test.go
index 85ec864..c809d60 100644
--- a/agent/state_test.go
+++ b/core/agent/state_test.go
@@ -1,7 +1,7 @@
 package agent_test
 
 import (
-	. "github.com/mudler/local-agent-framework/agent"
+	. "github.com/mudler/local-agent-framework/core/agent"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
diff --git a/agent/templates.go b/core/agent/templates.go
similarity index 98%
rename from agent/templates.go
rename to core/agent/templates.go
index 4575c9c..5f6190d 100644
--- a/agent/templates.go
+++ b/core/agent/templates.go
@@ -5,7 +5,7 @@ import (
 	"html/template"
 	"time"
 
-	"github.com/mudler/local-agent-framework/action"
+	"github.com/mudler/local-agent-framework/core/action"
 	"github.com/sashabaranov/go-openai"
 )
 
diff --git a/example/webui/actions.go b/example/webui/actions.go
index 3ddef6b..b7136c7 100644
--- a/example/webui/actions.go
+++ b/example/webui/actions.go
@@ -4,11 +4,11 @@ import (
 	"context"
 	"encoding/json"
 
-	"github.com/mudler/local-agent-framework/action"
-	"github.com/mudler/local-agent-framework/xlog"
+	"github.com/mudler/local-agent-framework/core/action"
+	"github.com/mudler/local-agent-framework/pkg/xlog"
 
-	. "github.com/mudler/local-agent-framework/agent"
-	"github.com/mudler/local-agent-framework/external"
+	. "github.com/mudler/local-agent-framework/core/agent"
+	"github.com/mudler/local-agent-framework/services/actions"
 )
 
 const (
@@ -39,7 +39,7 @@ var AvailableActions = []string{
 }
 
 func (a *AgentConfig) availableActions(ctx context.Context) []Action {
-	actions := []Action{}
+	allActions := []Action{}
 
 	for _, a := range a.Actions {
 		var config map[string]string
@@ -55,27 +55,27 @@ func (a *AgentConfig) availableActions(ctx context.Context) []Action {
 				xlog.Error("Error creating custom action", "error", err)
 				continue
 			}
-			actions = append(actions, customAction)
+			allActions = append(allActions, customAction)
 		case ActionSearch:
-			actions = append(actions, external.NewSearch(config))
+			allActions = append(allActions, actions.NewSearch(config))
 		case ActionGithubIssueLabeler:
-			actions = append(actions, external.NewGithubIssueLabeler(ctx, config))
+			allActions = append(allActions, actions.NewGithubIssueLabeler(ctx, config))
 		case ActionGithubIssueOpener:
-			actions = append(actions, external.NewGithubIssueOpener(ctx, config))
+			allActions = append(allActions, actions.NewGithubIssueOpener(ctx, config))
 		case ActionGithubIssueCloser:
-			actions = append(actions, external.NewGithubIssueCloser(ctx, config))
+			allActions = append(allActions, actions.NewGithubIssueCloser(ctx, config))
 		case ActionGithubIssueSearcher:
-			actions = append(actions, external.NewGithubIssueSearch(ctx, config))
+			allActions = append(allActions, actions.NewGithubIssueSearch(ctx, config))
 		case ActionScraper:
-			actions = append(actions, external.NewScraper(config))
+			allActions = append(allActions, actions.NewScraper(config))
 		case ActionWikipedia:
-			actions = append(actions, external.NewWikipedia(config))
+			allActions = append(allActions, actions.NewWikipedia(config))
 		case ActionBrowse:
-			actions = append(actions, external.NewBrowse(config))
+			allActions = append(allActions, actions.NewBrowse(config))
 		case ActionSendMail:
-			actions = append(actions, external.NewSendMail(config))
+			allActions = append(allActions, actions.NewSendMail(config))
 		}
 	}
 
-	return actions
+	return allActions
 }
diff --git a/example/webui/agentpool.go b/example/webui/agentpool.go
index 54d9c42..685cd98 100644
--- a/example/webui/agentpool.go
+++ b/example/webui/agentpool.go
@@ -10,10 +10,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/mudler/local-agent-framework/agent"
-	"github.com/mudler/local-agent-framework/xlog"
+	"github.com/mudler/local-agent-framework/core/agent"
+	"github.com/mudler/local-agent-framework/pkg/xlog"
 
-	. "github.com/mudler/local-agent-framework/agent"
+	. "github.com/mudler/local-agent-framework/core/agent"
 )
 
 type AgentPool struct {
diff --git a/example/webui/app.go b/example/webui/app.go
index 58d27f6..bcc4673 100644
--- a/example/webui/app.go
+++ b/example/webui/app.go
@@ -8,9 +8,9 @@ import (
 	"os"
 	"strings"
 
-	"github.com/mudler/local-agent-framework/xlog"
+	"github.com/mudler/local-agent-framework/pkg/xlog"
 
-	. "github.com/mudler/local-agent-framework/agent"
+	. "github.com/mudler/local-agent-framework/core/agent"
 
 	"github.com/donseba/go-htmx"
 	"github.com/dslipak/pdf"
diff --git a/example/webui/connectors.go b/example/webui/connectors.go
index ec1d80b..2e54fda 100644
--- a/example/webui/connectors.go
+++ b/example/webui/connectors.go
@@ -3,11 +3,10 @@ package main
 import (
 	"encoding/json"
 
-	"github.com/mudler/local-agent-framework/xlog"
+	"github.com/mudler/local-agent-framework/pkg/xlog"
+	"github.com/mudler/local-agent-framework/services/connectors"
 
-	. "github.com/mudler/local-agent-framework/agent"
-
-	"github.com/mudler/local-agent-framework/example/webui/connector"
+	. "github.com/mudler/local-agent-framework/core/agent"
 )
 
 const (
@@ -34,7 +33,7 @@ var AvailableConnectors = []string{
 }
 
 func (a *AgentConfig) availableConnectors() []Connector {
-	connectors := []Connector{}
+	conns := []Connector{}
 
 	for _, c := range a.Connector {
 		var config map[string]string
@@ -44,22 +43,22 @@ func (a *AgentConfig) availableConnectors() []Connector {
 		}
 		switch c.Type {
 		case ConnectorTelegram:
-			cc, err := connector.NewTelegramConnector(config)
+			cc, err := connectors.NewTelegramConnector(config)
 			if err != nil {
 				xlog.Info("Error creating telegram connector", err)
 				continue
 			}
 
-			connectors = append(connectors, cc)
+			conns = append(conns, cc)
 		case ConnectorSlack:
-			connectors = append(connectors, connector.NewSlack(config))
+			conns = append(conns, connectors.NewSlack(config))
 		case ConnectorDiscord:
-			connectors = append(connectors, connector.NewDiscord(config))
+			conns = append(conns, connectors.NewDiscord(config))
 		case ConnectorGithubIssues:
-			connectors = append(connectors, connector.NewGithubIssueWatcher(config))
+			conns = append(conns, connectors.NewGithubIssueWatcher(config))
 		case ConnectorGithubPRs:
-			connectors = append(connectors, connector.NewGithubPRWatcher(config))
+			conns = append(conns, connectors.NewGithubPRWatcher(config))
 		}
 	}
-	return connectors
+	return conns
 }
diff --git a/example/webui/main.go b/example/webui/main.go
index ff3a9b3..b24a88f 100644
--- a/example/webui/main.go
+++ b/example/webui/main.go
@@ -10,9 +10,9 @@ import (
 	fiber "github.com/gofiber/fiber/v2"
 	"github.com/gofiber/template/html/v2"
 
-	. "github.com/mudler/local-agent-framework/agent"
-	"github.com/mudler/local-agent-framework/llm"
-	"github.com/mudler/local-agent-framework/llm/rag"
+	. "github.com/mudler/local-agent-framework/core/agent"
+	"github.com/mudler/local-agent-framework/pkg/llm"
+	"github.com/mudler/local-agent-framework/pkg/llm/rag"
 )
 
 var testModel = os.Getenv("TEST_MODEL")
diff --git a/example/webui/rag.go b/example/webui/rag.go
index cfc0024..d7479e0 100644
--- a/example/webui/rag.go
+++ b/example/webui/rag.go
@@ -5,14 +5,14 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/mudler/local-agent-framework/xlog"
+	"github.com/mudler/local-agent-framework/pkg/xlog"
 
 	"net/http"
 	"os"
 	"strings"
 	"sync"
 
-	. "github.com/mudler/local-agent-framework/agent"
+	. "github.com/mudler/local-agent-framework/core/agent"
 	"jaytaylor.com/html2text"
 
 	sitemap "github.com/oxffaa/gopher-parse-sitemap"
diff --git a/example/webui/routes.go b/example/webui/routes.go
index f719b90..afe052f 100644
--- a/example/webui/routes.go
+++ b/example/webui/routes.go
@@ -6,7 +6,7 @@ import (
 
 	fiber "github.com/gofiber/fiber/v2"
 	"github.com/gofiber/fiber/v2/middleware/filesystem"
-	"github.com/mudler/local-agent-framework/agent"
+	"github.com/mudler/local-agent-framework/core/agent"
 )
 
 func RegisterRoutes(webapp *fiber.App, pool *AgentPool, app *App) {
diff --git a/llm/client.go b/pkg/llm/client.go
similarity index 100%
rename from llm/client.go
rename to pkg/llm/client.go
diff --git a/llm/json.go b/pkg/llm/json.go
similarity index 100%
rename from llm/json.go
rename to pkg/llm/json.go
diff --git a/llm/rag/chromem.go b/pkg/llm/rag/chromem.go
similarity index 100%
rename from llm/rag/chromem.go
rename to pkg/llm/rag/chromem.go
diff --git a/llm/rag/localai.go b/pkg/llm/rag/localai.go
similarity index 100%
rename from llm/rag/localai.go
rename to pkg/llm/rag/localai.go
diff --git a/llm/rag/store.go b/pkg/llm/rag/store.go
similarity index 100%
rename from llm/rag/store.go
rename to pkg/llm/rag/store.go
diff --git a/xlog/xlog.go b/pkg/xlog/xlog.go
similarity index 100%
rename from xlog/xlog.go
rename to pkg/xlog/xlog.go
diff --git a/external/browse.go b/services/actions/browse.go
similarity index 95%
rename from external/browse.go
rename to services/actions/browse.go
index e17598b..eef67ab 100644
--- a/external/browse.go
+++ b/services/actions/browse.go
@@ -1,4 +1,4 @@
-package external
+package actions
 
 import (
 	"context"
@@ -6,7 +6,7 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/mudler/local-agent-framework/action"
+	"github.com/mudler/local-agent-framework/core/action"
 	"github.com/sashabaranov/go-openai/jsonschema"
 	"jaytaylor.com/html2text"
 )
diff --git a/external/githubissuecloser.go b/services/actions/githubissuecloser.go
similarity index 96%
rename from external/githubissuecloser.go
rename to services/actions/githubissuecloser.go
index 5de7a62..b3924ad 100644
--- a/external/githubissuecloser.go
+++ b/services/actions/githubissuecloser.go
@@ -1,11 +1,11 @@
-package external
+package actions
 
 import (
 	"context"
 	"fmt"
 
 	"github.com/google/go-github/v61/github"
-	"github.com/mudler/local-agent-framework/action"
+	"github.com/mudler/local-agent-framework/core/action"
 	"github.com/sashabaranov/go-openai/jsonschema"
 )
 
diff --git a/external/githubissuelabeler.go b/services/actions/githubissuelabeler.go
similarity index 97%
rename from external/githubissuelabeler.go
rename to services/actions/githubissuelabeler.go
index 2442655..a8297eb 100644
--- a/external/githubissuelabeler.go
+++ b/services/actions/githubissuelabeler.go
@@ -1,4 +1,4 @@
-package external
+package actions
 
 import (
 	"context"
@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	"github.com/google/go-github/v61/github"
-	"github.com/mudler/local-agent-framework/action"
+	"github.com/mudler/local-agent-framework/core/action"
 	"github.com/sashabaranov/go-openai/jsonschema"
 )
 
diff --git a/external/githubissueopener.go b/services/actions/githubissueopener.go
similarity index 96%
rename from external/githubissueopener.go
rename to services/actions/githubissueopener.go
index 29058cc..87eb4e1 100644
--- a/external/githubissueopener.go
+++ b/services/actions/githubissueopener.go
@@ -1,11 +1,11 @@
-package external
+package actions
 
 import (
 	"context"
 	"fmt"
 
 	"github.com/google/go-github/v61/github"
-	"github.com/mudler/local-agent-framework/action"
+	"github.com/mudler/local-agent-framework/core/action"
 	"github.com/sashabaranov/go-openai/jsonschema"
 )
 
diff --git a/external/githubissuesearch.go b/services/actions/githubissuesearch.go
similarity index 96%
rename from external/githubissuesearch.go
rename to services/actions/githubissuesearch.go
index 71b9bb8..9b114bf 100644
--- a/external/githubissuesearch.go
+++ b/services/actions/githubissuesearch.go
@@ -1,4 +1,4 @@
-package external
+package actions
 
 import (
 	"context"
@@ -6,7 +6,7 @@ import (
 	"log/slog"
 
 	"github.com/google/go-github/v61/github"
-	"github.com/mudler/local-agent-framework/action"
+	"github.com/mudler/local-agent-framework/core/action"
 	"github.com/sashabaranov/go-openai/jsonschema"
 )
 
diff --git a/external/scrape.go b/services/actions/scrape.go
similarity index 93%
rename from external/scrape.go
rename to services/actions/scrape.go
index ce001be..7cd4937 100644
--- a/external/scrape.go
+++ b/services/actions/scrape.go
@@ -1,10 +1,10 @@
-package external
+package actions
 
 import (
 	"context"
 	"fmt"
 
-	"github.com/mudler/local-agent-framework/action"
+	"github.com/mudler/local-agent-framework/core/action"
 	"github.com/sashabaranov/go-openai/jsonschema"
 	"github.com/tmc/langchaingo/tools/scraper"
 )
diff --git a/external/search.go b/services/actions/search.go
similarity index 94%
rename from external/search.go
rename to services/actions/search.go
index 3c23120..f7c08df 100644
--- a/external/search.go
+++ b/services/actions/search.go
@@ -1,11 +1,11 @@
-package external
+package actions
 
 import (
 	"context"
 	"fmt"
 	"log/slog"
 
-	"github.com/mudler/local-agent-framework/action"
+	"github.com/mudler/local-agent-framework/core/action"
 	"github.com/sashabaranov/go-openai/jsonschema"
 	"github.com/tmc/langchaingo/tools/duckduckgo"
 )
diff --git a/external/sendmail.go b/services/actions/sendmail.go
similarity index 95%
rename from external/sendmail.go
rename to services/actions/sendmail.go
index 4c93946..c9b113d 100644
--- a/external/sendmail.go
+++ b/services/actions/sendmail.go
@@ -1,11 +1,11 @@
-package external
+package actions
 
 import (
 	"context"
 	"fmt"
 	"net/smtp"
 
-	"github.com/mudler/local-agent-framework/action"
+	"github.com/mudler/local-agent-framework/core/action"
 	"github.com/sashabaranov/go-openai/jsonschema"
 )
 
diff --git a/external/wikipedia.go b/services/actions/wikipedia.go
similarity index 93%
rename from external/wikipedia.go
rename to services/actions/wikipedia.go
index bfe5837..41be55f 100644
--- a/external/wikipedia.go
+++ b/services/actions/wikipedia.go
@@ -1,10 +1,10 @@
-package external
+package actions
 
 import (
 	"context"
 	"fmt"
 
-	"github.com/mudler/local-agent-framework/action"
+	"github.com/mudler/local-agent-framework/core/action"
 	"github.com/sashabaranov/go-openai/jsonschema"
 	"github.com/tmc/langchaingo/tools/wikipedia"
 )
diff --git a/example/webui/connector/discord.go b/services/connectors/discord.go
similarity index 96%
rename from example/webui/connector/discord.go
rename to services/connectors/discord.go
index 832c20f..a8b3f30 100644
--- a/example/webui/connector/discord.go
+++ b/services/connectors/discord.go
@@ -1,11 +1,11 @@
-package connector
+package connectors
 
 import (
 	"strings"
 
 	"github.com/bwmarrin/discordgo"
-	"github.com/mudler/local-agent-framework/agent"
-	"github.com/mudler/local-agent-framework/xlog"
+	"github.com/mudler/local-agent-framework/core/agent"
+	"github.com/mudler/local-agent-framework/pkg/xlog"
 )
 
 type Discord struct {
diff --git a/example/webui/connector/githubissue.go b/services/connectors/githubissue.go
similarity index 97%
rename from example/webui/connector/githubissue.go
rename to services/connectors/githubissue.go
index 3883869..6553666 100644
--- a/example/webui/connector/githubissue.go
+++ b/services/connectors/githubissue.go
@@ -1,4 +1,4 @@
-package connector
+package connectors
 
 import (
 	"fmt"
@@ -6,8 +6,8 @@ import (
 	"time"
 
 	"github.com/google/go-github/v61/github"
-	"github.com/mudler/local-agent-framework/agent"
-	"github.com/mudler/local-agent-framework/xlog"
+	"github.com/mudler/local-agent-framework/core/agent"
+	"github.com/mudler/local-agent-framework/pkg/xlog"
 
 	"github.com/sashabaranov/go-openai"
 )
diff --git a/example/webui/connector/githubpr.go b/services/connectors/githubpr.go
similarity index 97%
rename from example/webui/connector/githubpr.go
rename to services/connectors/githubpr.go
index 6765c04..112b9bd 100644
--- a/example/webui/connector/githubpr.go
+++ b/services/connectors/githubpr.go
@@ -1,4 +1,4 @@
-package connector
+package connectors
 
 import (
 	"fmt"
@@ -6,8 +6,8 @@ import (
 	"time"
 
 	"github.com/google/go-github/v61/github"
-	"github.com/mudler/local-agent-framework/agent"
-	"github.com/mudler/local-agent-framework/xlog"
+	"github.com/mudler/local-agent-framework/core/agent"
+	"github.com/mudler/local-agent-framework/pkg/xlog"
 
 	"github.com/sashabaranov/go-openai"
 )
diff --git a/example/webui/connector/slack.go b/services/connectors/slack.go
similarity index 96%
rename from example/webui/connector/slack.go
rename to services/connectors/slack.go
index 5a9e2a6..eaf7812 100644
--- a/example/webui/connector/slack.go
+++ b/services/connectors/slack.go
@@ -1,4 +1,4 @@
-package connector
+package connectors
 
 import (
 	"fmt"
@@ -6,9 +6,9 @@ import (
 	"os"
 	"strings"
 
-	"github.com/mudler/local-agent-framework/xlog"
+	"github.com/mudler/local-agent-framework/pkg/xlog"
 
-	"github.com/mudler/local-agent-framework/agent"
+	"github.com/mudler/local-agent-framework/core/agent"
 
 	"github.com/slack-go/slack/socketmode"
 
diff --git a/example/webui/connector/telegram.go b/services/connectors/telegram.go
similarity index 96%
rename from example/webui/connector/telegram.go
rename to services/connectors/telegram.go
index 151b9ca..b6c1290 100644
--- a/example/webui/connector/telegram.go
+++ b/services/connectors/telegram.go
@@ -1,4 +1,4 @@
-package connector
+package connectors
 
 import (
 	"context"
@@ -8,7 +8,7 @@ import (
 
 	"github.com/go-telegram/bot"
 	"github.com/go-telegram/bot/models"
-	"github.com/mudler/local-agent-framework/agent"
+	"github.com/mudler/local-agent-framework/core/agent"
 )
 
 type Telegram struct {