diff --git a/vs/LO23/Server/data/Comm_calls_Data_Server_Impl.cs b/vs/LO23/Server/data/Comm_calls_Data_Server_Impl.cs
index 8f7f74cd9257ddfe7c78557ca6b1035f37341418..6917410d282470ba66d9b6945a2dc8fc27bd1860 100644
--- a/vs/LO23/Server/data/Comm_calls_Data_Server_Impl.cs
+++ b/vs/LO23/Server/data/Comm_calls_Data_Server_Impl.cs
@@ -12,11 +12,6 @@ namespace Server.Data
         private static List<LightUser> users = new List<LightUser>();
         private static List<LightGame> games = new List<LightGame>();
 
-        public Comm_calls_Data_Server_Impl()
-        {
-
-        }
-
         public Comm_calls_Data_Server_Impl()
         {
             this.user = new LightUser();
@@ -39,7 +34,7 @@ namespace Server.Data
         {
             foreach(LightUser user in users)
             {
-                if(user.getIdJoueur() == idJoueur)
+                if(user.id == idJoueur)
                 {
                     users.Remove(user);
                     break;
diff --git a/vs/LO23/Shared/data/Card.cs b/vs/LO23/Shared/data/Card.cs
index e279418dd9df632068789eef2c0d8e6306ebed60..566ede63e7e168e0fcf4f56db8ac03c8678e4eca 100644
--- a/vs/LO23/Shared/data/Card.cs
+++ b/vs/LO23/Shared/data/Card.cs
@@ -1,10 +1,13 @@
 using System;
 
-public class Card
+namespace Shared.data
 {
-    private int index;
-    private char color;
-    private int value;
-    private bool isInHand;
-    private bool isHidden;
+    public class Card
+    {
+        private int index;
+        private char color;
+        private int value;
+        private bool isInHand;
+        private bool isHidden;
+    }
 }
diff --git a/vs/LO23/Shared/data/ChatMessage.cs b/vs/LO23/Shared/data/ChatMessage.cs
index e1b078312fe6a54695c1774a17045939c345e034..a76f2128f2a9c2ff260fa8d3412eae8f0d461128 100644
--- a/vs/LO23/Shared/data/ChatMessage.cs
+++ b/vs/LO23/Shared/data/ChatMessage.cs
@@ -1,18 +1,21 @@
 using System;
 
-public class ChatMessage
+namespace Shared.data
 {
-    private DateTime date;
-    private string sender; // username sera passé en paramètre
-    private string text;
-    private int idGame;
-
-   /* public Message(DateTime datet, string sendert, string textt, int idGamet)
+    public class ChatMessage
     {
-        date = datet;
-        sender = sendert;
-        text = textt;
-        idGame = idGamet; 
-    }*/
+        private DateTime date;
+        private string sender; // username sera passé en paramètre
+        private string text;
+        private int idGame;
+
+        /* public Message(DateTime datet, string sendert, string textt, int idGamet)
+         {
+             date = datet;
+             sender = sendert;
+             text = textt;
+             idGame = idGamet; 
+         }*/
 
+    }
 }
diff --git a/vs/LO23/Shared/data/Deck.cs b/vs/LO23/Shared/data/Deck.cs
index 7a73283f5c59cdfbbc4125dd7e682ddc9a888e29..45feee80cc8ea7e94bd7784cc3b8cd28c99af1ec 100644
--- a/vs/LO23/Shared/data/Deck.cs
+++ b/vs/LO23/Shared/data/Deck.cs
@@ -1,8 +1,10 @@
 using System;
-using static Card;
 
-public class Deck
+namespace Shared.data
 {
-    private int index;
-    private Card[] cards;
-}
\ No newline at end of file
+    public class Deck
+    {
+        private int index;
+        private Card[] cards;
+    }
+}
diff --git a/vs/LO23/Shared/data/Game.cs b/vs/LO23/Shared/data/Game.cs
index 1679b63ccde76b69ab1da2a0b9e07b4621b9e3e1..3793ee942e4ba292f8606813237bf07bf5cc262b 100644
--- a/vs/LO23/Shared/data/Game.cs
+++ b/vs/LO23/Shared/data/Game.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace Shared.data
 {
-    class Game
+    public class Game
     {
         Round[] rounds { get; set; }
         int turn { set; get; }
diff --git a/vs/LO23/Shared/data/LightGame.cs b/vs/LO23/Shared/data/LightGame.cs
index 633279a2c8965f6ed92072ad77109ab4ce903e9a..ff5370bf5c37cbd051e734d495635f7992cb08ef 100644
--- a/vs/LO23/Shared/data/LightGame.cs
+++ b/vs/LO23/Shared/data/LightGame.cs
@@ -14,7 +14,7 @@ namespace Shared.data
         finished = 3
     }
 
-   public  class LightGame
+   public class LightGame
     {
         int id { get; set; }
         GameStatus status { get; set; }
diff --git a/vs/LO23/Shared/data/LightUser.cs b/vs/LO23/Shared/data/LightUser.cs
index ee3a17219c6f7f1a9aee4f7f76c4a559117cc199..4128d866a4e464c98b495ab598843045bfee9a75 100644
--- a/vs/LO23/Shared/data/LightUser.cs
+++ b/vs/LO23/Shared/data/LightUser.cs
@@ -10,7 +10,7 @@ namespace Shared.data
     public class LightUser
 
     {
-        public int id;
+        public int id { get; set; }
         public string userName;// userName et login c'est la même chose 
         public string image;
 
diff --git a/vs/LO23/Shared/data/Phase.cs b/vs/LO23/Shared/data/Phase.cs
index 8e1cea764a6704b450198d6d5fec095ccc4df571..1f316bf53ac2ddd998ab6ad1453ae2a0f6bdc893 100644
--- a/vs/LO23/Shared/data/Phase.cs
+++ b/vs/LO23/Shared/data/Phase.cs
@@ -18,9 +18,6 @@ namespace Shared.data
     public class Phase
     {
         GameAction[] actions { set; get; }
-
-
-
     }
 
 }
\ No newline at end of file
diff --git a/vs/LO23/Shared/data/Player.cs b/vs/LO23/Shared/data/Player.cs
index 24acaa90b58b63cc06a74e2a202bb8acb015f506..0ab76f448b5201a8812fc9422f7547bc9ab655d9 100644
--- a/vs/LO23/Shared/data/Player.cs
+++ b/vs/LO23/Shared/data/Player.cs
@@ -1,18 +1,20 @@
 using System;
-using static Card;
 
-enum PlayerRole : ushort {
-    smallBlind = 1,
-    bigBlind = 2,
-    nothing = 3
-}
-
-public class Player
+namespace Shared.data
 {
-    private PlayerRole role;
-    private bool isFolded;
-    private int tokens;
-    private int tokensBet;
-    private Card[] hand;
-}
+    enum PlayerRole : ushort
+    {
+        smallBlind = 1,
+        bigBlind = 2,
+        nothing = 3
+    }
 
+    public class Player
+    {
+        private PlayerRole role;
+        private bool isFolded;
+        private int tokens;
+        private int tokensBet;
+        private Card[] hand;
+    }
+}
diff --git a/vs/LO23/Shared/data/User.cs b/vs/LO23/Shared/data/User.cs
index 88ed88fdedefb3e502ce6d302784cbfbc9428806..9e45574e5ed406d76614f9395a95743e581599a5 100644
--- a/vs/LO23/Shared/data/User.cs
+++ b/vs/LO23/Shared/data/User.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Shared.data;
 
 namespace Shared.data {