diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 314e736d..214a81d2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,13 +16,13 @@ set(kasts_srcs
     datamanager.cpp
     audiomanager.cpp
     error.cpp
-    enclosuredownloadjob.cpp
-    storagemanager.cpp
-    storagemovejob.cpp
-    updatefeedjob.cpp
-    fetchfeedsjob.cpp
-    systrayicon.cpp
-    networkconnectionmanager.cpp
+    utils/enclosuredownloadjob.cpp
+    utils/storagemanager.cpp
+    utils/storagemovejob.cpp
+    utils/updatefeedjob.cpp
+    utils/fetchfeedsjob.cpp
+    utils/systrayicon.cpp
+    utils/networkconnectionmanager.cpp
     models/abstractepisodemodel.cpp
     models/abstractepisodeproxymodel.cpp
     models/chaptermodel.cpp
@@ -140,7 +140,7 @@ ecm_qt_declare_logging_category(kasts_srcs
 
 if(ANDROID)
     list(APPEND kasts_srcs
-         androidlogging.h)
+         utils/androidlogging.h)
 endif()
 
 if(KASTS_FLATPAK)
diff --git a/src/audiomanager.cpp b/src/audiomanager.cpp
index 04867a5f..f4342338 100644
--- a/src/audiomanager.cpp
+++ b/src/audiomanager.cpp
@@ -19,8 +19,8 @@
 #include "feed.h"
 #include "fetcher.h"
 #include "models/errorlogmodel.h"
-#include "networkconnectionmanager.h"
 #include "settingsmanager.h"
+#include "utils/networkconnectionmanager.h"
 
 class AudioManagerPrivate
 {
diff --git a/src/datamanager.cpp b/src/datamanager.cpp
index e1e4accb..c59f55f9 100644
--- a/src/datamanager.cpp
+++ b/src/datamanager.cpp
@@ -22,8 +22,8 @@
 #include "feed.h"
 #include "fetcher.h"
 #include "settingsmanager.h"
-#include "storagemanager.h"
 #include "sync/sync.h"
+#include "utils/storagemanager.h"
 
 DataManager::DataManager()
 {
diff --git a/src/enclosure.cpp b/src/enclosure.cpp
index e44d924b..906e1fb2 100644
--- a/src/enclosure.cpp
+++ b/src/enclosure.cpp
@@ -23,16 +23,16 @@
 #include "audiomanager.h"
 #include "database.h"
 #include "datamanager.h"
-#include "enclosuredownloadjob.h"
 #include "entry.h"
 #include "error.h"
 #include "fetcher.h"
 #include "models/downloadmodel.h"
 #include "models/errorlogmodel.h"
-#include "networkconnectionmanager.h"
 #include "settingsmanager.h"
-#include "storagemanager.h"
 #include "sync/sync.h"
+#include "utils/enclosuredownloadjob.h"
+#include "utils/networkconnectionmanager.h"
+#include "utils/storagemanager.h"
 
 Enclosure::Enclosure(Entry *entry)
     : QObject(entry)
diff --git a/src/fetcher.cpp b/src/fetcher.cpp
index 92f9afd9..ea1dd937 100644
--- a/src/fetcher.cpp
+++ b/src/fetcher.cpp
@@ -22,13 +22,13 @@
 
 #include "database.h"
 #include "enclosure.h"
-#include "fetchfeedsjob.h"
 #include "kasts-version.h"
 #include "models/errorlogmodel.h"
-#include "networkconnectionmanager.h"
 #include "settingsmanager.h"
-#include "storagemanager.h"
 #include "sync/sync.h"
+#include "utils/fetchfeedsjob.h"
+#include "utils/networkconnectionmanager.h"
+#include "utils/storagemanager.h"
 
 Fetcher::Fetcher()
 {
diff --git a/src/main.cpp b/src/main.cpp
index 78eb5063..61b29378 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -49,12 +49,12 @@
 #include "models/feedsproxymodel.h"
 #include "models/podcastsearchmodel.h"
 #include "models/queuemodel.h"
-#include "networkconnectionmanager.h"
 #include "settingsmanager.h"
-#include "storagemanager.h"
 #include "sync/sync.h"
 #include "sync/syncutils.h"
-#include "systrayicon.h"
+#include "utils/networkconnectionmanager.h"
+#include "utils/storagemanager.h"
+#include "utils/systrayicon.h"
 
 #ifdef Q_OS_WINDOWS
 #include <windows.h>
diff --git a/src/models/chaptermodel.cpp b/src/models/chaptermodel.cpp
index 6c0b50ab..aaea5964 100644
--- a/src/models/chaptermodel.cpp
+++ b/src/models/chaptermodel.cpp
@@ -20,7 +20,7 @@
 
 #include "audiomanager.h"
 #include "database.h"
-#include "storagemanager.h"
+#include "utils/storagemanager.h"
 
 ChapterModel::ChapterModel(QObject *parent)
     : QAbstractListModel(parent)
diff --git a/src/sync/sync.cpp b/src/sync/sync.cpp
index 8954ead5..ec98fac0 100644
--- a/src/sync/sync.cpp
+++ b/src/sync/sync.cpp
@@ -27,11 +27,8 @@
 #include "datamanager.h"
 #include "entry.h"
 #include "fetcher.h"
-#include "fetchfeedsjob.h"
 #include "models/errorlogmodel.h"
-#include "networkconnectionmanager.h"
 #include "settingsmanager.h"
-#include "storagemanager.h"
 #include "sync/gpodder/devicerequest.h"
 #include "sync/gpodder/episodeactionrequest.h"
 #include "sync/gpodder/gpodder.h"
@@ -44,6 +41,9 @@
 #include "sync/gpodder/uploadsubscriptionrequest.h"
 #include "sync/syncjob.h"
 #include "sync/syncutils.h"
+#include "utils/fetchfeedsjob.h"
+#include "utils/networkconnectionmanager.h"
+#include "utils/storagemanager.h"
 
 using namespace SyncUtils;
 
diff --git a/src/sync/syncjob.cpp b/src/sync/syncjob.cpp
index 94062a39..16b58ba2 100644
--- a/src/sync/syncjob.cpp
+++ b/src/sync/syncjob.cpp
@@ -19,7 +19,6 @@
 #include "database.h"
 #include "datamanager.h"
 #include "entry.h"
-#include "fetchfeedsjob.h"
 #include "models/errorlogmodel.h"
 #include "settingsmanager.h"
 #include "sync/gpodder/episodeactionrequest.h"
@@ -29,6 +28,7 @@
 #include "sync/gpodder/uploadsubscriptionrequest.h"
 #include "sync/sync.h"
 #include "sync/syncutils.h"
+#include "utils/fetchfeedsjob.h"
 
 using namespace SyncUtils;
 
diff --git a/src/androidlogging.h b/src/utils/androidlogging.h
similarity index 100%
rename from src/androidlogging.h
rename to src/utils/androidlogging.h
diff --git a/src/enclosuredownloadjob.cpp b/src/utils/enclosuredownloadjob.cpp
similarity index 100%
rename from src/enclosuredownloadjob.cpp
rename to src/utils/enclosuredownloadjob.cpp
diff --git a/src/enclosuredownloadjob.h b/src/utils/enclosuredownloadjob.h
similarity index 100%
rename from src/enclosuredownloadjob.h
rename to src/utils/enclosuredownloadjob.h
diff --git a/src/fetchfeedsjob.cpp b/src/utils/fetchfeedsjob.cpp
similarity index 100%
rename from src/fetchfeedsjob.cpp
rename to src/utils/fetchfeedsjob.cpp
diff --git a/src/fetchfeedsjob.h b/src/utils/fetchfeedsjob.h
similarity index 100%
rename from src/fetchfeedsjob.h
rename to src/utils/fetchfeedsjob.h
diff --git a/src/networkconnectionmanager.cpp b/src/utils/networkconnectionmanager.cpp
similarity index 100%
rename from src/networkconnectionmanager.cpp
rename to src/utils/networkconnectionmanager.cpp
diff --git a/src/networkconnectionmanager.h b/src/utils/networkconnectionmanager.h
similarity index 100%
rename from src/networkconnectionmanager.h
rename to src/utils/networkconnectionmanager.h
diff --git a/src/storagemanager.cpp b/src/utils/storagemanager.cpp
similarity index 100%
rename from src/storagemanager.cpp
rename to src/utils/storagemanager.cpp
diff --git a/src/storagemanager.h b/src/utils/storagemanager.h
similarity index 100%
rename from src/storagemanager.h
rename to src/utils/storagemanager.h
diff --git a/src/storagemovejob.cpp b/src/utils/storagemovejob.cpp
similarity index 99%
rename from src/storagemovejob.cpp
rename to src/utils/storagemovejob.cpp
index 61f715c0..df55b113 100644
--- a/src/storagemovejob.cpp
+++ b/src/utils/storagemovejob.cpp
@@ -13,7 +13,6 @@
 
 #include <KLocalizedString>
 
-
 StorageMoveJob::StorageMoveJob(const QString &from, const QString &to, QStringList &list, QObject *parent)
     : KJob(parent)
     , m_from(from)
diff --git a/src/storagemovejob.h b/src/utils/storagemovejob.h
similarity index 100%
rename from src/storagemovejob.h
rename to src/utils/storagemovejob.h
diff --git a/src/systrayicon.cpp b/src/utils/systrayicon.cpp
similarity index 100%
rename from src/systrayicon.cpp
rename to src/utils/systrayicon.cpp
diff --git a/src/systrayicon.h b/src/utils/systrayicon.h
similarity index 100%
rename from src/systrayicon.h
rename to src/utils/systrayicon.h
diff --git a/src/updatefeedjob.cpp b/src/utils/updatefeedjob.cpp
similarity index 100%
rename from src/updatefeedjob.cpp
rename to src/utils/updatefeedjob.cpp
diff --git a/src/updatefeedjob.h b/src/utils/updatefeedjob.h
similarity index 100%
rename from src/updatefeedjob.h
rename to src/utils/updatefeedjob.h