diff --git a/sidecar/src/Aryx.AgentHost/Services/AryxCopilotAgent.cs b/sidecar/src/Aryx.AgentHost/Services/Providers/Copilot/AryxCopilotAgent.cs
similarity index 100%
rename from sidecar/src/Aryx.AgentHost/Services/AryxCopilotAgent.cs
rename to sidecar/src/Aryx.AgentHost/Services/Providers/Copilot/AryxCopilotAgent.cs
diff --git a/sidecar/src/Aryx.AgentHost/Services/CopilotAgentBundle.cs b/sidecar/src/Aryx.AgentHost/Services/Providers/Copilot/CopilotAgentBundle.cs
similarity index 100%
rename from sidecar/src/Aryx.AgentHost/Services/CopilotAgentBundle.cs
rename to sidecar/src/Aryx.AgentHost/Services/Providers/Copilot/CopilotAgentBundle.cs
diff --git a/sidecar/src/Aryx.AgentHost/Services/CopilotAgentProvider.cs b/sidecar/src/Aryx.AgentHost/Services/Providers/Copilot/CopilotAgentProvider.cs
similarity index 100%
rename from sidecar/src/Aryx.AgentHost/Services/CopilotAgentProvider.cs
rename to sidecar/src/Aryx.AgentHost/Services/Providers/Copilot/CopilotAgentProvider.cs
diff --git a/sidecar/src/Aryx.AgentHost/Services/CopilotApprovalCoordinator.cs b/sidecar/src/Aryx.AgentHost/Services/Providers/Copilot/CopilotApprovalCoordinator.cs
similarity index 100%
rename from sidecar/src/Aryx.AgentHost/Services/CopilotApprovalCoordinator.cs
rename to sidecar/src/Aryx.AgentHost/Services/Providers/Copilot/CopilotApprovalCoordinator.cs
diff --git a/sidecar/src/Aryx.AgentHost/Services/CopilotCliPathResolver.cs b/sidecar/src/Aryx.AgentHost/Services/Providers/Copilot/CopilotCliPathResolver.cs
similarity index 100%
rename from sidecar/src/Aryx.AgentHost/Services/CopilotCliPathResolver.cs
rename to sidecar/src/Aryx.AgentHost/Services/Providers/Copilot/CopilotCliPathResolver.cs
diff --git a/sidecar/src/Aryx.AgentHost/Services/CopilotConnectionMetadataResolver.cs b/sidecar/src/Aryx.AgentHost/Services/Providers/Copilot/CopilotConnectionMetadataResolver.cs
similarity index 100%
rename from sidecar/src/Aryx.AgentHost/Services/CopilotConnectionMetadataResolver.cs
rename to sidecar/src/Aryx.AgentHost/Services/Providers/Copilot/CopilotConnectionMetadataResolver.cs
diff --git a/sidecar/src/Aryx.AgentHost/Services/CopilotEventAdapter.cs b/sidecar/src/Aryx.AgentHost/Services/Providers/Copilot/CopilotEventAdapter.cs
similarity index 100%
rename from sidecar/src/Aryx.AgentHost/Services/CopilotEventAdapter.cs
rename to sidecar/src/Aryx.AgentHost/Services/Providers/Copilot/CopilotEventAdapter.cs
diff --git a/sidecar/src/Aryx.AgentHost/Services/CopilotExitPlanModeCoordinator.cs b/sidecar/src/Aryx.AgentHost/Services/Providers/Copilot/CopilotExitPlanModeCoordinator.cs
similarity index 100%
rename from sidecar/src/Aryx.AgentHost/Services/CopilotExitPlanModeCoordinator.cs
rename to sidecar/src/Aryx.AgentHost/Services/Providers/Copilot/CopilotExitPlanModeCoordinator.cs
diff --git a/sidecar/src/Aryx.AgentHost/Services/CopilotManagedSessionIds.cs b/sidecar/src/Aryx.AgentHost/Services/Providers/Copilot/CopilotManagedSessionIds.cs
similarity index 100%
rename from sidecar/src/Aryx.AgentHost/Services/CopilotManagedSessionIds.cs
rename to sidecar/src/Aryx.AgentHost/Services/Providers/Copilot/CopilotManagedSessionIds.cs
diff --git a/sidecar/src/Aryx.AgentHost/Services/CopilotMcpOAuthCoordinator.cs b/sidecar/src/Aryx.AgentHost/Services/Providers/Copilot/CopilotMcpOAuthCoordinator.cs
similarity index 100%
rename from sidecar/src/Aryx.AgentHost/Services/CopilotMcpOAuthCoordinator.cs
rename to sidecar/src/Aryx.AgentHost/Services/Providers/Copilot/CopilotMcpOAuthCoordinator.cs
diff --git a/sidecar/src/Aryx.AgentHost/Services/CopilotMessageOptionsMetadata.cs b/sidecar/src/Aryx.AgentHost/Services/Providers/Copilot/CopilotMessageOptionsMetadata.cs
similarity index 100%
rename from sidecar/src/Aryx.AgentHost/Services/CopilotMessageOptionsMetadata.cs
rename to sidecar/src/Aryx.AgentHost/Services/Providers/Copilot/CopilotMessageOptionsMetadata.cs
diff --git a/sidecar/src/Aryx.AgentHost/Services/CopilotSessionHooks.cs b/sidecar/src/Aryx.AgentHost/Services/Providers/Copilot/CopilotSessionHooks.cs
similarity index 100%
rename from sidecar/src/Aryx.AgentHost/Services/CopilotSessionHooks.cs
rename to sidecar/src/Aryx.AgentHost/Services/Providers/Copilot/CopilotSessionHooks.cs
diff --git a/sidecar/src/Aryx.AgentHost/Services/CopilotSessionManager.cs b/sidecar/src/Aryx.AgentHost/Services/Providers/Copilot/CopilotSessionManager.cs
similarity index 100%
rename from sidecar/src/Aryx.AgentHost/Services/CopilotSessionManager.cs
rename to sidecar/src/Aryx.AgentHost/Services/Providers/Copilot/CopilotSessionManager.cs
diff --git a/sidecar/src/Aryx.AgentHost/Services/CopilotUserInputCoordinator.cs b/sidecar/src/Aryx.AgentHost/Services/Providers/Copilot/CopilotUserInputCoordinator.cs
similarity index 100%
rename from sidecar/src/Aryx.AgentHost/Services/CopilotUserInputCoordinator.cs
rename to sidecar/src/Aryx.AgentHost/Services/Providers/Copilot/CopilotUserInputCoordinator.cs
diff --git a/sidecar/src/Aryx.AgentHost/Services/CopilotWorkflowRunner.cs b/sidecar/src/Aryx.AgentHost/Services/Providers/Copilot/CopilotWorkflowRunner.cs
similarity index 100%
rename from sidecar/src/Aryx.AgentHost/Services/CopilotWorkflowRunner.cs
rename to sidecar/src/Aryx.AgentHost/Services/Providers/Copilot/CopilotWorkflowRunner.cs
diff --git a/sidecar/src/Aryx.AgentHost/Services/ICopilotSessionManager.cs b/sidecar/src/Aryx.AgentHost/Services/Providers/Copilot/ICopilotSessionManager.cs
similarity index 100%
rename from sidecar/src/Aryx.AgentHost/Services/ICopilotSessionManager.cs
rename to sidecar/src/Aryx.AgentHost/Services/Providers/Copilot/ICopilotSessionManager.cs
diff --git a/sidecar/src/Aryx.AgentHost/Services/QuotaSnapshotMapper.cs b/sidecar/src/Aryx.AgentHost/Services/Providers/Copilot/QuotaSnapshotMapper.cs
similarity index 100%
rename from sidecar/src/Aryx.AgentHost/Services/QuotaSnapshotMapper.cs
rename to sidecar/src/Aryx.AgentHost/Services/Providers/Copilot/QuotaSnapshotMapper.cs
diff --git a/sidecar/src/Aryx.AgentHost/Services/SessionToolingBundle.cs b/sidecar/src/Aryx.AgentHost/Services/Providers/Copilot/SessionToolingBundle.cs
similarity index 100%
rename from sidecar/src/Aryx.AgentHost/Services/SessionToolingBundle.cs
rename to sidecar/src/Aryx.AgentHost/Services/Providers/Copilot/SessionToolingBundle.cs
diff --git a/sidecar/src/Aryx.AgentHost/Services/WorkflowTranscriptProjector.cs b/sidecar/src/Aryx.AgentHost/Services/Providers/Copilot/WorkflowTranscriptProjector.cs
similarity index 100%
rename from sidecar/src/Aryx.AgentHost/Services/WorkflowTranscriptProjector.cs
rename to sidecar/src/Aryx.AgentHost/Services/Providers/Copilot/WorkflowTranscriptProjector.cs