@@ -120,12 +120,12 @@ If you need an internal API stabilized please [file an issue](https://github.com
 ## Workspace Builder
 
 ```{eval-rst}
-.. autoclass:: tmuxp.workspacebuilder.WorkspaceBuilder
+.. autoclass:: tmuxp.workspace.builder.WorkspaceBuilder
    :members:
 ```
 
 ```{eval-rst}
-.. automethod:: tmuxp.workspacebuilder.freeze
+.. automethod:: tmuxp.workspace.builder.freeze
 ```
 
 ## Exceptions
 
@@ -761,7 +761,7 @@ windows:
 
 tmuxp sessions can be scripted in python. The first way is to use the
 ORM in the {ref}`API`. The second is to pass a {py:obj}`dict` into
-{class}`~tmuxp.workspacebuilder.WorkspaceBuilder` with a correct schema.
+{class}`~tmuxp.workspace.builder.WorkspaceBuilder` with a correct schema.
 See: {meth}`tmuxp.config.validate_schema`.
 
 :::
 
@@ -10,7 +10,7 @@
 
 from .. import util
 from ..workspace import config
-from ..workspacebuilder import freeze
+from ..workspace.builder import freeze
 from .utils import get_config_dir, prompt, prompt_choices, prompt_yes_no
 
 if t.TYPE_CHECKING:
 
@@ -20,7 +20,7 @@
 
 from .. import config_reader, exc, log, util
 from ..workspace import config
-from ..workspacebuilder import WorkspaceBuilder
+from ..workspace.builder import WorkspaceBuilder
 from .utils import (
     find_workspace_file,
     get_config_dir,
@@ -154,7 +154,7 @@ def _reattach(builder: WorkspaceBuilder):
 
     Parameters
     ----------
-    builder: :class:`workspacebuilder.WorkspaceBuilder`
+    builder: :class:`workspace.builder.WorkspaceBuilder`
 
     Notes
     -----
@@ -183,7 +183,7 @@ def _load_attached(builder: WorkspaceBuilder, detached: bool) -> None:
 
     Parameters
     ----------
-    builder: :class:`workspacebuilder.WorkspaceBuilder`
+    builder: :class:`workspace.builder.WorkspaceBuilder`
     detached : bool
     """
     builder.build()
@@ -216,7 +216,7 @@ def _load_detached(builder: WorkspaceBuilder) -> None:
 
     Parameters
     ----------
-    builder: :class:`workspacebuilder.WorkspaceBuilder`
+    builder: :class:`workspace.builder.WorkspaceBuilder`
     """
     builder.build()
 
@@ -233,7 +233,7 @@ def _load_append_windows_to_current_session(builder: WorkspaceBuilder) -> None:
 
     Parameters
     ----------
-    builder: :class:`workspacebuilder.WorkspaceBuilder`
+    builder: :class:`workspace.builder.WorkspaceBuilder`
     """
     current_attached_session = builder.find_current_attached_session()
     builder.build(current_attached_session, append=True)
@@ -248,7 +248,7 @@ def _setup_plugins(builder: WorkspaceBuilder) -> Session:
 
     Parameters
     ----------
-    builder: :class:`workspacebuilder.WorkspaceBuilder`
+    builder: :class:`workspace.builder.WorkspaceBuilder`
     """
     for plugin in builder.plugins:
         plugin.before_script(builder.session)
@@ -311,7 +311,7 @@ def load_workspace(
     just the object.
 
     The prepared configuration and the server object is passed into an instance
-    of :class:`~tmuxp.workspacebuilder.WorkspaceBuilder`.
+    of :class:`~tmuxp.workspace.builder.WorkspaceBuilder`.
 
     A sanity check against :meth:`libtmux.common.which` is ran. It will raise
     an exception if tmux isn't found.
@@ -321,7 +321,7 @@ def load_workspace(
     does not allow appending a workspace / incremental building on top of a
     current session (pull requests are welcome!).
 
-    :meth:`~tmuxp.workspacebuilder.WorkspaceBuilder.build` will build the session in
+    :meth:`~tmuxp.workspace.builder.build` will build the session in
     the background via using tmux's detached state (``-d``).
 
     After the session (workspace) is built, unless the user decided to load
 
@@ -1,7 +1,7 @@
-"""Create a tmux workspace from a configuration :py:obj:`dict`.
+"""Create a tmux workspace from a workspace configuration :py:obj:`dict`.
 
-tmuxp.workspacebuilder
-~~~~~~~~~~~~~~~~~~~~~~
+tmuxp.workspace.builder
+~~~~~~~~~~~~~~~~~~~~~~~
 
 """
 import logging
@@ -13,8 +13,8 @@
 from libtmux.session import Session
 from libtmux.window import Window
 
-from . import exc
-from .util import get_current_pane, run_before_script
+from .. import exc
+from ..util import get_current_pane, run_before_script
 
 logger = logging.getLogger(__name__)
 
 
@@ -31,7 +31,7 @@
 )
 from tmuxp.config_reader import ConfigReader
 from tmuxp.workspace import config
-from tmuxp.workspacebuilder import WorkspaceBuilder
+from tmuxp.workspace.builder import WorkspaceBuilder
 
 from .constants import FIXTURE_PATH
 from .fixtures import utils as test_utils
 
@@ -15,7 +15,7 @@
 from tmuxp.cli.load import load_plugins
 from tmuxp.config_reader import ConfigReader
 from tmuxp.workspace import config
-from tmuxp.workspacebuilder import WorkspaceBuilder
+from tmuxp.workspace.builder import WorkspaceBuilder
 
 from .constants import EXAMPLE_PATH, FIXTURE_PATH
 from .fixtures import utils as test_utils
 
@@ -3,7 +3,7 @@
 
 from tmuxp.config_reader import ConfigReader
 from tmuxp.workspace import config
-from tmuxp.workspacebuilder import WorkspaceBuilder, freeze
+from tmuxp.workspace.builder import WorkspaceBuilder, freeze
 
 from .fixtures import utils as test_utils
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`)`
`32`	`32`	`from tmuxp.config_reader import ConfigReader`
`33`	`33`	`from tmuxp.workspace import config`
`34`		`-from tmuxp.workspacebuilder import WorkspaceBuilder`
	`34`	`+from tmuxp.workspace.builder import WorkspaceBuilder`
`35`	`35`
`36`	`36`	`from .constants import FIXTURE_PATH`
`37`	`37`	`from .fixtures import utils as test_utils`