14 files changed, 14 insertions, 87 deletions
diff --git a/DSALib/Models/Database/DSA/Advantage.cs b/DSALib/Models/Database/DSA/Advantage.cs
index 500cf6d..2ed0bf9 100644
--- a/DSALib/Models/Database/DSA/Advantage.cs
+++ b/DSALib/Models/Database/DSA/Advantage.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace DSALib.Models.Database.DSA
+namespace DSALib.Models.Database.Dsa
 {
     public class Advantage
     {
diff --git a/DSALib/Models/Database/DSA/CharSpell.cs b/DSALib/Models/Database/DSA/CharSpell.cs
index 77a8dc8..d08bc74 100644
--- a/DSALib/Models/Database/DSA/CharSpell.cs
+++ b/DSALib/Models/Database/DSA/CharSpell.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace DSALib.Models.Database.DSA
+namespace DSALib.Models.Database.Dsa
 {
     public class CharSpell
     {
diff --git a/DSALib/Models/Database/DSA/DatabaseChar.cs b/DSALib/Models/Database/DSA/DatabaseChar.cs
index cfd7174..1312f95 100644
--- a/DSALib/Models/Database/DSA/DatabaseChar.cs
+++ b/DSALib/Models/Database/DSA/DatabaseChar.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using DSALib.DSA_Game.Characters;
 
-namespace DSALib.Models.Database.DSA
+namespace DSALib.Models.Database.Dsa
 {
     public class DatabaseChar
     {
@@ -16,7 +16,7 @@ namespace DSALib.Models.Database.DSA
         {
             Id = id;
             Name = name ?? throw new ArgumentNullException(nameof(name));
-            Rasse = rasse ?? throw new ArgumentNullException(nameof(rasse));
+            Race = rasse ?? throw new ArgumentNullException(nameof(rasse));
             Skills = skills ?? throw new ArgumentNullException(nameof(skills));
             Talents = talents ?? throw new ArgumentNullException(nameof(talents));
             Advantages = advantages ?? throw new ArgumentNullException(nameof(advantages));
@@ -28,7 +28,7 @@ namespace DSALib.Models.Database.DSA
 
         public string Name { get; set; }
 
-        public string Rasse { get; set; }
+        public string Race { get; set; }
 
         public List<Field> Skills { get; set; } = new List<Field>();
 
diff --git a/DSALib/Models/Database/DSA/Field.cs b/DSALib/Models/Database/DSA/Field.cs
index 1b10232..6d1b82e 100644
--- a/DSALib/Models/Database/DSA/Field.cs
+++ b/DSALib/Models/Database/DSA/Field.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace DSALib.Models.Database.DSA
+namespace DSALib.Models.Database.Dsa
 {
     public class Field
     {
diff --git a/DSALib/Models/Database/DSA/GeneralSpell.cs b/DSALib/Models/Database/DSA/GeneralSpell.cs
index 6fe6a78..964c38e 100644
--- a/DSALib/Models/Database/DSA/GeneralSpell.cs
+++ b/DSALib/Models/Database/DSA/GeneralSpell.cs
@@ -1,4 +1,4 @@
-namespace DSALib.Models.Database.DSA
+namespace DSALib.Models.Database.Dsa
 {
     public class GeneralSpell : Talent
     {
diff --git a/DSALib/Models/Database/DSA/GroupChar.cs b/DSALib/Models/Database/DSA/GroupChar.cs
index 0c1ecf1..a0115cd 100644
--- a/DSALib/Models/Database/DSA/GroupChar.cs
+++ b/DSALib/Models/Database/DSA/GroupChar.cs
@@ -1,4 +1,4 @@
-namespace DSALib.Models.Database.DSA
+namespace DSALib.Models.Database.Dsa
 {
     public class GroupChar
     {
diff --git a/DSALib/Models/Database/DSA/Inventory.cs b/DSALib/Models/Database/DSA/Inventory.cs
index 086564c..f3f5d7a 100644
--- a/DSALib/Models/Database/DSA/Inventory.cs
+++ b/DSALib/Models/Database/DSA/Inventory.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace DSALib.Models.Database.DSA
+namespace DSALib.Models.Database.Dsa
 {
     public class Inventory
     {
diff --git a/DSALib/Models/Database/DSA/Talent.cs b/DSALib/Models/Database/DSA/Talent.cs
index 578d93c..214aecc 100644
--- a/DSALib/Models/Database/DSA/Talent.cs
+++ b/DSALib/Models/Database/DSA/Talent.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace DSALib.Models.Database.DSA
+namespace DSALib.Models.Database.Dsa
 {
     public class Talent : DSALib.Models.Database.DataObject
     {
diff --git a/DSALib/Models/Database/DSA/Weapon.cs b/DSALib/Models/Database/DSA/Weapon.cs
index 8ed63d7..308c6c5 100644
--- a/DSALib/Models/Database/DSA/Weapon.cs
+++ b/DSALib/Models/Database/DSA/Weapon.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace DSALib.Models.Database.DSA
+namespace DSALib.Models.Database.Dsa
 {
     public class Weapon
     {
diff --git a/DSALib/Models/Database/DSA/WeaponTalent.cs b/DSALib/Models/Database/DSA/WeaponTalent.cs
index f65fb3f..2ab921b 100644
--- a/DSALib/Models/Database/DSA/WeaponTalent.cs
+++ b/DSALib/Models/Database/DSA/WeaponTalent.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace DSALib.Models.Database.DSA
+namespace DSALib.Models.Database.Dsa
 {
     public class WeaponTalent
     {
diff --git a/DSALib/Models/Database/Groups/DSAGroup.cs b/DSALib/Models/Database/Groups/DSAGroup.cs
index 377376e..adbd0ac 100644
--- a/DSALib/Models/Database/Groups/DSAGroup.cs
+++ b/DSALib/Models/Database/Groups/DSAGroup.cs
@@ -1,9 +1,9 @@
 using System.Collections.Generic;
-using DSALib.Models.Database.DSA;
+using DSALib.Models.Database.Dsa;
 
 namespace DSALib.Models.Database.Groups
 {
-    public class DSAGroup : Group
+    public class DsaGroup : Group
     {
         public List<GroupChar> Chars { get; set; } = new List<GroupChar>();
     }
diff --git a/DSALib/Models/Network/Group.cs b/DSALib/Models/Network/Group.cs
deleted file mode 100644
index 608e5ea..0000000
--- a/DSALib/Models/Network/Group.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace DSALib.Models.Network
-{
-    public class Group
-    {
-        public Group(string name, string password)
-        {
-            Name = name;
-            Password = password;
-        }
-
-        public Group(string name, int userOnline)
-        {
-            Name = name ?? throw new ArgumentNullException(nameof(name));
-        }
-
-        public string Name { get; set; }
-        public string Password { get; set; }
-        public List<User> Users { get; set; } = new List<User>();
-
-        public int UserCount => Users.Count;
-
-        public SendGroup SendGroup()
-        {
-            return new SendGroup(Name, UserCount);
-        }
-    }
-
-    public class SendGroup
-    {
-        public SendGroup(string name, int userCount)
-        {
-            Name = name ?? throw new ArgumentNullException(nameof(name));
-            UserCount = userCount;
-        }
-
-        public string Name { get; set; }
-
-        public int UserCount { get; set; }
-    }
-}
-\ No newline at end of file
diff --git a/DSALib/Models/Network/Token.cs b/DSALib/Models/Network/Token.cs
deleted file mode 100644
index 2310607..0000000
--- a/DSALib/Models/Network/Token.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-
-namespace DSALib.Models.Network
-{
-    public class Token
-    {
-        private readonly DateTime creation = DateTime.Now;
-
-        public Token(string group)
-        {
-            Group = group;
-        }
-
-        public string Group { get; set; }
-
-        public bool IsValid()
-        {
-            return DateTime.Now - creation < TimeSpan.FromMinutes(1);
-        }
-    }
-}
-\ No newline at end of file
diff --git a/DSALib/Models/Network/User.cs b/DSALib/Models/Network/User.cs
deleted file mode 100644
index 314a0bf..0000000
--- a/DSALib/Models/Network/User.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace DSALib.Models.Network
-{
-    public class User
-    {
-        public string Name { get; set; }
-        public string ConnectionId { get; set; }
-        public int Char { get; set; }
-    }
-}
-\ No newline at end of file