🏗️📦️ Make separate packages for clarity

Sources/App/Program.cs

@@ -1,5 +1,6 @@
 using Data;
-using Model;
+using Model.Games;
+using System.Diagnostics;
 
 namespace App
 {

Sources/Data/ILoader.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Model;
+using Model.Games;
 
 namespace Data
 {

Sources/Data/Stub.cs

@@ -1,4 +1,7 @@
-using Model;
+using Model.Dice;
+using Model.Dice.Faces;
+using Model.Games;
+using Model.Players;
 
 namespace Data
 {

Sources/Model/Dice/Die.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
+using Model.Dice.Faces;
 
-namespace Model
+namespace Model.Dice
 {
     public class Die
     {

Sources/Model/Dice/DieManager.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Model
+namespace Model.Dice
 {
     public class DieManager
     {

Sources/Model/Dice/Faces/AbstractDieFace.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Model
+namespace Model.Dice.Faces
 {
     public abstract class AbstractDieFace
     {

Sources/Model/Dice/Faces/ColorDieFace.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Model
+namespace Model.Dice.Faces
 {
     public class ColorDieFace : AbstractDieFace
     {

Sources/Model/Dice/Faces/ImageDieFace.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Model
+namespace Model.Dice.Faces
 {
     public class ImageDieFace : AbstractDieFace
     {
@@ -29,7 +29,7 @@ namespace Model
 
         public override object GetPracticalValue()
         {
-            return String.Format("Assets/images/{0}", Value);
+            return string.Format("Assets/images/{0}", Value);
         }
     }
 }

Sources/Model/Dice/Faces/NumberDieFace.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Model
+namespace Model.Dice.Faces
 {
     public class NumberDieFace : AbstractDieFace
     {

Sources/Model/Dice/FavGroup.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Model
+namespace Model.Dice
 {
     public class FavGroup
     {

Sources/Model/Dice/FavGroupManager.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Model
+namespace Model.Dice
 {
     public class FavGroupManager
     {

Sources/Model/Games/Game.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Model
+namespace Model.Games
 {
     public class Game
     {

Sources/Model/Games/GameRunner.cs

@@ -3,8 +3,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Model.Dice;
+using Model.Players;
 
-namespace Model
+namespace Model.Games
 {
     public class GameRunner
     {

Sources/Model/Games/Turn.cs

@@ -1,6 +1,7 @@
 using System;
+using Model.Players;
 
-namespace Model
+namespace Model.Games
 {
     /// <summary>
     /// a Turn consists of a Player, a DateTime, and a IEnumerable of AbstractDieFace
@@ -87,15 +88,15 @@ namespace Model
         /// <returns>a turn in string format</returns>
         public override string ToString()
         {
-            return String.Format("{0} -- {1} rolled {2}",
+            return string.Format("{0} -- {1} rolled {2}",
                 ToStringIsoWithZ(),
-                this.player.ToString(),
+                player.ToString(),
                 "<face>, <face>, <face>...");
         }
 
         private string ToStringIsoWithZ()
         {
-            return this.when.ToString("s", System.Globalization.CultureInfo.InvariantCulture) + "Z";
+            return when.ToString("s", System.Globalization.CultureInfo.InvariantCulture) + "Z";
         }
     }
 }

Sources/Model/Players/Player.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Model
+namespace Model.Players
 {
     /// <summary>
     /// A player for the purpose of a game of dice, consists of a name
@@ -15,7 +15,7 @@ namespace Model
         public string Name { get; private set; }
         public Player(string name)
         {
-            if (!String.IsNullOrWhiteSpace(name))
+            if (!string.IsNullOrWhiteSpace(name))
             {
                 Name = name.Trim();
             }
@@ -40,7 +40,7 @@ namespace Model
             return Name.ToUpper() == other.Name.ToUpper(); // equality is case insensitive
         }
 
-        public override bool Equals(Object obj)
+        public override bool Equals(object obj)
         {
             if (obj is not Player)
             {

Sources/Model/Players/PlayerManager.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Model
+namespace Model.Players
 {
     public class PlayerManager : IManager<Player>
     {
@@ -52,7 +52,7 @@ namespace Model
         /// <returns>player with said name, <em>or null</em> if no such player was found</returns>
         public Player GetOneByName(string name)
         {
-            if (!String.IsNullOrWhiteSpace(name))
+            if (!string.IsNullOrWhiteSpace(name))
             {
                 Player wanted = new(name);
                 Player result = players.FirstOrDefault(p => p.Equals(wanted));

Sources/Tests/Model_UTs/PlayerManagerTest.cs

@@ -1,4 +1,4 @@
-using Model;
+using Model.Players;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;

Sources/Tests/Model_UTs/PlayerTest.cs

@@ -1,4 +1,4 @@
-using Model;
+using Model.Players;
 using System;
 using Xunit;
 

Sources/Tests/Model_UTs/TurnTest.cs

@@ -1,4 +1,5 @@
-using Model;
+using Model.Games;
+using Model.Players;
 using System;
 using Xunit;