diff --git a/src/importer/sources/lutris_source.py b/src/importer/sources/lutris_source.py
index ccd3488..be483db 100644
--- a/src/importer/sources/lutris_source.py
+++ b/src/importer/sources/lutris_source.py
@@ -1,12 +1,12 @@
 from abc import abstractmethod
 from functools import lru_cache
+from pathlib import Path
 from sqlite3 import connect
 from time import time
-from pathlib import Path
 
 import src.shared as shared
 from src.game import Game
-from src.importer.source import Source, SourceIterator
+from src.importer.sources.source import Source, SourceIterator
 from src.utils.decorators import replaced_by_path, replaced_by_schema_key
 from src.utils.save_cover import resize_cover, save_cover
 
diff --git a/src/importer/source.py b/src/importer/sources/source.py
similarity index 100%
rename from src/importer/source.py
rename to src/importer/sources/source.py
diff --git a/src/importer/sources/steam_source.py b/src/importer/sources/steam_source.py
index c1206fb..69fc1b2 100644
--- a/src/importer/sources/steam_source.py
+++ b/src/importer/sources/steam_source.py
@@ -4,22 +4,15 @@ from pathlib import Path
 from time import time
 from typing import Iterator
 
-from requests import HTTPError, JSONDecodeError
-
 from src.game import Game
-from src.importer.source import Source, SourceIterator
+from src.importer.sources.source import Source, SourceIterator
 from src.utils.decorators import (
     replaced_by_env_path,
     replaced_by_path,
     replaced_by_schema_key,
 )
 from src.utils.save_cover import resize_cover, save_cover
-from src.utils.steam import (
-    SteamGameNotFoundError,
-    SteamHelper,
-    SteamInvalidManifestError,
-    SteamNotAGameError,
-)
+from src.utils.steam import SteamHelper, SteamInvalidManifestError
 
 
 class SteamSourceIterator(SourceIterator):
diff --git a/src/main.py b/src/main.py
index 73b5f63..c127fea 100644
--- a/src/main.py
+++ b/src/main.py
@@ -39,10 +39,10 @@ from src.importer.sources.steam_source import (
     SteamWindowsSource,
 )
 from src.preferences import PreferencesWindow
-from src.store.display_manager import DisplayManager
-from src.store.file_manager import FileManager
-from src.store.sgdb_manager import SGDBManager
-from src.store.steam_api_manager import SteamAPIManager
+from src.store.managers.display_manager import DisplayManager
+from src.store.managers.file_manager import FileManager
+from src.store.managers.sgdb_manager import SGDBManager
+from src.store.managers.steam_api_manager import SteamAPIManager
 from src.store.store import Store
 from src.window import CartridgesWindow
 
diff --git a/src/store/display_manager.py b/src/store/managers/display_manager.py
similarity index 67%
rename from src/store/display_manager.py
rename to src/store/managers/display_manager.py
index 97934df..235ae62 100644
--- a/src/store/display_manager.py
+++ b/src/store/managers/display_manager.py
@@ -1,8 +1,8 @@
 import src.shared as shared
 from src.game import Game
-from src.store.manager import Manager
-from src.store.sgdb_manager import SGDBManager
-from src.store.steam_api_manager import SteamAPIManager
+from src.store.managers.manager import Manager
+from src.store.managers.sgdb_manager import SGDBManager
+from src.store.managers.steam_api_manager import SteamAPIManager
 
 
 class DisplayManager(Manager):
diff --git a/src/store/file_manager.py b/src/store/managers/file_manager.py
similarity index 63%
rename from src/store/file_manager.py
rename to src/store/managers/file_manager.py
index b202157..2a7b67e 100644
--- a/src/store/file_manager.py
+++ b/src/store/managers/file_manager.py
@@ -1,7 +1,7 @@
 from src.game import Game
-from src.store.manager import Manager
-from src.store.sgdb_manager import SGDBManager
-from src.store.steam_api_manager import SteamAPIManager
+from src.store.managers.manager import Manager
+from src.store.managers.sgdb_manager import SGDBManager
+from src.store.managers.steam_api_manager import SteamAPIManager
 
 
 class FileManager(Manager):
diff --git a/src/store/manager.py b/src/store/managers/manager.py
similarity index 100%
rename from src/store/manager.py
rename to src/store/managers/manager.py
diff --git a/src/store/sgdb_manager.py b/src/store/managers/sgdb_manager.py
similarity index 93%
rename from src/store/sgdb_manager.py
rename to src/store/managers/sgdb_manager.py
index faec500..d68abf7 100644
--- a/src/store/sgdb_manager.py
+++ b/src/store/managers/sgdb_manager.py
@@ -1,7 +1,7 @@
 from requests import HTTPError
 
 from src.game import Game
-from src.store.manager import Manager
+from src.store.managers.manager import Manager
 from src.utils.steamgriddb import SGDBAuthError, SGDBError, SGDBHelper
 
 
diff --git a/src/store/steam_api_manager.py b/src/store/managers/steam_api_manager.py
similarity index 95%
rename from src/store/steam_api_manager.py
rename to src/store/managers/steam_api_manager.py
index de2643b..93e4d42 100644
--- a/src/store/steam_api_manager.py
+++ b/src/store/managers/steam_api_manager.py
@@ -1,7 +1,7 @@
 from requests import HTTPError, JSONDecodeError
 
 from src.game import Game
-from src.store.manager import Manager
+from src.store.managers.manager import Manager
 from src.utils.steam import SteamGameNotFoundError, SteamHelper, SteamNotAGameError
 
 
diff --git a/src/store/store.py b/src/store/store.py
index 6aea015..eb36374 100644
--- a/src/store/store.py
+++ b/src/store/store.py
@@ -4,8 +4,8 @@ from gi.repository import GObject
 
 import src.shared as shared
 from src.game import Game
-from src.store.manager import Manager
 from src.utils.task import Task
+from store.managers.manager import Manager
 
 
 class Pipeline(GObject.Object):