diff --git a/API/Program.cs b/API/Program.cs
index 1bca2dc..1ea36d6 100644
--- a/API/Program.cs
+++ b/API/Program.cs
@@ -1,6 +1,8 @@
 using System.Runtime.InteropServices;
 using Logging;
 using Tranga;
+using Tranga.NotificationManagers;
+using Tranga.LibraryManagers;
 
 namespace API;
 
diff --git a/Tranga/LibraryManager.cs b/Tranga/LibraryManagers/LibraryManager.cs
similarity index 99%
rename from Tranga/LibraryManager.cs
rename to Tranga/LibraryManagers/LibraryManager.cs
index b0dcb70..c2ead5f 100644
--- a/Tranga/LibraryManager.cs
+++ b/Tranga/LibraryManagers/LibraryManager.cs
@@ -5,7 +5,7 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Tranga.LibraryManagers;
 
-namespace Tranga;
+namespace Tranga.LibraryManagers;
 
 public abstract class LibraryManager
 {
diff --git a/Tranga/Migrate.cs b/Tranga/Migrate.cs
index 61b34ee..4db6f5c 100644
--- a/Tranga/Migrate.cs
+++ b/Tranga/Migrate.cs
@@ -1,5 +1,6 @@
 using Logging;
 using Newtonsoft.Json;
+using Tranga.TrangaTasks;
 
 namespace Tranga;
 
diff --git a/Tranga/NotificationManager.cs b/Tranga/NotificationManagers/NotificationManager.cs
similarity index 97%
rename from Tranga/NotificationManager.cs
rename to Tranga/NotificationManagers/NotificationManager.cs
index 1c6da52..7c65063 100644
--- a/Tranga/NotificationManager.cs
+++ b/Tranga/NotificationManagers/NotificationManager.cs
@@ -1,9 +1,8 @@
 using Logging;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using Tranga.NotificationManagers;
 
-namespace Tranga;
+namespace Tranga.NotificationManagers;
 
 public abstract class NotificationManager
 {
diff --git a/Tranga/TrangaTasks/DownloadChapterTask.cs b/Tranga/TrangaTasks/DownloadChapterTask.cs
index fa396dd..8a76f69 100644
--- a/Tranga/TrangaTasks/DownloadChapterTask.cs
+++ b/Tranga/TrangaTasks/DownloadChapterTask.cs
@@ -1,5 +1,7 @@
 using System.Net;
 using Logging;
+using Tranga.NotificationManagers;
+using Tranga.LibraryManagers;
 
 namespace Tranga.TrangaTasks;
 
diff --git a/Tranga/TrangaTask.cs b/Tranga/TrangaTasks/TrangaTask.cs
similarity index 99%
rename from Tranga/TrangaTask.cs
rename to Tranga/TrangaTasks/TrangaTask.cs
index 6dbf0d1..4c2b4eb 100644
--- a/Tranga/TrangaTask.cs
+++ b/Tranga/TrangaTasks/TrangaTask.cs
@@ -3,10 +3,9 @@ using System.Text.Json.Serialization;
 using Logging;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using Tranga.TrangaTasks;
 using JsonConverter = Newtonsoft.Json.JsonConverter;
 
-namespace Tranga;
+namespace Tranga.TrangaTasks;
 
 /// <summary>
 /// Stores information on Task, when implementing new Tasks also update the serializer