diff --git a/SurveyBackend/SurveyBackend.API/Controllers/AuthController.cs b/SurveyBackend/SurveyBackend.API/Controllers/AuthController.cs
index d66e555..e0ecc0b 100644
--- a/SurveyBackend/SurveyBackend.API/Controllers/AuthController.cs
+++ b/SurveyBackend/SurveyBackend.API/Controllers/AuthController.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using SurveyBackend.DTOs;
-using SurveyBackend.Infrastructure.Services;
 using SurveyBackend.Mappers.UserDTOs;
+using SurveyBackend.Services.Services;
 
 namespace SurveyBackend.Controllers;
 
diff --git a/SurveyBackend/SurveyBackend.API/Mappers/UserDTOs/UserRegistrationMapper.cs b/SurveyBackend/SurveyBackend.API/Mappers/UserDTOs/UserRegistrationMapper.cs
index 4427b77..5d98322 100644
--- a/SurveyBackend/SurveyBackend.API/Mappers/UserDTOs/UserRegistrationMapper.cs
+++ b/SurveyBackend/SurveyBackend.API/Mappers/UserDTOs/UserRegistrationMapper.cs
@@ -1,7 +1,6 @@
 using SurveyBackend.Core.Models;
 using SurveyBackend.Core.Services;
 using SurveyBackend.DTOs;
-using SurveyBackend.Infrastructure.Services;
 
 namespace SurveyBackend.Mappers.UserDTOs;
 
diff --git a/SurveyBackend/SurveyBackend.API/Program.cs b/SurveyBackend/SurveyBackend.API/Program.cs
index d15021d..77e7695 100644
--- a/SurveyBackend/SurveyBackend.API/Program.cs
+++ b/SurveyBackend/SurveyBackend.API/Program.cs
@@ -7,7 +7,8 @@ using SurveyBackend.Core.Services;
 using SurveyBackend.Infrastructure;
 using SurveyBackend.Infrastructure.Data;
 using SurveyBackend.Infrastructure.Repositories;
-using SurveyBackend.Infrastructure.Services;
+using SurveyBackend.Services;
+using SurveyBackend.Services.Services;
 using SurveyLib.Core.Repositories;
 using SurveyLib.Core.Services;
 using SurveyLib.Infrastructure.EFCore.Data;
diff --git a/SurveyBackend/SurveyBackend.API/SurveyBackend.API.csproj b/SurveyBackend/SurveyBackend.API/SurveyBackend.API.csproj
index 3764109..5a5254e 100644
--- a/SurveyBackend/SurveyBackend.API/SurveyBackend.API.csproj
+++ b/SurveyBackend/SurveyBackend.API/SurveyBackend.API.csproj
@@ -17,6 +17,7 @@
     <ItemGroup>
       <ProjectReference Include="..\SurveyBackend.Core\SurveyBackend.Core.csproj" />
       <ProjectReference Include="..\SurveyBackend.Infrastructure\SurveyBackend.Infrastructure.csproj" />
+      <ProjectReference Include="..\SurveyBackend.Services\SurveyBackend.Services.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/SurveyBackend/SurveyBackend.Infrastructure/AuthOptions.cs b/SurveyBackend/SurveyBackend.Services/AuthOptions.cs
similarity index 96%
rename from SurveyBackend/SurveyBackend.Infrastructure/AuthOptions.cs
rename to SurveyBackend/SurveyBackend.Services/AuthOptions.cs
index cd379e8..7d92d6f 100644
--- a/SurveyBackend/SurveyBackend.Infrastructure/AuthOptions.cs
+++ b/SurveyBackend/SurveyBackend.Services/AuthOptions.cs
@@ -2,7 +2,7 @@ using System.Text;
 using Microsoft.Extensions.Configuration;
 using Microsoft.IdentityModel.Tokens;
 
