diff --git a/lib/modules/ai_bot/anthropic_bot.rb b/lib/discourse_ai/ai_bot/anthropic_bot.rb
similarity index 100%
rename from lib/modules/ai_bot/anthropic_bot.rb
rename to lib/discourse_ai/ai_bot/anthropic_bot.rb
diff --git a/lib/modules/ai_bot/bot.rb b/lib/discourse_ai/ai_bot/bot.rb
similarity index 100%
rename from lib/modules/ai_bot/bot.rb
rename to lib/discourse_ai/ai_bot/bot.rb
diff --git a/lib/modules/ai_bot/commands/categories_command.rb b/lib/discourse_ai/ai_bot/commands/categories_command.rb
similarity index 100%
rename from lib/modules/ai_bot/commands/categories_command.rb
rename to lib/discourse_ai/ai_bot/commands/categories_command.rb
diff --git a/lib/modules/ai_bot/commands/command.rb b/lib/discourse_ai/ai_bot/commands/command.rb
similarity index 100%
rename from lib/modules/ai_bot/commands/command.rb
rename to lib/discourse_ai/ai_bot/commands/command.rb
diff --git a/lib/modules/ai_bot/commands/db_schema_command.rb b/lib/discourse_ai/ai_bot/commands/db_schema_command.rb
similarity index 100%
rename from lib/modules/ai_bot/commands/db_schema_command.rb
rename to lib/discourse_ai/ai_bot/commands/db_schema_command.rb
diff --git a/lib/modules/ai_bot/commands/google_command.rb b/lib/discourse_ai/ai_bot/commands/google_command.rb
similarity index 100%
rename from lib/modules/ai_bot/commands/google_command.rb
rename to lib/discourse_ai/ai_bot/commands/google_command.rb
diff --git a/lib/modules/ai_bot/commands/image_command.rb b/lib/discourse_ai/ai_bot/commands/image_command.rb
similarity index 100%
rename from lib/modules/ai_bot/commands/image_command.rb
rename to lib/discourse_ai/ai_bot/commands/image_command.rb
diff --git a/lib/modules/ai_bot/commands/read_command.rb b/lib/discourse_ai/ai_bot/commands/read_command.rb
similarity index 100%
rename from lib/modules/ai_bot/commands/read_command.rb
rename to lib/discourse_ai/ai_bot/commands/read_command.rb
diff --git a/lib/modules/ai_bot/commands/search_command.rb b/lib/discourse_ai/ai_bot/commands/search_command.rb
similarity index 100%
rename from lib/modules/ai_bot/commands/search_command.rb
rename to lib/discourse_ai/ai_bot/commands/search_command.rb
diff --git a/lib/modules/ai_bot/commands/search_settings_command.rb b/lib/discourse_ai/ai_bot/commands/search_settings_command.rb
similarity index 100%
rename from lib/modules/ai_bot/commands/search_settings_command.rb
rename to lib/discourse_ai/ai_bot/commands/search_settings_command.rb
diff --git a/lib/modules/ai_bot/commands/setting_context_command.rb b/lib/discourse_ai/ai_bot/commands/setting_context_command.rb
similarity index 100%
rename from lib/modules/ai_bot/commands/setting_context_command.rb
rename to lib/discourse_ai/ai_bot/commands/setting_context_command.rb
diff --git a/lib/modules/ai_bot/commands/summarize_command.rb b/lib/discourse_ai/ai_bot/commands/summarize_command.rb
similarity index 100%
rename from lib/modules/ai_bot/commands/summarize_command.rb
rename to lib/discourse_ai/ai_bot/commands/summarize_command.rb
diff --git a/lib/modules/ai_bot/commands/tags_command.rb b/lib/discourse_ai/ai_bot/commands/tags_command.rb
similarity index 100%
rename from lib/modules/ai_bot/commands/tags_command.rb
rename to lib/discourse_ai/ai_bot/commands/tags_command.rb
diff --git a/lib/modules/ai_bot/commands/time_command.rb b/lib/discourse_ai/ai_bot/commands/time_command.rb
similarity index 100%
rename from lib/modules/ai_bot/commands/time_command.rb
rename to lib/discourse_ai/ai_bot/commands/time_command.rb
diff --git a/lib/modules/ai_bot/entry_point.rb b/lib/discourse_ai/ai_bot/entry_point.rb
similarity index 100%
rename from lib/modules/ai_bot/entry_point.rb
rename to lib/discourse_ai/ai_bot/entry_point.rb
diff --git a/lib/modules/ai_bot/jobs/regular/create_ai_reply.rb b/lib/discourse_ai/ai_bot/jobs/regular/create_ai_reply.rb
similarity index 100%
rename from lib/modules/ai_bot/jobs/regular/create_ai_reply.rb
rename to lib/discourse_ai/ai_bot/jobs/regular/create_ai_reply.rb
diff --git a/lib/modules/ai_bot/jobs/regular/update_ai_bot_pm_title.rb b/lib/discourse_ai/ai_bot/jobs/regular/update_ai_bot_pm_title.rb
similarity index 100%
rename from lib/modules/ai_bot/jobs/regular/update_ai_bot_pm_title.rb
rename to lib/discourse_ai/ai_bot/jobs/regular/update_ai_bot_pm_title.rb
diff --git a/lib/modules/ai_bot/open_ai_bot.rb b/lib/discourse_ai/ai_bot/open_ai_bot.rb
similarity index 100%
rename from lib/modules/ai_bot/open_ai_bot.rb
rename to lib/discourse_ai/ai_bot/open_ai_bot.rb
diff --git a/lib/modules/ai_bot/personas/artist.rb b/lib/discourse_ai/ai_bot/personas/artist.rb
similarity index 100%
rename from lib/modules/ai_bot/personas/artist.rb
rename to lib/discourse_ai/ai_bot/personas/artist.rb
diff --git a/lib/modules/ai_bot/personas/creative.rb b/lib/discourse_ai/ai_bot/personas/creative.rb
similarity index 100%
rename from lib/modules/ai_bot/personas/creative.rb
rename to lib/discourse_ai/ai_bot/personas/creative.rb
diff --git a/lib/modules/ai_bot/personas/general.rb b/lib/discourse_ai/ai_bot/personas/general.rb
similarity index 100%
rename from lib/modules/ai_bot/personas/general.rb
rename to lib/discourse_ai/ai_bot/personas/general.rb
diff --git a/lib/modules/ai_bot/personas/persona.rb b/lib/discourse_ai/ai_bot/personas/persona.rb
similarity index 100%
rename from lib/modules/ai_bot/personas/persona.rb
rename to lib/discourse_ai/ai_bot/personas/persona.rb
diff --git a/lib/modules/ai_bot/personas/researcher.rb b/lib/discourse_ai/ai_bot/personas/researcher.rb
similarity index 100%
rename from lib/modules/ai_bot/personas/researcher.rb
rename to lib/discourse_ai/ai_bot/personas/researcher.rb
diff --git a/lib/modules/ai_bot/personas/settings_explorer.rb b/lib/discourse_ai/ai_bot/personas/settings_explorer.rb
similarity index 100%
rename from lib/modules/ai_bot/personas/settings_explorer.rb
rename to lib/discourse_ai/ai_bot/personas/settings_explorer.rb
diff --git a/lib/modules/ai_bot/personas/sql_helper.rb b/lib/discourse_ai/ai_bot/personas/sql_helper.rb
similarity index 100%
rename from lib/modules/ai_bot/personas/sql_helper.rb
rename to lib/discourse_ai/ai_bot/personas/sql_helper.rb
diff --git a/lib/modules/ai_bot/site_settings_extension.rb b/lib/discourse_ai/ai_bot/site_settings_extension.rb
similarity index 100%
rename from lib/modules/ai_bot/site_settings_extension.rb
rename to lib/discourse_ai/ai_bot/site_settings_extension.rb
diff --git a/lib/discourse_ai/engine.rb b/lib/discourse_ai/engine.rb
index 6c43e22e..aea18d53 100644
--- a/lib/discourse_ai/engine.rb
+++ b/lib/discourse_ai/engine.rb
@@ -4,5 +4,6 @@ module ::DiscourseAi
   class Engine < ::Rails::Engine
     engine_name PLUGIN_NAME
     isolate_namespace DiscourseAi
+    config.autoload_paths << File.join(config.root, "lib")
   end
 end
diff --git a/plugin.rb b/plugin.rb
index 67ac5e2d..44dbc224 100644
--- a/plugin.rb
+++ b/plugin.rb
@@ -58,7 +58,6 @@ after_initialize do
   require_relative "lib/modules/ai_helper/entry_point"
   require_relative "lib/modules/embeddings/entry_point"
   require_relative "lib/modules/summarization/entry_point"
-  require_relative "lib/modules/ai_bot/entry_point"
   require_relative "lib/discourse_automation/llm_triage"
 
   [