diff --git a/cache/__init__.py b/cache/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/cache.py b/cache/cli.py
similarity index 97%
rename from cache.py
rename to cache/cli.py
index 8a24fe6..1930a22 100644
--- a/cache.py
+++ b/cache/cli.py
@@ -13,7 +13,7 @@ PATHS = list(CHROOT_PATHS.keys())
 
 @click.group(name='cache')
 def cmd_cache():
-    """Clean various working directories"""
+    """Clean various cache directories"""
 
 
 @cmd_cache.command(name='clean')
diff --git a/main.py b/main.py
index 92eabbe..d3bc9fa 100755
--- a/main.py
+++ b/main.py
@@ -8,13 +8,14 @@ from typing import Optional
 
 from logger import logging, setup_logging, verbose_option
 from wrapper import nowrapper_option, enforce_wrap
+
 from config.cli import config, config_option, cmd_config
 from packages.cli import cmd_packages
 from flavours.cli import cmd_flavours
 from devices.cli import cmd_devices
 from net.cli import cmd_net
 from chroot.cli import cmd_chroot
-from cache import cmd_cache
+from cache.cli import cmd_cache
 from image.cli import cmd_image