-namespace SurveyBackend.Infrastructure;
+namespace SurveyBackend.Services;
 
 public static class AuthOptions
 {
diff --git a/SurveyBackend/SurveyBackend.Infrastructure/Helpers/TokenHelper.cs b/SurveyBackend/SurveyBackend.Services/Helpers/TokenHelper.cs
similarity index 94%
rename from SurveyBackend/SurveyBackend.Infrastructure/Helpers/TokenHelper.cs
rename to SurveyBackend/SurveyBackend.Services/Helpers/TokenHelper.cs
index a52ae64..7c401a4 100644
--- a/SurveyBackend/SurveyBackend.Infrastructure/Helpers/TokenHelper.cs
+++ b/SurveyBackend/SurveyBackend.Services/Helpers/TokenHelper.cs
@@ -3,7 +3,7 @@ using System.Security.Claims;
 using Microsoft.IdentityModel.Tokens;
 using SurveyBackend.Core.Models;
 
-namespace SurveyBackend.Infrastructure.Helpers;
+namespace SurveyBackend.Services.Helpers;
 
 public class TokenHelper
 {
diff --git a/SurveyBackend/SurveyBackend.Infrastructure/Services/AuthorizationService.cs b/SurveyBackend/SurveyBackend.Services/Services/AuthorizationService.cs
similarity index 92%
rename from SurveyBackend/SurveyBackend.Infrastructure/Services/AuthorizationService.cs
rename to SurveyBackend/SurveyBackend.Services/Services/AuthorizationService.cs
index 10e244e..25fcbdf 100644
--- a/SurveyBackend/SurveyBackend.Infrastructure/Services/AuthorizationService.cs
+++ b/SurveyBackend/SurveyBackend.Services/Services/AuthorizationService.cs
@@ -1,8 +1,8 @@
 using SurveyBackend.Core.Models;
 using SurveyBackend.Core.Services;
-using SurveyBackend.Infrastructure.Helpers;
+using SurveyBackend.Services.Helpers;
 
-namespace SurveyBackend.Infrastructure.Services;
+namespace SurveyBackend.Services.Services;
 
 public class AuthorizationService
 {
diff --git a/SurveyBackend/SurveyBackend.Infrastructure/Services/Sha256PasswordHasher.cs b/SurveyBackend/SurveyBackend.Services/Services/Sha256PasswordHasher.cs
similarity index 97%
rename from SurveyBackend/SurveyBackend.Infrastructure/Services/Sha256PasswordHasher.cs
rename to SurveyBackend/SurveyBackend.Services/Services/Sha256PasswordHasher.cs
index b6cde0d..ed54508 100644
--- a/SurveyBackend/SurveyBackend.Infrastructure/Services/Sha256PasswordHasher.cs
+++ b/SurveyBackend/SurveyBackend.Services/Services/Sha256PasswordHasher.cs
@@ -1,7 +1,7 @@
 using System.Security.Cryptography;
 using SurveyBackend.Core.Services;
 
-namespace SurveyBackend.Infrastructure.Services;
+namespace SurveyBackend.Services.Services;
 
 public class Sha256PasswordHasher : IPasswordHasher
 {
diff --git a/SurveyBackend/SurveyBackend.Infrastructure/Services/UserService.cs b/SurveyBackend/SurveyBackend.Services/Services/UserService.cs
similarity index 91%
rename from SurveyBackend/SurveyBackend.Infrastructure/Services/UserService.cs
rename to SurveyBackend/SurveyBackend.Services/Services/UserService.cs
index f0f4b4e..8ae531d 100644
--- a/SurveyBackend/SurveyBackend.Infrastructure/Services/UserService.cs
+++ b/SurveyBackend/SurveyBackend.Services/Services/UserService.cs
@@ -2,7 +2,7 @@ using SurveyBackend.Core.Models;
 using SurveyBackend.Core.Repositories;
 using SurveyBackend.Core.Services;
 
-namespace SurveyBackend.Infrastructure.Services;
+namespace SurveyBackend.Services.Services;
 
 public class UserService : IUserService
 {
diff --git a/SurveyBackend/SurveyBackend.Services/SurveyBackend.Services.csproj b/SurveyBackend/SurveyBackend.Services/SurveyBackend.Services.csproj
new file mode 100644
index 0000000..5765782
--- /dev/null
+++ b/SurveyBackend/SurveyBackend.Services/SurveyBackend.Services.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\SurveyBackend.Core\SurveyBackend.Core.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.1.2" />
+    </ItemGroup>
+
+</Project>
diff --git a/SurveyBackend/SurveyBackend.sln b/SurveyBackend/SurveyBackend.sln
index bbfd9ab..56dba6f 100644
--- a/SurveyBackend/SurveyBackend.sln
+++ b/SurveyBackend/SurveyBackend.sln
@@ -10,6 +10,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SurveyLib.Infrastructure.EF
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SurveyLib.Core", "..\SurveyLib\SurveyLib.Core\SurveyLib.Core.csproj", "{C17C405B-37CF-48E6-AA44-44B878F4DE56}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SurveyBackend.Services", "SurveyBackend.Services\SurveyBackend.Services.csproj", "{3CDA6495-4FB2-4F07-8B2F-15BFD2A35181}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -36,5 +38,9 @@ Global
 		{C17C405B-37CF-48E6-AA44-44B878F4DE56}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C17C405B-37CF-48E6-AA44-44B878F4DE56}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C17C405B-37CF-48E6-AA44-44B878F4DE56}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3CDA6495-4FB2-4F07-8B2F-15BFD2A35181}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3CDA6495-4FB2-4F07-8B2F-15BFD2A35181}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3CDA6495-4FB2-4F07-8B2F-15BFD2A35181}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3CDA6495-4FB2-4F07-8B2F-15BFD2A35181}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal