diff --git a/src/cirruslib/__init__.py b/src/cirruslib/__init__.py
new file mode 100644
index 0000000..142948f
--- /dev/null
+++ b/src/cirruslib/__init__.py
@@ -0,0 +1,7 @@
+import warnings
+
+warnings.warn(
+    "Imports via 'cirruslib' will be removed in a future cirrus version. "
+    "Update all imports to instead use 'cirrus.lib'.",
+    DeprecationWarning,
+)
diff --git a/src/cirruslib/catalog.py b/src/cirruslib/catalog.py
new file mode 100644
index 0000000..7fe10e0
--- /dev/null
+++ b/src/cirruslib/catalog.py
@@ -0,0 +1,4 @@
+import importlib
+import sys
+module = __name__.split('.')[-1]
+sys.modules[__name__] = importlib.import_module(f'cirrus.lib.{module}')
diff --git a/src/cirruslib/errors.py b/src/cirruslib/errors.py
new file mode 100644
index 0000000..7fe10e0
--- /dev/null
+++ b/src/cirruslib/errors.py
@@ -0,0 +1,4 @@
+import importlib
+import sys
+module = __name__.split('.')[-1]
+sys.modules[__name__] = importlib.import_module(f'cirrus.lib.{module}')
diff --git a/src/cirruslib/logging.py b/src/cirruslib/logging.py
new file mode 100644
index 0000000..7fe10e0
--- /dev/null
+++ b/src/cirruslib/logging.py
@@ -0,0 +1,4 @@
+import importlib
+import sys
+module = __name__.split('.')[-1]
+sys.modules[__name__] = importlib.import_module(f'cirrus.lib.{module}')
diff --git a/src/cirruslib/statedb.py b/src/cirruslib/statedb.py
new file mode 100644
index 0000000..7fe10e0
--- /dev/null
+++ b/src/cirruslib/statedb.py
@@ -0,0 +1,4 @@
+import importlib
+import sys
+module = __name__.split('.')[-1]
+sys.modules[__name__] = importlib.import_module(f'cirrus.lib.{module}')
diff --git a/src/cirruslib/transfer.py b/src/cirruslib/transfer.py
new file mode 100644
index 0000000..7fe10e0
--- /dev/null
+++ b/src/cirruslib/transfer.py
@@ -0,0 +1,4 @@
+import importlib
+import sys
+module = __name__.split('.')[-1]
+sys.modules[__name__] = importlib.import_module(f'cirrus.lib.{module}')
diff --git a/src/cirruslib/utils.py b/src/cirruslib/utils.py
new file mode 100644
index 0000000..7fe10e0
--- /dev/null
+++ b/src/cirruslib/utils.py
@@ -0,0 +1,4 @@
+import importlib
+import sys
+module = __name__.split('.')[-1]
+sys.modules[__name__] = importlib.import_module(f'cirrus.lib.{module}')