diff --git a/KTUSA PS.sln b/KTUSA PS.sln
index d888b32..c7ceef5 100644
--- a/KTUSA PS.sln	
+++ b/KTUSA PS.sln	
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31606.5
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KTUSA PS", "KTUSA PS\KTUSA PS.csproj", "{D86FA38D-E6E6-48DA-AE1A-007D9FDB3ED8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KTUSAPS", "KTUSAPS\KTUSAPS.csproj", "{D86FA38D-E6E6-48DA-AE1A-007D9FDB3ED8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KTUSAPS.Data", "KTUSAPS.Data\KTUSAPS.Data.csproj", "{CF02E79E-4B41-4E48-B2FC-094665980F89}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KTUSAPS.Data", "KTUSAPS.Data\KTUSAPS.Data.csproj", "{CF02E79E-4B41-4E48-B2FC-094665980F89}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/KTUSA PS/ClientApp/.gitignore b/KTUSAPS/ClientApp/.gitignore
similarity index 100%
rename from KTUSA PS/ClientApp/.gitignore
rename to KTUSAPS/ClientApp/.gitignore
diff --git a/KTUSA PS/ClientApp/.prettierrc.js b/KTUSAPS/ClientApp/.prettierrc.js
similarity index 100%
rename from KTUSA PS/ClientApp/.prettierrc.js
rename to KTUSAPS/ClientApp/.prettierrc.js
diff --git a/KTUSA PS/ClientApp/README.md b/KTUSAPS/ClientApp/README.md
similarity index 100%
rename from KTUSA PS/ClientApp/README.md
rename to KTUSAPS/ClientApp/README.md
diff --git a/KTUSA PS/ClientApp/babel.config.js b/KTUSAPS/ClientApp/babel.config.js
similarity index 100%
rename from KTUSA PS/ClientApp/babel.config.js
rename to KTUSAPS/ClientApp/babel.config.js
diff --git a/KTUSA PS/ClientApp/package-lock.json b/KTUSAPS/ClientApp/package-lock.json
similarity index 100%
rename from KTUSA PS/ClientApp/package-lock.json
rename to KTUSAPS/ClientApp/package-lock.json
diff --git a/KTUSA PS/ClientApp/package.json b/KTUSAPS/ClientApp/package.json
similarity index 100%
rename from KTUSA PS/ClientApp/package.json
rename to KTUSAPS/ClientApp/package.json
diff --git a/KTUSA PS/ClientApp/public/favicon.ico b/KTUSAPS/ClientApp/public/favicon.ico
similarity index 100%
rename from KTUSA PS/ClientApp/public/favicon.ico
rename to KTUSAPS/ClientApp/public/favicon.ico
diff --git a/KTUSA PS/ClientApp/public/index.html b/KTUSAPS/ClientApp/public/index.html
similarity index 100%
rename from KTUSA PS/ClientApp/public/index.html
rename to KTUSAPS/ClientApp/public/index.html
diff --git a/KTUSA PS/ClientApp/src/App.vue b/KTUSAPS/ClientApp/src/App.vue
similarity index 100%
rename from KTUSA PS/ClientApp/src/App.vue
rename to KTUSAPS/ClientApp/src/App.vue
diff --git a/KTUSA PS/ClientApp/src/assets/_custom.scss b/KTUSAPS/ClientApp/src/assets/_custom.scss
similarity index 100%
rename from KTUSA PS/ClientApp/src/assets/_custom.scss
rename to KTUSAPS/ClientApp/src/assets/_custom.scss
diff --git a/KTUSA PS/ClientApp/src/assets/logo.png b/KTUSAPS/ClientApp/src/assets/logo.png
similarity index 100%
rename from KTUSA PS/ClientApp/src/assets/logo.png
rename to KTUSAPS/ClientApp/src/assets/logo.png
diff --git a/KTUSA PS/ClientApp/src/assets/main.scss b/KTUSAPS/ClientApp/src/assets/main.scss
similarity index 100%
rename from KTUSA PS/ClientApp/src/assets/main.scss
rename to KTUSAPS/ClientApp/src/assets/main.scss
diff --git a/KTUSA PS/ClientApp/src/components/NavMenu.vue b/KTUSAPS/ClientApp/src/components/NavMenu.vue
similarity index 100%
rename from KTUSA PS/ClientApp/src/components/NavMenu.vue
rename to KTUSAPS/ClientApp/src/components/NavMenu.vue
diff --git a/KTUSA PS/ClientApp/src/main.js b/KTUSAPS/ClientApp/src/main.js
similarity index 100%
rename from KTUSA PS/ClientApp/src/main.js
rename to KTUSAPS/ClientApp/src/main.js
diff --git a/KTUSA PS/ClientApp/src/pages/Home.vue b/KTUSAPS/ClientApp/src/pages/Home.vue
similarity index 100%
rename from KTUSA PS/ClientApp/src/pages/Home.vue
rename to KTUSAPS/ClientApp/src/pages/Home.vue
diff --git a/KTUSA PS/ClientApp/src/pages/OidcEndpoint.vue b/KTUSAPS/ClientApp/src/pages/OidcEndpoint.vue
similarity index 100%
rename from KTUSA PS/ClientApp/src/pages/OidcEndpoint.vue
rename to KTUSAPS/ClientApp/src/pages/OidcEndpoint.vue
diff --git a/KTUSA PS/ClientApp/src/router/index.js b/KTUSAPS/ClientApp/src/router/index.js
similarity index 100%
rename from KTUSA PS/ClientApp/src/router/index.js
rename to KTUSAPS/ClientApp/src/router/index.js
diff --git a/KTUSA PS/ClientApp/src/store/index.js b/KTUSAPS/ClientApp/src/store/index.js
similarity index 100%
rename from KTUSA PS/ClientApp/src/store/index.js
rename to KTUSAPS/ClientApp/src/store/index.js
diff --git a/KTUSA PS/ClientApp/src/store/modules/auth.js b/KTUSAPS/ClientApp/src/store/modules/auth.js
similarity index 100%
rename from KTUSA PS/ClientApp/src/store/modules/auth.js
rename to KTUSAPS/ClientApp/src/store/modules/auth.js
diff --git a/KTUSA PS/ClientApp/vue.config.js b/KTUSAPS/ClientApp/vue.config.js
similarity index 100%
rename from KTUSA PS/ClientApp/vue.config.js
rename to KTUSAPS/ClientApp/vue.config.js
diff --git a/KTUSA PS/Controllers/AuthMetadataController.cs b/KTUSAPS/Controllers/AuthMetadataController.cs
similarity index 95%
rename from KTUSA PS/Controllers/AuthMetadataController.cs
rename to KTUSAPS/Controllers/AuthMetadataController.cs
index b730969..c1c62d1 100644
--- a/KTUSA PS/Controllers/AuthMetadataController.cs	
+++ b/KTUSAPS/Controllers/AuthMetadataController.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace KTUSA_PS.Controllers
+namespace KTUSAPS.Controllers
 {
     [Route("api/[controller]")]
     [ApiController]
diff --git a/KTUSA PS/Controllers/TestController.cs b/KTUSAPS/Controllers/TestController.cs
similarity index 95%
rename from KTUSA PS/Controllers/TestController.cs
rename to KTUSAPS/Controllers/TestController.cs
index 1701d0a..fcaf3f7 100644
--- a/KTUSA PS/Controllers/TestController.cs	
+++ b/KTUSAPS/Controllers/TestController.cs
@@ -7,7 +7,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace KTUSA_PS.Controllers
+namespace KTUSAPS.Controllers
 {
     [Route("[controller]")]
     [Authorize]
diff --git a/KTUSA PS/KTUSA PS.csproj b/KTUSAPS/KTUSAPS.csproj
similarity index 83%
rename from KTUSA PS/KTUSA PS.csproj
rename to KTUSAPS/KTUSAPS.csproj
index 74ee535..149e5f5 100644
--- a/KTUSA PS/KTUSA PS.csproj	
+++ b/KTUSAPS/KTUSAPS.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-    <RootNamespace>KTUSA_PS</RootNamespace>
+    <RootNamespace>KTUSAPS</RootNamespace>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -22,10 +22,6 @@
     <None Include="$(SpaRoot)**" Exclude="$(SpaRoot)node_modules\**" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Remove="ClientApp\src\assets\NewFile.txt" />
-  </ItemGroup>
-
   <Target Name="DebugEnsureNodeEnv" BeforeTargets="Build" Condition=" '$(Configuration)' == 'Debug' And !Exists('$(SpaRoot)node_modules') ">
     <!-- Ensure Node.js is installed -->
     <Exec Command="node --version" ContinueOnError="true">
@@ -40,12 +36,10 @@
     <!-- As part of publishing, ensure the JS resources are freshly built in production mode -->
     <Exec WorkingDirectory="$(SpaRoot)" Command="npm install" />
     <Exec WorkingDirectory="$(SpaRoot)" Command="npm run build -- --prod" />
-    <Exec WorkingDirectory="$(SpaRoot)" Command="npm run build:ssr -- --prod" Condition=" '$(BuildServerSideRenderer)' == 'true' " />
 
     <!-- Include the newly-built files in the publish output -->
     <ItemGroup>
-      <DistFiles Include="$(SpaRoot)dist\**; $(SpaRoot)dist-server\**" />
-      <DistFiles Include="$(SpaRoot)node_modules\**" Condition="'$(BuildServerSideRenderer)' == 'true'" />
+      <DistFiles Include="$(SpaRoot)dist\**" />
       <ResolvedFileToPublish Include="@(DistFiles->'%(FullPath)')" Exclude="@(ResolvedFileToPublish)">
         <RelativePath>%(DistFiles.Identity)</RelativePath>
         <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
diff --git a/KTUSA PS/Program.cs b/KTUSAPS/Program.cs
similarity index 97%
rename from KTUSA PS/Program.cs
rename to KTUSAPS/Program.cs
index 2f1fe16..4bd59b1 100644
--- a/KTUSA PS/Program.cs	
+++ b/KTUSAPS/Program.cs
@@ -7,7 +7,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace KTUSA_PS
+namespace KTUSAPS
 {
     public class Program
     {
diff --git a/KTUSA PS/Properties/launchSettings.json b/KTUSAPS/Properties/launchSettings.json
similarity index 97%
rename from KTUSA PS/Properties/launchSettings.json
rename to KTUSAPS/Properties/launchSettings.json
index 66b6894..6982f02 100644
--- a/KTUSA PS/Properties/launchSettings.json	
+++ b/KTUSAPS/Properties/launchSettings.json
@@ -16,7 +16,7 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
-    "KTUSA_PS": {
+    "KTUSAPS": {
       "commandName": "Project",
       "launchBrowser": true,
       "launchUrl": "weatherforecast",
diff --git a/KTUSA PS/Startup.cs b/KTUSAPS/Startup.cs
similarity index 83%
rename from KTUSA PS/Startup.cs
rename to KTUSAPS/Startup.cs
index e7f2ede..d2aee56 100644
--- a/KTUSA PS/Startup.cs	
+++ b/KTUSAPS/Startup.cs
@@ -1,19 +1,12 @@
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json;
-using System.Threading.Tasks;
 using VueCliMiddleware;
 
-namespace KTUSA_PS
+namespace KTUSAPS
 {
     public class Startup
     {
@@ -30,7 +23,7 @@ namespace KTUSA_PS
             services.AddControllers();
             services.AddSpaStaticFiles(configuration =>
             {
-                configuration.RootPath = "ClientApp";
+                configuration.RootPath = "ClientApp/dist";
             });
 
             services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
@@ -69,10 +62,7 @@ namespace KTUSA_PS
 
             app.UseSpa(spa =>
             {
-                if (env.IsDevelopment())
-                    spa.Options.SourcePath = "ClientApp/";
-                else
-                    spa.Options.SourcePath = "dist";
+                spa.Options.SourcePath = "ClientApp/";
 
                 if (env.IsDevelopment())
                 {
diff --git a/KTUSA PS/appsettings.Development.json b/KTUSAPS/appsettings.Development.json
similarity index 100%
rename from KTUSA PS/appsettings.Development.json
rename to KTUSAPS/appsettings.Development.json
diff --git a/KTUSA PS/appsettings.json b/KTUSAPS/appsettings.json
similarity index 100%
rename from KTUSA PS/appsettings.json
rename to KTUSAPS/appsettings.json