diff --git a/ntfysh_client/App.config b/ntfysh_client/App.config
deleted file mode 100644
index 56efbc7..0000000
--- a/ntfysh_client/App.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
-    </startup>
-</configuration>
\ No newline at end of file
diff --git a/ntfysh_client/MainForm.cs b/ntfysh_client/MainForm.cs
index 7aeb861..895ffee 100644
--- a/ntfysh_client/MainForm.cs
+++ b/ntfysh_client/MainForm.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using System.Reflection;
 using System.Windows.Forms;
 using Newtonsoft.Json;
+using ntfysh_client.Notifications;
 
 namespace ntfysh_client
 {
diff --git a/ntfysh_client/NotificationListener.cs b/ntfysh_client/Notifications/NotificationListener.cs
similarity index 99%
rename from ntfysh_client/NotificationListener.cs
rename to ntfysh_client/Notifications/NotificationListener.cs
index 5e4d58c..ef39467 100644
--- a/ntfysh_client/NotificationListener.cs
+++ b/ntfysh_client/Notifications/NotificationListener.cs
@@ -1,5 +1,4 @@
-using Newtonsoft.Json;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
@@ -12,8 +11,9 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Web;
+using Newtonsoft.Json;
 
-namespace ntfysh_client
+namespace ntfysh_client.Notifications
 {
     public class NotificationListener
     {
diff --git a/ntfysh_client/NotificationReceiveEventArgs.cs b/ntfysh_client/Notifications/NotificationReceiveEventArgs.cs
similarity index 89%
rename from ntfysh_client/NotificationReceiveEventArgs.cs
rename to ntfysh_client/Notifications/NotificationReceiveEventArgs.cs
index 87d932e..6590e67 100644
--- a/ntfysh_client/NotificationReceiveEventArgs.cs
+++ b/ntfysh_client/Notifications/NotificationReceiveEventArgs.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace ntfysh_client
+namespace ntfysh_client.Notifications
 {
     public class NotificationReceiveEventArgs : EventArgs
     {
diff --git a/ntfysh_client/NtfyEvent.cs b/ntfysh_client/Notifications/NtfyEvent.cs
similarity index 93%
rename from ntfysh_client/NtfyEvent.cs
rename to ntfysh_client/Notifications/NtfyEvent.cs
index ef4ee82..6cada12 100644
--- a/ntfysh_client/NtfyEvent.cs
+++ b/ntfysh_client/Notifications/NtfyEvent.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace ntfysh_client
+namespace ntfysh_client.Notifications
 {
     public class NtfyEvent
     {
diff --git a/ntfysh_client/SubscribedTopic.cs b/ntfysh_client/Notifications/SubscribedTopic.cs
similarity index 96%
rename from ntfysh_client/SubscribedTopic.cs
rename to ntfysh_client/Notifications/SubscribedTopic.cs
index b0593e1..9189c4f 100644
--- a/ntfysh_client/SubscribedTopic.cs
+++ b/ntfysh_client/Notifications/SubscribedTopic.cs
@@ -3,7 +3,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 
-namespace ntfysh_client
+namespace ntfysh_client.Notifications
 {
     public class SubscribedTopic
     {
diff --git a/ntfysh_client/Program.cs b/ntfysh_client/Program.cs
index a64b094..5942747 100644
--- a/ntfysh_client/Program.cs
+++ b/ntfysh_client/Program.cs
@@ -4,6 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Windows.Forms;
+using ntfysh_client.Notifications;
 
 namespace ntfysh_client
 {
diff --git a/ntfysh_client/packages.config b/ntfysh_client/packages.config
deleted file mode 100644
index 5eaa239..0000000
--- a/ntfysh_client/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
-</packages>
\ No newline at end of file