diff --git a/src/mpd_now_playable/cocoa/now_playing.py b/src/mpd_now_playable/cocoa/now_playing.py
index 5cf1b2b..15225de 100644
--- a/src/mpd_now_playable/cocoa/now_playing.py
+++ b/src/mpd_now_playable/cocoa/now_playing.py
@@ -35,9 +35,9 @@ from MediaPlayer import (
 	MPRemoteCommandHandlerStatusSuccess,
 )
 
-from ..async_tools import run_background_task
 from ..player import Player
 from ..song import PlaybackState, Song
+from ..tools.asyncio import run_background_task
 from .persistent_id import song_to_persistent_id
 
 
diff --git a/src/mpd_now_playable/mpd/artwork_cache.py b/src/mpd_now_playable/mpd/artwork_cache.py
index b4b8146..6ec5a9a 100644
--- a/src/mpd_now_playable/mpd/artwork_cache.py
+++ b/src/mpd_now_playable/mpd/artwork_cache.py
@@ -4,8 +4,8 @@ from typing import TypedDict
 
 from yarl import URL
 
-from ..async_tools import run_background_task
 from ..cache import Cache, make_cache
+from ..tools.asyncio import run_background_task
 from .types import CurrentSongResponse, MpdStateHandler
 
 CACHE_TTL = 60 * 60  # seconds = 1 hour
diff --git a/src/mpd_now_playable/mpd/listener.py b/src/mpd_now_playable/mpd/listener.py
index 9d6ba45..1a8c107 100644
--- a/src/mpd_now_playable/mpd/listener.py
+++ b/src/mpd_now_playable/mpd/listener.py
@@ -9,7 +9,7 @@ from yarl import URL
 from ..config.model import MpdConfig
 from ..player import Player
 from ..song import PlaybackState, Song, SongListener
-from ..type_tools import convert_if_exists
+from ..tools.types import convert_if_exists
 from .artwork_cache import MpdArtworkCache
 from .types import CurrentSongResponse, StatusResponse
 
diff --git a/src/mpd_now_playable/tools/__init__.py b/src/mpd_now_playable/tools/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/mpd_now_playable/async_tools.py b/src/mpd_now_playable/tools/asyncio.py
similarity index 100%
rename from src/mpd_now_playable/async_tools.py
rename to src/mpd_now_playable/tools/asyncio.py
diff --git a/src/mpd_now_playable/type_tools.py b/src/mpd_now_playable/tools/types.py
similarity index 100%
rename from src/mpd_now_playable/type_tools.py
rename to src/mpd_now_playable/tools/types.py