diff --git a/hermes_agent/__init__.py b/hermes_agent/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/acp_adapter/__init__.py b/hermes_agent/acp/__init__.py
similarity index 100%
rename from acp_adapter/__init__.py
rename to hermes_agent/acp/__init__.py
diff --git a/acp_adapter/__main__.py b/hermes_agent/acp/__main__.py
similarity index 100%
rename from acp_adapter/__main__.py
rename to hermes_agent/acp/__main__.py
diff --git a/acp_adapter/auth.py b/hermes_agent/acp/auth.py
similarity index 100%
rename from acp_adapter/auth.py
rename to hermes_agent/acp/auth.py
diff --git a/acp_adapter/entry.py b/hermes_agent/acp/entry.py
similarity index 100%
rename from acp_adapter/entry.py
rename to hermes_agent/acp/entry.py
diff --git a/acp_adapter/events.py b/hermes_agent/acp/events.py
similarity index 100%
rename from acp_adapter/events.py
rename to hermes_agent/acp/events.py
diff --git a/acp_adapter/permissions.py b/hermes_agent/acp/permissions.py
similarity index 100%
rename from acp_adapter/permissions.py
rename to hermes_agent/acp/permissions.py
diff --git a/acp_adapter/server.py b/hermes_agent/acp/server.py
similarity index 100%
rename from acp_adapter/server.py
rename to hermes_agent/acp/server.py
diff --git a/acp_adapter/session.py b/hermes_agent/acp/session.py
similarity index 100%
rename from acp_adapter/session.py
rename to hermes_agent/acp/session.py
diff --git a/acp_adapter/tools.py b/hermes_agent/acp/tools.py
similarity index 100%
rename from acp_adapter/tools.py
rename to hermes_agent/acp/tools.py
diff --git a/agent/__init__.py b/hermes_agent/agent/__init__.py
similarity index 100%
rename from agent/__init__.py
rename to hermes_agent/agent/__init__.py
diff --git a/hermes_agent/agent/context/__init__.py b/hermes_agent/agent/context/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/agent/context_compressor.py b/hermes_agent/agent/context/compressor.py
similarity index 100%
rename from agent/context_compressor.py
rename to hermes_agent/agent/context/compressor.py
diff --git a/agent/context_engine.py b/hermes_agent/agent/context/engine.py
similarity index 100%
rename from agent/context_engine.py
rename to hermes_agent/agent/context/engine.py
diff --git a/agent/context_references.py b/hermes_agent/agent/context/references.py
similarity index 100%
rename from agent/context_references.py
rename to hermes_agent/agent/context/references.py
diff --git a/agent/copilot_acp_client.py b/hermes_agent/agent/copilot_acp_client.py
similarity index 100%
rename from agent/copilot_acp_client.py
rename to hermes_agent/agent/copilot_acp_client.py
diff --git a/agent/display.py b/hermes_agent/agent/display.py
similarity index 100%
rename from agent/display.py
rename to hermes_agent/agent/display.py
diff --git a/agent/file_safety.py b/hermes_agent/agent/file_safety.py
similarity index 100%
rename from agent/file_safety.py
rename to hermes_agent/agent/file_safety.py
diff --git a/hermes_agent/agent/image_gen/__init__.py b/hermes_agent/agent/image_gen/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/agent/image_gen_provider.py b/hermes_agent/agent/image_gen/provider.py
similarity index 100%
rename from agent/image_gen_provider.py
rename to hermes_agent/agent/image_gen/provider.py
diff --git a/agent/image_gen_registry.py b/hermes_agent/agent/image_gen/registry.py
similarity index 100%
rename from agent/image_gen_registry.py
rename to hermes_agent/agent/image_gen/registry.py
diff --git a/agent/insights.py b/hermes_agent/agent/insights.py
similarity index 100%
rename from agent/insights.py
rename to hermes_agent/agent/insights.py
diff --git a/run_agent.py b/hermes_agent/agent/loop.py
similarity index 100%
rename from run_agent.py
rename to hermes_agent/agent/loop.py
diff --git a/agent/manual_compression_feedback.py b/hermes_agent/agent/manual_compression_feedback.py
similarity index 100%
rename from agent/manual_compression_feedback.py
rename to hermes_agent/agent/manual_compression_feedback.py
diff --git a/hermes_agent/agent/memory/__init__.py b/hermes_agent/agent/memory/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/agent/memory_manager.py b/hermes_agent/agent/memory/manager.py
similarity index 100%
rename from agent/memory_manager.py
rename to hermes_agent/agent/memory/manager.py
diff --git a/agent/memory_provider.py b/hermes_agent/agent/memory/provider.py
similarity index 100%
rename from agent/memory_provider.py
rename to hermes_agent/agent/memory/provider.py
diff --git a/agent/prompt_builder.py b/hermes_agent/agent/prompt_builder.py
similarity index 100%
rename from agent/prompt_builder.py
rename to hermes_agent/agent/prompt_builder.py
diff --git a/agent/redact.py b/hermes_agent/agent/redact.py
similarity index 100%
rename from agent/redact.py
rename to hermes_agent/agent/redact.py
diff --git a/agent/shell_hooks.py b/hermes_agent/agent/shell_hooks.py
similarity index 100%
rename from agent/shell_hooks.py
rename to hermes_agent/agent/shell_hooks.py
diff --git a/agent/skill_commands.py b/hermes_agent/agent/skill_commands.py
similarity index 100%
rename from agent/skill_commands.py
rename to hermes_agent/agent/skill_commands.py
diff --git a/agent/skill_utils.py b/hermes_agent/agent/skill_utils.py
similarity index 100%
rename from agent/skill_utils.py
rename to hermes_agent/agent/skill_utils.py
diff --git a/agent/subdirectory_hints.py b/hermes_agent/agent/subdirectory_hints.py
similarity index 100%
rename from agent/subdirectory_hints.py
rename to hermes_agent/agent/subdirectory_hints.py
diff --git a/agent/title_generator.py b/hermes_agent/agent/title_generator.py
similarity index 100%
rename from agent/title_generator.py
rename to hermes_agent/agent/title_generator.py
diff --git a/agent/trajectory.py b/hermes_agent/agent/trajectory.py
similarity index 100%
rename from agent/trajectory.py
rename to hermes_agent/agent/trajectory.py
diff --git a/tools/environments/__init__.py b/hermes_agent/backends/__init__.py
similarity index 100%
rename from tools/environments/__init__.py
rename to hermes_agent/backends/__init__.py
diff --git a/tools/environments/base.py b/hermes_agent/backends/base.py
similarity index 100%
rename from tools/environments/base.py
rename to hermes_agent/backends/base.py
diff --git a/tools/environments/daytona.py b/hermes_agent/backends/daytona.py
similarity index 100%
rename from tools/environments/daytona.py
rename to hermes_agent/backends/daytona.py
diff --git a/tools/environments/docker.py b/hermes_agent/backends/docker.py
similarity index 100%
rename from tools/environments/docker.py
rename to hermes_agent/backends/docker.py
diff --git a/tools/environments/file_sync.py b/hermes_agent/backends/file_sync.py
similarity index 100%
rename from tools/environments/file_sync.py
rename to hermes_agent/backends/file_sync.py
diff --git a/tools/environments/local.py b/hermes_agent/backends/local.py
similarity index 100%
rename from tools/environments/local.py
rename to hermes_agent/backends/local.py
diff --git a/tools/environments/managed_modal.py b/hermes_agent/backends/managed_modal.py
similarity index 100%
rename from tools/environments/managed_modal.py
rename to hermes_agent/backends/managed_modal.py
diff --git a/tools/environments/modal.py b/hermes_agent/backends/modal.py
similarity index 100%
rename from tools/environments/modal.py
rename to hermes_agent/backends/modal.py
diff --git a/tools/environments/modal_utils.py b/hermes_agent/backends/modal_utils.py
similarity index 100%
rename from tools/environments/modal_utils.py
rename to hermes_agent/backends/modal_utils.py
diff --git a/tools/environments/singularity.py b/hermes_agent/backends/singularity.py
similarity index 100%
rename from tools/environments/singularity.py
rename to hermes_agent/backends/singularity.py
diff --git a/tools/environments/ssh.py b/hermes_agent/backends/ssh.py
similarity index 100%
rename from tools/environments/ssh.py
rename to hermes_agent/backends/ssh.py
diff --git a/hermes_cli/__init__.py b/hermes_agent/cli/__init__.py
similarity index 100%
rename from hermes_cli/__init__.py
rename to hermes_agent/cli/__init__.py
diff --git a/hermes_agent/cli/auth/__init__.py b/hermes_agent/cli/auth/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/hermes_cli/auth.py b/hermes_agent/cli/auth/auth.py
similarity index 100%
rename from hermes_cli/auth.py
rename to hermes_agent/cli/auth/auth.py
diff --git a/hermes_cli/auth_commands.py b/hermes_agent/cli/auth/commands.py
similarity index 100%
rename from hermes_cli/auth_commands.py
rename to hermes_agent/cli/auth/commands.py
diff --git a/hermes_cli/copilot_auth.py b/hermes_agent/cli/auth/copilot.py
similarity index 100%
rename from hermes_cli/copilot_auth.py
rename to hermes_agent/cli/auth/copilot.py
diff --git a/hermes_cli/dingtalk_auth.py b/hermes_agent/cli/auth/dingtalk.py
similarity index 100%
rename from hermes_cli/dingtalk_auth.py
rename to hermes_agent/cli/auth/dingtalk.py
diff --git a/hermes_cli/backup.py b/hermes_agent/cli/backup.py
similarity index 100%
rename from hermes_cli/backup.py
rename to hermes_agent/cli/backup.py
diff --git a/hermes_cli/claw.py b/hermes_agent/cli/claw.py
similarity index 100%
rename from hermes_cli/claw.py
rename to hermes_agent/cli/claw.py
diff --git a/hermes_cli/clipboard.py b/hermes_agent/cli/clipboard.py
similarity index 100%
rename from hermes_cli/clipboard.py
rename to hermes_agent/cli/clipboard.py
diff --git a/hermes_cli/commands.py b/hermes_agent/cli/commands.py
similarity index 100%
rename from hermes_cli/commands.py
rename to hermes_agent/cli/commands.py
diff --git a/hermes_cli/config.py b/hermes_agent/cli/config.py
similarity index 100%
rename from hermes_cli/config.py
rename to hermes_agent/cli/config.py
diff --git a/hermes_cli/cron.py b/hermes_agent/cli/cron.py
similarity index 100%
rename from hermes_cli/cron.py
rename to hermes_agent/cli/cron.py
diff --git a/hermes_cli/debug.py b/hermes_agent/cli/debug.py
similarity index 100%
rename from hermes_cli/debug.py
rename to hermes_agent/cli/debug.py
diff --git a/hermes_cli/default_soul.py b/hermes_agent/cli/default_soul.py
similarity index 100%
rename from hermes_cli/default_soul.py
rename to hermes_agent/cli/default_soul.py
diff --git a/hermes_cli/doctor.py b/hermes_agent/cli/doctor.py
similarity index 100%
rename from hermes_cli/doctor.py
rename to hermes_agent/cli/doctor.py
diff --git a/hermes_cli/dump.py b/hermes_agent/cli/dump.py
similarity index 100%
rename from hermes_cli/dump.py
rename to hermes_agent/cli/dump.py
diff --git a/hermes_cli/env_loader.py b/hermes_agent/cli/env_loader.py
similarity index 100%
rename from hermes_cli/env_loader.py
rename to hermes_agent/cli/env_loader.py
diff --git a/hermes_cli/gateway.py b/hermes_agent/cli/gateway.py
similarity index 100%
rename from hermes_cli/gateway.py
rename to hermes_agent/cli/gateway.py
diff --git a/hermes_cli/hooks.py b/hermes_agent/cli/hooks.py
similarity index 100%
rename from hermes_cli/hooks.py
rename to hermes_agent/cli/hooks.py
diff --git a/hermes_cli/logs.py b/hermes_agent/cli/logs.py
similarity index 100%
rename from hermes_cli/logs.py
rename to hermes_agent/cli/logs.py
diff --git a/hermes_cli/main.py b/hermes_agent/cli/main.py
similarity index 100%
rename from hermes_cli/main.py
rename to hermes_agent/cli/main.py
diff --git a/hermes_cli/mcp_config.py b/hermes_agent/cli/mcp_config.py
similarity index 100%
rename from hermes_cli/mcp_config.py
rename to hermes_agent/cli/mcp_config.py
diff --git a/hermes_cli/memory_setup.py b/hermes_agent/cli/memory_setup.py
similarity index 100%
rename from hermes_cli/memory_setup.py
rename to hermes_agent/cli/memory_setup.py
diff --git a/hermes_agent/cli/models/__init__.py b/hermes_agent/cli/models/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/hermes_cli/codex_models.py b/hermes_agent/cli/models/codex.py
similarity index 100%
rename from hermes_cli/codex_models.py
rename to hermes_agent/cli/models/codex.py
diff --git a/hermes_cli/models.py b/hermes_agent/cli/models/models.py
similarity index 100%
rename from hermes_cli/models.py
rename to hermes_agent/cli/models/models.py
diff --git a/hermes_cli/model_normalize.py b/hermes_agent/cli/models/normalize.py
similarity index 100%
rename from hermes_cli/model_normalize.py
rename to hermes_agent/cli/models/normalize.py
diff --git a/hermes_cli/model_switch.py b/hermes_agent/cli/models/switch.py
similarity index 100%
rename from hermes_cli/model_switch.py
rename to hermes_agent/cli/models/switch.py
diff --git a/hermes_cli/nous_subscription.py b/hermes_agent/cli/nous_subscription.py
similarity index 100%
rename from hermes_cli/nous_subscription.py
rename to hermes_agent/cli/nous_subscription.py
diff --git a/hermes_cli/pairing.py b/hermes_agent/cli/pairing.py
similarity index 100%
rename from hermes_cli/pairing.py
rename to hermes_agent/cli/pairing.py
diff --git a/hermes_cli/platforms.py b/hermes_agent/cli/platforms.py
similarity index 100%
rename from hermes_cli/platforms.py
rename to hermes_agent/cli/platforms.py
diff --git a/hermes_cli/plugins.py b/hermes_agent/cli/plugins.py
similarity index 100%
rename from hermes_cli/plugins.py
rename to hermes_agent/cli/plugins.py
diff --git a/hermes_cli/plugins_cmd.py b/hermes_agent/cli/plugins_cmd.py
similarity index 100%
rename from hermes_cli/plugins_cmd.py
rename to hermes_agent/cli/plugins_cmd.py
diff --git a/hermes_cli/profiles.py b/hermes_agent/cli/profiles.py
similarity index 100%
rename from hermes_cli/profiles.py
rename to hermes_agent/cli/profiles.py
diff --git a/hermes_cli/providers.py b/hermes_agent/cli/providers.py
similarity index 100%
rename from hermes_cli/providers.py
rename to hermes_agent/cli/providers.py
diff --git a/cli.py b/hermes_agent/cli/repl.py
similarity index 100%
rename from cli.py
rename to hermes_agent/cli/repl.py
diff --git a/hermes_cli/runtime_provider.py b/hermes_agent/cli/runtime_provider.py
similarity index 100%
rename from hermes_cli/runtime_provider.py
rename to hermes_agent/cli/runtime_provider.py
diff --git a/hermes_cli/setup.py b/hermes_agent/cli/setup_wizard.py
similarity index 100%
rename from hermes_cli/setup.py
rename to hermes_agent/cli/setup_wizard.py
diff --git a/hermes_cli/skills_config.py b/hermes_agent/cli/skills_config.py
similarity index 100%
rename from hermes_cli/skills_config.py
rename to hermes_agent/cli/skills_config.py
diff --git a/hermes_cli/skills_hub.py b/hermes_agent/cli/skills_hub.py
similarity index 100%
rename from hermes_cli/skills_hub.py
rename to hermes_agent/cli/skills_hub.py
diff --git a/hermes_cli/timeouts.py b/hermes_agent/cli/timeouts.py
similarity index 100%
rename from hermes_cli/timeouts.py
rename to hermes_agent/cli/timeouts.py
diff --git a/hermes_cli/tools_config.py b/hermes_agent/cli/tools_config.py
similarity index 100%
rename from hermes_cli/tools_config.py
rename to hermes_agent/cli/tools_config.py
diff --git a/hermes_agent/cli/ui/__init__.py b/hermes_agent/cli/ui/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/hermes_cli/banner.py b/hermes_agent/cli/ui/banner.py
similarity index 100%
rename from hermes_cli/banner.py
rename to hermes_agent/cli/ui/banner.py
diff --git a/hermes_cli/callbacks.py b/hermes_agent/cli/ui/callbacks.py
similarity index 100%
rename from hermes_cli/callbacks.py
rename to hermes_agent/cli/ui/callbacks.py
diff --git a/hermes_cli/colors.py b/hermes_agent/cli/ui/colors.py
similarity index 100%
rename from hermes_cli/colors.py
rename to hermes_agent/cli/ui/colors.py
diff --git a/hermes_cli/completion.py b/hermes_agent/cli/ui/completion.py
similarity index 100%
rename from hermes_cli/completion.py
rename to hermes_agent/cli/ui/completion.py
diff --git a/hermes_cli/curses_ui.py b/hermes_agent/cli/ui/curses.py
similarity index 100%
rename from hermes_cli/curses_ui.py
rename to hermes_agent/cli/ui/curses.py
diff --git a/hermes_cli/cli_output.py b/hermes_agent/cli/ui/output.py
similarity index 100%
rename from hermes_cli/cli_output.py
rename to hermes_agent/cli/ui/output.py
diff --git a/hermes_cli/skin_engine.py b/hermes_agent/cli/ui/skin_engine.py
similarity index 100%
rename from hermes_cli/skin_engine.py
rename to hermes_agent/cli/ui/skin_engine.py
diff --git a/hermes_cli/status.py b/hermes_agent/cli/ui/status.py
similarity index 100%
rename from hermes_cli/status.py
rename to hermes_agent/cli/ui/status.py
diff --git a/hermes_cli/tips.py b/hermes_agent/cli/ui/tips.py
similarity index 100%
rename from hermes_cli/tips.py
rename to hermes_agent/cli/ui/tips.py
diff --git a/hermes_cli/uninstall.py b/hermes_agent/cli/uninstall.py
similarity index 100%
rename from hermes_cli/uninstall.py
rename to hermes_agent/cli/uninstall.py
diff --git a/hermes_cli/web_server.py b/hermes_agent/cli/web_server.py
similarity index 100%
rename from hermes_cli/web_server.py
rename to hermes_agent/cli/web_server.py
diff --git a/hermes_cli/webhook.py b/hermes_agent/cli/webhook.py
similarity index 100%
rename from hermes_cli/webhook.py
rename to hermes_agent/cli/webhook.py
diff --git a/hermes_constants.py b/hermes_agent/constants.py
similarity index 100%
rename from hermes_constants.py
rename to hermes_agent/constants.py
diff --git a/cron/__init__.py b/hermes_agent/cron/__init__.py
similarity index 100%
rename from cron/__init__.py
rename to hermes_agent/cron/__init__.py
diff --git a/cron/jobs.py b/hermes_agent/cron/jobs.py
similarity index 100%
rename from cron/jobs.py
rename to hermes_agent/cron/jobs.py
diff --git a/cron/scheduler.py b/hermes_agent/cron/scheduler.py
similarity index 100%
rename from cron/scheduler.py
rename to hermes_agent/cron/scheduler.py
diff --git a/gateway/__init__.py b/hermes_agent/gateway/__init__.py
similarity index 100%
rename from gateway/__init__.py
rename to hermes_agent/gateway/__init__.py
diff --git a/gateway/builtin_hooks/__init__.py b/hermes_agent/gateway/builtin_hooks/__init__.py
similarity index 100%
rename from gateway/builtin_hooks/__init__.py
rename to hermes_agent/gateway/builtin_hooks/__init__.py
diff --git a/gateway/builtin_hooks/boot_md.py b/hermes_agent/gateway/builtin_hooks/boot_md.py
similarity index 100%
rename from gateway/builtin_hooks/boot_md.py
rename to hermes_agent/gateway/builtin_hooks/boot_md.py
diff --git a/gateway/channel_directory.py b/hermes_agent/gateway/channel_directory.py
similarity index 100%
rename from gateway/channel_directory.py
rename to hermes_agent/gateway/channel_directory.py
diff --git a/gateway/config.py b/hermes_agent/gateway/config.py
similarity index 100%
rename from gateway/config.py
rename to hermes_agent/gateway/config.py
diff --git a/gateway/delivery.py b/hermes_agent/gateway/delivery.py
similarity index 100%
rename from gateway/delivery.py
rename to hermes_agent/gateway/delivery.py
diff --git a/gateway/display_config.py b/hermes_agent/gateway/display_config.py
similarity index 100%
rename from gateway/display_config.py
rename to hermes_agent/gateway/display_config.py
diff --git a/gateway/hooks.py b/hermes_agent/gateway/hooks.py
similarity index 100%
rename from gateway/hooks.py
rename to hermes_agent/gateway/hooks.py
diff --git a/gateway/mirror.py b/hermes_agent/gateway/mirror.py
similarity index 100%
rename from gateway/mirror.py
rename to hermes_agent/gateway/mirror.py
diff --git a/gateway/pairing.py b/hermes_agent/gateway/pairing.py
similarity index 100%
rename from gateway/pairing.py
rename to hermes_agent/gateway/pairing.py
diff --git a/gateway/platforms/ADDING_A_PLATFORM.md b/hermes_agent/gateway/platforms/ADDING_A_PLATFORM.md
similarity index 100%
rename from gateway/platforms/ADDING_A_PLATFORM.md
rename to hermes_agent/gateway/platforms/ADDING_A_PLATFORM.md
diff --git a/gateway/platforms/__init__.py b/hermes_agent/gateway/platforms/__init__.py
similarity index 100%
rename from gateway/platforms/__init__.py
rename to hermes_agent/gateway/platforms/__init__.py
diff --git a/gateway/platforms/api_server.py b/hermes_agent/gateway/platforms/api_server.py
similarity index 100%
rename from gateway/platforms/api_server.py
rename to hermes_agent/gateway/platforms/api_server.py
diff --git a/gateway/platforms/base.py b/hermes_agent/gateway/platforms/base.py
similarity index 100%
rename from gateway/platforms/base.py
rename to hermes_agent/gateway/platforms/base.py
diff --git a/gateway/platforms/bluebubbles.py b/hermes_agent/gateway/platforms/bluebubbles.py
similarity index 100%
rename from gateway/platforms/bluebubbles.py
rename to hermes_agent/gateway/platforms/bluebubbles.py
diff --git a/gateway/platforms/dingtalk.py b/hermes_agent/gateway/platforms/dingtalk.py
similarity index 100%
rename from gateway/platforms/dingtalk.py
rename to hermes_agent/gateway/platforms/dingtalk.py
diff --git a/gateway/platforms/discord.py b/hermes_agent/gateway/platforms/discord.py
similarity index 100%
rename from gateway/platforms/discord.py
rename to hermes_agent/gateway/platforms/discord.py
diff --git a/gateway/platforms/email.py b/hermes_agent/gateway/platforms/email.py
similarity index 100%
rename from gateway/platforms/email.py
rename to hermes_agent/gateway/platforms/email.py
diff --git a/gateway/platforms/feishu.py b/hermes_agent/gateway/platforms/feishu.py
similarity index 100%
rename from gateway/platforms/feishu.py
rename to hermes_agent/gateway/platforms/feishu.py
diff --git a/gateway/platforms/feishu_comment.py b/hermes_agent/gateway/platforms/feishu_comment.py
similarity index 100%
rename from gateway/platforms/feishu_comment.py
rename to hermes_agent/gateway/platforms/feishu_comment.py
diff --git a/gateway/platforms/feishu_comment_rules.py b/hermes_agent/gateway/platforms/feishu_comment_rules.py
similarity index 100%
rename from gateway/platforms/feishu_comment_rules.py
rename to hermes_agent/gateway/platforms/feishu_comment_rules.py
diff --git a/gateway/platforms/helpers.py b/hermes_agent/gateway/platforms/helpers.py
similarity index 100%
rename from gateway/platforms/helpers.py
rename to hermes_agent/gateway/platforms/helpers.py
diff --git a/gateway/platforms/homeassistant.py b/hermes_agent/gateway/platforms/homeassistant.py
similarity index 100%
rename from gateway/platforms/homeassistant.py
rename to hermes_agent/gateway/platforms/homeassistant.py
diff --git a/gateway/platforms/matrix.py b/hermes_agent/gateway/platforms/matrix.py
similarity index 100%
rename from gateway/platforms/matrix.py
rename to hermes_agent/gateway/platforms/matrix.py
diff --git a/gateway/platforms/mattermost.py b/hermes_agent/gateway/platforms/mattermost.py
similarity index 100%
rename from gateway/platforms/mattermost.py
rename to hermes_agent/gateway/platforms/mattermost.py
diff --git a/gateway/platforms/qqbot/__init__.py b/hermes_agent/gateway/platforms/qqbot/__init__.py
similarity index 100%
rename from gateway/platforms/qqbot/__init__.py
rename to hermes_agent/gateway/platforms/qqbot/__init__.py
diff --git a/gateway/platforms/qqbot/adapter.py b/hermes_agent/gateway/platforms/qqbot/adapter.py
similarity index 100%
rename from gateway/platforms/qqbot/adapter.py
rename to hermes_agent/gateway/platforms/qqbot/adapter.py
diff --git a/gateway/platforms/qqbot/constants.py b/hermes_agent/gateway/platforms/qqbot/constants.py
similarity index 100%
rename from gateway/platforms/qqbot/constants.py
rename to hermes_agent/gateway/platforms/qqbot/constants.py
diff --git a/gateway/platforms/qqbot/crypto.py b/hermes_agent/gateway/platforms/qqbot/crypto.py
similarity index 100%
rename from gateway/platforms/qqbot/crypto.py
rename to hermes_agent/gateway/platforms/qqbot/crypto.py
diff --git a/gateway/platforms/qqbot/onboard.py b/hermes_agent/gateway/platforms/qqbot/onboard.py
similarity index 100%
rename from gateway/platforms/qqbot/onboard.py
rename to hermes_agent/gateway/platforms/qqbot/onboard.py
diff --git a/gateway/platforms/qqbot/utils.py b/hermes_agent/gateway/platforms/qqbot/utils.py
similarity index 100%
rename from gateway/platforms/qqbot/utils.py
rename to hermes_agent/gateway/platforms/qqbot/utils.py
diff --git a/gateway/platforms/signal.py b/hermes_agent/gateway/platforms/signal.py
similarity index 100%
rename from gateway/platforms/signal.py
rename to hermes_agent/gateway/platforms/signal.py
diff --git a/gateway/platforms/slack.py b/hermes_agent/gateway/platforms/slack.py
similarity index 100%
rename from gateway/platforms/slack.py
rename to hermes_agent/gateway/platforms/slack.py
diff --git a/gateway/platforms/sms.py b/hermes_agent/gateway/platforms/sms.py
similarity index 100%
rename from gateway/platforms/sms.py
rename to hermes_agent/gateway/platforms/sms.py
diff --git a/gateway/platforms/telegram.py b/hermes_agent/gateway/platforms/telegram.py
similarity index 100%
rename from gateway/platforms/telegram.py
rename to hermes_agent/gateway/platforms/telegram.py
diff --git a/gateway/platforms/telegram_network.py b/hermes_agent/gateway/platforms/telegram_network.py
similarity index 100%
rename from gateway/platforms/telegram_network.py
rename to hermes_agent/gateway/platforms/telegram_network.py
diff --git a/gateway/platforms/webhook.py b/hermes_agent/gateway/platforms/webhook.py
similarity index 100%
rename from gateway/platforms/webhook.py
rename to hermes_agent/gateway/platforms/webhook.py
diff --git a/gateway/platforms/wecom.py b/hermes_agent/gateway/platforms/wecom.py
similarity index 100%
rename from gateway/platforms/wecom.py
rename to hermes_agent/gateway/platforms/wecom.py
diff --git a/gateway/platforms/wecom_callback.py b/hermes_agent/gateway/platforms/wecom_callback.py
similarity index 100%
rename from gateway/platforms/wecom_callback.py
rename to hermes_agent/gateway/platforms/wecom_callback.py
diff --git a/gateway/platforms/wecom_crypto.py b/hermes_agent/gateway/platforms/wecom_crypto.py
similarity index 100%
rename from gateway/platforms/wecom_crypto.py
rename to hermes_agent/gateway/platforms/wecom_crypto.py
diff --git a/gateway/platforms/weixin.py b/hermes_agent/gateway/platforms/weixin.py
similarity index 100%
rename from gateway/platforms/weixin.py
rename to hermes_agent/gateway/platforms/weixin.py
diff --git a/gateway/platforms/whatsapp.py b/hermes_agent/gateway/platforms/whatsapp.py
similarity index 100%
rename from gateway/platforms/whatsapp.py
rename to hermes_agent/gateway/platforms/whatsapp.py
diff --git a/gateway/restart.py b/hermes_agent/gateway/restart.py
similarity index 100%
rename from gateway/restart.py
rename to hermes_agent/gateway/restart.py
diff --git a/gateway/run.py b/hermes_agent/gateway/run.py
similarity index 100%
rename from gateway/run.py
rename to hermes_agent/gateway/run.py
diff --git a/gateway/session.py b/hermes_agent/gateway/session.py
similarity index 100%
rename from gateway/session.py
rename to hermes_agent/gateway/session.py
diff --git a/gateway/session_context.py b/hermes_agent/gateway/session_context.py
similarity index 100%
rename from gateway/session_context.py
rename to hermes_agent/gateway/session_context.py
diff --git a/gateway/status.py b/hermes_agent/gateway/status.py
similarity index 100%
rename from gateway/status.py
rename to hermes_agent/gateway/status.py
diff --git a/gateway/sticker_cache.py b/hermes_agent/gateway/sticker_cache.py
similarity index 100%
rename from gateway/sticker_cache.py
rename to hermes_agent/gateway/sticker_cache.py
diff --git a/gateway/stream_consumer.py b/hermes_agent/gateway/stream_consumer.py
similarity index 100%
rename from gateway/stream_consumer.py
rename to hermes_agent/gateway/stream_consumer.py
diff --git a/hermes_logging.py b/hermes_agent/logging.py
similarity index 100%
rename from hermes_logging.py
rename to hermes_agent/logging.py
diff --git a/plugins/__init__.py b/hermes_agent/plugins/__init__.py
similarity index 100%
rename from plugins/__init__.py
rename to hermes_agent/plugins/__init__.py
diff --git a/plugins/context_engine/__init__.py b/hermes_agent/plugins/context_engine/__init__.py
similarity index 100%
rename from plugins/context_engine/__init__.py
rename to hermes_agent/plugins/context_engine/__init__.py
diff --git a/plugins/disk-cleanup/README.md b/hermes_agent/plugins/disk-cleanup/README.md
similarity index 100%
rename from plugins/disk-cleanup/README.md
rename to hermes_agent/plugins/disk-cleanup/README.md
diff --git a/plugins/disk-cleanup/__init__.py b/hermes_agent/plugins/disk-cleanup/__init__.py
similarity index 100%
rename from plugins/disk-cleanup/__init__.py
rename to hermes_agent/plugins/disk-cleanup/__init__.py
diff --git a/plugins/disk-cleanup/disk_cleanup.py b/hermes_agent/plugins/disk-cleanup/disk_cleanup.py
similarity index 100%
rename from plugins/disk-cleanup/disk_cleanup.py
rename to hermes_agent/plugins/disk-cleanup/disk_cleanup.py
diff --git a/plugins/disk-cleanup/plugin.yaml b/hermes_agent/plugins/disk-cleanup/plugin.yaml
similarity index 100%
rename from plugins/disk-cleanup/plugin.yaml
rename to hermes_agent/plugins/disk-cleanup/plugin.yaml
diff --git a/plugins/example-dashboard/dashboard/dist/index.js b/hermes_agent/plugins/example-dashboard/dashboard/dist/index.js
similarity index 100%
rename from plugins/example-dashboard/dashboard/dist/index.js
rename to hermes_agent/plugins/example-dashboard/dashboard/dist/index.js
diff --git a/plugins/example-dashboard/dashboard/manifest.json b/hermes_agent/plugins/example-dashboard/dashboard/manifest.json
similarity index 100%
rename from plugins/example-dashboard/dashboard/manifest.json
rename to hermes_agent/plugins/example-dashboard/dashboard/manifest.json
diff --git a/plugins/example-dashboard/dashboard/plugin_api.py b/hermes_agent/plugins/example-dashboard/dashboard/plugin_api.py
similarity index 100%
rename from plugins/example-dashboard/dashboard/plugin_api.py
rename to hermes_agent/plugins/example-dashboard/dashboard/plugin_api.py
diff --git a/plugins/image_gen/openai/__init__.py b/hermes_agent/plugins/image_gen/openai/__init__.py
similarity index 100%
rename from plugins/image_gen/openai/__init__.py
rename to hermes_agent/plugins/image_gen/openai/__init__.py
diff --git a/plugins/image_gen/openai/plugin.yaml b/hermes_agent/plugins/image_gen/openai/plugin.yaml
similarity index 100%
rename from plugins/image_gen/openai/plugin.yaml
rename to hermes_agent/plugins/image_gen/openai/plugin.yaml
diff --git a/plugins/memory/__init__.py b/hermes_agent/plugins/memory/__init__.py
similarity index 100%
rename from plugins/memory/__init__.py
rename to hermes_agent/plugins/memory/__init__.py
diff --git a/plugins/memory/byterover/README.md b/hermes_agent/plugins/memory/byterover/README.md
similarity index 100%
rename from plugins/memory/byterover/README.md
rename to hermes_agent/plugins/memory/byterover/README.md
diff --git a/plugins/memory/byterover/__init__.py b/hermes_agent/plugins/memory/byterover/__init__.py
similarity index 100%
rename from plugins/memory/byterover/__init__.py
rename to hermes_agent/plugins/memory/byterover/__init__.py
diff --git a/plugins/memory/byterover/plugin.yaml b/hermes_agent/plugins/memory/byterover/plugin.yaml
similarity index 100%
rename from plugins/memory/byterover/plugin.yaml
rename to hermes_agent/plugins/memory/byterover/plugin.yaml
diff --git a/plugins/memory/hindsight/README.md b/hermes_agent/plugins/memory/hindsight/README.md
similarity index 100%
rename from plugins/memory/hindsight/README.md
rename to hermes_agent/plugins/memory/hindsight/README.md
diff --git a/plugins/memory/hindsight/__init__.py b/hermes_agent/plugins/memory/hindsight/__init__.py
similarity index 100%
rename from plugins/memory/hindsight/__init__.py
rename to hermes_agent/plugins/memory/hindsight/__init__.py
diff --git a/plugins/memory/hindsight/plugin.yaml b/hermes_agent/plugins/memory/hindsight/plugin.yaml
similarity index 100%
rename from plugins/memory/hindsight/plugin.yaml
rename to hermes_agent/plugins/memory/hindsight/plugin.yaml
diff --git a/plugins/memory/holographic/README.md b/hermes_agent/plugins/memory/holographic/README.md
similarity index 100%
rename from plugins/memory/holographic/README.md
rename to hermes_agent/plugins/memory/holographic/README.md
diff --git a/plugins/memory/holographic/__init__.py b/hermes_agent/plugins/memory/holographic/__init__.py
similarity index 100%
rename from plugins/memory/holographic/__init__.py
rename to hermes_agent/plugins/memory/holographic/__init__.py
diff --git a/plugins/memory/holographic/holographic.py b/hermes_agent/plugins/memory/holographic/holographic.py
similarity index 100%
rename from plugins/memory/holographic/holographic.py
rename to hermes_agent/plugins/memory/holographic/holographic.py
diff --git a/plugins/memory/holographic/plugin.yaml b/hermes_agent/plugins/memory/holographic/plugin.yaml
similarity index 100%
rename from plugins/memory/holographic/plugin.yaml
rename to hermes_agent/plugins/memory/holographic/plugin.yaml
diff --git a/plugins/memory/holographic/retrieval.py b/hermes_agent/plugins/memory/holographic/retrieval.py
similarity index 100%
rename from plugins/memory/holographic/retrieval.py
rename to hermes_agent/plugins/memory/holographic/retrieval.py
diff --git a/plugins/memory/holographic/store.py b/hermes_agent/plugins/memory/holographic/store.py
similarity index 100%
rename from plugins/memory/holographic/store.py
rename to hermes_agent/plugins/memory/holographic/store.py
diff --git a/plugins/memory/honcho/README.md b/hermes_agent/plugins/memory/honcho/README.md
similarity index 100%
rename from plugins/memory/honcho/README.md
rename to hermes_agent/plugins/memory/honcho/README.md
diff --git a/plugins/memory/honcho/__init__.py b/hermes_agent/plugins/memory/honcho/__init__.py
similarity index 100%
rename from plugins/memory/honcho/__init__.py
rename to hermes_agent/plugins/memory/honcho/__init__.py
diff --git a/plugins/memory/honcho/cli.py b/hermes_agent/plugins/memory/honcho/cli.py
similarity index 100%
rename from plugins/memory/honcho/cli.py
rename to hermes_agent/plugins/memory/honcho/cli.py
diff --git a/plugins/memory/honcho/client.py b/hermes_agent/plugins/memory/honcho/client.py
similarity index 100%
rename from plugins/memory/honcho/client.py
rename to hermes_agent/plugins/memory/honcho/client.py
diff --git a/plugins/memory/honcho/plugin.yaml b/hermes_agent/plugins/memory/honcho/plugin.yaml
similarity index 100%
rename from plugins/memory/honcho/plugin.yaml
rename to hermes_agent/plugins/memory/honcho/plugin.yaml
diff --git a/plugins/memory/honcho/session.py b/hermes_agent/plugins/memory/honcho/session.py
similarity index 100%
rename from plugins/memory/honcho/session.py
rename to hermes_agent/plugins/memory/honcho/session.py
diff --git a/plugins/memory/mem0/README.md b/hermes_agent/plugins/memory/mem0/README.md
similarity index 100%
rename from plugins/memory/mem0/README.md
rename to hermes_agent/plugins/memory/mem0/README.md
diff --git a/plugins/memory/mem0/__init__.py b/hermes_agent/plugins/memory/mem0/__init__.py
similarity index 100%
rename from plugins/memory/mem0/__init__.py
rename to hermes_agent/plugins/memory/mem0/__init__.py
diff --git a/plugins/memory/mem0/plugin.yaml b/hermes_agent/plugins/memory/mem0/plugin.yaml
similarity index 100%
rename from plugins/memory/mem0/plugin.yaml
rename to hermes_agent/plugins/memory/mem0/plugin.yaml
diff --git a/plugins/memory/openviking/README.md b/hermes_agent/plugins/memory/openviking/README.md
similarity index 100%
rename from plugins/memory/openviking/README.md
rename to hermes_agent/plugins/memory/openviking/README.md
diff --git a/plugins/memory/openviking/__init__.py b/hermes_agent/plugins/memory/openviking/__init__.py
similarity index 100%
rename from plugins/memory/openviking/__init__.py
rename to hermes_agent/plugins/memory/openviking/__init__.py
diff --git a/plugins/memory/openviking/plugin.yaml b/hermes_agent/plugins/memory/openviking/plugin.yaml
similarity index 100%
rename from plugins/memory/openviking/plugin.yaml
rename to hermes_agent/plugins/memory/openviking/plugin.yaml
diff --git a/plugins/memory/retaindb/README.md b/hermes_agent/plugins/memory/retaindb/README.md
similarity index 100%
rename from plugins/memory/retaindb/README.md
rename to hermes_agent/plugins/memory/retaindb/README.md
diff --git a/plugins/memory/retaindb/__init__.py b/hermes_agent/plugins/memory/retaindb/__init__.py
similarity index 100%
rename from plugins/memory/retaindb/__init__.py
rename to hermes_agent/plugins/memory/retaindb/__init__.py
diff --git a/plugins/memory/retaindb/plugin.yaml b/hermes_agent/plugins/memory/retaindb/plugin.yaml
similarity index 100%
rename from plugins/memory/retaindb/plugin.yaml
rename to hermes_agent/plugins/memory/retaindb/plugin.yaml
diff --git a/plugins/memory/supermemory/README.md b/hermes_agent/plugins/memory/supermemory/README.md
similarity index 100%
rename from plugins/memory/supermemory/README.md
rename to hermes_agent/plugins/memory/supermemory/README.md
diff --git a/plugins/memory/supermemory/__init__.py b/hermes_agent/plugins/memory/supermemory/__init__.py
similarity index 100%
rename from plugins/memory/supermemory/__init__.py
rename to hermes_agent/plugins/memory/supermemory/__init__.py
diff --git a/plugins/memory/supermemory/plugin.yaml b/hermes_agent/plugins/memory/supermemory/plugin.yaml
similarity index 100%
rename from plugins/memory/supermemory/plugin.yaml
rename to hermes_agent/plugins/memory/supermemory/plugin.yaml
diff --git a/agent/transports/__init__.py b/hermes_agent/providers/__init__.py
similarity index 100%
rename from agent/transports/__init__.py
rename to hermes_agent/providers/__init__.py
diff --git a/agent/account_usage.py b/hermes_agent/providers/account_usage.py
similarity index 100%
rename from agent/account_usage.py
rename to hermes_agent/providers/account_usage.py
diff --git a/agent/anthropic_adapter.py b/hermes_agent/providers/anthropic_adapter.py
similarity index 100%
rename from agent/anthropic_adapter.py
rename to hermes_agent/providers/anthropic_adapter.py
diff --git a/agent/transports/anthropic.py b/hermes_agent/providers/anthropic_transport.py
similarity index 100%
rename from agent/transports/anthropic.py
rename to hermes_agent/providers/anthropic_transport.py
diff --git a/agent/auxiliary_client.py b/hermes_agent/providers/auxiliary.py
similarity index 100%
rename from agent/auxiliary_client.py
rename to hermes_agent/providers/auxiliary.py
diff --git a/agent/transports/base.py b/hermes_agent/providers/base.py
similarity index 100%
rename from agent/transports/base.py
rename to hermes_agent/providers/base.py
diff --git a/agent/bedrock_adapter.py b/hermes_agent/providers/bedrock_adapter.py
similarity index 100%
rename from agent/bedrock_adapter.py
rename to hermes_agent/providers/bedrock_adapter.py
diff --git a/agent/transports/bedrock.py b/hermes_agent/providers/bedrock_transport.py
similarity index 100%
rename from agent/transports/bedrock.py
rename to hermes_agent/providers/bedrock_transport.py
diff --git a/agent/prompt_caching.py b/hermes_agent/providers/caching.py
similarity index 100%
rename from agent/prompt_caching.py
rename to hermes_agent/providers/caching.py
diff --git a/agent/codex_responses_adapter.py b/hermes_agent/providers/codex_adapter.py
similarity index 100%
rename from agent/codex_responses_adapter.py
rename to hermes_agent/providers/codex_adapter.py
diff --git a/agent/transports/codex.py b/hermes_agent/providers/codex_transport.py
similarity index 100%
rename from agent/transports/codex.py
rename to hermes_agent/providers/codex_transport.py
diff --git a/agent/credential_pool.py b/hermes_agent/providers/credential_pool.py
similarity index 100%
rename from agent/credential_pool.py
rename to hermes_agent/providers/credential_pool.py
diff --git a/agent/credential_sources.py b/hermes_agent/providers/credential_sources.py
similarity index 100%
rename from agent/credential_sources.py
rename to hermes_agent/providers/credential_sources.py
diff --git a/agent/error_classifier.py b/hermes_agent/providers/errors.py
similarity index 100%
rename from agent/error_classifier.py
rename to hermes_agent/providers/errors.py
diff --git a/agent/gemini_native_adapter.py b/hermes_agent/providers/gemini_adapter.py
similarity index 100%
rename from agent/gemini_native_adapter.py
rename to hermes_agent/providers/gemini_adapter.py
diff --git a/agent/gemini_cloudcode_adapter.py b/hermes_agent/providers/gemini_cloudcode_adapter.py
similarity index 100%
rename from agent/gemini_cloudcode_adapter.py
rename to hermes_agent/providers/gemini_cloudcode_adapter.py
diff --git a/agent/gemini_schema.py b/hermes_agent/providers/gemini_schema.py
similarity index 100%
rename from agent/gemini_schema.py
rename to hermes_agent/providers/gemini_schema.py
diff --git a/agent/google_code_assist.py b/hermes_agent/providers/google_code_assist.py
similarity index 100%
rename from agent/google_code_assist.py
rename to hermes_agent/providers/google_code_assist.py
diff --git a/agent/google_oauth.py b/hermes_agent/providers/google_oauth.py
similarity index 100%
rename from agent/google_oauth.py
rename to hermes_agent/providers/google_oauth.py
diff --git a/agent/model_metadata.py b/hermes_agent/providers/metadata.py
similarity index 100%
rename from agent/model_metadata.py
rename to hermes_agent/providers/metadata.py
diff --git a/agent/models_dev.py b/hermes_agent/providers/metadata_dev.py
similarity index 100%
rename from agent/models_dev.py
rename to hermes_agent/providers/metadata_dev.py
diff --git a/agent/nous_rate_guard.py b/hermes_agent/providers/nous_rate_guard.py
similarity index 100%
rename from agent/nous_rate_guard.py
rename to hermes_agent/providers/nous_rate_guard.py
diff --git a/agent/transports/chat_completions.py b/hermes_agent/providers/openai_transport.py
similarity index 100%
rename from agent/transports/chat_completions.py
rename to hermes_agent/providers/openai_transport.py
diff --git a/agent/usage_pricing.py b/hermes_agent/providers/pricing.py
similarity index 100%
rename from agent/usage_pricing.py
rename to hermes_agent/providers/pricing.py
diff --git a/agent/rate_limit_tracker.py b/hermes_agent/providers/rate_limiting.py
similarity index 100%
rename from agent/rate_limit_tracker.py
rename to hermes_agent/providers/rate_limiting.py
diff --git a/agent/retry_utils.py b/hermes_agent/providers/retry.py
similarity index 100%
rename from agent/retry_utils.py
rename to hermes_agent/providers/retry.py
diff --git a/agent/transports/types.py b/hermes_agent/providers/types.py
similarity index 100%
rename from agent/transports/types.py
rename to hermes_agent/providers/types.py
diff --git a/hermes_state.py b/hermes_agent/state.py
similarity index 100%
rename from hermes_state.py
rename to hermes_agent/state.py
diff --git a/hermes_time.py b/hermes_agent/time.py
similarity index 100%
rename from hermes_time.py
rename to hermes_agent/time.py
diff --git a/tools/__init__.py b/hermes_agent/tools/__init__.py
similarity index 100%
rename from tools/__init__.py
rename to hermes_agent/tools/__init__.py
diff --git a/tools/ansi_strip.py b/hermes_agent/tools/ansi_strip.py
similarity index 100%
rename from tools/ansi_strip.py
rename to hermes_agent/tools/ansi_strip.py
diff --git a/tools/tool_backend_helpers.py b/hermes_agent/tools/backend_helpers.py
similarity index 100%
rename from tools/tool_backend_helpers.py
rename to hermes_agent/tools/backend_helpers.py
diff --git a/tools/binary_extensions.py b/hermes_agent/tools/binary_extensions.py
similarity index 100%
rename from tools/binary_extensions.py
rename to hermes_agent/tools/binary_extensions.py
diff --git a/hermes_agent/tools/browser/__init__.py b/hermes_agent/tools/browser/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tools/browser_camofox.py b/hermes_agent/tools/browser/camofox.py
similarity index 100%
rename from tools/browser_camofox.py
rename to hermes_agent/tools/browser/camofox.py
diff --git a/tools/browser_camofox_state.py b/hermes_agent/tools/browser/camofox_state.py
similarity index 100%
rename from tools/browser_camofox_state.py
rename to hermes_agent/tools/browser/camofox_state.py
diff --git a/tools/browser_cdp_tool.py b/hermes_agent/tools/browser/cdp.py
similarity index 100%
rename from tools/browser_cdp_tool.py
rename to hermes_agent/tools/browser/cdp.py
diff --git a/tools/browser_providers/__init__.py b/hermes_agent/tools/browser/providers/__init__.py
similarity index 100%
rename from tools/browser_providers/__init__.py
rename to hermes_agent/tools/browser/providers/__init__.py
diff --git a/tools/browser_providers/base.py b/hermes_agent/tools/browser/providers/base.py
similarity index 100%
rename from tools/browser_providers/base.py
rename to hermes_agent/tools/browser/providers/base.py
diff --git a/tools/browser_providers/browser_use.py b/hermes_agent/tools/browser/providers/browser_use.py
similarity index 100%
rename from tools/browser_providers/browser_use.py
rename to hermes_agent/tools/browser/providers/browser_use.py
diff --git a/tools/browser_providers/browserbase.py b/hermes_agent/tools/browser/providers/browserbase.py
similarity index 100%
rename from tools/browser_providers/browserbase.py
rename to hermes_agent/tools/browser/providers/browserbase.py
diff --git a/tools/browser_providers/firecrawl.py b/hermes_agent/tools/browser/providers/firecrawl.py
similarity index 100%
rename from tools/browser_providers/firecrawl.py
rename to hermes_agent/tools/browser/providers/firecrawl.py
diff --git a/tools/browser_tool.py b/hermes_agent/tools/browser/tool.py
similarity index 100%
rename from tools/browser_tool.py
rename to hermes_agent/tools/browser/tool.py
diff --git a/tools/budget_config.py b/hermes_agent/tools/budget_config.py
similarity index 100%
rename from tools/budget_config.py
rename to hermes_agent/tools/budget_config.py
diff --git a/tools/checkpoint_manager.py b/hermes_agent/tools/checkpoint.py
similarity index 100%
rename from tools/checkpoint_manager.py
rename to hermes_agent/tools/checkpoint.py
diff --git a/tools/clarify_tool.py b/hermes_agent/tools/clarify.py
similarity index 100%
rename from tools/clarify_tool.py
rename to hermes_agent/tools/clarify.py
diff --git a/tools/code_execution_tool.py b/hermes_agent/tools/code_execution.py
similarity index 100%
rename from tools/code_execution_tool.py
rename to hermes_agent/tools/code_execution.py
diff --git a/tools/credential_files.py b/hermes_agent/tools/credential_files.py
similarity index 100%
rename from tools/credential_files.py
rename to hermes_agent/tools/credential_files.py
diff --git a/tools/cronjob_tools.py b/hermes_agent/tools/cronjob.py
similarity index 100%
rename from tools/cronjob_tools.py
rename to hermes_agent/tools/cronjob.py
diff --git a/tools/debug_helpers.py b/hermes_agent/tools/debug_helpers.py
similarity index 100%
rename from tools/debug_helpers.py
rename to hermes_agent/tools/debug_helpers.py
diff --git a/tools/delegate_tool.py b/hermes_agent/tools/delegate.py
similarity index 100%
rename from tools/delegate_tool.py
rename to hermes_agent/tools/delegate.py
diff --git a/tools/discord_tool.py b/hermes_agent/tools/discord.py
similarity index 100%
rename from tools/discord_tool.py
rename to hermes_agent/tools/discord.py
diff --git a/model_tools.py b/hermes_agent/tools/dispatch.py
similarity index 100%
rename from model_tools.py
rename to hermes_agent/tools/dispatch.py
diff --git a/toolset_distributions.py b/hermes_agent/tools/distributions.py
similarity index 100%
rename from toolset_distributions.py
rename to hermes_agent/tools/distributions.py
diff --git a/tools/env_passthrough.py b/hermes_agent/tools/env_passthrough.py
similarity index 100%
rename from tools/env_passthrough.py
rename to hermes_agent/tools/env_passthrough.py
diff --git a/tools/feishu_doc_tool.py b/hermes_agent/tools/feishu_doc.py
similarity index 100%
rename from tools/feishu_doc_tool.py
rename to hermes_agent/tools/feishu_doc.py
diff --git a/tools/feishu_drive_tool.py b/hermes_agent/tools/feishu_drive.py
similarity index 100%
rename from tools/feishu_drive_tool.py
rename to hermes_agent/tools/feishu_drive.py
diff --git a/hermes_agent/tools/files/__init__.py b/hermes_agent/tools/files/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tools/file_operations.py b/hermes_agent/tools/files/operations.py
similarity index 100%
rename from tools/file_operations.py
rename to hermes_agent/tools/files/operations.py
diff --git a/tools/file_state.py b/hermes_agent/tools/files/state.py
similarity index 100%
rename from tools/file_state.py
rename to hermes_agent/tools/files/state.py
diff --git a/tools/file_tools.py b/hermes_agent/tools/files/tools.py
similarity index 100%
rename from tools/file_tools.py
rename to hermes_agent/tools/files/tools.py
diff --git a/tools/fuzzy_match.py b/hermes_agent/tools/fuzzy_match.py
similarity index 100%
rename from tools/fuzzy_match.py
rename to hermes_agent/tools/fuzzy_match.py
diff --git a/tools/homeassistant_tool.py b/hermes_agent/tools/homeassistant.py
similarity index 100%
rename from tools/homeassistant_tool.py
rename to hermes_agent/tools/homeassistant.py
diff --git a/tools/interrupt.py b/hermes_agent/tools/interrupt.py
similarity index 100%
rename from tools/interrupt.py
rename to hermes_agent/tools/interrupt.py
diff --git a/tools/managed_tool_gateway.py b/hermes_agent/tools/managed_gateway.py
similarity index 100%
rename from tools/managed_tool_gateway.py
rename to hermes_agent/tools/managed_gateway.py
diff --git a/hermes_agent/tools/mcp/__init__.py b/hermes_agent/tools/mcp/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tools/mcp_oauth.py b/hermes_agent/tools/mcp/oauth.py
similarity index 100%
rename from tools/mcp_oauth.py
rename to hermes_agent/tools/mcp/oauth.py
diff --git a/tools/mcp_oauth_manager.py b/hermes_agent/tools/mcp/oauth_manager.py
similarity index 100%
rename from tools/mcp_oauth_manager.py
rename to hermes_agent/tools/mcp/oauth_manager.py
diff --git a/mcp_serve.py b/hermes_agent/tools/mcp/serve.py
similarity index 100%
rename from mcp_serve.py
rename to hermes_agent/tools/mcp/serve.py
diff --git a/tools/mcp_tool.py b/hermes_agent/tools/mcp/tool.py
similarity index 100%
rename from tools/mcp_tool.py
rename to hermes_agent/tools/mcp/tool.py
diff --git a/hermes_agent/tools/media/__init__.py b/hermes_agent/tools/media/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tools/image_generation_tool.py b/hermes_agent/tools/media/image_gen.py
similarity index 100%
rename from tools/image_generation_tool.py
rename to hermes_agent/tools/media/image_gen.py
diff --git a/tools/neutts_synth.py b/hermes_agent/tools/media/neutts.py
similarity index 100%
rename from tools/neutts_synth.py
rename to hermes_agent/tools/media/neutts.py
diff --git a/tools/neutts_samples/jo.txt b/hermes_agent/tools/media/neutts_samples/jo.txt
similarity index 100%
rename from tools/neutts_samples/jo.txt
rename to hermes_agent/tools/media/neutts_samples/jo.txt
diff --git a/tools/neutts_samples/jo.wav b/hermes_agent/tools/media/neutts_samples/jo.wav
similarity index 100%
rename from tools/neutts_samples/jo.wav
rename to hermes_agent/tools/media/neutts_samples/jo.wav
diff --git a/tools/transcription_tools.py b/hermes_agent/tools/media/transcription.py
similarity index 100%
rename from tools/transcription_tools.py
rename to hermes_agent/tools/media/transcription.py
diff --git a/tools/tts_tool.py b/hermes_agent/tools/media/tts.py
similarity index 100%
rename from tools/tts_tool.py
rename to hermes_agent/tools/media/tts.py
diff --git a/tools/voice_mode.py b/hermes_agent/tools/media/voice.py
similarity index 100%
rename from tools/voice_mode.py
rename to hermes_agent/tools/media/voice.py
diff --git a/tools/memory_tool.py b/hermes_agent/tools/memory.py
similarity index 100%
rename from tools/memory_tool.py
rename to hermes_agent/tools/memory.py
diff --git a/tools/mixture_of_agents_tool.py b/hermes_agent/tools/mixture_of_agents.py
similarity index 100%
rename from tools/mixture_of_agents_tool.py
rename to hermes_agent/tools/mixture_of_agents.py
diff --git a/tools/openrouter_client.py b/hermes_agent/tools/openrouter.py
similarity index 100%
rename from tools/openrouter_client.py
rename to hermes_agent/tools/openrouter.py
diff --git a/tools/osv_check.py b/hermes_agent/tools/osv_check.py
similarity index 100%
rename from tools/osv_check.py
rename to hermes_agent/tools/osv_check.py
diff --git a/tools/patch_parser.py b/hermes_agent/tools/patch_parser.py
similarity index 100%
rename from tools/patch_parser.py
rename to hermes_agent/tools/patch_parser.py
diff --git a/tools/process_registry.py b/hermes_agent/tools/process_registry.py
similarity index 100%
rename from tools/process_registry.py
rename to hermes_agent/tools/process_registry.py
diff --git a/tools/registry.py b/hermes_agent/tools/registry.py
similarity index 100%
rename from tools/registry.py
rename to hermes_agent/tools/registry.py
diff --git a/tools/tool_result_storage.py b/hermes_agent/tools/result_storage.py
similarity index 100%
rename from tools/tool_result_storage.py
rename to hermes_agent/tools/result_storage.py
diff --git a/tools/rl_training_tool.py b/hermes_agent/tools/rl_training.py
similarity index 100%
rename from tools/rl_training_tool.py
rename to hermes_agent/tools/rl_training.py
diff --git a/hermes_agent/tools/security/__init__.py b/hermes_agent/tools/security/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tools/approval.py b/hermes_agent/tools/security/approval.py
similarity index 100%
rename from tools/approval.py
rename to hermes_agent/tools/security/approval.py
diff --git a/tools/path_security.py b/hermes_agent/tools/security/paths.py
similarity index 100%
rename from tools/path_security.py
rename to hermes_agent/tools/security/paths.py
diff --git a/tools/tirith_security.py b/hermes_agent/tools/security/tirith.py
similarity index 100%
rename from tools/tirith_security.py
rename to hermes_agent/tools/security/tirith.py
diff --git a/tools/url_safety.py b/hermes_agent/tools/security/urls.py
similarity index 100%
rename from tools/url_safety.py
rename to hermes_agent/tools/security/urls.py
diff --git a/tools/send_message_tool.py b/hermes_agent/tools/send_message.py
similarity index 100%
rename from tools/send_message_tool.py
rename to hermes_agent/tools/send_message.py
diff --git a/tools/session_search_tool.py b/hermes_agent/tools/session_search.py
similarity index 100%
rename from tools/session_search_tool.py
rename to hermes_agent/tools/session_search.py
diff --git a/hermes_agent/tools/skills/__init__.py b/hermes_agent/tools/skills/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tools/skills_guard.py b/hermes_agent/tools/skills/guard.py
similarity index 100%
rename from tools/skills_guard.py
rename to hermes_agent/tools/skills/guard.py
diff --git a/tools/skills_hub.py b/hermes_agent/tools/skills/hub.py
similarity index 100%
rename from tools/skills_hub.py
rename to hermes_agent/tools/skills/hub.py
diff --git a/tools/skill_manager_tool.py b/hermes_agent/tools/skills/manager.py
similarity index 100%
rename from tools/skill_manager_tool.py
rename to hermes_agent/tools/skills/manager.py
diff --git a/tools/skills_sync.py b/hermes_agent/tools/skills/sync.py
similarity index 100%
rename from tools/skills_sync.py
rename to hermes_agent/tools/skills/sync.py
diff --git a/tools/skills_tool.py b/hermes_agent/tools/skills/tool.py
similarity index 100%
rename from tools/skills_tool.py
rename to hermes_agent/tools/skills/tool.py
diff --git a/tools/terminal_tool.py b/hermes_agent/tools/terminal.py
similarity index 100%
rename from tools/terminal_tool.py
rename to hermes_agent/tools/terminal.py
diff --git a/tools/todo_tool.py b/hermes_agent/tools/todo.py
similarity index 100%
rename from tools/todo_tool.py
rename to hermes_agent/tools/todo.py
diff --git a/toolsets.py b/hermes_agent/tools/toolsets.py
similarity index 100%
rename from toolsets.py
rename to hermes_agent/tools/toolsets.py
diff --git a/tools/vision_tools.py b/hermes_agent/tools/vision.py
similarity index 100%
rename from tools/vision_tools.py
rename to hermes_agent/tools/vision.py
diff --git a/tools/web_tools.py b/hermes_agent/tools/web.py
similarity index 100%
rename from tools/web_tools.py
rename to hermes_agent/tools/web.py
diff --git a/tools/website_policy.py b/hermes_agent/tools/website_policy.py
similarity index 100%
rename from tools/website_policy.py
rename to hermes_agent/tools/website_policy.py
diff --git a/tools/xai_http.py b/hermes_agent/tools/xai_http.py
similarity index 100%
rename from tools/xai_http.py
rename to hermes_agent/tools/xai_http.py
diff --git a/utils.py b/hermes_agent/utils.py
similarity index 100%
rename from utils.py
rename to hermes_agent/utils.py