diff --git a/DemoDotnetWebApi.Tests/DemoDotnetWebApi.Tests.csproj b/DemoDotnetWebApi.Tests/DemoDotnetWebApi.Tests.csproj
new file mode 100644
index 0000000..37871ed
--- /dev/null
+++ b/DemoDotnetWebApi.Tests/DemoDotnetWebApi.Tests.csproj
@@ -0,0 +1,28 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.collector" Version="3.1.2">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\DemoDotnetWebApi\DemoDotnetWebApi.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/DemoDotnetWebApi.Tests/UnitTest1.cs b/DemoDotnetWebApi.Tests/UnitTest1.cs
new file mode 100644
index 0000000..58af5aa
--- /dev/null
+++ b/DemoDotnetWebApi.Tests/UnitTest1.cs
@@ -0,0 +1,10 @@
+namespace DemoDotnetWebApi.Tests;
+
+public class UnitTest1
+{
+    [Fact]
+    public void Test1()
+    {
+
+    }
+}
\ No newline at end of file
diff --git a/DemoDotnetWebApi.Tests/Usings.cs b/DemoDotnetWebApi.Tests/Usings.cs
new file mode 100644
index 0000000..8c927eb
--- /dev/null
+++ b/DemoDotnetWebApi.Tests/Usings.cs
@@ -0,0 +1 @@
+global using Xunit;
\ No newline at end of file
diff --git a/DemoDotnetWebApi.sln b/DemoDotnetWebApi.sln
new file mode 100644
index 0000000..b7cd205
--- /dev/null
+++ b/DemoDotnetWebApi.sln
@@ -0,0 +1,28 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31903.59
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DemoDotnetWebApi", "DemoDotnetWebApi\DemoDotnetWebApi.csproj", "{C23DC6F9-ADB7-4FFF-B864-53B8FD077ED0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DemoDotnetWebApi.Tests", "DemoDotnetWebApi.Tests\DemoDotnetWebApi.Tests.csproj", "{BD52DB82-803A-41E4-985E-9D3D0CBF4A41}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{C23DC6F9-ADB7-4FFF-B864-53B8FD077ED0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C23DC6F9-ADB7-4FFF-B864-53B8FD077ED0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C23DC6F9-ADB7-4FFF-B864-53B8FD077ED0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C23DC6F9-ADB7-4FFF-B864-53B8FD077ED0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BD52DB82-803A-41E4-985E-9D3D0CBF4A41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BD52DB82-803A-41E4-985E-9D3D0CBF4A41}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BD52DB82-803A-41E4-985E-9D3D0CBF4A41}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BD52DB82-803A-41E4-985E-9D3D0CBF4A41}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+EndGlobal
diff --git a/Controllers/PasswordController.cs b/DemoDotnetWebApi/Controllers/PasswordController.cs
similarity index 100%
rename from Controllers/PasswordController.cs
rename to DemoDotnetWebApi/Controllers/PasswordController.cs
diff --git a/demo-dotnet-web-api.csproj b/DemoDotnetWebApi/DemoDotnetWebApi.csproj
similarity index 67%
rename from demo-dotnet-web-api.csproj
rename to DemoDotnetWebApi/DemoDotnetWebApi.csproj
index 492f5d6..671ad0f 100644
--- a/demo-dotnet-web-api.csproj
+++ b/DemoDotnetWebApi/DemoDotnetWebApi.csproj
@@ -1,14 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>DemoDotnetWebApi</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
   </ItemGroup>
 
 </Project>
diff --git a/Interfaces/IPasswordGenerator.cs b/DemoDotnetWebApi/Interfaces/IPasswordGenerator.cs
similarity index 100%
rename from Interfaces/IPasswordGenerator.cs
rename to DemoDotnetWebApi/Interfaces/IPasswordGenerator.cs
diff --git a/Interfaces/IRandomCharacterGenerator.cs b/DemoDotnetWebApi/Interfaces/IRandomCharacterGenerator.cs
similarity index 100%
rename from Interfaces/IRandomCharacterGenerator.cs
rename to DemoDotnetWebApi/Interfaces/IRandomCharacterGenerator.cs
diff --git a/Interfaces/IStringShuffler.cs b/DemoDotnetWebApi/Interfaces/IStringShuffler.cs
similarity index 100%
rename from Interfaces/IStringShuffler.cs
rename to DemoDotnetWebApi/Interfaces/IStringShuffler.cs
diff --git a/Program.cs b/DemoDotnetWebApi/Program.cs
similarity index 100%
rename from Program.cs
rename to DemoDotnetWebApi/Program.cs
diff --git a/Properties/launchSettings.json b/DemoDotnetWebApi/Properties/launchSettings.json
similarity index 57%
rename from Properties/launchSettings.json
rename to DemoDotnetWebApi/Properties/launchSettings.json
index 3cd099f..39074ad 100644
--- a/Properties/launchSettings.json
+++ b/DemoDotnetWebApi/Properties/launchSettings.json
@@ -4,17 +4,27 @@
     "windowsAuthentication": false,
     "anonymousAuthentication": true,
     "iisExpress": {
-      "applicationUrl": "http://localhost:42697",
-      "sslPort": 44395
+      "applicationUrl": "http://localhost:58469",
+      "sslPort": 44379
     }
   },
   "profiles": {
-    "DemoDotnetWebApi": {
+    "http": {
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
       "launchUrl": "swagger",
-      "applicationUrl": "https://localhost:7145;http://localhost:5012",
+      "applicationUrl": "http://localhost:5144",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "https": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "applicationUrl": "https://localhost:7292;http://localhost:5144",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
diff --git a/Services/PasswordGenerator.cs b/DemoDotnetWebApi/Services/PasswordGenerator.cs
similarity index 100%
rename from Services/PasswordGenerator.cs
rename to DemoDotnetWebApi/Services/PasswordGenerator.cs
diff --git a/Services/RandomCharacterGenerator.cs b/DemoDotnetWebApi/Services/RandomCharacterGenerator.cs
similarity index 100%
rename from Services/RandomCharacterGenerator.cs
rename to DemoDotnetWebApi/Services/RandomCharacterGenerator.cs
diff --git a/Services/StringShuffler.cs b/DemoDotnetWebApi/Services/StringShuffler.cs
similarity index 100%
rename from Services/StringShuffler.cs
rename to DemoDotnetWebApi/Services/StringShuffler.cs
diff --git a/ShuffleExtension.cs b/DemoDotnetWebApi/ShuffleExtension.cs
similarity index 100%
rename from ShuffleExtension.cs
rename to DemoDotnetWebApi/ShuffleExtension.cs
diff --git a/appsettings.Development.json b/DemoDotnetWebApi/appsettings.Development.json
similarity index 100%
rename from appsettings.Development.json
rename to DemoDotnetWebApi/appsettings.Development.json
diff --git a/appsettings.json b/DemoDotnetWebApi/appsettings.json
similarity index 100%
rename from appsettings.json
rename to DemoDotnetWebApi/appsettings.json