diff --git a/tests/history/test_history_json.py b/tests/history/test_history_json.py
index 1ab622a09..fed2eb298 100644
--- a/tests/history/test_history_json.py
+++ b/tests/history/test_history_json.py
@@ -14,7 +14,7 @@ from xonsh.history.json import (
     _xhj_gc_seconds_to_rmfiles,
 )
 from xonsh.history.main import HistoryAlias, history_main
-from xonsh.lazyjson import LazyJSON
+from xonsh.lib.lazyjson import LazyJSON
 
 CMDS = ["ls", "cat hello kitty", "abc", "def", "touch me", "grep from me"]
 IGNORE_OPTS = ",".join(["ignoredups", "ignoreerr", "ignorespace"])
diff --git a/tests/lib/test_lazyasd.py b/tests/lib/test_lazyasd.py
index c1594ee65..3220ed1fe 100644
--- a/tests/lib/test_lazyasd.py
+++ b/tests/lib/test_lazyasd.py
@@ -1,6 +1,6 @@
 """Tests lazy and self destruictive objects."""
 
-from xonsh.lazyasd import LazyObject
+from xonsh.lib.lazyasd import LazyObject
 
 #
 # LazyObject Tests
diff --git a/tests/lib/test_lazyjson.py b/tests/lib/test_lazyjson.py
index ec2d571c1..0b1815127 100644
--- a/tests/lib/test_lazyjson.py
+++ b/tests/lib/test_lazyjson.py
@@ -2,7 +2,7 @@
 
 from io import StringIO
 
-from xonsh.lazyjson import LazyJSON, LJNode, index, ljdump
+from xonsh.lib.lazyjson import LazyJSON, LJNode, index, ljdump
 
 
 def test_index_int():
diff --git a/tests/test_pyghooks.py b/tests/test_pyghooks.py
index 2e0658479..0f6bead0a 100644
--- a/tests/test_pyghooks.py
+++ b/tests/test_pyghooks.py
@@ -328,7 +328,7 @@ def test_colorize_file_symlink(key, file_path, colorizable_files, xs_LS_COLORS):
     assert color_key == tar_color_key, "File classified as expected kind, via symlink"
 
 
-import xonsh.lazyimps
+import xonsh.lib.lazyimps
 
 
 def test_colorize_file_ca(xs_LS_COLORS, monkeypatch):
diff --git a/xonsh/aliases.py b/xonsh/aliases.py
index fb1df9b24..a4ed9f805 100644
--- a/xonsh/aliases.py
+++ b/xonsh/aliases.py
@@ -19,7 +19,7 @@ from xonsh.cli_utils import Annotated, Arg, ArgParserAlias
 from xonsh.dirstack import _get_cwd, cd, dirs, popd, pushd
 from xonsh.environ import locate_binary, make_args_env
 from xonsh.foreign_shells import foreign_shell_data
