all: import split crates directly

build/wire.rs

@@ -443,7 +443,7 @@ pub fn main() -> Result<()> {
     writeln!(f, "use std::rc::Rc;")?;
     writeln!(f, "use uapi::OwnedFd;")?;
     writeln!(f, "use bstr::BStr;")?;
-    writeln!(f, "use crate::fixed::Fixed;")?;
+    writeln!(f, "use jay_units::fixed::Fixed;")?;
     writeln!(f, "use crate::client::{{EventFormatter, RequestParser}};")?;
     writeln!(f, "use crate::object::{{ObjectId, Interface}};")?;
     writeln!(

src/acceptor.rs

@@ -1,6 +1,7 @@
+use jay_async_engine::SpawnedFuture;
 use {
     crate::{
-        async_engine::SpawnedFuture,
+
         client::ClientMetadata,
         state::State,
         utils::{

src/animation.rs

@@ -1,11 +1,13 @@
+use jay_theme::Color;
+use jay_geometry::Rect;
 use {
     crate::{
         cmm::{cmm_description::ColorDescription, cmm_render_intent::RenderIntent},
         gfx_api::{GfxTexture, SampleRect},
         ifs::wl_surface::{SurfaceBuffer, WlSurface},
-        rect::Rect,
+
         state::State,
-        theme::Color,
+
         tree::{LatchListener, NodeId, OutputNode},
         utils::{clonecell::CloneCell, event_listener::EventListener},
     },

src/async_engine.rs

@@ -1 +0,0 @@
-pub use jay_async_engine::*;

src/backend.rs

@@ -1,6 +1,7 @@
+use jay_async_engine::SpawnedFuture;
 use {
     crate::{
-        async_engine::SpawnedFuture,
+
         backend::transaction::{
             BackendConnectorTransaction, BackendConnectorTransactionError,
             BackendConnectorTransactionType, BackendConnectorTransactionTypeDyn,

src/backends/dummy.rs

@@ -1,6 +1,7 @@
+use jay_async_engine::SpawnedFuture;
 use {
     crate::{
-        async_engine::SpawnedFuture,
+
         backend::{
             self, Backend, BackendConnectorState, BackendConnectorStateSerial, Connector,
             ConnectorEvent, ConnectorId, ConnectorKernelId, DrmDeviceId,

src/backends/headless.rs

@@ -1,12 +1,14 @@
+use jay_io_uring::IoUringError;
+use jay_async_engine::SpawnedFuture;
 use {
     crate::{
-        async_engine::SpawnedFuture,
+
         backend::{Backend, BackendDrmDevice, BackendEvent, DrmDeviceId, DrmEvent},
         backends::headless::HeadlessBackendError::{
             CreateDrm, GetDrmNodes, MonitorFdFailed, MonitorFdReadable, NoDrmNodes, OpenDrmNode,
         },
         gfx_api::{GfxApi, GfxContext},
-        io_uring::IoUringError,
+
         state::State,
         udev::{Udev, UdevDevice, UdevError, UdevMonitor},
         utils::{

src/backends/metal.rs

@@ -5,9 +5,10 @@ mod present;
 mod transaction;
 mod video;
 
+use jay_async_engine::SpawnedFuture;
 use {
     crate::{
-        async_engine::SpawnedFuture,
+
         backend::{
             Backend, ButtonState, InputDevice, InputDeviceAccelProfile, InputDeviceCapability,
             InputDeviceClickMethod, InputDeviceGroupId, InputDeviceId, InputEvent, KeyState, Leds,

src/backends/metal/allocator.rs

@@ -1,3 +1,5 @@
+use jay_udmabuf::{Udmabuf, UdmabufError};
+use jay_geometry::{DamageQueue, Rect, Region};
 use {
     crate::{
         allocator::BufferObject,
@@ -14,8 +16,8 @@ use {
             AcquireSync, FdSync, GfxBlendBuffer, GfxError, GfxFormat, GfxFramebuffer, GfxTexture,
             GfxWriteModifier, ReleaseSync, needs_render_usage,
         },
-        rect::{DamageQueue, Rect, Region},
+
-        udmabuf::{Udmabuf, UdmabufError},
+
         utils::{errorfmt::ErrorFmt, rc_eq::rc_eq},
         video::{
             LINEAR_MODIFIER, Modifier,

src/backends/metal/input.rs

@@ -1,13 +1,13 @@
+use jay_units::fixed::Fixed;
 use {
     crate::{
         backend::{
-            AxisSource, ButtonState, InputEvent, KeyState, PadButtonState, ScrollAxis,
+            AxisSource, ButtonState, InputEvent, KeyState, PadButtonState, ScrollAxis, SwitchEvent,
-            SwitchEvent, TabletRingEventSource, TabletStripEventSource, TabletTool2dChange,
+            TabletRingEventSource, TabletStripEventSource, TabletTool2dChange,
             TabletToolCapability, TabletToolChanges, TabletToolId, TabletToolInit,
             TabletToolPositionChange, TabletToolType, TabletToolWheelChange, ToolButtonState,
         },
         backends::metal::MetalBackend,
-        fixed::Fixed,
         libinput::{
             consts::{
                 LIBINPUT_BUTTON_STATE_PRESSED, LIBINPUT_BUTTON_STATE_RELEASED,

src/backends/metal/present.rs

@@ -1,3 +1,5 @@
+use jay_time::Time;
+use jay_geometry::Region;
 use {
     crate::{
         backend::{BackendDrmDevice, Connector},
@@ -13,9 +15,9 @@ use {
             SyncFile, create_render_pass,
         },
         ifs::wl_output::BlendSpace,
-        rect::Region,
+
-        time::Time,
+
-        tracy::FrameName,
+        jay_tracy::FrameName,
         tree::OutputNode,
         utils::{errorfmt::ErrorFmt, oserror::OsError},
         video::{

src/backends/metal/video/discovery.rs

@@ -1,3 +1,5 @@
+use jay_edid::{CtaDataBlock, Descriptor, EdidExtension};
+use jay_async_engine::Phase;
 use {
     super::{
         ConnectorDisplayData, ConnectorFutures, FrontState, MetalConnector, MetalCrtc,
@@ -5,7 +7,7 @@ use {
         properties::{DefaultValue, collect_properties, create_default_properties},
     },
     crate::{
-        async_engine::Phase,
+
         backend::{
             BackendColorSpace, BackendConnectorState, BackendEotfs, BackendLuminance,
             ConnectorKernelId, Mode, OutputId,
@@ -16,7 +18,7 @@ use {
             transaction::{DrmConnectorState, DrmCrtcState, DrmPlaneState},
         },
         cmm::cmm_primaries::Primaries,
-        edid::{CtaDataBlock, Descriptor, EdidExtension},
+
         format::XRGB8888,
         utils::{
             binary_search_map::BinarySearchMap, bitflags::BitflagsExt, clonecell::CloneCell,
@@ -186,7 +188,7 @@ pub(super) fn create_connector_display_data(
                 break 'fetch_edid;
             }
         };
-        let edid = match crate::edid::parse(&blob) {
+        let edid = match jay_edid::parse(&blob) {
             Ok(e) => e,
             Err(e) => {
                 log::error!(

src/backends/metal/video/model.rs

@@ -1,7 +1,8 @@
+use jay_async_engine::SpawnedFuture;
 use {
     super::{copy_device::CopyDeviceHolder, lease::MetalLeaseData, properties::DefaultProperty},
     crate::{
-        async_engine::SpawnedFuture,
+
         backend::{
             BackendConnectorState, BackendLuminance, ConnectorEvent, ConnectorId,
             ConnectorKernelId, DrmDeviceId, DrmEvent, Mode, OutputId,

src/backends/x.rs

@@ -1,7 +1,10 @@
+use jay_time::Time;
+use jay_async_engine::{Phase, SpawnedFuture};
+use jay_units::fixed::Fixed;
 use {
     crate::{
         allocator::BufferObject,
-        async_engine::{Phase, SpawnedFuture},
+
         backend::{
             AXIS_120, AxisSource, Backend, BackendConnectorState, BackendDrmDevice, BackendEvent,
             ButtonState, Connector, ConnectorEvent, ConnectorId, ConnectorKernelId, DrmDeviceId,
@@ -15,13 +18,12 @@ use {
             },
         },
         cmm::cmm_primaries::Primaries,
-        fixed::Fixed,
         format::{Format, XRGB8888},
         gfx_api::{
             AcquireSync, GfxApi, GfxContext, GfxError, GfxFramebuffer, GfxTexture, ReleaseSync,
         },
         state::State,
-        time::Time,
+
         utils::{
             clonecell::CloneCell, copyhashmap::CopyHashMap, errorfmt::ErrorFmt, numcell::NumCell,
             queue::AsyncQueue, syncqueue::SyncQueue,

src/bugs.rs

@@ -1 +0,0 @@
-pub use jay_bugs::*;

src/cli.rs

@@ -22,6 +22,8 @@ mod unlock;
 mod version;
 mod xwayland;
 
+use jay_pr_caps::drop_all_pr_caps;
+use jay_logger::LogLevel;
 use {
     crate::{
         cli::{
@@ -31,9 +33,9 @@ use {
             xwayland::XwaylandArgs,
         },
         compositor::start_compositor,
-        logger::LogLevel,
+
         portal,
-        pr_caps::drop_all_pr_caps,
+
     },
     clap::{Args, Parser, Subcommand, ValueEnum, ValueHint},
     clap_complete::Shell,

src/cli/color.rs

@@ -1,5 +1,6 @@
 use {
-    crate::{theme::Color, utils::errorfmt::ErrorFmt},
+    crate::utils::errorfmt::ErrorFmt,
+    jay_theme::Color,
     std::ops::Range,
 };
 

src/cli/config.rs

@@ -1,8 +1,9 @@
+use jay_logger::Logger;
 use {
     crate::{
         cli::{GlobalArgs, json::jsonl},
         compositor::config_dir,
-        logger::Logger,
+
         utils::errorfmt::ErrorFmt,
     },
     clap::{Args, Subcommand},

src/cli/randr.rs

@@ -1,3 +1,5 @@
+use std::time::Duration;
+use jay_units::scale::Scale;
 use {
     crate::{
         backend::{BackendColorSpace, BackendEotfs},
@@ -11,7 +13,6 @@ use {
         cmm::cmm_primaries::Primaries,
         format::{Format, XRGB8888},
         ifs::wl_output::BlendSpace,
-        scale::Scale,
         tools::tool_client::{Handle, ToolClient, with_tool_client},
         tree::Transform,
         utils::{errorfmt::ErrorFmt, ordered_float::F64, static_text::StaticText},
@@ -29,7 +30,7 @@ use {
         fmt::{self, Display, Formatter},
         rc::Rc,
         str::FromStr,
-        time::Duration,
+
     },
     thiserror::Error,
 };

src/cli/screenshot.rs

@@ -1,12 +1,14 @@
+use jay_udmabuf::{Udmabuf, UdmabufError};
+use jay_eventfd_cache::EventfdCache;
 use {
     crate::{
         allocator::{Allocator, AllocatorError, BufferUsage, MappedBuffer},
         cli::{GlobalArgs, ScreenshotArgs, ScreenshotFormat},
-        eventfd_cache::EventfdCache,
+
         format::XRGB8888,
         gfx_apis,
         tools::tool_client::{Handle, ToolClient, with_tool_client},
-        udmabuf::{Udmabuf, UdmabufError},
+
         utils::{errorfmt::ErrorFmt, queue::AsyncQueue, windows::WindowsExt},
         video::{
             dmabuf::{DmaBuf, DmaBufIds, DmaBufPlane, PlaneVec},

src/cli/seat_test.rs

@@ -1,10 +1,10 @@
+use jay_units::fixed::Fixed;
 use {
     crate::{
         cli::{
             GlobalArgs, SeatTestArgs,
             json::{JsonAxisData, JsonSeatEvent, jsonl},
         },
-        fixed::Fixed,
         ifs::wl_seat::wl_pointer::{
             CONTINUOUS, FINGER, HORIZONTAL_SCROLL, PendingScroll, VERTICAL_SCROLL, WHEEL,
         },

src/cli/tree.rs

@@ -1,3 +1,4 @@
+use jay_geometry::Rect;
 use {
     crate::{
         cli::{
@@ -10,7 +11,7 @@ use {
             TREE_TY_LOCK_SURFACE, TREE_TY_OUTPUT, TREE_TY_PLACEHOLDER, TREE_TY_WORKSPACE,
             TREE_TY_X_WINDOW, TREE_TY_XDG_POPUP, TREE_TY_XDG_TOPLEVEL,
         },
-        rect::Rect,
+
         tools::tool_client::{Handle, ToolClient, with_tool_client},
         wire::{JayCompositorId, JayTreeQueryId, jay_client_query, jay_compositor, jay_tree_query},
     },

src/client.rs

@@ -1,11 +1,9 @@
+use jay_async_engine::SpawnedFuture;
 use {
     crate::{
-        async_engine::SpawnedFuture,
+
         client::{error::LookupError, objects::Objects},
-        criteria::{
+        criteria::clm::{CL_CHANGED_DESTROYED, CL_CHANGED_NEW, ClMatcherChange},
-            CritDestroyListener, CritMatcherId,
-            clm::{CL_CHANGED_DESTROYED, CL_CHANGED_NEW, ClMatcherChange},
-        },
         ifs::{
             wl_display::WlDisplay,
             wl_registry::WlRegistry,
@@ -28,6 +26,7 @@ use {
         wire::WlRegistryId,
     },
     ahash::AHashMap,
+    jay_criteria::{CritDestroyListener, CritMatcherId},
     std::{
         cell::{Cell, RefCell},
         collections::VecDeque,

src/client/tasks.rs

@@ -1,6 +1,7 @@
+use jay_async_engine::Phase;
 use {
     crate::{
-        async_engine::Phase,
+
         client::{Client, ClientError},
         utils::{
             buffd::{BufFdOut, MsgParser, WlBufFdIn, WlMessage},

src/compositor.rs

@@ -1,9 +1,20 @@
+use jay_wheel::{Wheel, WheelError};
+use std::time::Duration;
+use jay_sighand::{self as sighand, SighandError};
+use jay_pr_caps::{PrCapsThread, pr_caps};
+use jay_logger::Logger;
+use jay_io_uring::{IoUring, IoUringError};
+use jay_eventfd_cache::EventfdCache;
+use jay_cpu_worker::{CpuWorker, CpuWorkerError};
+use jay_async_engine::{AsyncEngine, Phase, SpawnedFuture};
+use jay_keyboard::KbvmContext;
 #[cfg(feature = "it")]
 use crate::it::test_backend::TestBackend;
+use jay_units::scale::Scale;
 use {
     crate::{
         acceptor::{Acceptor, AcceptorError},
-        async_engine::{AsyncEngine, Phase, SpawnedFuture},
+
         backend::{Backend, Connector},
         backends::{
             dummy::{DummyBackend, DummyOutput},
@@ -15,9 +26,8 @@ use {
         cmm::{cmm_manager::ColorManager, cmm_primaries::Primaries},
         config::ConfigProxy,
         copy_device::CopyDeviceRegistry,
-        cpu_worker::{CpuWorker, CpuWorkerError},
+
         criteria::{
-            CritMatcherIds,
             clm::{ClMatcherManager, handle_cl_changes, handle_cl_leaf_events},
             tlm::{
                 TlMatcherManager, handle_tl_changes, handle_tl_just_mapped, handle_tl_leaf_events,
@@ -26,7 +36,7 @@ use {
         damage::{DamageVisualizer, visualize_damage},
         dbus::Dbus,
         ei::ei_client::EiClients,
-        eventfd_cache::EventfdCache,
+
         forker,
         format::XRGB8888,
         gfx_api::GfxApi,
@@ -45,18 +55,16 @@ use {
             wlr_output_manager::wlr_output_manager_done,
             workspace_manager::workspace_manager_done,
         },
-        io_uring::{IoUring, IoUringError},
+
-        kbvm::KbvmContext,
         leaks,
-        logger::Logger,
+
         output_schedule::create_output_schedule,
         portal::{self, PortalStartup},
-        pr_caps::{PrCapsThread, pr_caps},
+
-        scale::Scale,
+
-        sighand::{self, SighandError},
         state::{ConnectorData, IdleState, ScreenlockState, State, XWaylandState},
         tasks::{self, handle_const_40hz_latch, idle},
-        tracy::enable_profiler,
+        jay_tracy::enable_profiler,
         tree::{
             DisplayNode, NodeIds, OutputNode, TearingMode, Transform, VrrMode,
             WorkspaceDisplayOrder, WorkspaceNode, container_layout, container_render_positions,
@@ -82,11 +90,12 @@ use {
         },
         version::VERSION,
         video::drm::wait_for_syncobj::WaitForSyncobj,
-        wheel::{Wheel, WheelError},
+
     },
     ahash::AHashSet,
     forker::ForkerProxy,
     jay_config::protocol::DEFAULT_SEAT_NAME,
+    jay_criteria::CritMatcherIds,
     std::{
         cell::{Cell, RefCell},
         env,
@@ -94,7 +103,7 @@ use {
         ops::Deref,
         rc::Rc,
         sync::Arc,
-        time::Duration,
+
     },
     thiserror::Error,
     uapi::c,
@@ -236,6 +245,7 @@ fn start_compositor2(
         render_ctx_ever_initialized: Cell::new(false),
         cursors: Default::default(),
         wheel,
+
         clients: Clients::new(),
         globals: Globals::new(),
         connector_ids: Default::default(),
@@ -355,6 +365,7 @@ fn start_compositor2(
         ei_clients: EiClients::new(),
         slow_ei_clients: Default::default(),
         cpu_worker,
+
         ui_drag_enabled: Cell::new(true),
         ui_drag_threshold_squared: Cell::new(10),
         animations: Default::default(),
@@ -395,6 +406,7 @@ fn start_compositor2(
         copy_device_registry: Rc::new(CopyDeviceRegistry::new(&ring, &engine, &eventfd_cache)),
         supports_presentation_feedback: Default::default(),
         eventfd_cache,
+
         lazy_event_sources: Default::default(),
         post_layout_event_sources: Default::default(),
         bo_drop_queue: Rc::new(ObjectDropQueue::new(&ring)),

src/config/handler.rs

@@ -1,6 +1,13 @@
+use std::time::{Duration, SystemTime};
+use jay_theme::{ThemeColor, ThemeSized};
+use jay_config::theme::{BarPosition, colors::Colorable, sized::Resizable};
+use jay_io_uring::TaskResultExt;
+use jay_async_engine::SpawnedFuture;
+use jay_keyboard::{KbvmError, KbvmMap};
+use jay_units::scale::Scale;
 use {
     crate::{
-        async_engine::SpawnedFuture,
+
         backend::{
             self, BackendColorSpace, BackendEotfs, ConnectorId, DrmDeviceId,
             InputDeviceAccelProfile, InputDeviceCapability, InputDeviceClickMethod, InputDeviceId,
@@ -10,7 +17,6 @@ use {
         cmm::cmm_eotf::Eotf,
         compositor::{MAX_EXTENTS, WAYLAND_DISPLAY},
         criteria::{
-            CritLiteralOrRegex, CritMgrExt, CritTarget, CritUpstreamNode,
             clm::ClmLeafMatcher,
             tlm::{TlmLeafMatcher, TlmUpstreamNode},
         },
@@ -20,13 +26,11 @@ use {
             wl_seat::{SeatId, WlSeatGlobal},
             wp_content_type_v1::ContentTypeExt,
         },
-        io_uring::TaskResultExt,
+
-        kbvm::{KbvmError, KbvmMap},
         output_schedule::map_cursor_hz,
-        scale::Scale,
         state::{ConnectorData, DeviceHandlerData, DrmDevData, OutputData, State},
         tagged_acceptor::TaggedAcceptorError,
-        theme::{ThemeColor, ThemeSized},
+
         tree::{
             ContainerSplit, OutputNode, TearingMode, TileState, ToplevelData, ToplevelIdentifier,
             ToplevelNode, VrrMode, WorkspaceNode, toplevel_create_split, toplevel_parent_container,
@@ -42,11 +46,6 @@ use {
         },
     },
     jay_config::{
-        protocol::{
-            ClientCriterionPayload, ClientCriterionStringField, ClientMessage, ConfigHandler,
-            GenericCriterionPayload, PollableId, Response, ServerMessage, Unref,
-            WindowCriterionPayload, WindowCriterionStringField, WireMode, WorkspaceSource,
-        },
         Axis, Direction, Workspace,
         client::{Client as ConfigClient, ClientMatcher},
         input::{
@@ -62,7 +61,12 @@ use {
         },
         keyboard::{Group, Keymap, mods::Modifiers, syms::KeySym},
         logging::LogLevel as ConfigLogLevel,
-        theme::{BarPosition, colors::Colorable, sized::Resizable},
+        protocol::{
+            ClientCriterionPayload, ClientCriterionStringField, ClientMessage, ConfigHandler,
+            GenericCriterionPayload, PollableId, Response, ServerMessage, Unref,
+            WindowCriterionPayload, WindowCriterionStringField, WireMode, WorkspaceSource,
+        },
+
         timer::Timer as JayTimer,
         video::{
             BlendSpace as ConfigBlendSpace, ColorSpace, Connector, DrmDevice, Eotf as ConfigEotf,
@@ -73,6 +77,7 @@ use {
         workspace::WorkspaceDisplayOrder,
         xwayland::XScalingMode,
     },
+    jay_criteria::{CritLiteralOrRegex, CritMgrExt, CritTarget, CritUpstreamNode},
     kbvm::Keycode,
     log::Level,
     regex::Regex,
@@ -82,7 +87,7 @@ use {
         hash::Hash,
         ops::Deref,
         rc::{Rc, Weak},
-        time::{Duration, SystemTime},
+
     },
     thiserror::Error,
     uapi::{OwnedFd, c, fcntl_dupfd_cloexec},
@@ -209,7 +214,6 @@ impl ConfigProxyHandler {
 
         self.window_matcher_leafs.clear();
         self.window_matchers.clear();
-
     }
 
     pub fn send(&self, msg: &ServerMessage) {
@@ -310,7 +314,6 @@ impl ConfigProxyHandler {
         }
         None
     }
-
 }
 
 #[derive(Debug, Error)]

src/config/handler/dispatch.rs

@@ -729,7 +729,7 @@ impl ConfigProxyHandler {
                 // Removed feature; kept for binary protocol compatibility.
             }
             ClientMessage::SetTabTitleAlign { align } => {
-                use crate::theme::TabTitleAlign;
+                use jay_theme::TabTitleAlign;
                 let val = match align {
                     1 => TabTitleAlign::Center,
                     2 => TabTitleAlign::End,

src/config/handler/theme.rs

@@ -55,7 +55,7 @@ impl ConfigProxyHandler {
     }
 
     pub(super) fn handle_set_corner_radius(&self, radius: f32) {
-        use crate::theme::CornerRadius;
+        use jay_theme::CornerRadius;
         let radius = radius.max(0.0).min(1000.0);
         self.state
             .theme

src/copy_device.rs

@@ -1,10 +1,13 @@
+use jay_io_uring::IoUring;
+use jay_eventfd_cache::EventfdCache;
+use jay_async_engine::{AsyncEngine, SpawnedFuture};
 use {
     crate::{
-        async_engine::{AsyncEngine, SpawnedFuture},
+
-        eventfd_cache::EventfdCache,
+
         format::{FORMATS, Format},
         gfx_api::FdSync,
-        io_uring::IoUring,
+
         utils::{
             clonecell::CloneCell,
             errorfmt::ErrorFmt,

src/copy_device/execute.rs

@@ -1,8 +1,9 @@
+use jay_geometry::{Rect, Region};
 use {
     super::{CopyDeviceCopy, CopyDeviceCopyType, CopyDeviceError, Pending},
     crate::{
         gfx_api::FdSync,
-        rect::{Rect, Region},
+
         vulkan_core::sync::VulkanDeviceSyncExt,
     },
     arrayvec::ArrayVec,

src/copy_device/registry.rs

@@ -1,9 +1,12 @@
+use jay_io_uring::IoUring;
+use jay_eventfd_cache::EventfdCache;
+use jay_async_engine::AsyncEngine;
 use {
     super::PhysicalCopyDevice,
     crate::{
-        async_engine::AsyncEngine,
+
-        eventfd_cache::EventfdCache,
+
-        io_uring::IoUring,
+
         utils::{copyhashmap::CopyHashMap, errorfmt::ErrorFmt},
     },
     std::rc::Rc,

src/cpu_worker.rs

@@ -1 +0,0 @@
-pub use jay_cpu_worker::*;

src/criteria.rs

@@ -1,4 +1,2 @@
 pub mod clm;
 pub mod tlm;
-
-pub use jay_criteria::*;

src/criteria/clm.rs

@@ -3,29 +3,29 @@ pub mod clm_matchers;
 use {
     crate::{
         client::{Client, ClientId},
-        criteria::{
+        criteria::clm::clm_matchers::{
-            CritDestroyListener, CritLiteralOrRegex, CritMatcherId, CritMatcherIds, CritMgrExt,
+            clmm_id::ClmMatchId,
-            CritUpstreamNode, FixedRootMatcher, RootMatcherMap,
+            clmm_is_xwayland::ClmMatchIsXwayland,
-            clm::clm_matchers::{
+            clmm_pid::ClmMatchPid,
-                clmm_id::ClmMatchId,
+            clmm_sandboxed::ClmMatchSandboxed,
-                clmm_is_xwayland::ClmMatchIsXwayland,
+            clmm_string::{
-                clmm_pid::ClmMatchPid,
+                ClmMatchComm, ClmMatchExe, ClmMatchSandboxAppId, ClmMatchSandboxEngine,
-                clmm_sandboxed::ClmMatchSandboxed,
+                ClmMatchSandboxInstanceId, ClmMatchTag,
-                clmm_string::{
-                    ClmMatchComm, ClmMatchExe, ClmMatchSandboxAppId, ClmMatchSandboxEngine,
-                    ClmMatchSandboxInstanceId, ClmMatchTag,
-                },
-                clmm_uid::ClmMatchUid,
             },
-            crit_graph::{
+            clmm_uid::ClmMatchUid,
-                CritMgr, CritRoot, CritRootFixed, CritTarget, CritTargetOwner, WeakCritTargetOwner,
-            },
-            crit_leaf::{CritLeafEvent, CritLeafMatcher},
-            crit_matchers::critm_constant::CritMatchConstant,
         },
         state::State,
         utils::{copyhashmap::CopyHashMap, hash_map_ext::HashMapExt, queue::AsyncQueue},
     },
+    jay_criteria::{
+        CritDestroyListener, CritLiteralOrRegex, CritMatcherId, CritMatcherIds, CritMgrExt,
+        CritUpstreamNode, FixedRootMatcher, RootMatcherMap,
+        crit_graph::{
+            CritMgr, CritRoot, CritRootFixed, CritTarget, CritTargetOwner, WeakCritTargetOwner,
+        },
+        crit_leaf::{CritLeafEvent, CritLeafMatcher},
+        crit_matchers::critm_constant::CritMatchConstant,
+    },
     linearize::static_map,
     std::{
         marker::PhantomData,

src/criteria/clm/clm_matchers.rs

@@ -1,6 +1,6 @@
 macro_rules! fixed_root_criterion {
     ($ty:ty, $field:ident) => {
-        impl crate::criteria::crit_graph::CritFixedRootCriterionBase<crate::client::Client>
+        impl jay_criteria::crit_graph::CritFixedRootCriterionBase<crate::client::Client>
             for $ty
         {
             fn constant(&self) -> bool {
@@ -10,7 +10,7 @@ macro_rules! fixed_root_criterion {
             fn not<'a>(
                 &self,
                 mgr: &'a crate::criteria::clm::ClMatcherManager,
-            ) -> &'a crate::criteria::FixedRootMatcher<crate::client::Client, Self> {
+            ) -> &'a jay_criteria::FixedRootMatcher<crate::client::Client, Self> {
                 &mgr.$field
             }
         }

src/criteria/clm/clm_matchers/clmm_id.rs

@@ -1,8 +1,9 @@
 use {
     crate::{
         client::{Client, ClientId},
-        criteria::{RootMatcherMap, clm::RootMatchers, crit_graph::CritRootCriterion},
+        criteria::clm::RootMatchers,
     },
+    jay_criteria::{RootMatcherMap, crit_graph::CritRootCriterion},
 };
 
 pub struct ClmMatchId(pub ClientId);

src/criteria/clm/clm_matchers/clmm_is_xwayland.rs

@@ -1,6 +1,4 @@
-use {
+use {crate::client::Client, jay_criteria::crit_graph::CritFixedRootCriterion};
-    crate::{client::Client, criteria::crit_graph::CritFixedRootCriterion},
-};
 
 pub struct ClmMatchIsXwayland(pub bool);
 

src/criteria/clm/clm_matchers/clmm_pid.rs

@@ -1,8 +1,6 @@
 use {
-    crate::{
+    crate::{client::Client, criteria::clm::RootMatchers},
-        client::Client,
+    jay_criteria::{RootMatcherMap, crit_graph::CritRootCriterion},
-        criteria::{RootMatcherMap, clm::RootMatchers, crit_graph::CritRootCriterion},
-    },
     uapi::c,
 };
 

src/criteria/clm/clm_matchers/clmm_sandboxed.rs

@@ -1,6 +1,4 @@
-use {
+use {crate::client::Client, jay_criteria::crit_graph::CritFixedRootCriterion};
-    crate::{client::Client, criteria::crit_graph::CritFixedRootCriterion},
-};
 
 pub struct ClmMatchSandboxed(pub bool);
 

src/criteria/clm/clm_matchers/clmm_string.rs

@@ -1,11 +1,9 @@
 use {
     crate::{
         client::{Client, ClientMetadata},
-        criteria::{
+        criteria::clm::{ClmRootMatcherMap, RootMatchers},
-            clm::{ClmRootMatcherMap, RootMatchers},
-            crit_matchers::critm_string::{CritMatchString, StringAccess},
-        },
     },
+    jay_criteria::crit_matchers::critm_string::{CritMatchString, StringAccess},
     std::marker::PhantomData,
 };
 

src/criteria/clm/clm_matchers/clmm_uid.rs

@@ -1,8 +1,6 @@
 use {
-    crate::{
+    crate::{client::Client, criteria::clm::RootMatchers},
-        client::Client,
+    jay_criteria::{RootMatcherMap, crit_graph::CritRootCriterion},
-        criteria::{RootMatcherMap, clm::RootMatchers, crit_graph::CritRootCriterion},
-    },
     uapi::c,
 };
 

src/criteria/tlm.rs

@@ -3,14 +3,7 @@ pub mod tlm_matchers;
 use {
     crate::{
         criteria::{
-            CritDestroyListener, CritLiteralOrRegex, CritMatcherId, CritMatcherIds, CritMgrExt,
-            CritUpstreamNode, FixedRootMatcher, RootMatcherMap,
             clm::ClmUpstreamNode,
-            crit_graph::{
-                CritMgr, CritRoot, CritRootFixed, CritTarget, CritTargetOwner, WeakCritTargetOwner,
-            },
-            crit_leaf::{CritLeafEvent, CritLeafMatcher},
-            crit_matchers::critm_constant::CritMatchConstant,
             tlm::tlm_matchers::{
                 tlmm_client::TlmMatchClient,
                 tlmm_content_type::TlmMatchContentType,
@@ -33,6 +26,15 @@ use {
         utils::{copyhashmap::CopyHashMap, hash_map_ext::HashMapExt, queue::AsyncQueue},
     },
     jay_config::window::{ContentType, WindowType},
+    jay_criteria::{
+        CritDestroyListener, CritLiteralOrRegex, CritMatcherId, CritMatcherIds, CritMgrExt,
+        CritUpstreamNode, FixedRootMatcher, RootMatcherMap,
+        crit_graph::{
+            CritMgr, CritRoot, CritRootFixed, CritTarget, CritTargetOwner, WeakCritTargetOwner,
+        },
+        crit_leaf::{CritLeafEvent, CritLeafMatcher},
+        crit_matchers::critm_constant::CritMatchConstant,
+    },
     linearize::static_map,
     std::{
         marker::PhantomData,

src/criteria/tlm/tlm_matchers.rs

@@ -1,6 +1,6 @@
 macro_rules! fixed_root_criterion {
     ($ty:ty, $field:ident) => {
-        impl crate::criteria::crit_graph::CritFixedRootCriterionBase<crate::tree::ToplevelData>
+        impl jay_criteria::crit_graph::CritFixedRootCriterionBase<crate::tree::ToplevelData>
             for $ty
         {
             fn constant(&self) -> bool {
@@ -10,7 +10,7 @@ macro_rules! fixed_root_criterion {
             fn not<'a>(
                 &self,
                 mgr: &'a crate::criteria::tlm::TlMatcherManager,
-            ) -> &'a crate::criteria::FixedRootMatcher<crate::tree::ToplevelData, Self> {
+            ) -> &'a jay_criteria::FixedRootMatcher<crate::tree::ToplevelData, Self> {
                 &mgr.$field
             }
         }

src/criteria/tlm/tlm_matchers/tlmm_client.rs

@@ -2,18 +2,20 @@ use {
     crate::{
         client::Client,
         criteria::{
-            CritMatcherId, CritUpstreamNode,
             clm::ClmUpstreamNode,
-            crit_graph::{
-                CritDownstream, CritDownstreamData, CritMgr, CritUpstreamData,
-                CritUpstreamNodeBase, CritUpstreamNodeData,
-            },
-            crit_per_target_data::{CritDestroyListenerBase, CritPerTargetData},
             tlm::TlMatcherManager,
         },
         state::State,
         tree::{ToplevelData, ToplevelNodeBase},
     },
+    jay_criteria::{
+        CritMatcherId, CritUpstreamNode,
+        crit_graph::{
+            CritDownstream, CritDownstreamData, CritMgr, CritUpstreamData, CritUpstreamNodeBase,
+            CritUpstreamNodeData,
+        },
+        crit_per_target_data::{CritDestroyListenerBase, CritPerTargetData},
+    },
     std::{rc::Rc, slice},
 };
 

src/criteria/tlm/tlm_matchers/tlmm_content_type.rs

@@ -1,14 +1,12 @@
 use {
     crate::{
-        criteria::{
+        criteria::tlm::{RootMatchers, TlmRootMatcherMap},
-            crit_graph::CritRootCriterion,
-            tlm::{RootMatchers, TlmRootMatcherMap},
-        },
         ifs::wp_content_type_v1::ContentTypeExt,
         tree::ToplevelData,
         utils::bitflags::BitflagsExt,
     },
     jay_config::window::ContentType,
+    jay_criteria::crit_graph::CritRootCriterion,
 };
 
 pub struct TlmMatchContentType {

src/criteria/tlm/tlm_matchers/tlmm_floating.rs

@@ -1,4 +1,4 @@
-use crate::{criteria::crit_graph::CritFixedRootCriterion, tree::ToplevelData};
+use {crate::tree::ToplevelData, jay_criteria::crit_graph::CritFixedRootCriterion};
 
 pub struct TlmMatchFloating(pub bool);
 

src/criteria/tlm/tlm_matchers/tlmm_fullscreen.rs

@@ -1,4 +1,4 @@
-use crate::{criteria::crit_graph::CritFixedRootCriterion, tree::ToplevelData};
+use {crate::tree::ToplevelData, jay_criteria::crit_graph::CritFixedRootCriterion};
 
 pub struct TlmMatchFullscreen(pub bool);
 

src/criteria/tlm/tlm_matchers/tlmm_just_mapped.rs

@@ -1,4 +1,4 @@
-use crate::{criteria::crit_graph::CritFixedRootCriterion, tree::ToplevelData};
+use {crate::tree::ToplevelData, jay_criteria::crit_graph::CritFixedRootCriterion};
 
 pub struct TlmMatchJustMapped(pub bool);
 

src/criteria/tlm/tlm_matchers/tlmm_kind.rs

@@ -1,13 +1,11 @@
 use {
     crate::{
-        criteria::{
+        criteria::tlm::{RootMatchers, TlmRootMatcherMap},
-            crit_graph::CritRootCriterion,
-            tlm::{RootMatchers, TlmRootMatcherMap},
-        },
         tree::ToplevelData,
         utils::bitflags::BitflagsExt,
     },
     jay_config::window::WindowType,
+    jay_criteria::crit_graph::CritRootCriterion,
 };
 
 pub struct TlmMatchKind {

src/criteria/tlm/tlm_matchers/tlmm_seat_focus.rs

@@ -1,11 +1,9 @@
 use crate::{
-    criteria::{
+    criteria::tlm::{RootMatchers, TlmRootMatcherMap},
-        crit_graph::CritRootCriterion,
-        tlm::{RootMatchers, TlmRootMatcherMap},
-    },
     ifs::wl_seat::SeatId,
     tree::ToplevelData,
 };
+use jay_criteria::crit_graph::CritRootCriterion;
 
 pub struct TlmMatchSeatFocus {
     id: SeatId,

src/criteria/tlm/tlm_matchers/tlmm_string.rs

@@ -1,10 +1,8 @@
 use crate::{
-    criteria::{
+    criteria::tlm::{RootMatchers, TlmRootMatcherMap},
-        crit_matchers::critm_string::{CritMatchString, StringAccess},
-        tlm::{RootMatchers, TlmRootMatcherMap},
-    },
     tree::{ToplevelData, ToplevelType},
 };
+use jay_criteria::crit_matchers::critm_string::{CritMatchString, StringAccess};
 
 pub type TlmMatchString<T> = CritMatchString<ToplevelData, T>;
 

src/criteria/tlm/tlm_matchers/tlmm_urgent.rs

@@ -1,4 +1,4 @@
-use crate::{criteria::crit_graph::CritFixedRootCriterion, tree::ToplevelData};
+use {crate::tree::ToplevelData, jay_criteria::crit_graph::CritFixedRootCriterion};
 
 pub struct TlmMatchUrgent(pub bool);
 

src/criteria/tlm/tlm_matchers/tlmm_visible.rs

@@ -1,4 +1,4 @@
-use crate::{criteria::crit_graph::CritFixedRootCriterion, tree::ToplevelData};
+use {crate::tree::ToplevelData, jay_criteria::crit_graph::CritFixedRootCriterion};
 
 pub struct TlmMatchVisible(pub bool);
 

src/cursor.rs

@@ -1,15 +1,19 @@
+use jay_time::Time;
+use std::time::Duration;
+use jay_geometry::Rect;
+use jay_async_engine::AsyncEngine;
+use jay_units::fixed::Fixed;
+use jay_units::scale::Scale;
 use {
     crate::{
-        async_engine::AsyncEngine,
+
         cmm::cmm_render_intent::RenderIntent,
-        fixed::Fixed,
         format::ARGB8888,
         gfx_api::{AcquireSync, AlphaMode, GfxContext, GfxError, GfxTexture, ReleaseSync},
-        rect::Rect,
+
         renderer::Renderer,
-        scale::Scale,
         state::State,
-        time::Time,
+
         tree::OutputNode,
         utils::{errorfmt::ErrorFmt, numcell::NumCell, smallmap::SmallMapMut},
     },
@@ -29,7 +33,7 @@ use {
         rc::Rc,
         slice, str,
         sync::LazyLock,
-        time::Duration,
+
     },
     thiserror::Error,
     uapi::Bytes,

src/cursor_user.rs

@@ -1,11 +1,12 @@
+use jay_geometry::Rect;
+use jay_units::fixed::Fixed;
+use jay_units::scale::Scale;
 use {
     crate::{
         backend::HardwareCursorUpdate,
         cursor::{Cursor, DEFAULT_CURSOR_SIZE, KnownCursor},
-        fixed::Fixed,
         gfx_api::{AcquireSync, ReleaseSync},
-        rect::Rect,
+
-        scale::Scale,
         state::State,
         tree::OutputNode,
         utils::{

src/damage.rs

@@ -1,13 +1,18 @@
+use jay_time::Time;
+use std::time::Duration;
+use jay_theme::Color;
+use jay_geometry::{Rect, Region};
+use jay_async_engine::AsyncEngine;
 use {
     crate::{
-        async_engine::AsyncEngine,
+
         cmm::{cmm_manager::ColorManager, cmm_render_intent::RenderIntent},
         ifs::wl_output::WlOutputGlobal,
-        rect::{Rect, Region},
+
         renderer::renderer_base::RendererBase,
         state::State,
-        theme::Color,
+
-        time::Time,
+
         utils::{asyncevent::AsyncEvent, errorfmt::ErrorFmt, timer::TimerFd},
     },
     isnt::std_1::primitive::IsntSliceExt,
@@ -15,7 +20,7 @@ use {
         cell::{Cell, RefCell},
         collections::VecDeque,
         rc::Rc,
-        time::Duration,
+
     },
     uapi::c::CLOCK_MONOTONIC,
 };

src/dbus.rs

@@ -1,8 +1,10 @@
 pub use jay_dbus_core::*;
+use jay_io_uring::IoUring;
+use jay_async_engine::{AsyncEngine, SpawnedFuture};
 use {
     crate::{
-        async_engine::{AsyncEngine, SpawnedFuture},
+
-        io_uring::IoUring,
+
         utils::{
             bufio::BufIo,
             clonecell::CloneCell,

src/dbus/holder.rs

@@ -1,8 +1,10 @@
+use jay_io_uring::IoUring;
+use jay_async_engine::AsyncEngine;
 use {
     crate::{
-        async_engine::AsyncEngine,
+
         dbus::{DbusError, DbusHolder, DbusSocket, auth::handle_auth},
-        io_uring::IoUring,
+
         utils::{
             bufio::BufIo, errorfmt::ErrorFmt, numcell::NumCell, oserror::OsErrorExt2,
             run_toplevel::RunToplevel,

src/edid.rs

@@ -1 +0,0 @@
-pub use jay_edid::*;

src/ei/ei_acceptor.rs

@@ -1,6 +1,7 @@
+use jay_async_engine::SpawnedFuture;
 use {
     crate::{
-        async_engine::SpawnedFuture,
+
         state::State,
         utils::{
             errorfmt::ErrorFmt,

src/ei/ei_client.rs

@@ -1,7 +1,8 @@
 pub use crate::ei::ei_client::ei_error::{EiClientError, EiParserError};
+use jay_async_engine::SpawnedFuture;
 use {
     crate::{
-        async_engine::SpawnedFuture,
+
         client::ClientId,
         ei::{
             EiContext, EiInterfaceVersion,

src/ei/ei_client/ei_tasks.rs

@@ -1,6 +1,7 @@
+use jay_async_engine::Phase;
 use {
     crate::{
-        async_engine::Phase,
+
         ei::{
             ei_client::{EiClient, ei_error::EiClientError},
             ei_object::EiObjectId,

src/ei/ei_ifs/ei_device.rs

@@ -1,3 +1,6 @@
+use jay_geometry::Rect;
+use jay_units::fixed::Fixed;
+use jay_units::scale::Scale;
 use {
     crate::{
         backend::{ButtonState, KeyState, ScrollAxis},
@@ -6,11 +9,9 @@ use {
             ei_ifs::{ei_seat::EiSeat, ei_touchscreen::TouchChange},
             ei_object::{EiObject, EiVersion},
         },
-        fixed::Fixed,
         ifs::wl_seat::{CursorPositionType, PX_PER_SCROLL},
         leaks::Tracker,
-        rect::Rect,
+
-        scale::Scale,
         utils::{copyhashmap::CopyHashMap, syncqueue::SyncQueue},
         wire_ei::{
             EiDeviceId,

src/ei/ei_ifs/ei_keyboard.rs

@@ -1,3 +1,4 @@
+use jay_keyboard::KeyboardState;
 use {
     crate::{
         backend::KeyState,
@@ -6,7 +7,6 @@ use {
             ei_ifs::ei_device::{EiDevice, EiDeviceInterface},
             ei_object::{EiObject, EiVersion},
         },
-        keyboard::KeyboardState,
         leaks::Tracker,
         wire_ei::{
             EiKeyboardId,

src/ei/ei_ifs/ei_pointer.rs

@@ -1,3 +1,4 @@
+use jay_units::fixed::Fixed;
 use {
     crate::{
         ei::{
@@ -5,7 +6,6 @@ use {
             ei_ifs::ei_device::{EiDevice, EiDeviceInterface},
             ei_object::{EiObject, EiVersion},
         },
-        fixed::Fixed,
         leaks::Tracker,
         wire_ei::{
             EiPointerId,

src/ei/ei_ifs/ei_pointer_absolute.rs

@@ -1,3 +1,4 @@
+use jay_units::fixed::Fixed;
 use {
     crate::{
         ei::{
@@ -5,7 +6,6 @@ use {
             ei_ifs::ei_device::{EiDevice, EiDeviceInterface},
             ei_object::{EiObject, EiVersion},
         },
-        fixed::Fixed,
         leaks::Tracker,
         wire_ei::{
             EiPointerAbsoluteId,

src/ei/ei_ifs/ei_scroll.rs

@@ -1,3 +1,4 @@
+use jay_units::fixed::Fixed;
 use {
     crate::{
         ei::{
@@ -5,7 +6,6 @@ use {
             ei_ifs::ei_device::{EiDevice, EiDeviceInterface},
             ei_object::{EiObject, EiVersion},
         },
-        fixed::Fixed,
         ifs::wl_seat::wl_pointer::{HORIZONTAL_SCROLL, VERTICAL_SCROLL},
         leaks::Tracker,
         wire_ei::{

src/ei/ei_ifs/ei_seat.rs

@@ -1,3 +1,5 @@
+use jay_units::fixed::Fixed;
+use jay_keyboard::{DynKeyboardState, KeyboardState, KeyboardStateId};
 use {
     crate::{
         backend::{ButtonState, KeyState},
@@ -15,12 +17,10 @@ use {
             },
             ei_object::{EiInterface, EiObject, EiVersion},
         },
-        fixed::Fixed,
         ifs::wl_seat::{
             PhysicalKeyboardId, WlSeatGlobal,
             wl_pointer::{HORIZONTAL_SCROLL, PendingScroll, VERTICAL_SCROLL},
         },
-        keyboard::{DynKeyboardState, KeyboardState, KeyboardStateId},
         leaks::Tracker,
         tree::Node,
         utils::{array, bitflags::BitflagsExt, clonecell::CloneCell},

src/ei/ei_ifs/ei_touchscreen.rs

@@ -1,3 +1,4 @@
+use jay_units::fixed::Fixed;
 use {
     crate::{
         ei::{
@@ -5,7 +6,6 @@ use {
             ei_ifs::ei_device::{EiDevice, EiDeviceInterface},
             ei_object::{EiObject, EiVersion},
         },
-        fixed::Fixed,
         leaks::Tracker,
         utils::clonecell::UnsafeCellCloneSafe,
         wire_ei::{

src/eventfd_cache.rs

@@ -1 +0,0 @@
-pub use jay_eventfd_cache::*;

src/fixed.rs

@@ -1 +0,0 @@
-pub use jay_units::fixed::*;

src/forker/io.rs

@@ -1,3 +1,4 @@
+use jay_io_uring::IoUring;
 use {
     bincode::Options,
     serde::{Serialize, de::DeserializeOwned},
@@ -7,7 +8,7 @@ use {
 use {
     crate::{
         forker::{ForkerError, protocol::bincode_ops},
-        io_uring::IoUring,
+
         utils::{
             buf::DynamicBuf,
             buffd::{BufFdIn, BufFdOut},

src/forker/proxy.rs

@@ -1,6 +1,7 @@
+use jay_async_engine::SpawnedFuture;
 use {
     crate::{
-        async_engine::SpawnedFuture,
+
         compositor::LIBEI_SOCKET,
         forker::{
             ForkerError,

src/forker/worker.rs

@@ -1,12 +1,14 @@
+use jay_io_uring::IoUring;
+use jay_async_engine::{AsyncEngine, SpawnedFuture};
 use {
     crate::{
-        async_engine::{AsyncEngine, SpawnedFuture},
+
         compositor::{DISPLAY, WAYLAND_DISPLAY},
         forker::{
             io::{IoIn, IoOut},
             protocol::{ForkerMessage, ServerMessage, bincode_ops},
         },
-        io_uring::IoUring,
+
         utils::{
             clone3::{Forked, fork_with_pidfd},
             copyhashmap::CopyHashMap,

src/gfx_api.rs

@@ -1,3 +1,10 @@
+use jay_theme::Color;
+use jay_io_uring::{IoUring, IoUringError};
+use jay_geometry::{Rect, Region};
+use jay_eventfd_cache::Eventfd;
+use jay_cpu_worker::CpuWorker;
+use jay_units::fixed::Fixed;
+use jay_units::scale::Scale;
 use {
     crate::{
         allocator::Allocator,
@@ -5,18 +12,16 @@ use {
             cmm_description::{ColorDescription, LinearColorDescription},
             cmm_render_intent::RenderIntent,
         },
-        cpu_worker::CpuWorker,
+
         cursor::Cursor,
         damage::DamageVisualizer,
-        eventfd_cache::Eventfd,
+
-        fixed::Fixed,
         format::Format,
-        io_uring::{IoUring, IoUringError},
+
-        rect::{Rect, Region},
+
         renderer::{Renderer, renderer_base::RendererBase},
-        scale::Scale,
         state::State,
-        theme::Color,
+
         tree::{Node, OutputNode, Transform},
         utils::{
             clonecell::UnsafeCellCloneSafe, errorfmt::ErrorFmt, oserror::OsErrorExt,

src/gfx_apis.rs

@@ -1,11 +1,15 @@
 pub use vulkan::create_vulkan_allocator;
+use jay_pr_caps::PrCapsThread;
+use jay_io_uring::IoUring;
+use jay_eventfd_cache::EventfdCache;
+use jay_async_engine::AsyncEngine;
 use {
     crate::{
-        async_engine::AsyncEngine,
+
-        eventfd_cache::EventfdCache,
+
         gfx_api::{GfxApi, GfxContext, GfxError},
-        io_uring::IoUring,
+
-        pr_caps::PrCapsThread,
+
         utils::errorfmt::ErrorFmt,
         video::drm::Drm,
     },

src/gfx_apis/gl.rs

@@ -18,6 +18,7 @@ macro_rules! egl_transparent {
     };
 }
 
+use jay_theme::Color;
 use {
     crate::{
         cmm::cmm_eotf::Eotf,
@@ -38,7 +39,7 @@ use {
                 GL_TRIANGLE_STRIP, GL_TRIANGLES,
             },
         },
-        theme::Color,
+
         utils::{errorfmt::ErrorFmt, rc_eq::rc_eq, vecstorage::VecStorage},
         video::{
             dmabuf::DMA_BUF_SYNC_READ,

src/gfx_apis/gl/renderer/context.rs

@@ -1,7 +1,9 @@
+use jay_geometry::Rect;
+use jay_cpu_worker::CpuWorker;
 use {
     crate::{
         allocator::Allocator,
-        cpu_worker::CpuWorker,
+
         format::{Format, XRGB8888},
         gfx_api::{
             AsyncShmGfxTexture, BufferResvUser, GfxApi, GfxBlendBuffer, GfxContext, GfxError,
@@ -17,7 +19,7 @@ use {
             },
             renderer::{framebuffer::Framebuffer, image::Image},
         },
-        rect::Rect,
+
         video::{
             dmabuf::DmaBuf,
             drm::{Drm, syncobj::SyncobjCtx},

src/gfx_apis/gl/renderer/framebuffer.rs

@@ -1,3 +1,5 @@
+use jay_theme::Color;
+use jay_geometry::Region;
 use {
     crate::{
         cmm::{
@@ -21,8 +23,8 @@ use {
             run_ops,
             sys::{GL_ONE, GL_ONE_MINUS_SRC_ALPHA},
         },
-        rect::Region,
+
-        theme::Color,
+
     },
     std::{
         cell::Cell,

src/gfx_apis/gl/renderer/texture.rs

@@ -1,3 +1,4 @@
+use jay_geometry::Region;
 use {
     crate::{
         format::Format,
@@ -14,7 +15,7 @@ use {
                 GL_UNPACK_ROW_LENGTH_EXT, GLint,
             },
         },
-        rect::Region,
+
         video::dmabuf::DmaBuf,
     },
     std::{

src/gfx_apis/vulkan.rs

@@ -21,12 +21,18 @@ mod shm_image;
 mod staging;
 mod transfer;
 
+use jay_pr_caps::PrCapsThread;
+use jay_io_uring::IoUring;
+use jay_geometry::Rect;
+use jay_eventfd_cache::EventfdCache;
+use jay_cpu_worker::{CpuWorker, jobs::read_write::ReadWriteJobError};
+use jay_async_engine::AsyncEngine;
 use {
     crate::{
         allocator::{Allocator, AllocatorError},
-        async_engine::AsyncEngine,
+
-        cpu_worker::{CpuWorker, jobs::read_write::ReadWriteJobError},
+
-        eventfd_cache::EventfdCache,
+
         format::Format,
         gfx_api::{
             AsyncShmGfxTexture, GfxApi, GfxBlendBuffer, GfxBuffer, GfxContext, GfxError, GfxFormat,
@@ -37,9 +43,9 @@ use {
             device::VulkanDevice, image::VulkanImageMemory, instance::VulkanInstance,
             renderer::VulkanRenderer,
         },
-        io_uring::IoUring,
+
-        pr_caps::PrCapsThread,
+
-        rect::Rect,
+
         utils::{errorfmt::ErrorFmt, oserror::OsError},
         video::{
             dmabuf::DmaBuf,

src/gfx_apis/vulkan/allocator.rs

@@ -1,6 +1,7 @@
+use jay_cpu_worker::{AsyncCpuWork, CpuJob, CpuWork, CpuWorker};
 use {
     crate::{
-        cpu_worker::{AsyncCpuWork, CpuJob, CpuWork, CpuWorker},
+
         gfx_apis::vulkan::{VulkanError, device::VulkanDevice, renderer::VulkanRenderer},
         utils::{numcell::NumCell, page_size::page_size, ptr_ext::MutPtrExt},
         vulkan_core::gpu_alloc_ash::{self, AshMemoryDevice},

src/gfx_apis/vulkan/device.rs

@@ -1,7 +1,8 @@
+use jay_eventfd_cache::EventfdCache;
 use {
     crate::{
         allocator::BufferObject,
-        eventfd_cache::EventfdCache,
+
         format::XRGB8888,
         gfx_apis::vulkan::{
             VulkanError,

src/gfx_apis/vulkan/image.rs

@@ -1,3 +1,5 @@
+use jay_theme::Color;
+use jay_geometry::Region;
 use {
     crate::{
         cmm::cmm_description::{ColorDescription, LinearColorDescription},
@@ -13,8 +15,8 @@ use {
             format::VulkanModifierLimits, renderer::VulkanRenderer, shm_image::VulkanShmImage,
             transfer::TransferType,
         },
-        rect::Region,
+
-        theme::Color,
+
         utils::oserror::OsErrorExt2,
         video::dmabuf::{DmaBuf, PlaneVec},
     },

src/gfx_apis/vulkan/renderer.rs

@@ -4,6 +4,11 @@ mod pipeline_cache;
 mod pipelines;
 mod paint_region;
 
+use jay_theme::Color;
+use jay_io_uring::IoUring;
+use jay_geometry::{Rect, Region};
+use jay_cpu_worker::PendingJob;
+use jay_async_engine::{AsyncEngine, SpawnedFuture};
 use {
     color::{ColorTransforms, EotfArgsCache},
     op::{
@@ -13,12 +18,12 @@ use {
     paint_region::{PaintRegion, Point, constrain_to_fb},
     pipeline_cache::{FillPipelines, OutPipelineKey, TexPipelines},
     crate::{
-        async_engine::{AsyncEngine, SpawnedFuture},
+
         cmm::{
             cmm_description::{ColorDescription, LinearColorDescription},
             cmm_render_intent::RenderIntent,
         },
-        cpu_worker::PendingJob,
+
         gfx_api::{
             AcquireSync, BufferResv, BufferResvUser, FdSync, GfxApiOpt, GfxBlendBuffer, GfxFormat,
             GfxTexture, GfxWriteModifier, ReleaseSync,
@@ -48,9 +53,9 @@ use {
                 VulkanShader,
             },
         },
-        io_uring::IoUring,
+
-        rect::{Rect, Region},
+
-        theme::Color,
+
         utils::{
             copyhashmap::CopyHashMap, errorfmt::ErrorFmt, numcell::NumCell, oserror::OsErrorExt2,
             stack::Stack,

src/gfx_apis/vulkan/renderer/color.rs

@@ -1,3 +1,4 @@
+use jay_theme::Color;
 use {
     crate::{
         cmm::{
@@ -11,7 +12,7 @@ use {
             buffer_cache::GenericBufferWriter,
             shaders::{ColorManagementData, EotfArgs, InvEotfArgs},
         },
-        theme::Color,
+
         utils::ordered_float::F32,
     },
     ahash::AHashMap,

src/gfx_apis/vulkan/renderer/paint_region.rs

@@ -1,7 +1,8 @@
 use {
-    crate::{gfx_apis::vulkan::image::VulkanImage, rect::Rect},
+    crate::gfx_apis::vulkan::image::VulkanImage,
     ash::vk::{Extent2D, Offset2D, Rect2D},
     jay_algorithms::rect::Tag,
+    jay_geometry::Rect,
 };
 
 pub(super) type Point = [[f32; 2]; 4];

src/gfx_apis/vulkan/shm_image.rs

@@ -1,6 +1,8 @@
+use jay_geometry::Rect;
+use jay_cpu_worker::CpuWorker;
 use {
     crate::{
-        cpu_worker::CpuWorker,
+
         format::Format,
         gfx_api::FdSync,
         gfx_apis::vulkan::{
@@ -12,7 +14,7 @@ use {
             staging::VulkanStagingBuffer,
             transfer::{TransferType, VulkanShmImageAsyncData},
         },
-        rect::Rect,
+
         utils::errorfmt::ErrorFmt,
         vulkan_core::sync::VulkanDeviceSyncExt,
     },

src/gfx_apis/vulkan/staging.rs

@@ -1,6 +1,7 @@
+use jay_cpu_worker::CpuWorker;
 use {
     crate::{
-        cpu_worker::CpuWorker,
+
         gfx_api::GfxStagingBuffer,
         gfx_apis::vulkan::{
             VulkanError,

src/gfx_apis/vulkan/transfer.rs

@@ -1,12 +1,13 @@
+use jay_geometry::{Rect, Region};
+use jay_cpu_worker::{
+    CpuJob, CpuWork, CpuWorker,
+    jobs::{
+        img_copy::ImgCopyWork,
+        read_write::{ReadWriteJobError, ReadWriteWork},
+    },
+};
 use {
     crate::{
-        cpu_worker::{
-            CpuJob, CpuWork, CpuWorker,
-            jobs::{
-                img_copy::ImgCopyWork,
-                read_write::{ReadWriteJobError, ReadWriteWork},
-            },
-        },
         gfx_api::{
             AsyncShmGfxTextureCallback, FdSync, PendingShmTransfer, ShmMemory, ShmMemoryBacking,
         },
@@ -19,7 +20,7 @@ use {
             shm_image::VulkanShmImage,
             staging::{VulkanStagingBuffer, VulkanStagingShell},
         },
-        rect::{Rect, Region},
+
         utils::{clonecell::CloneCell, errorfmt::ErrorFmt},
         vulkan_core::sync::VulkanDeviceSyncExt,
     },

src/icons.rs

@@ -1,14 +1,15 @@
 #![allow(clippy::excessive_precision)]
 #![allow(dead_code)]
 
+use jay_theme::Theme;
+use jay_units::scale::Scale;
 use {
     crate::{
         cmm::cmm_eotf::Eotf,
         format::ARGB8888,
         gfx_api::{GfxContext, GfxError, GfxTexture},
-        scale::Scale,
         state::State,
-        theme::Theme,
+
         utils::{copyhashmap::CopyHashMap, windows::WindowsExt},
     },
     ahash::AHashSet,
@@ -100,7 +101,7 @@ pub fn create_icons(
     }
     let size = size as u32;
 
-    let create_pins = |color: crate::theme::Color| {
+    let create_pins = |color: jay_theme::Color| {
         let create_pin = |color: Color| {
             let mut paint = Paint::default();
             paint.set_color(color);
@@ -222,7 +223,7 @@ impl PathBuilderExt for PathBuilder {
     }
 }
 
-fn calculate_accents(srgb: crate::theme::Color) -> [Color; 2] {
+fn calculate_accents(srgb: jay_theme::Color) -> [Color; 2] {
     let [l, a, b, alpha] = srgb_to_lab(srgb);
     let l2 = if l < 0.65 { 0.9 } else { l - 0.4 };
     let l1 = (l2 + l) / 2.0;
@@ -232,7 +233,7 @@ fn calculate_accents(srgb: crate::theme::Color) -> [Color; 2] {
     ]
 }
 
-fn srgb_to_lab(srgb: crate::theme::Color) -> [f32; 4] {
+fn srgb_to_lab(srgb: jay_theme::Color) -> [f32; 4] {
     let [mut r, mut g, mut b, alpha] = srgb.to_array(Eotf::Gamma22);
     if alpha < 1.0 {
         r /= alpha;

src/ifs/data_transfer.rs

@@ -1,7 +1,7 @@
+use jay_units::fixed::Fixed;
 use {
     crate::{
         client::{Client, ClientError, ClientId},
-        fixed::Fixed,
         ifs::{data_transfer::x_data_device::XTransferDevice, wl_seat::WlSeatGlobal},
         utils::{
             bitflags::BitflagsExt, cell_ext::CellExt, clonecell::CloneCell, numcell::NumCell,

src/ifs/data_transfer/wl_data_device.rs

@@ -1,11 +1,12 @@
+use jay_units::fixed::Fixed;
 use {
     crate::{
         client::{Client, ClientError, ClientId},
-        fixed::Fixed,
         ifs::{
             data_transfer::{
-                DeviceData, TransferVtable, IterableTransferVtable, OfferData, Role, break_device_loops,
+                DeviceData, IterableTransferVtable, OfferData, Role, TransferVtable,
-                destroy_data_device, wl_data_offer::WlDataOffer, wl_data_source::WlDataSource,
+                break_device_loops, destroy_data_device, wl_data_offer::WlDataOffer,
+                wl_data_source::WlDataSource,
             },
             wl_seat::{WlSeatError, WlSeatGlobal},
             wl_surface::WlSurfaceError,

src/ifs/data_transfer/wl_data_offer.rs

@@ -1,7 +1,7 @@
+use jay_units::fixed::Fixed;
 use {
     crate::{
         client::{Client, ClientError, ClientId},
-        fixed::Fixed,
         ifs::{
             data_transfer::{
                 DataOffer, DataOfferId, DynDataOffer, OFFER_STATE_ACCEPTED, OFFER_STATE_DROPPED,

src/ifs/ext_idle_notification_v1.rs

@@ -1,6 +1,7 @@
+use jay_async_engine::SpawnedFuture;
 use {
     crate::{
-        async_engine::SpawnedFuture,
+
         client::{Client, ClientError},
         ifs::wl_seat::WlSeatGlobal,
         leaks::Tracker,

src/ifs/ext_image_copy/ext_image_copy_capture_frame_v1.rs

@@ -1,3 +1,4 @@
+use jay_geometry::Region;
 use {
     crate::{
         client::{Client, ClientError},
@@ -13,7 +14,7 @@ use {
         },
         leaks::Tracker,
         object::Object,
-        rect::Region,
+
         tree::{self, Node, OutputNode},
         utils::{cell_ext::CellExt, errorfmt::ErrorFmt},
         wire::{ExtImageCopyCaptureFrameV1Id, ext_image_copy_capture_frame_v1::*},

src/ifs/ext_image_copy/ext_image_copy_capture_session_v1.rs

@@ -1,3 +1,4 @@
+use jay_time::Time;
 use {
     crate::{
         client::{Client, ClientError},
@@ -16,7 +17,7 @@ use {
         },
         leaks::Tracker,
         object::{Object, Version},
-        time::Time,
+
         tree::{LatchListener, OutputNode, PresentationListener},
         utils::{cell_ext::CellExt, clonecell::CloneCell, event_listener::EventListener},
         video::Modifier,

src/ifs/head_management.rs

@@ -1,3 +1,4 @@
+use jay_units::scale::Scale;
 use {
     crate::{
         backend::{
@@ -14,7 +15,6 @@ use {
             },
             wl_output::{BlendSpace, PersistentOutputState},
         },
-        scale::Scale,
         state::{OutputData, State},
         tree::{OutputNode, TearingMode, Transform, VrrMode},
         utils::{copyhashmap::CopyHashMap, hash_map_ext::HashMapExt, rc_eq::RcEq},

src/ifs/head_management/jay_head_ext/jay_head_ext_compositor_space_scaler_v1.rs

@@ -1,8 +1,8 @@
+use jay_units::scale::Scale;
 use {
     crate::{
         compositor::{MAX_SCALE, MIN_SCALE},
         ifs::head_management::{HeadOp, HeadState},
-        scale::Scale,
         wire::{
             jay_head_ext_compositor_space_scaler_v1::{
                 JayHeadExtCompositorSpaceScalerV1RequestHandler, Range, SetScale,

src/ifs/jay_compositor.rs

@@ -1,3 +1,4 @@
+use jay_logger::LogLevel;
 use {
     crate::{
         backend::transaction::BackendConnectorTransactionError,
@@ -26,7 +27,7 @@ use {
             wl_surface::jay_sync_file_surface::JaySyncFileSurface,
         },
         leaks::Tracker,
-        logger::LogLevel,
+
         object::{Object, Version},
         screenshoter::take_screenshot,
         tree::ToplevelIdentifier,