diff --git a/lib/kino/hub.ex b/lib/kino/hub.ex
index 449c76f0..6984ff4c 100644
--- a/lib/kino/hub.ex
+++ b/lib/kino/hub.ex
@@ -1,59 +1,6 @@
 defmodule Kino.Hub do
-  @moduledoc """
-  Functions related to hub integrations and Livebook apps.
-  """
+  @moduledoc false
 
-  @type app_info ::
-          %{type: :single}
-          | %{:type => :multi, optional(:started_by) => user_info()}
-          | %{type: :none}
-
-  @type user_info :: %{
-          id: String.t(),
-          name: String.t() | nil,
-          email: String.t() | nil,
-          source: atom(),
-          payload: map() | nil
-        }
-
-  @doc """
-  Returns information about the running app.
-
-  Note that `:started_by` information is only available for multi-session
-  apps when the app uses a Livebook Teams workspace.
-
-  Unless called from within an app deployment, returns `%{type: :none}`.
-  """
-  @spec app_info() :: app_info()
-  def app_info() do
-    case Kino.Bridge.get_app_info() do
-      {:ok, app_info} ->
-        app_info
-
-      {:request_error, reason} ->
-        raise "failed to access app info, reason: #{inspect(reason)}"
-    end
-  end
-
-  @doc """
-  Returns user information for the given connected client id.
-
-  Note that this information is only available when the session uses
-  Livebook Teams workspace, otherwise `:not_available` error is returned.
-
-  If there is no such connected client, `:not_found` error is returned.
-  """
-  @spec user_info(String.t()) :: {:ok, user_info()} | {:error, :not_found | :not_available}
-  def user_info(client_id) do
-    case Kino.Bridge.get_user_info(client_id) do
-      {:ok, user_info} ->
-        {:ok, user_info}
-
-      {:error, reason} ->
-        {:error, reason}
-
-      {:request_error, reason} ->
-        raise "failed to access user info, reason: #{inspect(reason)}"
-    end
-  end
+  @deprecated "Use Kino.Workspace.app_info/0 instead"
+  defdelegate app_info(), to: Kino.Workspace
 end
diff --git a/lib/kino/workspace.ex b/lib/kino/workspace.ex
new file mode 100644
index 00000000..8d44f800
--- /dev/null
+++ b/lib/kino/workspace.ex
@@ -0,0 +1,59 @@
+defmodule Kino.Workspace do
+  @moduledoc """
+  Functions related to workspace integrations and Livebook apps.
+  """
+
+  @type app_info ::
+          %{type: :single}
+          | %{:type => :multi, optional(:started_by) => user_info()}
+          | %{type: :none}
+
+  @type user_info :: %{
+          id: String.t(),
+          name: String.t() | nil,
+          email: String.t() | nil,
+          source: atom(),
+          payload: map() | nil
+        }
+
+  @doc """
+  Returns information about the running app.
+
+  Note that `:started_by` information is only available for multi-session
+  apps when the app uses a Livebook Teams workspace.
+
+  Unless called from within an app deployment, returns `%{type: :none}`.
+  """
+  @spec app_info() :: app_info()
+  def app_info() do
+    case Kino.Bridge.get_app_info() do
+      {:ok, app_info} ->
+        app_info
+
+      {:request_error, reason} ->
+        raise "failed to access app info, reason: #{inspect(reason)}"
+    end
+  end
+
+  @doc """
+  Returns user information for the given connected client id.
+
+  Note that this information is only available when the session uses
+  Livebook Teams workspace, otherwise `:not_available` error is returned.
+
+  If there is no such connected client, `:not_found` error is returned.
+  """
+  @spec user_info(String.t()) :: {:ok, user_info()} | {:error, :not_found | :not_available}
+  def user_info(client_id) do
+    case Kino.Bridge.get_user_info(client_id) do
+      {:ok, user_info} ->
+        {:ok, user_info}
+
+      {:error, reason} ->
+        {:error, reason}
+
+      {:request_error, reason} ->
+        raise "failed to access user info, reason: #{inspect(reason)}"
+    end
+  end
+end