-from xonsh.lazyasd import lazyobject
+from xonsh.lib.lazyasd import lazyobject
 from xonsh.parsers.ast import isexpression
 from xonsh.platform import (
     IN_APPIMAGE,
diff --git a/xonsh/ansi_colors.py b/xonsh/ansi_colors.py
index d0b4c402e..6f001d614 100644
--- a/xonsh/ansi_colors.py
+++ b/xonsh/ansi_colors.py
@@ -16,7 +16,7 @@ from xonsh.color_tools import (
     short_to_ints,
     warn_deprecated_no_color,
 )
-from xonsh.lazyasd import LazyDict, lazyobject
+from xonsh.lib.lazyasd import LazyDict, lazyobject
 from xonsh.platform import HAS_PYGMENTS
 from xonsh.tools import FORMATTER
 
diff --git a/xonsh/built_ins.py b/xonsh/built_ins.py
index c12984a62..4a9262a90 100644
--- a/xonsh/built_ins.py
+++ b/xonsh/built_ins.py
@@ -19,8 +19,8 @@ import types
 import warnings
 from ast import AST
 
-from xonsh.lazyasd import lazyobject
 from xonsh.lib.inspectors import Inspector
+from xonsh.lib.lazyasd import lazyobject
 from xonsh.platform import ON_POSIX
 from xonsh.tools import (
     XonshCalledProcessError,
diff --git a/xonsh/codecache.py b/xonsh/codecache.py
index be163eac5..d9698768c 100644
--- a/xonsh/codecache.py
+++ b/xonsh/codecache.py
@@ -7,7 +7,7 @@ import sys
 
 from xonsh import __version__ as XONSH_VERSION
 from xonsh.built_ins import XSH
-from xonsh.lazyasd import lazyobject
+from xonsh.lib.lazyasd import lazyobject
 from xonsh.platform import PYTHON_VERSION_INFO_BYTES
 from xonsh.tools import is_writable_file, print_warning
 
diff --git a/xonsh/color_tools.py b/xonsh/color_tools.py
index 1c61fa0ee..beee7b0f6 100644
--- a/xonsh/color_tools.py
+++ b/xonsh/color_tools.py
@@ -9,7 +9,7 @@ WTFPL http://sam.zoy.org/wtfpl/
 import math
 import re
 
-from xonsh.lazyasd import LazyObject, lazyobject
+from xonsh.lib.lazyasd import LazyObject, lazyobject
 from xonsh.tools import print_warning
 
 _NO_COLOR_WARNING_SHOWN = False
diff --git a/xonsh/commands_cache.py b/xonsh/commands_cache.py
index 8abdfb330..cfa32d16e 100644
--- a/xonsh/commands_cache.py
+++ b/xonsh/commands_cache.py
@@ -14,7 +14,7 @@ import time
 import typing as tp
 from pathlib import Path
 
-from xonsh.lazyasd import lazyobject
+from xonsh.lib.lazyasd import lazyobject
 from xonsh.platform import ON_POSIX, ON_WINDOWS, pathbasename
 from xonsh.tools import executables_in
 
diff --git a/xonsh/completers/imports.py b/xonsh/completers/imports.py
index 3c82c2afe..a7e8f89c2 100644
--- a/xonsh/completers/imports.py
+++ b/xonsh/completers/imports.py
@@ -21,7 +21,7 @@ from xonsh.completers.tools import (
     contextual_completer,
     get_filter_function,
 )
-from xonsh.lazyasd import lazyobject
+from xonsh.lib.lazyasd import lazyobject
 from xonsh.parsers.completion_context import CompletionContext
 
 _suffixes = all_suffixes()
diff --git a/xonsh/completers/path.py b/xonsh/completers/path.py
index da275d97c..7e1a3559f 100644
--- a/xonsh/completers/path.py
+++ b/xonsh/completers/path.py
@@ -3,7 +3,7 @@ import glob
 import os
 import re
 
-import xonsh.lazyasd as xl
+import xonsh.lib.lazyasd as xl
 import xonsh.platform as xp
 import xonsh.tools as xt
 from xonsh.built_ins import XSH
diff --git a/xonsh/completers/python.py b/xonsh/completers/python.py
index 467d58876..42b9a0952 100644
--- a/xonsh/completers/python.py
+++ b/xonsh/completers/python.py
@@ -6,7 +6,7 @@ import inspect
 import re
 import warnings
 
-import xonsh.lazyasd as xl
+import xonsh.lib.lazyasd as xl
 import xonsh.tools as xt
 from xonsh.built_ins import XSH
 from xonsh.completers.tools import (
diff --git a/xonsh/completers/tools.py b/xonsh/completers/tools.py
index f686f0adc..48ddeb908 100644
--- a/xonsh/completers/tools.py
+++ b/xonsh/completers/tools.py
@@ -10,7 +10,7 @@ from functools import wraps
 
 import xonsh.tools as xt
 from xonsh.built_ins import XSH
-from xonsh.lazyasd import lazyobject
+from xonsh.lib.lazyasd import lazyobject
 from xonsh.parsers.completion_context import CommandContext, CompletionContext
 
 
diff --git a/xonsh/environ.py b/xonsh/environ.py
index f2b5403c6..87c29e8a5 100644
--- a/xonsh/environ.py
+++ b/xonsh/environ.py
@@ -29,7 +29,7 @@ from xonsh.built_ins import XSH
 from xonsh.codecache import run_script_with_cache
 from xonsh.dirstack import _get_cwd
 from xonsh.events import events
-from xonsh.lazyasd import LazyBool, lazyobject
+from xonsh.lib.lazyasd import LazyBool, lazyobject
 from xonsh.platform import (
     BASH_COMPLETIONS_DEFAULT,
     DEFAULT_ENCODING,
diff --git a/xonsh/foreign_shells.py b/xonsh/foreign_shells.py
index c85ee6c5a..ea72d92fe 100644
--- a/xonsh/foreign_shells.py
+++ b/xonsh/foreign_shells.py
@@ -11,7 +11,7 @@ import tempfile
 import warnings
 
 from xonsh.built_ins import XSH
-from xonsh.lazyasd import lazyobject
+from xonsh.lib.lazyasd import lazyobject
 from xonsh.platform import ON_CYGWIN, ON_MSYS, ON_WINDOWS
 from xonsh.tools import ensure_string, to_bool
 
diff --git a/xonsh/history/diff_history.py b/xonsh/history/diff_history.py
index 6093b5543..2be9ed3b4 100644
--- a/xonsh/history/diff_history.py
+++ b/xonsh/history/diff_history.py
@@ -5,7 +5,7 @@ import difflib
 import itertools
 
 from xonsh.color_tools import COLORS
-from xonsh.lazyjson import LazyJSON
+from xonsh.lib.lazyjson import LazyJSON
 
 # intern some strings
 REPLACE_S = "replace"
diff --git a/xonsh/history/json.py b/xonsh/history/json.py
index b72f3de40..f64983757 100644
--- a/xonsh/history/json.py
+++ b/xonsh/history/json.py
@@ -19,7 +19,7 @@ except ImportError:
 
     JSONDecodeError = json.decoder.JSONDecodeError  # type: ignore
 
-import xonsh.lazyjson as xlj
+import xonsh.lib.lazyjson as xlj
 import xonsh.tools as xt
 import xonsh.xoreutils.uptime as uptime
 from xonsh.history.base import History
diff --git a/xonsh/imphooks.py b/xonsh/imphooks.py
index c61f577d8..9fe0efda8 100644
--- a/xonsh/imphooks.py
+++ b/xonsh/imphooks.py
@@ -15,7 +15,7 @@ from importlib.machinery import ModuleSpec
 from xonsh.built_ins import XSH
 from xonsh.events import events
 from xonsh.execer import Execer
-from xonsh.lazyasd import lazyobject
+from xonsh.lib.lazyasd import lazyobject
 from xonsh.platform import ON_WINDOWS
 from xonsh.tools import print_warning
 
diff --git a/xonsh/lib/inspectors.py b/xonsh/lib/inspectors.py
index cb2b24a81..aeb21b7fe 100644
--- a/xonsh/lib/inspectors.py
+++ b/xonsh/lib/inspectors.py
@@ -15,8 +15,8 @@ import os
 import sys
 import types
 
-from xonsh.lazyasd import LazyObject
-from xonsh.lazyimps import pyghooks, pygments
+from xonsh.lib.lazyasd import LazyObject
+from xonsh.lib.lazyimps import pyghooks, pygments
 from xonsh.lib.openpy import read_py_file
 from xonsh.lib.tokenize import detect_encoding
 from xonsh.platform import HAS_PYGMENTS
diff --git a/xonsh/lazyasd.py b/xonsh/lib/lazyasd.py
similarity index 100%
rename from xonsh/lazyasd.py
rename to xonsh/lib/lazyasd.py
diff --git a/xonsh/lazyimps.py b/xonsh/lib/lazyimps.py
similarity index 96%
rename from xonsh/lazyimps.py
rename to xonsh/lib/lazyimps.py
index 3ef390884..9d0fa27d6 100644
--- a/xonsh/lazyimps.py
+++ b/xonsh/lib/lazyimps.py
@@ -3,7 +3,7 @@
 import importlib
 import os
 
-from xonsh.lazyasd import LazyObject, lazyobject
+from xonsh.lib.lazyasd import LazyObject, lazyobject
 from xonsh.platform import ON_DARWIN, ON_WINDOWS
 
 pygments = LazyObject(
diff --git a/xonsh/lazyjson.py b/xonsh/lib/lazyjson.py
similarity index 100%
rename from xonsh/lazyjson.py
rename to xonsh/lib/lazyjson.py
diff --git a/xonsh/lib/openpy.py b/xonsh/lib/openpy.py
index 98edd0570..dab87a7a1 100644
--- a/xonsh/lib/openpy.py
+++ b/xonsh/lib/openpy.py
@@ -15,7 +15,7 @@ This file was forked from the IPython project:
 import io
 import re
 
-from xonsh.lazyasd import LazyObject
+from xonsh.lib.lazyasd import LazyObject
 from xonsh.lib.tokenize import detect_encoding, tokopen
 
 cookie_comment_re = LazyObject(
diff --git a/xonsh/lib/pretty.py b/xonsh/lib/pretty.py
index 3406d4c76..b3126547a 100644
--- a/xonsh/lib/pretty.py
+++ b/xonsh/lib/pretty.py
@@ -86,7 +86,7 @@ import re
 import sys
 import types
 
-from xonsh.lazyasd import LazyObject, lazyobject
+from xonsh.lib.lazyasd import LazyObject, lazyobject
 
 __all__ = [
     "pretty",
diff --git a/xonsh/lib/tokenize.py b/xonsh/lib/tokenize.py
index b2fdc1f1b..7a11aa17a 100644
--- a/xonsh/lib/tokenize.py
+++ b/xonsh/lib/tokenize.py
@@ -81,7 +81,7 @@ from token import (
     tok_name,
 )
 
-from xonsh.lazyasd import LazyObject
+from xonsh.lib.lazyasd import LazyObject
 from xonsh.platform import PYTHON_VERSION_INFO
 
 cookie_re = LazyObject(
diff --git a/xonsh/main.py b/xonsh/main.py
index d5fd9fb46..7585ca6c6 100644
--- a/xonsh/main.py
+++ b/xonsh/main.py
@@ -17,8 +17,8 @@ from xonsh.environ import get_home_xonshrc_path, make_args_env, xonshrc_context
 from xonsh.events import events
 from xonsh.execer import Execer
 from xonsh.imphooks import install_import_hooks
-from xonsh.lazyasd import lazyobject
-from xonsh.lazyimps import pyghooks, pygments
+from xonsh.lib.lazyasd import lazyobject
+from xonsh.lib.lazyimps import pyghooks, pygments
 from xonsh.lib.pretty import pretty
 from xonsh.platform import HAS_PYGMENTS, ON_WINDOWS
 from xonsh.procs.jobs import ignore_sigtstp
diff --git a/xonsh/parsers/__init__.py b/xonsh/parsers/__init__.py
index 3916b0d73..8d6b0f24c 100644
--- a/xonsh/parsers/__init__.py
+++ b/xonsh/parsers/__init__.py
@@ -1,6 +1,6 @@
 """Implements the xonsh parser."""
 
-from xonsh.lazyasd import lazyobject
+from xonsh.lib.lazyasd import lazyobject
 from xonsh.platform import PYTHON_VERSION_INFO
 
 
diff --git a/xonsh/parsers/base.py b/xonsh/parsers/base.py
index 91be5987f..f519b0d90 100644
--- a/xonsh/parsers/base.py
+++ b/xonsh/parsers/base.py
@@ -10,7 +10,7 @@ from ast import parse as pyparse
 from collections.abc import Iterable, Mapping, Sequence
 from threading import Thread
 
-from xonsh.lazyasd import LazyObject
+from xonsh.lib.lazyasd import LazyObject
 from xonsh.lib.tokenize import SearchPath, StringPrefix
 from xonsh.parsers import ast
 from xonsh.parsers.ast import has_elts, load_attribute_chain, xonsh_call
diff --git a/xonsh/parsers/completion_context.py b/xonsh/parsers/completion_context.py
index 09d39f882..f296d37a8 100644
--- a/xonsh/parsers/completion_context.py
+++ b/xonsh/parsers/completion_context.py
@@ -17,7 +17,7 @@ from typing import (
     overload,
 )
 
-from xonsh.lazyasd import lazyobject
+from xonsh.lib.lazyasd import lazyobject
 from xonsh.parsers.base import Location, raise_parse_error
 from xonsh.parsers.lexer import Lexer
 from xonsh.parsers.ply import yacc
diff --git a/xonsh/parsers/fstring_adaptor.py b/xonsh/parsers/fstring_adaptor.py
index c77ad9611..f9768eb1d 100644
--- a/xonsh/parsers/fstring_adaptor.py
+++ b/xonsh/parsers/fstring_adaptor.py
@@ -3,7 +3,7 @@
 import re
 from ast import parse as pyparse
 
-from xonsh.lazyasd import lazyobject
+from xonsh.lib.lazyasd import lazyobject
 from xonsh.parsers import ast
 from xonsh.platform import PYTHON_VERSION_INFO
 
diff --git a/xonsh/parsers/lexer.py b/xonsh/parsers/lexer.py
index b9c4630aa..3b3ed1fda 100644
--- a/xonsh/parsers/lexer.py
+++ b/xonsh/parsers/lexer.py
@@ -10,7 +10,7 @@ import keyword as kwmod
 import re
 import typing as tp
 
-from xonsh.lazyasd import lazyobject
+from xonsh.lib.lazyasd import lazyobject
 from xonsh.lib.tokenize import (
     CASE,
     COMMENT,
diff --git a/xonsh/platform/__init__.py b/xonsh/platform/__init__.py
index b57ac9407..1fecfe451 100644
--- a/xonsh/platform/__init__.py
+++ b/xonsh/platform/__init__.py
@@ -14,7 +14,7 @@ import signal
 import subprocess
 import sys
 
-from xonsh.lazyasd import LazyBool, lazybool, lazyobject
+from xonsh.lib.lazyasd import LazyBool, lazybool, lazyobject
 
 # do not import any xonsh-modules here to avoid circular dependencies
 
diff --git a/xonsh/platform/winutils.py b/xonsh/platform/winutils.py
index 438b4324c..ddaff5eaf 100644
--- a/xonsh/platform/winutils.py
+++ b/xonsh/platform/winutils.py
@@ -40,8 +40,9 @@ from ctypes.wintypes import (
     WORD,
 )
 
-from xonsh import lazyimps, platform
-from xonsh.lazyasd import lazyobject
+from xonsh import platform
+from xonsh.lib import lazyimps
+from xonsh.lib.lazyasd import lazyobject
 
 __all__ = ("sudo",)
 
diff --git a/xonsh/procs/jobs.py b/xonsh/procs/jobs.py
index 2f490b175..3c7433392 100644
--- a/xonsh/procs/jobs.py
+++ b/xonsh/procs/jobs.py
@@ -14,7 +14,7 @@ import typing as tp
 from xonsh.built_ins import XSH
 from xonsh.cli_utils import Annotated, Arg, ArgParserAlias
 from xonsh.completers.tools import RichCompletion
-from xonsh.lazyasd import LazyObject
+from xonsh.lib.lazyasd import LazyObject
 from xonsh.platform import FD_STDERR, LIBC, ON_CYGWIN, ON_DARWIN, ON_MSYS, ON_WINDOWS
 from xonsh.tools import get_signal_name, on_main_thread, unthreadable
 
diff --git a/xonsh/procs/pipelines.py b/xonsh/procs/pipelines.py
index bb0ed8a77..80f22f87b 100644
--- a/xonsh/procs/pipelines.py
+++ b/xonsh/procs/pipelines.py
@@ -9,7 +9,7 @@ import sys
 import threading
 import time
 
-import xonsh.lazyasd as xl
+import xonsh.lib.lazyasd as xl
 import xonsh.platform as xp
 import xonsh.procs.jobs as xj
 import xonsh.tools as xt
diff --git a/xonsh/procs/posix.py b/xonsh/procs/posix.py
index fa561026f..93b9fce63 100644
--- a/xonsh/procs/posix.py
+++ b/xonsh/procs/posix.py
@@ -9,8 +9,8 @@ import sys
 import threading
 import time
 
-import xonsh.lazyasd as xl
-import xonsh.lazyimps as xli
+import xonsh.lib.lazyasd as xl
+import xonsh.lib.lazyimps as xli
 import xonsh.platform as xp
 import xonsh.tools as xt
 from xonsh.built_ins import XSH
diff --git a/xonsh/procs/proxies.py b/xonsh/procs/proxies.py
index 37243285c..6add535ab 100644
--- a/xonsh/procs/proxies.py
+++ b/xonsh/procs/proxies.py
@@ -16,7 +16,7 @@ import sys
 import threading
 import time
 
-import xonsh.lazyimps as xli
+import xonsh.lib.lazyimps as xli
 import xonsh.platform as xp
 import xonsh.tools as xt
 from xonsh.built_ins import XSH
diff --git a/xonsh/procs/readers.py b/xonsh/procs/readers.py
index 75eb570e9..16bd8bf0d 100644
--- a/xonsh/procs/readers.py
+++ b/xonsh/procs/readers.py
@@ -8,7 +8,7 @@ import sys
 import threading
 import time
 
-import xonsh.lazyimps as xli
+import xonsh.lib.lazyimps as xli
 from xonsh.built_ins import XSH
 
 
diff --git a/xonsh/procs/specs.py b/xonsh/procs/specs.py
index f51789319..0530fb037 100644
--- a/xonsh/procs/specs.py
+++ b/xonsh/procs/specs.py
@@ -13,8 +13,8 @@ import subprocess
 import sys
 
 import xonsh.environ as xenv
-import xonsh.lazyasd as xl
-import xonsh.lazyimps as xli
+import xonsh.lib.lazyasd as xl
+import xonsh.lib.lazyimps as xli
 import xonsh.platform as xp
 import xonsh.procs.jobs as xj
 import xonsh.tools as xt
diff --git a/xonsh/prompt/vc.py b/xonsh/prompt/vc.py
index f1b16fab7..7bf145d29 100644
--- a/xonsh/prompt/vc.py
+++ b/xonsh/prompt/vc.py
@@ -12,7 +12,7 @@ import threading
 
 import xonsh.tools as xt
 from xonsh.built_ins import XSH
-from xonsh.lazyasd import LazyObject
+from xonsh.lib.lazyasd import LazyObject
 
 RE_REMOVE_ANSI = LazyObject(
     lambda: re.compile(r"(?:\x1B[@-_]|[\x80-\x9F])[0-?]*[ -/]*[@-~]"),
diff --git a/xonsh/pyghooks.py b/xonsh/pyghooks.py
index eae403127..13e3882e3 100644
--- a/xonsh/pyghooks.py
+++ b/xonsh/pyghooks.py
@@ -40,8 +40,8 @@ from xonsh.color_tools import (
 )
 from xonsh.commands_cache import CommandsCache
 from xonsh.events import events
-from xonsh.lazyasd import LazyDict, LazyObject, lazyobject
-from xonsh.lazyimps import html, os_listxattr, terminal256
+from xonsh.lib.lazyasd import LazyDict, LazyObject, lazyobject
+from xonsh.lib.lazyimps import html, os_listxattr, terminal256
 from xonsh.platform import (
     os_environ,
     ptk_version_info,
diff --git a/xonsh/shells/base_shell.py b/xonsh/shells/base_shell.py
index 1476605ac..5d26da6c7 100644
--- a/xonsh/shells/base_shell.py
+++ b/xonsh/shells/base_shell.py
@@ -17,7 +17,7 @@ from xonsh.codecache import (
 )
 from xonsh.completer import Completer
 from xonsh.events import events
-from xonsh.lazyimps import pyghooks, pygments
+from xonsh.lib.lazyimps import pyghooks, pygments
 from xonsh.platform import HAS_PYGMENTS, ON_WINDOWS
 from xonsh.prompt.base import PromptFormatter, multiline_prompt
 from xonsh.shells.shell import transform_command
diff --git a/xonsh/shells/ptk_shell/__init__.py b/xonsh/shells/ptk_shell/__init__.py
index ea541bb2d..5ee5d770a 100644
--- a/xonsh/shells/ptk_shell/__init__.py
+++ b/xonsh/shells/ptk_shell/__init__.py
@@ -26,7 +26,7 @@ from prompt_toolkit.styles.pygments import pygments_token_to_classname
 
 from xonsh.built_ins import XSH
 from xonsh.events import events
-from xonsh.lazyimps import pyghooks, pygments, winutils
+from xonsh.lib.lazyimps import pyghooks, pygments, winutils
 from xonsh.platform import HAS_PYGMENTS, ON_POSIX, ON_WINDOWS
 from xonsh.pygments_cache import get_all_styles
 from xonsh.shells.base_shell import BaseShell
diff --git a/xonsh/shells/readline_shell.py b/xonsh/shells/readline_shell.py
index 77e4bbecc..c685baf3e 100644
--- a/xonsh/shells/readline_shell.py
+++ b/xonsh/shells/readline_shell.py
@@ -28,8 +28,8 @@ from xonsh.ansi_colors import (
 )
 from xonsh.built_ins import XSH
 from xonsh.events import events
-from xonsh.lazyasd import LazyObject, lazyobject
-from xonsh.lazyimps import pyghooks, pygments, winutils
+from xonsh.lib.lazyasd import LazyObject, lazyobject
+from xonsh.lib.lazyimps import pyghooks, pygments, winutils
 from xonsh.platform import (
     ON_CYGWIN,
     ON_DARWIN,
diff --git a/xonsh/style_tools.py b/xonsh/style_tools.py
index c49bc358b..73ebb8610 100644
--- a/xonsh/style_tools.py
+++ b/xonsh/style_tools.py
@@ -3,7 +3,7 @@
 from collections import defaultdict
 
 from xonsh.color_tools import RE_BACKGROUND, iscolor, warn_deprecated_no_color
-from xonsh.lazyasd import LazyObject
+from xonsh.lib.lazyasd import LazyObject
 from xonsh.platform import HAS_PYGMENTS
 from xonsh.tools import FORMATTER
 
diff --git a/xonsh/timings.py b/xonsh/timings.py
index cdb7484a4..fe72a96fa 100644
--- a/xonsh/timings.py
+++ b/xonsh/timings.py
@@ -17,8 +17,7 @@ import timeit
 
 from xonsh.built_ins import XSH
 from xonsh.events import events
-from xonsh.lazyasd import lazybool, lazyobject
-from xonsh.platform import ON_WINDOWS
+from xonsh.lib.lazyasd import lazybool, lazyobject
 
 
 @lazybool
diff --git a/xonsh/tools.py b/xonsh/tools.py
index 6041bc187..c8bff91a4 100644
--- a/xonsh/tools.py
+++ b/xonsh/tools.py
@@ -44,7 +44,7 @@ from contextlib import contextmanager
 # adding imports from further xonsh modules is discouraged to avoid circular
 # dependencies
 from xonsh import __version__
-from xonsh.lazyasd import LazyDict, LazyObject, lazyobject
+from xonsh.lib.lazyasd import LazyDict, LazyObject, lazyobject
 from xonsh.platform import (
     DEFAULT_ENCODING,
     HAS_PYGMENTS,
diff --git a/xonsh/tracer.py b/xonsh/tracer.py
index 74ffdf6a9..e7d88703e 100644
--- a/xonsh/tracer.py
+++ b/xonsh/tracer.py
@@ -11,9 +11,9 @@ import typing as tp
 import xonsh.procs.pipelines as xpp
 import xonsh.prompt.cwd as prompt
 from xonsh.cli_utils import Annotated, Arg, ArgParserAlias
-from xonsh.lazyasd import LazyObject
-from xonsh.lazyimps import pyghooks, pygments
 from xonsh.lib.inspectors import find_file
+from xonsh.lib.lazyasd import LazyObject
+from xonsh.lib.lazyimps import pyghooks, pygments
 from xonsh.platform import HAS_PYGMENTS
 from xonsh.tools import DefaultNotGiven, normabspath, print_color, to_bool
 
diff --git a/xonsh/xonfig.py b/xonsh/xonfig.py
index c5ea9e9ac..22e99e85c 100644
--- a/xonsh/xonfig.py
+++ b/xonsh/xonfig.py
@@ -19,7 +19,7 @@ from xonsh.built_ins import XSH
 from xonsh.cli_utils import Arg, ArgParserAlias
 from xonsh.events import events
 from xonsh.foreign_shells import CANON_SHELL_NAMES
-from xonsh.lazyasd import lazyobject
+from xonsh.lib.lazyasd import lazyobject
 from xonsh.parsers import ply
 from xonsh.platform import (
     DEFAULT_ENCODING,
diff --git a/xonsh/xoreutils/umask.py b/xonsh/xoreutils/umask.py
index 5104e8047..b996ccbaa 100644
--- a/xonsh/xoreutils/umask.py
+++ b/xonsh/xoreutils/umask.py
@@ -3,7 +3,7 @@
 import os
 import re
 
-import xonsh.lazyasd as xl
+import xonsh.lib.lazyasd as xl
 
 
 @xl.lazyobject
diff --git a/xonsh/xoreutils/uptime.py b/xonsh/xoreutils/uptime.py
index 3af800598..95ac123d3 100644
--- a/xonsh/xoreutils/uptime.py
+++ b/xonsh/xoreutils/uptime.py
@@ -19,7 +19,7 @@ import struct
 import sys
 import time
 
-import xonsh.lazyimps as xlimps
+import xonsh.lib.lazyimps as xlimps
 import xonsh.platform as xp