diff --git a/PiwigoDotnet/Piwigo.Client/AlbumPosition.cs b/PiwigoDotnet/Piwigo.Client/Contract/AlbumPosition.cs
similarity index 63%
rename from PiwigoDotnet/Piwigo.Client/AlbumPosition.cs
rename to PiwigoDotnet/Piwigo.Client/Contract/AlbumPosition.cs
index b65ecf1..5bb67de 100644
--- a/PiwigoDotnet/Piwigo.Client/AlbumPosition.cs
+++ b/PiwigoDotnet/Piwigo.Client/Contract/AlbumPosition.cs
@@ -1,4 +1,4 @@
-namespace Piwigo.Client;
+namespace Piwigo.Client.Contract;
 
 public enum AlbumPosition
 {
diff --git a/PiwigoDotnet/Piwigo.Client/AlbumStatus.cs b/PiwigoDotnet/Piwigo.Client/Contract/AlbumStatus.cs
similarity index 63%
rename from PiwigoDotnet/Piwigo.Client/AlbumStatus.cs
rename to PiwigoDotnet/Piwigo.Client/Contract/AlbumStatus.cs
index f82aa0f..8081758 100644
--- a/PiwigoDotnet/Piwigo.Client/AlbumStatus.cs
+++ b/PiwigoDotnet/Piwigo.Client/Contract/AlbumStatus.cs
@@ -1,4 +1,4 @@
-namespace Piwigo.Client;
+namespace Piwigo.Client.Contract;
 
 public enum AlbumStatus
 {
diff --git a/PiwigoDotnet/Piwigo.Client/ImageOrder.cs b/PiwigoDotnet/Piwigo.Client/Contract/ImageOrder.cs
similarity index 79%
rename from PiwigoDotnet/Piwigo.Client/ImageOrder.cs
rename to PiwigoDotnet/Piwigo.Client/Contract/ImageOrder.cs
index deddde0..1cbb5ad 100644
--- a/PiwigoDotnet/Piwigo.Client/ImageOrder.cs
+++ b/PiwigoDotnet/Piwigo.Client/Contract/ImageOrder.cs
@@ -1,4 +1,4 @@
-namespace Piwigo.Client;
+namespace Piwigo.Client.Contract;
 
 public enum ImageOrder
 {