diff --git a/.github b/.github
new file mode 160000
index 0000000..5b12611
--- /dev/null
+++ b/.github
@@ -0,0 +1 @@
+Subproject commit 5b126118d5dfaabb1b8dd4bb79693f968a2156a5
diff --git a/.gitignore b/.gitignore
index 496c52c..67551ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,36 +1,38 @@
-.tmp*
-.tmp/*
-*.log
-target*
-.env
-*.env
-work
+# Build artifacts
+target/
 *.out
-bin
-botserver-stack
+bin/
+
+# Logs
+*.log
 *logfile*
 *-log*
-docs/book
+
+# Temporary files
+.tmp*
+.tmp/*
+
+# Environment files
+.env
+*.env
+
+# Work directories
+work/
+
+# Redis
 *.rdb
+
+# Documentation build
+docs/book
+
+# Installers (keep gitkeep)
 botserver-installers/*
 !botserver-installers/.gitkeep
 
-# Subproject directories (have their own git repos)
-botapp/
-botserver/
-botlib/
-botui/
-botbook/
-bottest/
-botdevice/
-botmodels/
-botplugin/
-bottemplates/
-
-# IDE/Editor
+# IDE/Editor settings (local only)
 .vscode/
 .zed/
-.github/
+.idea/
 
-# Build artifacts
+# Lock file (regenerated from Cargo.toml)
 Cargo.lock
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..3b79285
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,42 @@
+[submodule "botapp"]
+	path = botapp
+	url = https://alm.pragmatismo.com.br/GeneralBots/botapp.git
+
+[submodule "botserver"]
+	path = botserver
+	url = https://alm.pragmatismo.com.br/GeneralBots/botserver.git
+
+[submodule "botlib"]
+	path = botlib
+	url = https://alm.pragmatismo.com.br/GeneralBots/botlib.git
+
+[submodule "botui"]
+	path = botui
+	url = https://alm.pragmatismo.com.br/GeneralBots/botui.git
+
+[submodule "botbook"]
+	path = botbook
+	url = https://alm.pragmatismo.com.br/GeneralBots/botbook.git
+
+[submodule "bottest"]
+	path = bottest
+	url = https://alm.pragmatismo.com.br/GeneralBots/bottest.git
+
+[submodule "botdevice"]
+	path = botdevice
+	url = https://alm.pragmatismo.com.br/GeneralBots/botdevice.git
+
+[submodule "botmodels"]
+	path = botmodels
+	url = https://alm.pragmatismo.com.br/GeneralBots/botmodels.git
+
+[submodule "botplugin"]
+	path = botplugin
+	url = https://alm.pragmatismo.com.br/GeneralBots/botplugin.git
+
+[submodule "bottemplates"]
+	path = bottemplates
+	url = https://alm.pragmatismo.com.br/GeneralBots/bottemplates.git
+[submodule ".github"]
+	path = .github
+	url = https://alm.pragmatismo.com.br/GeneralBots/.github.git
diff --git a/botapp b/botapp
new file mode 160000
index 0000000..bc875b5
--- /dev/null
+++ b/botapp
@@ -0,0 +1 @@
+Subproject commit bc875b511f7a9be11b8cb49d8be4f33e2998f015
diff --git a/botbook b/botbook
new file mode 160000
index 0000000..25a6603
--- /dev/null
+++ b/botbook
@@ -0,0 +1 @@
+Subproject commit 25a66030ba2160b3d8a036cabdc5953a268afac0
diff --git a/botdevice b/botdevice
new file mode 160000
index 0000000..f2afa7e
--- /dev/null
+++ b/botdevice
@@ -0,0 +1 @@
+Subproject commit f2afa7e7bebac98272940715f499c50381b30d4f
diff --git a/botlib b/botlib
new file mode 160000
index 0000000..94f333f
--- /dev/null
+++ b/botlib
@@ -0,0 +1 @@
+Subproject commit 94f333f983aa7f4fcfc541b9d6f52f2261d3095a
diff --git a/botmodels b/botmodels
new file mode 160000
index 0000000..f7690e1
--- /dev/null
+++ b/botmodels
@@ -0,0 +1 @@
+Subproject commit f7690e1d811824d39151e953ea604868a80be532
diff --git a/botplugin b/botplugin
new file mode 160000
index 0000000..17a3cae
--- /dev/null
+++ b/botplugin
@@ -0,0 +1 @@
+Subproject commit 17a3caebabddbe843c2b7fd93f624b0ccd9c44fb
diff --git a/botserver b/botserver
new file mode 160000
index 0000000..8d5bf7a
--- /dev/null
+++ b/botserver
@@ -0,0 +1 @@
+Subproject commit 8d5bf7a7291f29efcec13637207a0c2448ee6ad7
diff --git a/bottemplates b/bottemplates
new file mode 160000
index 0000000..98fb0b3
--- /dev/null
+++ b/bottemplates
@@ -0,0 +1 @@
+Subproject commit 98fb0b31a6e14aefbd6c77cf41dda2028b64dfda
diff --git a/bottest b/bottest
new file mode 160000
index 0000000..b38574c
--- /dev/null
+++ b/bottest
@@ -0,0 +1 @@
+Subproject commit b38574c5885d356b026f5060af51ad02d2fcef21
diff --git a/botui b/botui
new file mode 160000
index 0000000..1df0df2
--- /dev/null
+++ b/botui
@@ -0,0 +1 @@
+Subproject commit 1df0df222f1facb98588878648ac71030b5f43c3