diff --git a/Sources/Stim_Model/Administrateur.cs b/Sources/Stim.Model/Administrateur.cs
similarity index 92%
rename from Sources/Stim_Model/Administrateur.cs
rename to Sources/Stim.Model/Administrateur.cs
index 68e2947..cfa9fc7 100644
--- a/Sources/Stim_Model/Administrateur.cs
+++ b/Sources/Stim.Model/Administrateur.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Stim_Model
+namespace Stim.Model
 {
     internal class Administrateur : User
     {
diff --git a/Sources/Stim_Model/Game.cs b/Sources/Stim.Model/Game.cs
similarity index 94%
rename from Sources/Stim_Model/Game.cs
rename to Sources/Stim.Model/Game.cs
index e68a4bf..f2f6ab7 100644
--- a/Sources/Stim_Model/Game.cs
+++ b/Sources/Stim.Model/Game.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Stim_Model
+namespace Stim.Model
 {
     internal class Game
     {
diff --git a/Sources/Stim_Model/Review.cs b/Sources/Stim.Model/Review.cs
similarity index 92%
rename from Sources/Stim_Model/Review.cs
rename to Sources/Stim.Model/Review.cs
index 70bafac..1f09f03 100644
--- a/Sources/Stim_Model/Review.cs
+++ b/Sources/Stim.Model/Review.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Stim_Model
+namespace Stim.Model
 {
     internal class Review
     {
diff --git a/Sources/Stim.Model/Stim.Model.csproj b/Sources/Stim.Model/Stim.Model.csproj
new file mode 100644
index 0000000..4658cbf
--- /dev/null
+++ b/Sources/Stim.Model/Stim.Model.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>
diff --git a/Sources/Stim_Model/User.cs b/Sources/Stim.Model/User.cs
similarity index 94%
rename from Sources/Stim_Model/User.cs
rename to Sources/Stim.Model/User.cs
index 34f96c3..e4f4e98 100644
--- a/Sources/Stim_Model/User.cs
+++ b/Sources/Stim.Model/User.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
-namespace Stim_Model
+namespace Stim.Model
 {
     internal class User
     {
diff --git a/Sources/Stim.sln b/Sources/Stim.sln
index bf98d4b..fb27def 100644
--- a/Sources/Stim.sln
+++ b/Sources/Stim.sln
@@ -5,9 +5,9 @@ VisualStudioVersion = 17.0.31611.283
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stim", "Stim\Stim.csproj", "{88365436-AFDF-4183-B010-C13784779E6B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stim_Model", "Stim_Model\Stim_Model.csproj", "{F9E5DE48-8AF0-4F85-8A78-7639066FD061}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Console", "Console\Console.csproj", "{D1C5D8F9-A7E8-4D52-9A7E-15373CAD5C08}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Console", "Console\Console.csproj", "{D1C5D8F9-A7E8-4D52-9A7E-15373CAD5C08}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stim.Model", "Stim.Model\Stim.Model.csproj", "{BA382A71-FDE3-4B0A-BC0D-7BA62BFC4866}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -21,14 +21,14 @@ Global
 		{88365436-AFDF-4183-B010-C13784779E6B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{88365436-AFDF-4183-B010-C13784779E6B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{88365436-AFDF-4183-B010-C13784779E6B}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{F9E5DE48-8AF0-4F85-8A78-7639066FD061}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F9E5DE48-8AF0-4F85-8A78-7639066FD061}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F9E5DE48-8AF0-4F85-8A78-7639066FD061}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F9E5DE48-8AF0-4F85-8A78-7639066FD061}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D1C5D8F9-A7E8-4D52-9A7E-15373CAD5C08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D1C5D8F9-A7E8-4D52-9A7E-15373CAD5C08}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D1C5D8F9-A7E8-4D52-9A7E-15373CAD5C08}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D1C5D8F9-A7E8-4D52-9A7E-15373CAD5C08}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BA382A71-FDE3-4B0A-BC0D-7BA62BFC4866}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BA382A71-FDE3-4B0A-BC0D-7BA62BFC4866}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BA382A71-FDE3-4B0A-BC0D-7BA62BFC4866}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BA382A71-FDE3-4B0A-BC0D-7BA62BFC4866}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Sources/Stim/Stim.sln b/Sources/Stim/Stim.sln
deleted file mode 100644
index 669be06..0000000
--- a/Sources/Stim/Stim.sln
+++ /dev/null
@@ -1,39 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.31611.283
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stim", "Stim\Stim.csproj", "{88365436-AFDF-4183-B010-C13784779E6B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stim_Model", "Stim_Model\Stim_Model.csproj", "{F9E5DE48-8AF0-4F85-8A78-7639066FD061}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Console", "Console\Console.csproj", "{D1C5D8F9-A7E8-4D52-9A7E-15373CAD5C08}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{88365436-AFDF-4183-B010-C13784779E6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{88365436-AFDF-4183-B010-C13784779E6B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{88365436-AFDF-4183-B010-C13784779E6B}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{88365436-AFDF-4183-B010-C13784779E6B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{88365436-AFDF-4183-B010-C13784779E6B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{88365436-AFDF-4183-B010-C13784779E6B}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{F9E5DE48-8AF0-4F85-8A78-7639066FD061}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F9E5DE48-8AF0-4F85-8A78-7639066FD061}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F9E5DE48-8AF0-4F85-8A78-7639066FD061}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F9E5DE48-8AF0-4F85-8A78-7639066FD061}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D1C5D8F9-A7E8-4D52-9A7E-15373CAD5C08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D1C5D8F9-A7E8-4D52-9A7E-15373CAD5C08}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D1C5D8F9-A7E8-4D52-9A7E-15373CAD5C08}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D1C5D8F9-A7E8-4D52-9A7E-15373CAD5C08}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {61F7FB11-1E47-470C-91E2-47F8143E1572}
-	EndGlobalSection
-EndGlobal
diff --git a/Sources/Stim_Model/Stim_Model.csproj b/Sources/Stim_Model/Stim_Model.csproj
deleted file mode 100644
index a41b49f..0000000
--- a/Sources/Stim_Model/Stim_Model.csproj
+++ /dev/null
@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<TargetFrameworks>net7.0;net7.0-maccatalyst;net7.0-ios;net7.0-android</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
-		<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
-		<!-- <TargetFrameworks>$(TargetFrameworks);net6.0-tizen</TargetFrameworks> -->
-		<UseMaui>true</UseMaui>
-		<SingleProject>true</SingleProject>
-		<ImplicitUsings>enable</ImplicitUsings>
-
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">14.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
-		<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
-	</PropertyGroup>
-
-</Project>