@@ -15,11 +15,11 @@
 - `TabStackListener.on_close` prunes closed sheets and removes empty window state.
 - Tab captions come from `plugin/captions.py`; widgets, panels, and transient/non-tab views are excluded from MRU.
 - Ctrl-release detection lives in `plugin/ctrl_release/`.
-- Under Linux, Ctrl-release detection uses the `tabstack-keystate` helper (`plugin/ctrl_release/keystate_helper.py`) when its probe succeeds.
+- Under Linux, Ctrl-release detection uses the `tabstack-keystate` helper (`plugin/ctrl_release/linux/keystate_helper.py`) when its probe succeeds.
   `plugin_loaded` probes it on the async thread, because running it can take up to 2 s; until the result arrives, Linux behaves as if the helper were missing, but without the setup dialog.
   The probe records the helper path it ran with, the poller runs exactly that path, and a change of `keystate_helper_path` triggers a new probe.
   The helper reads evdev key state with `cap_dac_read_search`, is spawned once per session, and reports Ctrl state changes on stdout.
-- Without a working helper, Linux falls back to the X11 key state API, but not on native Wayland (`is_native_wayland()` in `plugin/ctrl_release/linux.py`), because XWayland reports Ctrl as released while a Wayland client has focus; Sublime exposes no key-release API.
+- Without a working helper, Linux falls back to the X11 key state API (`plugin/ctrl_release/linux/x11.py`), but not on native Wayland (`is_native_wayland()` in `plugin/ctrl_release/linux/__init__.py`), because XWayland reports Ctrl as released while a Wayland client has focus; Sublime exposes no key-release API.
 - On native Wayland without a working helper, the first `ctrl+tab` per plugin load shows a dialog offering the setup (`offer_wayland_setup` in `plugin/setup.py`), unless `show_wayland_setup_dialog` is `false`.
 - `tab_stack_setup_keystate_helper` (Command Palette: `TabStack: Set Up Ctrl Detection for Wayland`) re-probes, extracts `keystate/tabstack-keystate.c` to `sublime.cache_path()/TabStack/keystate/`, and shows the build, install and `setcap` commands.
   The plugin never runs `sudo`, a compiler or `setcap`; the user installs the helper to `keystate_helper_path` (default `/usr/local/libexec/tabstack-keystate`) with `cap_dac_read_search`, which the helper drops right after opening the input devices.
 
@@ -35,10 +35,10 @@ def is_native_wayland() -> bool:
         return False
 
 else:
-    from .keystate_helper import HelperProbe, start_helper_probe
-    from .keystate_helper import watch_helper_path as _watch_platform_settings
     from .linux import create_poller, is_native_wayland, probe
     from .linux import plugin_unloaded as _platform_plugin_unloaded
+    from .linux.keystate_helper import HelperProbe, start_helper_probe
+    from .linux.keystate_helper import watch_helper_path as _watch_platform_settings
 
     def _start_platform_probe(on_done: Callable[[], None]) -> None:
         def on_helper_probed(_: HelperProbe) -> None:
 
@@ -0,0 +1,42 @@
+from __future__ import annotations
+
+import os
+from collections.abc import Callable
+from typing import Optional
+
+from ...state import CtrlPoller
+from .keystate_helper import HelperCtrlReleasePoller, HelperStatus, get_helper_probe
+from .keystate_helper import plugin_unloaded as _helper_plugin_unloaded
+from .x11 import X11CtrlReleasePoller, is_x11_available
+from .x11 import plugin_unloaded as _x11_plugin_unloaded
+
+
+def is_native_wayland() -> bool:
+    return bool(os.environ.get("WAYLAND_DISPLAY")) and os.environ.get("GDK_BACKEND") != "x11"
+
+
+def create_poller(on_release: Callable[[], None], interval_ms: int) -> CtrlPoller:
+    path = _working_helper_path()
+    if path is not None:
+        return HelperCtrlReleasePoller(on_release, interval_ms, path)
+    return X11CtrlReleasePoller(on_release, interval_ms)
+
+
+def probe() -> bool:
+    if _working_helper_path() is not None:
+        return True
+    # Under native Wayland, XWayland reports Ctrl as released while Sublime has focus,
+    # which would commit every session immediately.
+    return not is_native_wayland() and is_x11_available()
+
+
+def _working_helper_path() -> Optional[str]:
+    helper_probe = get_helper_probe()
+    if helper_probe is None or helper_probe.status is not HelperStatus.OK:
+        return None
+    return helper_probe.path
+
+
+def plugin_unloaded() -> None:
+    _x11_plugin_unloaded()
+    _helper_plugin_unloaded()
@@ -10,10 +10,7 @@
 
 import sublime
 
-from ..state import CtrlPoller
-from ._availability import set_unavailable
-from .keystate_helper import HelperCtrlReleasePoller, HelperStatus, get_helper_probe
-from .keystate_helper import plugin_unloaded as _helper_plugin_unloaded
+from .._availability import set_unavailable
 
 _XK_Control_L = 0xFFE3
 _XK_Control_R = 0xFFE4
@@ -114,30 +111,8 @@ def _open_x11_state(self) -> Optional[_X11State]:
         )
 
 
-def is_native_wayland() -> bool:
-    return bool(os.environ.get("WAYLAND_DISPLAY")) and os.environ.get("GDK_BACKEND") != "x11"
-
-
-def create_poller(on_release: Callable[[], None], interval_ms: int) -> CtrlPoller:
-    path = _working_helper_path()
-    if path is not None:
-        return HelperCtrlReleasePoller(on_release, interval_ms, path)
-    return X11CtrlReleasePoller(on_release, interval_ms)
-
-
-def probe() -> bool:
-    if _working_helper_path() is not None:
-        return True
-    # Under native Wayland, XWayland reports Ctrl as released while Sublime has focus,
-    # which would commit every session immediately.
-    return not is_native_wayland() and _get_x11() is not None
-
-
-def _working_helper_path() -> Optional[str]:
-    helper_probe = get_helper_probe()
-    if helper_probe is None or helper_probe.status is not HelperStatus.OK:
-        return None
-    return helper_probe.path
+def is_x11_available() -> bool:
+    return _get_x11() is not None
 
 
 def _keycode_is_down(keymap: ctypes.Array[ctypes.c_ubyte], keycode: int) -> bool:
@@ -179,4 +154,3 @@ def _get_x11() -> Optional[ctypes.CDLL]:
 def plugin_unloaded() -> None:
     global _x11
     _x11 = None
-    _helper_plugin_unloaded()
@@ -7,7 +7,7 @@
 import sublime_plugin
 
 from .ctrl_release import is_native_wayland, refresh_availability
-from .ctrl_release.keystate_helper import (
+from .ctrl_release.linux.keystate_helper import (
     DEFAULT_HELPER_PATH,
     HelperProbe,
     HelperStatus,