diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/FilesRetentionClient.cs b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/FileRetention/FilesRetentionClient.cs
similarity index 79%
rename from Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/FilesRetentionClient.cs
rename to Pilz.Net.CloudProviders.Nextcloud/Client/Apps/FileRetention/FilesRetentionClient.cs
index 8ba58f4..54ffe58 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/FilesRetentionClient.cs
+++ b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/FileRetention/FilesRetentionClient.cs
@@ -1,6 +1,8 @@
-using Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Model;
+using Pilz.Net.CloudProviders.Nextcloud;
+using Pilz.Net.CloudProviders.Nextcloud.Client;
+using Pilz.Net.CloudProviders.Nextcloud.Client.Apps.FileRetention.Model;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention;
+namespace Pilz.Net.CloudProviders.Nextcloud.Client.Apps.FileRetention;
 
 public class FilesRetentionClient : ClientBase
 {
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Model/RetentionRule.cs b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/FileRetention/Model/RetentionRule.cs
similarity index 80%
rename from Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Model/RetentionRule.cs
rename to Pilz.Net.CloudProviders.Nextcloud/Client/Apps/FileRetention/Model/RetentionRule.cs
index 0d85135..e6821f0 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Model/RetentionRule.cs
+++ b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/FileRetention/Model/RetentionRule.cs
@@ -1,6 +1,6 @@
-using Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Ocs;
+using Pilz.Net.CloudProviders.Nextcloud.Client.Apps.FileRetention.Ocs;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Model;
+namespace Pilz.Net.CloudProviders.Nextcloud.Client.Apps.FileRetention.Model;
 
 public class RetentionRule : RetentionRuleInfo
 {
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Model/RetentionRuleInfo.cs b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/FileRetention/Model/RetentionRuleInfo.cs
similarity index 83%
rename from Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Model/RetentionRuleInfo.cs
rename to Pilz.Net.CloudProviders.Nextcloud/Client/Apps/FileRetention/Model/RetentionRuleInfo.cs
index 082a1f8..f2a45b9 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Model/RetentionRuleInfo.cs
+++ b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/FileRetention/Model/RetentionRuleInfo.cs
@@ -1,6 +1,6 @@
-using Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Ocs;
+using Pilz.Net.CloudProviders.Nextcloud.Client.Apps.FileRetention.Ocs;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Model;
+namespace Pilz.Net.CloudProviders.Nextcloud.Client.Apps.FileRetention.Model;
 
 public class RetentionRuleInfo
 {
diff --git a/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/FileRetention/Model/RetentionTimeAfter.cs b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/FileRetention/Model/RetentionTimeAfter.cs
new file mode 100644
index 0000000..e7e092d
--- /dev/null
+++ b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/FileRetention/Model/RetentionTimeAfter.cs
@@ -0,0 +1,7 @@
+namespace Pilz.Net.CloudProviders.Nextcloud.Client.Apps.FileRetention.Model;
+
+public enum RetentionTimeAfter
+{
+    CreationDate,
+    LastAccess
+}
diff --git a/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/FileRetention/Model/RetentionTimeUnit.cs b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/FileRetention/Model/RetentionTimeUnit.cs
new file mode 100644
index 0000000..a3122d2
--- /dev/null
+++ b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/FileRetention/Model/RetentionTimeUnit.cs
@@ -0,0 +1,9 @@
+namespace Pilz.Net.CloudProviders.Nextcloud.Client.Apps.FileRetention.Model;
+
+public enum RetentionTimeUnit
+{
+    Day,
+    Week,
+    Month,
+    Year
+}
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Ocs/OcsDataRetentionRule.cs b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/FileRetention/Ocs/OcsDataRetentionRule.cs
similarity index 72%
rename from Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Ocs/OcsDataRetentionRule.cs
rename to Pilz.Net.CloudProviders.Nextcloud/Client/Apps/FileRetention/Ocs/OcsDataRetentionRule.cs
index fe99b2b..5b6de08 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Ocs/OcsDataRetentionRule.cs
+++ b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/FileRetention/Ocs/OcsDataRetentionRule.cs
@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
-using Pilz.Networking.CloudProviders.Nextcloud.Ocs;
+using Pilz.Net.CloudProviders.Nextcloud.OCS;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Ocs;
+namespace Pilz.Net.CloudProviders.Nextcloud.Client.Apps.FileRetention.Ocs;
 
 public class OcsDataRetentionRule : OcsData
 {
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Ocs/OcsResponseDataEntryRetention.cs b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/FileRetention/Ocs/OcsResponseDataEntryRetention.cs
similarity index 77%
rename from Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Ocs/OcsResponseDataEntryRetention.cs
rename to Pilz.Net.CloudProviders.Nextcloud/Client/Apps/FileRetention/Ocs/OcsResponseDataEntryRetention.cs
index 5f8b536..38059f2 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Ocs/OcsResponseDataEntryRetention.cs
+++ b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/FileRetention/Ocs/OcsResponseDataEntryRetention.cs
@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
-using Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses;
+using Pilz.Net.CloudProviders.Nextcloud.OCS.Responses;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Ocs;
+namespace Pilz.Net.CloudProviders.Nextcloud.Client.Apps.FileRetention.Ocs;
 
 public class OcsResponseDataEntryRetention : OcsResponseDataEntry
 {
diff --git a/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/FileRetention/Ocs/OcsResponseRetention.cs b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/FileRetention/Ocs/OcsResponseRetention.cs
new file mode 100644
index 0000000..6c79632
--- /dev/null
+++ b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/FileRetention/Ocs/OcsResponseRetention.cs
@@ -0,0 +1,7 @@
+using Pilz.Net.CloudProviders.Nextcloud.OCS.Responses;
+
+namespace Pilz.Net.CloudProviders.Nextcloud.Client.Apps.FileRetention.Ocs;
+
+public class OcsResponseRetention : OcsResponse<OcsResponseDataArray<OcsResponseDataEntryRetention>>
+{
+}
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/OcsApiFilesRetention.cs b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/FileRetention/OcsApiFilesRetention.cs
similarity index 81%
rename from Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/OcsApiFilesRetention.cs
rename to Pilz.Net.CloudProviders.Nextcloud/Client/Apps/FileRetention/OcsApiFilesRetention.cs
index 4ca6fc3..4702bd7 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/OcsApiFilesRetention.cs
+++ b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/FileRetention/OcsApiFilesRetention.cs
@@ -1,7 +1,8 @@
-using Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Ocs;
-using Pilz.Networking.CloudProviders.Nextcloud.Ocs;
+using Pilz.Net.CloudProviders.Nextcloud;
+using Pilz.Net.CloudProviders.Nextcloud.Client.Apps.FileRetention.Ocs;
+using Pilz.Net.CloudProviders.Nextcloud.OCS;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention;
+namespace Pilz.Net.CloudProviders.Nextcloud.Client.Apps.FileRetention;
 
 public class OcsApiFilesRetention : OcsApiBase
 {
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/Column.cs b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/Tables/Model/Column.cs
similarity index 97%
rename from Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/Column.cs
rename to Pilz.Net.CloudProviders.Nextcloud/Client/Apps/Tables/Model/Column.cs
index 1bf2c64..d3b3839 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/Column.cs
+++ b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/Tables/Model/Column.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model;
+namespace Pilz.Net.CloudProviders.Nextcloud.Client.Apps.Tables.Model;
 
 public class Column
 {
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/ColumnSelectionOption.cs b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/Tables/Model/ColumnSelectionOption.cs
similarity index 71%
rename from Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/ColumnSelectionOption.cs
rename to Pilz.Net.CloudProviders.Nextcloud/Client/Apps/Tables/Model/ColumnSelectionOption.cs
index da7ebda..a21cef9 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/ColumnSelectionOption.cs
+++ b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/Tables/Model/ColumnSelectionOption.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model;
+namespace Pilz.Net.CloudProviders.Nextcloud.Client.Apps.Tables.Model;
 
 public class ColumnSelectionOption
 {
diff --git a/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/Tables/Model/ColumnSubtype.cs b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/Tables/Model/ColumnSubtype.cs
new file mode 100644
index 0000000..a3ecdae
--- /dev/null
+++ b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/Tables/Model/ColumnSubtype.cs
@@ -0,0 +1,8 @@
+namespace Pilz.Net.CloudProviders.Nextcloud.Client.Apps.Tables.Model;
+
+public enum ColumnSubtype
+{
+    None,
+    Unknown,
+    Line
+}
diff --git a/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/Tables/Model/ColumnType.cs b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/Tables/Model/ColumnType.cs
new file mode 100644
index 0000000..50459a8
--- /dev/null
+++ b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/Tables/Model/ColumnType.cs
@@ -0,0 +1,9 @@
+namespace Pilz.Net.CloudProviders.Nextcloud.Client.Apps.Tables.Model;
+
+public enum ColumnType
+{
+    Unknown,
+    Text,
+    Selection,
+    DateTime
+}
diff --git a/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/Tables/Model/Columns.cs b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/Tables/Model/Columns.cs
new file mode 100644
index 0000000..29c46e8
--- /dev/null
+++ b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/Tables/Model/Columns.cs
@@ -0,0 +1,5 @@
+namespace Pilz.Net.CloudProviders.Nextcloud.Client.Apps.Tables.Model;
+
+public class Columns : List<Column>
+{
+}
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/Row.cs b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/Tables/Model/Row.cs
similarity index 88%
rename from Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/Row.cs
rename to Pilz.Net.CloudProviders.Nextcloud/Client/Apps/Tables/Model/Row.cs
index 1f72439..763b7da 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/Row.cs
+++ b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/Tables/Model/Row.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model;
+namespace Pilz.Net.CloudProviders.Nextcloud.Client.Apps.Tables.Model;
 
 public class Row
 {
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/RowData.cs b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/Tables/Model/RowData.cs
similarity index 71%
rename from Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/RowData.cs
rename to Pilz.Net.CloudProviders.Nextcloud/Client/Apps/Tables/Model/RowData.cs
index df05a9e..a73813e 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/RowData.cs
+++ b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/Tables/Model/RowData.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model;
+namespace Pilz.Net.CloudProviders.Nextcloud.Client.Apps.Tables.Model;
 
 public class RowData
 {
diff --git a/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/Tables/Model/RowSimple.cs b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/Tables/Model/RowSimple.cs
new file mode 100644
index 0000000..7d0c1ef
--- /dev/null
+++ b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/Tables/Model/RowSimple.cs
@@ -0,0 +1,5 @@
+namespace Pilz.Net.CloudProviders.Nextcloud.Client.Apps.Tables.Model;
+
+public class RowSimple : List<object>
+{
+}
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/RowUpdate.cs b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/Tables/Model/RowUpdate.cs
similarity index 65%
rename from Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/RowUpdate.cs
rename to Pilz.Net.CloudProviders.Nextcloud/Client/Apps/Tables/Model/RowUpdate.cs
index 1e64ed0..389efea 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/RowUpdate.cs
+++ b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/Tables/Model/RowUpdate.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model;
+namespace Pilz.Net.CloudProviders.Nextcloud.Client.Apps.Tables.Model;
 
 public class RowUpdate
 {
diff --git a/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/Tables/Model/Rows.cs b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/Tables/Model/Rows.cs
new file mode 100644
index 0000000..91b6556
--- /dev/null
+++ b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/Tables/Model/Rows.cs
@@ -0,0 +1,5 @@
+namespace Pilz.Net.CloudProviders.Nextcloud.Client.Apps.Tables.Model;
+
+public class Rows : List<Row>
+{
+}
diff --git a/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/Tables/Model/RowsSimple.cs b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/Tables/Model/RowsSimple.cs
new file mode 100644
index 0000000..32e66b7
--- /dev/null
+++ b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/Tables/Model/RowsSimple.cs
@@ -0,0 +1,5 @@
+namespace Pilz.Net.CloudProviders.Nextcloud.Client.Apps.Tables.Model;
+
+public class RowsSimple : List<RowSimple>
+{
+}
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/OcsApiTables.cs b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/Tables/OcsApiTables.cs
similarity index 92%
rename from Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/OcsApiTables.cs
rename to Pilz.Net.CloudProviders.Nextcloud/Client/Apps/Tables/OcsApiTables.cs
index 25e7f12..ad5c70a 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/OcsApiTables.cs
+++ b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/Tables/OcsApiTables.cs
@@ -1,7 +1,8 @@
-using Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model;
-using Pilz.Networking.CloudProviders.Nextcloud.Ocs;
+using Pilz.Net.CloudProviders.Nextcloud;
+using Pilz.Net.CloudProviders.Nextcloud.Client.Apps.Tables.Model;
+using Pilz.Net.CloudProviders.Nextcloud.OCS;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables;
+namespace Pilz.Net.CloudProviders.Nextcloud.Client.Apps.Tables;
 
 public class OcsApiTables : OcsApiBase
 {
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/TablesClient.cs b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/Tables/TablesClient.cs
similarity index 88%
rename from Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/TablesClient.cs
rename to Pilz.Net.CloudProviders.Nextcloud/Client/Apps/Tables/TablesClient.cs
index 6282bd8..f979d95 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/TablesClient.cs
+++ b/Pilz.Net.CloudProviders.Nextcloud/Client/Apps/Tables/TablesClient.cs
@@ -1,6 +1,8 @@
-using Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model;
+using Pilz.Net.CloudProviders.Nextcloud;
+using Pilz.Net.CloudProviders.Nextcloud.Client;
+using Pilz.Net.CloudProviders.Nextcloud.Client.Apps.Tables.Model;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables;
+namespace Pilz.Net.CloudProviders.Nextcloud.Client.Apps.Tables;
 
 public class TablesClient : ClientBase
 {
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Client/ClientBase.cs b/Pilz.Net.CloudProviders.Nextcloud/Client/ClientBase.cs
similarity index 88%
rename from Pilz.Networking.CloudProviders.Nextcloud/Client/ClientBase.cs
rename to Pilz.Net.CloudProviders.Nextcloud/Client/ClientBase.cs
index 36f4d26..fd0a13a 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/Client/ClientBase.cs
+++ b/Pilz.Net.CloudProviders.Nextcloud/Client/ClientBase.cs
@@ -1,4 +1,4 @@
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client;
+namespace Pilz.Net.CloudProviders.Nextcloud.Client;
 
 
 /* Nicht gemergte Änderung aus Projekt "Pilz.Networking.CloudProviders.Nextcloud (net6.0)"
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/CloudClient.cs b/Pilz.Net.CloudProviders.Nextcloud/Client/Cloud/CloudClient.cs
similarity index 76%
rename from Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/CloudClient.cs
rename to Pilz.Net.CloudProviders.Nextcloud/Client/Cloud/CloudClient.cs
index a3496f6..a10b612 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/CloudClient.cs
+++ b/Pilz.Net.CloudProviders.Nextcloud/Client/Cloud/CloudClient.cs
@@ -1,6 +1,7 @@
-using Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Model;
+using Pilz.Net.CloudProviders.Nextcloud.Client;
+using Pilz.Net.CloudProviders.Nextcloud.Client.Cloud.Model;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud;
+namespace Pilz.Net.CloudProviders.Nextcloud.Client.Cloud;
 
 public class CloudClient : ClientBase
 {
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/Model/UserBackendCapabilities.cs b/Pilz.Net.CloudProviders.Nextcloud/Client/Cloud/Model/UserBackendCapabilities.cs
similarity index 80%
rename from Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/Model/UserBackendCapabilities.cs
rename to Pilz.Net.CloudProviders.Nextcloud/Client/Cloud/Model/UserBackendCapabilities.cs
index 4477461..4567c93 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/Model/UserBackendCapabilities.cs
+++ b/Pilz.Net.CloudProviders.Nextcloud/Client/Cloud/Model/UserBackendCapabilities.cs
@@ -1,4 +1,4 @@
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Model;
+namespace Pilz.Net.CloudProviders.Nextcloud.Client.Cloud.Model;
 
 public class UserBackendCapabilities
 {
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/Model/UserInfo.cs b/Pilz.Net.CloudProviders.Nextcloud/Client/Cloud/Model/UserInfo.cs
similarity index 95%
rename from Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/Model/UserInfo.cs
rename to Pilz.Net.CloudProviders.Nextcloud/Client/Cloud/Model/UserInfo.cs
index 2a2c232..9fb0fe8 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/Model/UserInfo.cs
+++ b/Pilz.Net.CloudProviders.Nextcloud/Client/Cloud/Model/UserInfo.cs
@@ -1,6 +1,7 @@
-using Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Ocs;
+using Pilz.Net.CloudProviders.Nextcloud;
+using Pilz.Net.CloudProviders.Nextcloud.Client.Cloud.Ocs;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Model;
+namespace Pilz.Net.CloudProviders.Nextcloud.Client.Cloud.Model;
 
 public class UserInfo
 {
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/Model/UserQuota.cs b/Pilz.Net.CloudProviders.Nextcloud/Client/Cloud/Model/UserQuota.cs
similarity index 89%
rename from Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/Model/UserQuota.cs
rename to Pilz.Net.CloudProviders.Nextcloud/Client/Cloud/Model/UserQuota.cs
index 49fa91a..4d70a66 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/Model/UserQuota.cs
+++ b/Pilz.Net.CloudProviders.Nextcloud/Client/Cloud/Model/UserQuota.cs
@@ -1,4 +1,4 @@
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Model;
+namespace Pilz.Net.CloudProviders.Nextcloud.Client.Cloud.Model;
 
 public class UserQuota
 {
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/Ocs/OcsResponseDataUser.cs b/Pilz.Net.CloudProviders.Nextcloud/Client/Cloud/Ocs/OcsResponseDataUser.cs
similarity index 93%
rename from Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/Ocs/OcsResponseDataUser.cs
rename to Pilz.Net.CloudProviders.Nextcloud/Client/Cloud/Ocs/OcsResponseDataUser.cs
index c30cb0b..89edd0c 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/Ocs/OcsResponseDataUser.cs
+++ b/Pilz.Net.CloudProviders.Nextcloud/Client/Cloud/Ocs/OcsResponseDataUser.cs
@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
-using Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses;
+using Pilz.Net.CloudProviders.Nextcloud.OCS.Responses;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Ocs;
+namespace Pilz.Net.CloudProviders.Nextcloud.Client.Cloud.Ocs;
 
 public class OcsResponseDataUser : OcsResponseData
 {
diff --git a/Pilz.Net.CloudProviders.Nextcloud/Client/Cloud/Ocs/OcsResponseUser.cs b/Pilz.Net.CloudProviders.Nextcloud/Client/Cloud/Ocs/OcsResponseUser.cs
new file mode 100644
index 0000000..268b4fe
--- /dev/null
+++ b/Pilz.Net.CloudProviders.Nextcloud/Client/Cloud/Ocs/OcsResponseUser.cs
@@ -0,0 +1,7 @@
+using Pilz.Net.CloudProviders.Nextcloud.OCS.Responses;
+
+namespace Pilz.Net.CloudProviders.Nextcloud.Client.Cloud.Ocs;
+
+public class OcsResponseUser : OcsResponse<OcsResponseDataUser>
+{
+}
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/OcsApiCloud.cs b/Pilz.Net.CloudProviders.Nextcloud/Client/Cloud/OcsApiCloud.cs
similarity index 66%
rename from Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/OcsApiCloud.cs
rename to Pilz.Net.CloudProviders.Nextcloud/Client/Cloud/OcsApiCloud.cs
index de67e63..f0621c4 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/OcsApiCloud.cs
+++ b/Pilz.Net.CloudProviders.Nextcloud/Client/Cloud/OcsApiCloud.cs
@@ -1,7 +1,8 @@
-using Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Ocs;
-using Pilz.Networking.CloudProviders.Nextcloud.Ocs;
+using Pilz.Net.CloudProviders.Nextcloud;
+using Pilz.Net.CloudProviders.Nextcloud.Client.Cloud.Ocs;
+using Pilz.Net.CloudProviders.Nextcloud.OCS;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud;
+namespace Pilz.Net.CloudProviders.Nextcloud.Client.Cloud;
 
 public class OcsApiCloud : OcsApiBase
 {
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Client/Core/OcsApiCore.cs b/Pilz.Net.CloudProviders.Nextcloud/Client/Core/OcsApiCore.cs
similarity index 63%
rename from Pilz.Networking.CloudProviders.Nextcloud/Client/Core/OcsApiCore.cs
rename to Pilz.Net.CloudProviders.Nextcloud/Client/Core/OcsApiCore.cs
index 41cc33d..d6f0001 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/Client/Core/OcsApiCore.cs
+++ b/Pilz.Net.CloudProviders.Nextcloud/Client/Core/OcsApiCore.cs
@@ -6,17 +6,9 @@ Nach:
 using Pilz.Networking.CloudProviders.Nextcloud.Ocs;
 using System;
 */
-using
-/* Nicht gemergte Änderung aus Projekt "Pilz.Networking.CloudProviders.Nextcloud (net6.0)"
-Vor:
-using System.Threading.Tasks;
-using Pilz.Networking.CloudProviders.Nextcloud.Ocs;
-Nach:
-using System.Threading.Tasks;
-*/
-Pilz.Networking.CloudProviders.Nextcloud.Ocs;
+using Pilz.Net.CloudProviders.Nextcloud.OCS;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Core;
+namespace Pilz.Net.CloudProviders.Nextcloud.Client.Core;
 
 public class OcsApiCore : OcsApiBase
 {
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Client/LoginFlowV2/Ocs/OcsResponseLoginFlowV2.cs b/Pilz.Net.CloudProviders.Nextcloud/Client/LoginFlowV2/Ocs/OcsResponseLoginFlowV2.cs
similarity index 91%
rename from Pilz.Networking.CloudProviders.Nextcloud/Client/LoginFlowV2/Ocs/OcsResponseLoginFlowV2.cs
rename to Pilz.Net.CloudProviders.Nextcloud/Client/LoginFlowV2/Ocs/OcsResponseLoginFlowV2.cs
index b3cdc4d..07d8032 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/Client/LoginFlowV2/Ocs/OcsResponseLoginFlowV2.cs
+++ b/Pilz.Net.CloudProviders.Nextcloud/Client/LoginFlowV2/Ocs/OcsResponseLoginFlowV2.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.LoginFlowV2.Ocs;
+namespace Pilz.Net.CloudProviders.Nextcloud.Client.LoginFlowV2.Ocs;
 
 public class OcsResponseLoginFlowV2
 {
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Client/LoginFlowV2/Ocs/OcsResponseLoginFlowV2Credentials.cs b/Pilz.Net.CloudProviders.Nextcloud/Client/LoginFlowV2/Ocs/OcsResponseLoginFlowV2Credentials.cs
similarity index 88%
rename from Pilz.Networking.CloudProviders.Nextcloud/Client/LoginFlowV2/Ocs/OcsResponseLoginFlowV2Credentials.cs
rename to Pilz.Net.CloudProviders.Nextcloud/Client/LoginFlowV2/Ocs/OcsResponseLoginFlowV2Credentials.cs
index cc32e86..dd08aa7 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/Client/LoginFlowV2/Ocs/OcsResponseLoginFlowV2Credentials.cs
+++ b/Pilz.Net.CloudProviders.Nextcloud/Client/LoginFlowV2/Ocs/OcsResponseLoginFlowV2Credentials.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.LoginFlowV2.Ocs;
+namespace Pilz.Net.CloudProviders.Nextcloud.Client.LoginFlowV2.Ocs;
 
 public class OcsResponseLoginFlowV2Credentials
 {
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Client/LoginFlowV2/OcsApiLoginFlowV2.cs b/Pilz.Net.CloudProviders.Nextcloud/Client/LoginFlowV2/OcsApiLoginFlowV2.cs
similarity index 80%
rename from Pilz.Networking.CloudProviders.Nextcloud/Client/LoginFlowV2/OcsApiLoginFlowV2.cs
rename to Pilz.Net.CloudProviders.Nextcloud/Client/LoginFlowV2/OcsApiLoginFlowV2.cs
index 2d6ed78..3e9f17c 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/Client/LoginFlowV2/OcsApiLoginFlowV2.cs
+++ b/Pilz.Net.CloudProviders.Nextcloud/Client/LoginFlowV2/OcsApiLoginFlowV2.cs
@@ -1,7 +1,7 @@
-using Pilz.Networking.CloudProviders.Nextcloud.Client.LoginFlowV2.Ocs;
-using Pilz.Networking.CloudProviders.Nextcloud.Ocs;
+using Pilz.Net.CloudProviders.Nextcloud.Client.LoginFlowV2.Ocs;
+using Pilz.Net.CloudProviders.Nextcloud.OCS;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.LoginFlowV2;
+namespace Pilz.Net.CloudProviders.Nextcloud.Client.LoginFlowV2;
 
 public class OcsApiLoginFlowV2 : OcsApiBase
 {
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Extensions.cs b/Pilz.Net.CloudProviders.Nextcloud/Extensions.cs
similarity index 91%
rename from Pilz.Networking.CloudProviders.Nextcloud/Extensions.cs
rename to Pilz.Net.CloudProviders.Nextcloud/Extensions.cs
index 5e85fa7..d5a33a6 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/Extensions.cs
+++ b/Pilz.Net.CloudProviders.Nextcloud/Extensions.cs
@@ -1,7 +1,7 @@
-using Pilz.Networking.CloudProviders.Nextcloud.Ocs;
+using Pilz.Net.CloudProviders.Nextcloud.OCS;
 using System.Text;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud;
+namespace Pilz.Net.CloudProviders.Nextcloud;
 
 public static class Extensions
 {
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/NextcloudClient.cs b/Pilz.Net.CloudProviders.Nextcloud/NextcloudClient.cs
similarity index 92%
rename from Pilz.Networking.CloudProviders.Nextcloud/NextcloudClient.cs
rename to Pilz.Net.CloudProviders.Nextcloud/NextcloudClient.cs
index 0defd4f..1914b38 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/NextcloudClient.cs
+++ b/Pilz.Net.CloudProviders.Nextcloud/NextcloudClient.cs
@@ -1,7 +1,8 @@
-using Pilz.Networking.CloudProviders.Nextcloud.Client;
-using Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud;
-using Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Model;
-using Pilz.Networking.CloudProviders.Nextcloud.Client.LoginFlowV2.Ocs;
+using Pilz.Net.CloudProviders.Nextcloud.Client;
+using Pilz.Net.CloudProviders.Nextcloud.Client.Cloud;
+using Pilz.Net.CloudProviders.Nextcloud.Client.Cloud.Model;
+using Pilz.Net.CloudProviders.Nextcloud.Client.LoginFlowV2.Ocs;
+using Pilz.Net.CloudProviders.Nextcloud.OCS;
 
 /* Nicht gemergte Änderung aus Projekt "Pilz.Networking.CloudProviders.Nextcloud (net6.0)"
 Vor:
@@ -17,10 +18,9 @@ using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 */
-using Pilz.Networking.CloudProviders.Nextcloud.Ocs;
 using System.Diagnostics;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud;
+namespace Pilz.Net.CloudProviders.Nextcloud;
 
 public class NextcloudClient : IDisposable
 {
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/NextcloudLogin.cs b/Pilz.Net.CloudProviders.Nextcloud/NextcloudLogin.cs
similarity index 84%
rename from Pilz.Networking.CloudProviders.Nextcloud/NextcloudLogin.cs
rename to Pilz.Net.CloudProviders.Nextcloud/NextcloudLogin.cs
index f84c8ad..d436b3b 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/NextcloudLogin.cs
+++ b/Pilz.Net.CloudProviders.Nextcloud/NextcloudLogin.cs
@@ -1,6 +1,6 @@
-using Pilz.Networking.CloudProviders.Nextcloud.Client.LoginFlowV2.Ocs;
+using Pilz.Net.CloudProviders.Nextcloud.Client.LoginFlowV2.Ocs;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud;
+namespace Pilz.Net.CloudProviders.Nextcloud;
 
 public class NextcloudLogin
 {
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/OCS/GetOcsApiAuthCredentailsEventArgs.cs b/Pilz.Net.CloudProviders.Nextcloud/OCS/GetOcsApiAuthCredentailsEventArgs.cs
similarity index 80%
rename from Pilz.Networking.CloudProviders.Nextcloud/OCS/GetOcsApiAuthCredentailsEventArgs.cs
rename to Pilz.Net.CloudProviders.Nextcloud/OCS/GetOcsApiAuthCredentailsEventArgs.cs
index 57549d4..07875a8 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/OCS/GetOcsApiAuthCredentailsEventArgs.cs
+++ b/Pilz.Net.CloudProviders.Nextcloud/OCS/GetOcsApiAuthCredentailsEventArgs.cs
@@ -1,4 +1,4 @@
-namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs;
+namespace Pilz.Net.CloudProviders.Nextcloud.OCS;
 
 public delegate void GetOcsApiAuthCredentailsEventHandler(object sender, GetOcsApiAuthCredentailsEventArgs eventArgs);
 
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApi.cs b/Pilz.Net.CloudProviders.Nextcloud/OCS/OcsApi.cs
similarity index 98%
rename from Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApi.cs
rename to Pilz.Net.CloudProviders.Nextcloud/OCS/OcsApi.cs
index 0837d32..1c6b76a 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApi.cs
+++ b/Pilz.Net.CloudProviders.Nextcloud/OCS/OcsApi.cs
@@ -23,7 +23,9 @@ using
 Nach:
 using
 */
-namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs;
+using Pilz.Net.CloudProviders.Nextcloud;
+
+namespace Pilz.Net.CloudProviders.Nextcloud.OCS;
 
 public class OcsApi : IDisposable
 {
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApiAuthCredentials.cs b/Pilz.Net.CloudProviders.Nextcloud/OCS/OcsApiAuthCredentials.cs
similarity index 82%
rename from Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApiAuthCredentials.cs
rename to Pilz.Net.CloudProviders.Nextcloud/OCS/OcsApiAuthCredentials.cs
index fd2591d..ca84fb9 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApiAuthCredentials.cs
+++ b/Pilz.Net.CloudProviders.Nextcloud/OCS/OcsApiAuthCredentials.cs
@@ -1,4 +1,4 @@
-namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs;
+namespace Pilz.Net.CloudProviders.Nextcloud.OCS;
 
 public struct OcsApiAuthCredentials
 {
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApiBase.cs b/Pilz.Net.CloudProviders.Nextcloud/OCS/OcsApiBase.cs
similarity index 73%
rename from Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApiBase.cs
rename to Pilz.Net.CloudProviders.Nextcloud/OCS/OcsApiBase.cs
index 06c8cc5..2db6238 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApiBase.cs
+++ b/Pilz.Net.CloudProviders.Nextcloud/OCS/OcsApiBase.cs
@@ -1,4 +1,4 @@
-namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs;
+namespace Pilz.Net.CloudProviders.Nextcloud.OCS;
 
 public abstract class OcsApiBase
 {
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApiResponse.cs b/Pilz.Net.CloudProviders.Nextcloud/OCS/OcsApiResponse.cs
similarity index 60%
rename from Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApiResponse.cs
rename to Pilz.Net.CloudProviders.Nextcloud/OCS/OcsApiResponse.cs
index cd80b26..0476ac7 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApiResponse.cs
+++ b/Pilz.Net.CloudProviders.Nextcloud/OCS/OcsApiResponse.cs
@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
-using Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses;
+using Pilz.Net.CloudProviders.Nextcloud.OCS.Responses;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs;
+namespace Pilz.Net.CloudProviders.Nextcloud.OCS;
 
 public class OcsApiResponse<TOcsResponse> where TOcsResponse : IOcsResponse
 {
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApiUrlPath.cs b/Pilz.Net.CloudProviders.Nextcloud/OCS/OcsApiUrlPath.cs
similarity index 88%
rename from Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApiUrlPath.cs
rename to Pilz.Net.CloudProviders.Nextcloud/OCS/OcsApiUrlPath.cs
index 6f37463..a5f6517 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApiUrlPath.cs
+++ b/Pilz.Net.CloudProviders.Nextcloud/OCS/OcsApiUrlPath.cs
@@ -1,4 +1,4 @@
-namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs;
+namespace Pilz.Net.CloudProviders.Nextcloud.OCS;
 
 public readonly struct OcsApiUrlPath
 {
diff --git a/Pilz.Net.CloudProviders.Nextcloud/OCS/OcsData.cs b/Pilz.Net.CloudProviders.Nextcloud/OCS/OcsData.cs
new file mode 100644
index 0000000..1fa08a8
--- /dev/null
+++ b/Pilz.Net.CloudProviders.Nextcloud/OCS/OcsData.cs
@@ -0,0 +1,5 @@
+namespace Pilz.Net.CloudProviders.Nextcloud.OCS;
+
+public class OcsData
+{
+}
diff --git a/Pilz.Net.CloudProviders.Nextcloud/OCS/Responses/IOcsResponse.cs b/Pilz.Net.CloudProviders.Nextcloud/OCS/Responses/IOcsResponse.cs
new file mode 100644
index 0000000..fc53a47
--- /dev/null
+++ b/Pilz.Net.CloudProviders.Nextcloud/OCS/Responses/IOcsResponse.cs
@@ -0,0 +1,5 @@
+namespace Pilz.Net.CloudProviders.Nextcloud.OCS.Responses;
+
+public interface IOcsResponse
+{
+}
diff --git a/Pilz.Net.CloudProviders.Nextcloud/OCS/Responses/IOcsResponseData.cs b/Pilz.Net.CloudProviders.Nextcloud/OCS/Responses/IOcsResponseData.cs
new file mode 100644
index 0000000..e76bab4
--- /dev/null
+++ b/Pilz.Net.CloudProviders.Nextcloud/OCS/Responses/IOcsResponseData.cs
@@ -0,0 +1,5 @@
+namespace Pilz.Net.CloudProviders.Nextcloud.OCS.Responses;
+
+public interface IOcsResponseData
+{
+}
diff --git a/Pilz.Net.CloudProviders.Nextcloud/OCS/Responses/IOcsResponseMeta.cs b/Pilz.Net.CloudProviders.Nextcloud/OCS/Responses/IOcsResponseMeta.cs
new file mode 100644
index 0000000..d5b5a89
--- /dev/null
+++ b/Pilz.Net.CloudProviders.Nextcloud/OCS/Responses/IOcsResponseMeta.cs
@@ -0,0 +1,5 @@
+namespace Pilz.Net.CloudProviders.Nextcloud.OCS.Responses;
+
+public interface IOcsResponseMeta
+{
+}
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/OcsResponse.cs b/Pilz.Net.CloudProviders.Nextcloud/OCS/Responses/OcsResponse.cs
similarity index 87%
rename from Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/OcsResponse.cs
rename to Pilz.Net.CloudProviders.Nextcloud/OCS/Responses/OcsResponse.cs
index 7d237f8..211cbf4 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/OcsResponse.cs
+++ b/Pilz.Net.CloudProviders.Nextcloud/OCS/Responses/OcsResponse.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses;
+namespace Pilz.Net.CloudProviders.Nextcloud.OCS.Responses;
 
 public class OcsResponse<TMeta, TData> : IOcsResponse where TMeta : IOcsResponseMeta where TData : IOcsResponseData
 {
diff --git a/Pilz.Net.CloudProviders.Nextcloud/OCS/Responses/OcsResponseData.cs b/Pilz.Net.CloudProviders.Nextcloud/OCS/Responses/OcsResponseData.cs
new file mode 100644
index 0000000..0a43513
--- /dev/null
+++ b/Pilz.Net.CloudProviders.Nextcloud/OCS/Responses/OcsResponseData.cs
@@ -0,0 +1,5 @@
+namespace Pilz.Net.CloudProviders.Nextcloud.OCS.Responses;
+
+public class OcsResponseData : IOcsResponseData
+{
+}
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/OcsResponseDataArray.cs b/Pilz.Net.CloudProviders.Nextcloud/OCS/Responses/OcsResponseDataArray.cs
similarity index 62%
rename from Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/OcsResponseDataArray.cs
rename to Pilz.Net.CloudProviders.Nextcloud/OCS/Responses/OcsResponseDataArray.cs
index e9cdb7a..7c964ab 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/OcsResponseDataArray.cs
+++ b/Pilz.Net.CloudProviders.Nextcloud/OCS/Responses/OcsResponseDataArray.cs
@@ -1,4 +1,4 @@
-namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses;
+namespace Pilz.Net.CloudProviders.Nextcloud.OCS.Responses;
 
 public class OcsResponseDataArray<TEntry> : List<TEntry>, IOcsResponseData where TEntry : OcsResponseDataEntry
 {
diff --git a/Pilz.Net.CloudProviders.Nextcloud/OCS/Responses/OcsResponseDataEntry.cs b/Pilz.Net.CloudProviders.Nextcloud/OCS/Responses/OcsResponseDataEntry.cs
new file mode 100644
index 0000000..8874cf9
--- /dev/null
+++ b/Pilz.Net.CloudProviders.Nextcloud/OCS/Responses/OcsResponseDataEntry.cs
@@ -0,0 +1,5 @@
+namespace Pilz.Net.CloudProviders.Nextcloud.OCS.Responses;
+
+public class OcsResponseDataEntry
+{
+}
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/OcsResponseMeta.cs b/Pilz.Net.CloudProviders.Nextcloud/OCS/Responses/OcsResponseMeta.cs
similarity index 81%
rename from Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/OcsResponseMeta.cs
rename to Pilz.Net.CloudProviders.Nextcloud/OCS/Responses/OcsResponseMeta.cs
index 4563745..8cde839 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/OcsResponseMeta.cs
+++ b/Pilz.Net.CloudProviders.Nextcloud/OCS/Responses/OcsResponseMeta.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses;
+namespace Pilz.Net.CloudProviders.Nextcloud.OCS.Responses;
 
 public class OcsResponseMeta : IOcsResponseMeta
 {
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Pilz.Networking.CloudProviders.Nextcloud.csproj b/Pilz.Net.CloudProviders.Nextcloud/Pilz.Net.CloudProviders.Nextcloud.csproj
similarity index 100%
rename from Pilz.Networking.CloudProviders.Nextcloud/Pilz.Networking.CloudProviders.Nextcloud.csproj
rename to Pilz.Net.CloudProviders.Nextcloud/Pilz.Net.CloudProviders.Nextcloud.csproj
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/README.md b/Pilz.Net.CloudProviders.Nextcloud/README.md
similarity index 100%
rename from Pilz.Networking.CloudProviders.Nextcloud/README.md
rename to Pilz.Net.CloudProviders.Nextcloud/README.md
diff --git a/Pilz.Net/Api/ApiAuthCheckEventArgs.cs b/Pilz.Net/Api/ApiAuthCheckEventArgs.cs
new file mode 100644
index 0000000..ba09a72
--- /dev/null
+++ b/Pilz.Net/Api/ApiAuthCheckEventArgs.cs
@@ -0,0 +1,20 @@
+namespace Pilz.Net.Api;
+
+public record class ApiAuthCheckEventArgs(string AuthKey)
+{
+    private bool hasDenyed;
+
+    public bool Valid { get; set; }
+
+    public void Deny()
+    {
+        Valid = false;
+        hasDenyed = true;
+    }
+
+    public void Permit()
+    {
+        if (!hasDenyed)
+            Valid = true;
+    }
+}
diff --git a/Pilz.Networking/Api/ApiClient.cs b/Pilz.Net/Api/ApiClient.cs
similarity index 81%
rename from Pilz.Networking/Api/ApiClient.cs
rename to Pilz.Net/Api/ApiClient.cs
index 545c3b0..72dc676 100644
--- a/Pilz.Networking/Api/ApiClient.cs
+++ b/Pilz.Net/Api/ApiClient.cs
@@ -1,17 +1,18 @@
-namespace Pilz.Networking.Api;
+namespace Pilz.Net.Api;
 
 public class ApiClient(string apiUrl) : IApiClient
 {
     protected readonly HttpClient httpClient = new();
 
-    public string ApiUrl { get; } = apiUrl;
+    public virtual string ApiUrl { get; } = apiUrl;
 
-    public IMessageSerializer Serializer { get; set; } = new DefaultMessageSerializer();
+    public string? AuthKey { get; set; }
+
+    public virtual IMessageSerializer Serializer { get; set; } = new DefaultMessageSerializer();
 
     public virtual async Task<ApiResponse> SendMessage<TResponse>(string url, ApiMessage message, IMessageSerializer? serializer)
     {
         serializer ??= Serializer;
-        //message.AuthSecret = AuthSecret;
 
         var res = await Send(url, message, serializer);
 
@@ -21,7 +22,6 @@ public class ApiClient(string apiUrl) : IApiClient
     public virtual async Task<ApiResponse<TResponse>> SendRequest<TResponse>(string url, ApiMessage message, IMessageSerializer? serializer) where TResponse : ApiMessage
     {
         serializer ??= Serializer;
-        //message.AuthSecret = AuthSecret;
 
         var res = await Send(url, message, serializer);
         TResponse? result = null;
@@ -36,6 +36,7 @@ public class ApiClient(string apiUrl) : IApiClient
     {
         var fullRequestUrl = ApiUrl + url;
         var content = new StringContent(serializer.Serialize(message)!, null, "application/json");
+        content.Headers.Add("API-AUTH-KEY", AuthKey);
         return await httpClient.PostAsync(fullRequestUrl, content);
     }
 }
diff --git a/Pilz.Net/Api/ApiMessage.cs b/Pilz.Net/Api/ApiMessage.cs
new file mode 100644
index 0000000..64486fc
--- /dev/null
+++ b/Pilz.Net/Api/ApiMessage.cs
@@ -0,0 +1,5 @@
+namespace Pilz.Net.Api;
+
+public abstract class ApiMessage
+{
+}
diff --git a/Pilz.Networking/Api/ApiResponse.cs b/Pilz.Net/Api/ApiResponse.cs
similarity index 88%
rename from Pilz.Networking/Api/ApiResponse.cs
rename to Pilz.Net/Api/ApiResponse.cs
index b95cc4d..2af962b 100644
--- a/Pilz.Networking/Api/ApiResponse.cs
+++ b/Pilz.Net/Api/ApiResponse.cs
@@ -1,6 +1,6 @@
 using System.Net;
 
-namespace Pilz.Networking.Api;
+namespace Pilz.Net.Api;
 
 public record class ApiResponse(
     HttpStatusCode StatusCode)
diff --git a/Pilz.Networking/Api/ApiResponseT.cs b/Pilz.Net/Api/ApiResponseT.cs
similarity index 89%
rename from Pilz.Networking/Api/ApiResponseT.cs
rename to Pilz.Net/Api/ApiResponseT.cs
index 294ce3b..e7f1d73 100644
--- a/Pilz.Networking/Api/ApiResponseT.cs
+++ b/Pilz.Net/Api/ApiResponseT.cs
@@ -1,6 +1,6 @@
 using System.Net;
 
-namespace Pilz.Networking.Api;
+namespace Pilz.Net.Api;
 
 public record class ApiResponse<T>(
     HttpStatusCode StatusCode,
diff --git a/Pilz.Networking/Api/ApiResult.cs b/Pilz.Net/Api/ApiResult.cs
similarity index 90%
rename from Pilz.Networking/Api/ApiResult.cs
rename to Pilz.Net/Api/ApiResult.cs
index 1baed6c..60eb8f7 100644
--- a/Pilz.Networking/Api/ApiResult.cs
+++ b/Pilz.Net/Api/ApiResult.cs
@@ -1,6 +1,6 @@
 using System.Net;
 
-namespace Pilz.Networking.Api;
+namespace Pilz.Net.Api;
 
 public record class ApiResult(
     HttpStatusCode StatusCode,
diff --git a/Pilz.Networking/Api/ApiServer.cs b/Pilz.Net/Api/ApiServer.cs
similarity index 80%
rename from Pilz.Networking/Api/ApiServer.cs
rename to Pilz.Net/Api/ApiServer.cs
index 7421a2b..7e87785 100644
--- a/Pilz.Networking/Api/ApiServer.cs
+++ b/Pilz.Net/Api/ApiServer.cs
@@ -1,19 +1,24 @@
 using Pilz.Extensions.Reflection;
 using System.Net;
 using System.Reflection;
+using static Pilz.Net.Api.IApiServer;
 
-namespace Pilz.Networking.Api;
+namespace Pilz.Net.Api;
 
-public class ApiServer(string apiUrl) : ApiClient, IApiServer
+public class ApiServer(string apiUrl) : IApiServer
 {
     protected readonly Dictionary<string, Delegate> handlers = [];
     protected readonly Dictionary<Type, IMessageSerializer> serializers = [];
     protected readonly HttpListener httpListener = new();
 
+    public event OnCheckAuthenticationEventHandler? OnCheckAuthentication;
+
     protected record PrivateApiResult(ApiResult Original, string? ResultJson);
 
     public string ApiUrl { get; } = apiUrl;
 
+    public virtual bool EnableAuth { get; set; }
+
     public IMessageSerializer Serializer { get; set; } = new DefaultMessageSerializer();
 
     public virtual void Start()
@@ -22,6 +27,11 @@ public class ApiServer(string apiUrl) : ApiClient, IApiServer
         Listen();
     }
 
+    public virtual void Stop()
+    {
+        httpListener.Stop();
+    }
+
     public virtual void RegisterHandler<T>(T instance) where T : class
     {
         // Get all public instance methods
@@ -44,7 +54,7 @@ public class ApiServer(string apiUrl) : ApiClient, IApiServer
             throw new NotSupportedException("The first parameter needs to be of type ApiMessage and must return an ApiResult object and the method must have the MessageHandlerAttribute.");
 
         // Add handler
-        handlers.Add(ApiUrl + attribute.Url, handler);
+        handlers.Add(ApiUrl + attribute.Route, handler);
     }
 
     protected virtual void Listen()
@@ -78,8 +88,12 @@ public class ApiServer(string apiUrl) : ApiClient, IApiServer
         using StreamReader input = new(context.Request.InputStream);
         var contentJson = input.ReadToEnd();
 
+        // Get auth key
+        if (context.Request.Headers.Get("API-AUTH-KEY") is not string authKey)
+            authKey = null!;
+
         // Handle message
-        if (HandleMessage(path, contentJson) is not PrivateApiResult result)
+        if (HandleMessage(path, contentJson, authKey) is not PrivateApiResult result)
         {
             close();
             return;
@@ -87,8 +101,6 @@ public class ApiServer(string apiUrl) : ApiClient, IApiServer
 
         // Set response parameters
         context.Response.StatusCode = (int)result.Original.StatusCode;
-        if (result.Original.StatusDescription is not null)
-            context.Response.StatusDescription = result.Original.StatusDescription;
 
         // Write response content
         if (result.ResultJson is not null)
@@ -101,13 +113,17 @@ public class ApiServer(string apiUrl) : ApiClient, IApiServer
         close();
     }
 
-    protected virtual PrivateApiResult? HandleMessage(string url, string json)
+    protected virtual PrivateApiResult? HandleMessage(string url, string json, string? authKey)
     {
         // Get handler
         if (!handlers.TryGetValue(url, out var handler)
             || handler.Method.GetCustomAttribute<MessageHandlerAttribute>() is not MessageHandlerAttribute attribute)
             return null;
 
+        // Check authentication
+        if (attribute.RequiesAuth && (string.IsNullOrWhiteSpace(authKey) || !CheckAuthentication(authKey)))
+            return null;
+
         // Get required infos
         var targetType = handler.Method.GetParameters().First().ParameterType;
         var serializer = GetSerializer(attribute.Serializer);
@@ -146,4 +162,15 @@ public class ApiServer(string apiUrl) : ApiClient, IApiServer
         }
         return Serializer;
     }
+
+    protected virtual bool CheckAuthentication(string authKey)
+    {
+        if (OnCheckAuthentication != null)
+        {
+            var args = new ApiAuthCheckEventArgs(authKey);
+            OnCheckAuthentication?.Invoke(this, args);
+            return args.Valid;
+        }
+        return false;
+    }
 }
diff --git a/Pilz.Networking/Api/DefaultMessageSerializer.cs b/Pilz.Net/Api/DefaultMessageSerializer.cs
similarity index 96%
rename from Pilz.Networking/Api/DefaultMessageSerializer.cs
rename to Pilz.Net/Api/DefaultMessageSerializer.cs
index 20ad3be..27c67c6 100644
--- a/Pilz.Networking/Api/DefaultMessageSerializer.cs
+++ b/Pilz.Net/Api/DefaultMessageSerializer.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace Pilz.Networking.Api;
+namespace Pilz.Net.Api;
 
 public class DefaultMessageSerializer : IMessageSerializer
 {
diff --git a/Pilz.Networking/Api/IApiClient.cs b/Pilz.Net/Api/IApiClient.cs
similarity index 69%
rename from Pilz.Networking/Api/IApiClient.cs
rename to Pilz.Net/Api/IApiClient.cs
index ec01c42..8ea4432 100644
--- a/Pilz.Networking/Api/IApiClient.cs
+++ b/Pilz.Net/Api/IApiClient.cs
@@ -1,7 +1,14 @@
-namespace Pilz.Networking.Api;
+namespace Pilz.Net.Api;
 
 public interface IApiClient
 {
+    string ApiUrl { get; }
+
+    string? AuthKey { get; set; }
+
+    IMessageSerializer Serializer { get; }
+
     Task<ApiResponse> SendMessage<TResponse>(string url, ApiMessage message, IMessageSerializer? serializer = null);
+
     Task<ApiResponse<TResponse>> SendRequest<TResponse>(string url, ApiMessage message, IMessageSerializer? serializer = null) where TResponse : ApiMessage;
 }
diff --git a/Pilz.Net/Api/IApiServer.cs b/Pilz.Net/Api/IApiServer.cs
new file mode 100644
index 0000000..2cb5c75
--- /dev/null
+++ b/Pilz.Net/Api/IApiServer.cs
@@ -0,0 +1,22 @@
+namespace Pilz.Net.Api;
+
+public interface IApiServer
+{
+    public delegate void OnCheckAuthenticationEventHandler(object sender, ApiAuthCheckEventArgs e);
+
+    event OnCheckAuthenticationEventHandler? OnCheckAuthentication;
+
+    string ApiUrl { get; }
+
+    bool EnableAuth { get; set; }
+
+    IMessageSerializer Serializer { get; }
+
+    void Start();
+
+    void Stop();
+
+    void RegisterHandler<T>(T instance) where T : class;
+
+    void RegisterHandler(Delegate handler);
+}
diff --git a/Pilz.Networking/Api/IMessageSerializer.cs b/Pilz.Net/Api/IMessageSerializer.cs
similarity index 80%
rename from Pilz.Networking/Api/IMessageSerializer.cs
rename to Pilz.Net/Api/IMessageSerializer.cs
index 84eda48..ac3679a 100644
--- a/Pilz.Networking/Api/IMessageSerializer.cs
+++ b/Pilz.Net/Api/IMessageSerializer.cs
@@ -1,4 +1,4 @@
-namespace Pilz.Networking.Api;
+namespace Pilz.Net.Api;
 
 public interface IMessageSerializer
 {
diff --git a/Pilz.Net/Api/MessageHandlerAttribute.cs b/Pilz.Net/Api/MessageHandlerAttribute.cs
new file mode 100644
index 0000000..9423f68
--- /dev/null
+++ b/Pilz.Net/Api/MessageHandlerAttribute.cs
@@ -0,0 +1,9 @@
+namespace Pilz.Net.Api;
+
+[AttributeUsage(AttributeTargets.Method)]
+public class MessageHandlerAttribute(string route) : Attribute
+{
+    public string Route { get; set; } = route;
+    public Type? Serializer { get; set; }
+    public bool RequiesAuth { get; set; }
+}
diff --git a/Pilz.Networking/ConnectionManagerBase.cs b/Pilz.Net/ConnectionManagerBase.cs
similarity index 98%
rename from Pilz.Networking/ConnectionManagerBase.cs
rename to Pilz.Net/ConnectionManagerBase.cs
index 3a09362..312f752 100644
--- a/Pilz.Networking/ConnectionManagerBase.cs
+++ b/Pilz.Net/ConnectionManagerBase.cs
@@ -2,7 +2,7 @@
 using System.Data;
 using System.Net;
 
-namespace Pilz.Networking;
+namespace Pilz.Net;
 
 public abstract class ConnectionManagerBase(int port)
 {
@@ -14,7 +14,7 @@ public abstract class ConnectionManagerBase(int port)
     public int Port { get; private set; } = port;
     public bool UseAssemblyQualifiedName { get; set; } = false;
 
-    public event RetriveDataEventHandler RetriveData;
+    public event RetriveDataEventHandler? RetriveData;
 
     public delegate void RetriveDataEventHandler(ConnectionManagerBase manager, string senderIP, string cmd, object content);
 
diff --git a/Pilz.Networking/NetworkFeatures.cs b/Pilz.Net/NetworkFeatures.cs
similarity index 80%
rename from Pilz.Networking/NetworkFeatures.cs
rename to Pilz.Net/NetworkFeatures.cs
index 6168b17..92f2468 100644
--- a/Pilz.Networking/NetworkFeatures.cs
+++ b/Pilz.Net/NetworkFeatures.cs
@@ -2,23 +2,23 @@
 using System.Net.NetworkInformation;
 using System.Net.Sockets;
 
-namespace Pilz.Networking;
+namespace Pilz.Net;
 
 public static class NetworkFeatures
 {
-    public static IPAddress GetIPFromHost(string hostName)
+    public static IPAddress? GetIPFromHost(string hostName)
     {
         return Dns.GetHostAddresses(hostName).FirstOrDefault(n => n.AddressFamily == AddressFamily.InterNetwork);
     }
 
-    public static object GetHostFromIP(string ip)
+    public static object? GetHostFromIP(string ip)
     {
         return Dns.GetHostEntry(ip)?.HostName;
     }
 
-    public static UnicastIPAddressInformation GetLocalIPInformations()
+    public static UnicastIPAddressInformation? GetLocalIPInformations()
     {
-        UnicastIPAddressInformation addr = null;
+        UnicastIPAddressInformation? addr = null;
 
         foreach (NetworkInterface adapter in NetworkInterface.GetAllNetworkInterfaces())
         {
@@ -35,19 +35,19 @@ public static class NetworkFeatures
         return addr;
     }
 
-    public static IPAddress GetLocalIPAddress()
+    public static IPAddress? GetLocalIPAddress()
     {
         return GetLocalIPInformations()?.Address;
     }
 
-    public static IPAddress GetLocalIPv4Mask()
+    public static IPAddress? GetLocalIPv4Mask()
     {
         return GetLocalIPInformations()?.IPv4Mask;
     }
 
     public static IPAddress GetLocalBoradcastIP(UnicastIPAddressInformation ipInfo)
     {
-        IPAddress ip = null;
+        IPAddress? ip = null;
         byte[] myIPBytes = ipInfo.Address.GetAddressBytes();
         byte[] subnetBytes = ipInfo.IPv4Mask.GetAddressBytes();
         byte[] broadcastBytes = new byte[myIPBytes.Length];
diff --git a/Pilz.Networking/Pilz.Networking.csproj b/Pilz.Net/Pilz.Net.csproj
similarity index 82%
rename from Pilz.Networking/Pilz.Networking.csproj
rename to Pilz.Net/Pilz.Net.csproj
index d33d5b4..43f0ebd 100644
--- a/Pilz.Networking/Pilz.Networking.csproj
+++ b/Pilz.Net/Pilz.Net.csproj
@@ -1,9 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   
   <PropertyGroup>
-    <MyType>Windows</MyType>
-    <TargetFrameworks>net8.0-windows</TargetFrameworks>
-    <LangVersion>latest</LangVersion>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/Pilz.Networking/TCPManager.cs b/Pilz.Net/TCPManager.cs
similarity index 85%
rename from Pilz.Networking/TCPManager.cs
rename to Pilz.Net/TCPManager.cs
index 4d4dbe3..5662ee4 100644
--- a/Pilz.Networking/TCPManager.cs
+++ b/Pilz.Net/TCPManager.cs
@@ -1,18 +1,13 @@
 using System.Net;
 using System.Net.Sockets;
 
-namespace Pilz.Networking;
+namespace Pilz.Net;
 
-public class TCPManager : ConnectionManagerBase
+public class TCPManager(int port) : ConnectionManagerBase(port)
 {
-    private readonly TcpListener listener;
+    private readonly TcpListener listener = new TcpListener(IPAddress.Any, port);
     public int BufferSize { get; set; } = 10240;
 
-    public TCPManager(int port) : base(port)
-    {
-        listener = new TcpListener(IPAddress.Any, port);
-    }
-
     public override void Start()
     {
         if (!IsListening)
@@ -44,7 +39,7 @@ public class TCPManager : ConnectionManagerBase
             if (listener.Pending())
             {
                 var tcp = listener.AcceptTcpClient();
-                string ip = ((IPEndPoint)tcp.Client.RemoteEndPoint).Address.ToString();
+                string ip = ((IPEndPoint)tcp.Client.RemoteEndPoint!).Address.ToString();
                 var Stream = tcp.GetStream();
                 byte[] buf = new byte[BufferSize];
 
diff --git a/Pilz.Networking/UDPManager.cs b/Pilz.Net/UDPManager.cs
similarity index 95%
rename from Pilz.Networking/UDPManager.cs
rename to Pilz.Net/UDPManager.cs
index 5c7eda5..f26c05b 100644
--- a/Pilz.Networking/UDPManager.cs
+++ b/Pilz.Net/UDPManager.cs
@@ -1,12 +1,12 @@
 using System.Net;
 using System.Net.Sockets;
 
-namespace Pilz.Networking;
+namespace Pilz.Net;
 
 public class UDPManager : ConnectionManagerBase
 {
     private readonly UdpClient client;
-    private Task listenTask = null;
+    private Task? listenTask = null;
     private readonly CancellationTokenSource cancelTokenSource = new();
     private readonly CancellationToken cancelToken;
     public int MaxBufferSize { get; private set; } = 8192;
@@ -43,7 +43,7 @@ public class UDPManager : ConnectionManagerBase
         {
             IsListening = false;
             cancelTokenSource.Cancel();
-            listenTask.Wait();
+            listenTask?.Wait();
         }
     }
 
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Model/RetentionTimeAfter.cs b/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Model/RetentionTimeAfter.cs
deleted file mode 100644
index 0cf9767..0000000
--- a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Model/RetentionTimeAfter.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Model;
-
-public enum RetentionTimeAfter
-{
-    CreationDate,
-    LastAccess
-}
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Model/RetentionTimeUnit.cs b/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Model/RetentionTimeUnit.cs
deleted file mode 100644
index 779e7ef..0000000
--- a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Model/RetentionTimeUnit.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Model;
-
-public enum RetentionTimeUnit
-{
-    Day,
-    Week,
-    Month,
-    Year
-}
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Ocs/OcsResponseRetention.cs b/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Ocs/OcsResponseRetention.cs
deleted file mode 100644
index 780b486..0000000
--- a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Ocs/OcsResponseRetention.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses;
-
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Ocs;
-
-public class OcsResponseRetention : OcsResponse<OcsResponseDataArray<OcsResponseDataEntryRetention>>
-{
-}
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/ColumnSubtype.cs b/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/ColumnSubtype.cs
deleted file mode 100644
index 63245b2..0000000
--- a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/ColumnSubtype.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model;
-
-public enum ColumnSubtype
-{
-    None,
-    Unknown,
-    Line
-}
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/ColumnType.cs b/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/ColumnType.cs
deleted file mode 100644
index d4f1dc3..0000000
--- a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/ColumnType.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model;
-
-public enum ColumnType
-{
-    Unknown,
-    Text,
-    Selection,
-    DateTime
-}
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/Columns.cs b/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/Columns.cs
deleted file mode 100644
index f1fd723..0000000
--- a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/Columns.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model;
-
-public class Columns : List<Column>
-{
-}
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/RowSimple.cs b/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/RowSimple.cs
deleted file mode 100644
index 0b810b0..0000000
--- a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/RowSimple.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model;
-
-public class RowSimple : List<object>
-{
-}
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/Rows.cs b/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/Rows.cs
deleted file mode 100644
index 334e878..0000000
--- a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/Rows.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model;
-
-public class Rows : List<Row>
-{
-}
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/RowsSimple.cs b/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/RowsSimple.cs
deleted file mode 100644
index cdf17de..0000000
--- a/Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/RowsSimple.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model;
-
-public class RowsSimple : List<RowSimple>
-{
-}
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/Ocs/OcsResponseUser.cs b/Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/Ocs/OcsResponseUser.cs
deleted file mode 100644
index 3bd5030..0000000
--- a/Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/Ocs/OcsResponseUser.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses;
-
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Ocs;
-
-public class OcsResponseUser : OcsResponse<OcsResponseDataUser>
-{
-}
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsData.cs b/Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsData.cs
deleted file mode 100644
index 1493df6..0000000
--- a/Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsData.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs;
-
-public class OcsData
-{
-}
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/IOcsResponse.cs b/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/IOcsResponse.cs
deleted file mode 100644
index f30b1ee..0000000
--- a/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/IOcsResponse.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses;
-
-public interface IOcsResponse
-{
-}
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/IOcsResponseData.cs b/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/IOcsResponseData.cs
deleted file mode 100644
index bb9a2a1..0000000
--- a/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/IOcsResponseData.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses;
-
-public interface IOcsResponseData
-{
-}
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/IOcsResponseMeta.cs b/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/IOcsResponseMeta.cs
deleted file mode 100644
index d7052ee..0000000
--- a/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/IOcsResponseMeta.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses;
-
-public interface IOcsResponseMeta
-{
-}
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/OcsResponseData.cs b/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/OcsResponseData.cs
deleted file mode 100644
index 73ad990..0000000
--- a/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/OcsResponseData.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses;
-
-public class OcsResponseData : IOcsResponseData
-{
-}
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/OcsResponseDataEntry.cs b/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/OcsResponseDataEntry.cs
deleted file mode 100644
index f54cb6a..0000000
--- a/Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/OcsResponseDataEntry.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses;
-
-public class OcsResponseDataEntry
-{
-}
diff --git a/Pilz.Networking/Api/ApiMessage.cs b/Pilz.Networking/Api/ApiMessage.cs
deleted file mode 100644
index a1ba7d1..0000000
--- a/Pilz.Networking/Api/ApiMessage.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace Pilz.Networking.Api;
-
-public abstract class ApiMessage
-{
-    internal protected virtual string? Serialize(ApiMessage message)
-    {
-
-    }
-
-    internal protected virtual ApiMessage? Deserialize(string json)
-    {
-
-    }
-}
diff --git a/Pilz.Networking/Api/IApiServer.cs b/Pilz.Networking/Api/IApiServer.cs
deleted file mode 100644
index 4ebfa4e..0000000
--- a/Pilz.Networking/Api/IApiServer.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Pilz.Networking.Api;
-
-public interface IApiServer : IApiClient
-{
-    void RegisterHandler<T>(T instance) where T : class;
-    void RegisterHandler(Delegate handler);
-}
diff --git a/Pilz.Networking/Api/MessageHandlerAttribute.cs b/Pilz.Networking/Api/MessageHandlerAttribute.cs
deleted file mode 100644
index c82283b..0000000
--- a/Pilz.Networking/Api/MessageHandlerAttribute.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace Pilz.Networking.Api;
-
-[AttributeUsage(AttributeTargets.Method)]
-public class MessageHandlerAttribute(string url) : Attribute
-{
-    public string Url { get; set; } = url;
-    public Type? Serializer { get; set; }
-}
diff --git a/Pilz.sln b/Pilz.sln
index 1846eca..e3784c6 100644
--- a/Pilz.sln
+++ b/Pilz.sln
@@ -25,13 +25,13 @@ Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "Pilz.Simple3DFileParser", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pilz.LicenseHelper", "Pilz.LicenseHelper\Pilz.LicenseHelper.csproj", "{67593FF7-C1D1-4529-98C4-61CBD0615F08}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pilz.Networking", "Pilz.Networking\Pilz.Networking.csproj", "{F7A0304A-C59E-0F5D-06C3-B43F63B2DBC6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pilz.Net", "Pilz.Net\Pilz.Net.csproj", "{F7A0304A-C59E-0F5D-06C3-B43F63B2DBC6}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pilz.Cryptography", "Pilz.Cryptography\Pilz.Cryptography.csproj", "{3F5988E6-439E-4A9D-B2C6-47EFFB161AC6}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pilz.UI.Telerik", "Pilz.UI.Telerik\Pilz.UI.Telerik.csproj", "{DF674119-CC28-40AA-968F-1E23D184A491}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pilz.Networking.CloudProviders.Nextcloud", "Pilz.Networking.CloudProviders.Nextcloud\Pilz.Networking.CloudProviders.Nextcloud.csproj", "{A91E966B-3A82-4F32-A703-2FC1C7654FD1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pilz.Net.CloudProviders.Nextcloud", "Pilz.Net.CloudProviders.Nextcloud\Pilz.Net.CloudProviders.Nextcloud.csproj", "{A91E966B-3A82-4F32-A703-2FC1C7654FD1}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pilz.Plugins", "Pilz.Plugins\Pilz.Plugins.csproj", "{1170FCA6-192D-42FE-A79F-49EE03035554}"
 EndProject