diff --git a/agent/agent.go b/agent/agent.go
index 652aa0affd..ee33a20ca1 100644
--- a/agent/agent.go
+++ b/agent/agent.go
@@ -38,7 +38,6 @@ import (
 	"cdr.dev/slog/v3"
 	"github.com/coder/clistat"
 	"github.com/coder/coder/v2/agent/agentcontainers"
-	"github.com/coder/coder/v2/agent/agentdesktop"
 	"github.com/coder/coder/v2/agent/agentexec"
 	"github.com/coder/coder/v2/agent/agentfiles"
 	"github.com/coder/coder/v2/agent/agentgit"
@@ -50,6 +49,7 @@ import (
 	"github.com/coder/coder/v2/agent/proto"
 	"github.com/coder/coder/v2/agent/proto/resourcesmonitor"
 	"github.com/coder/coder/v2/agent/reconnectingpty"
+	"github.com/coder/coder/v2/agent/x/agentdesktop"
 	"github.com/coder/coder/v2/buildinfo"
 	"github.com/coder/coder/v2/cli/gitauth"
 	"github.com/coder/coder/v2/coderd/database/dbtime"
diff --git a/agent/agentdesktop/api.go b/agent/x/agentdesktop/api.go
similarity index 100%
rename from agent/agentdesktop/api.go
rename to agent/x/agentdesktop/api.go
diff --git a/agent/agentdesktop/api_test.go b/agent/x/agentdesktop/api_test.go
similarity index 99%
rename from agent/agentdesktop/api_test.go
rename to agent/x/agentdesktop/api_test.go
index a4a91d835e..6b3a67cdfd 100644
--- a/agent/agentdesktop/api_test.go
+++ b/agent/x/agentdesktop/api_test.go
@@ -15,7 +15,7 @@ import (
 	"golang.org/x/xerrors"
 
 	"cdr.dev/slog/v3/sloggers/slogtest"
-	"github.com/coder/coder/v2/agent/agentdesktop"
+	"github.com/coder/coder/v2/agent/x/agentdesktop"
 	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/coder/v2/codersdk/workspacesdk"
 	"github.com/coder/quartz"
diff --git a/agent/agentdesktop/desktop.go b/agent/x/agentdesktop/desktop.go
similarity index 100%
rename from agent/agentdesktop/desktop.go
rename to agent/x/agentdesktop/desktop.go
diff --git a/agent/agentdesktop/portabledesktop.go b/agent/x/agentdesktop/portabledesktop.go
similarity index 100%
rename from agent/agentdesktop/portabledesktop.go
rename to agent/x/agentdesktop/portabledesktop.go
diff --git a/agent/agentdesktop/portabledesktop_internal_test.go b/agent/x/agentdesktop/portabledesktop_internal_test.go
similarity index 100%
rename from agent/agentdesktop/portabledesktop_internal_test.go
rename to agent/x/agentdesktop/portabledesktop_internal_test.go